Revision 58355
Added by Michele Artini about 4 years ago
| DatabaseUtils.java | ||
|---|---|---|
| 23 | 23 |
import eu.dnetlib.organizations.controller.UserRole; |
| 24 | 24 |
import eu.dnetlib.organizations.model.Acronym; |
| 25 | 25 |
import eu.dnetlib.organizations.model.OpenaireConflict; |
| 26 |
import eu.dnetlib.organizations.model.OpenaireConflictPK; |
|
| 26 | 27 |
import eu.dnetlib.organizations.model.Organization; |
| 27 | 28 |
import eu.dnetlib.organizations.model.OtherIdentifier; |
| 28 | 29 |
import eu.dnetlib.organizations.model.OtherName; |
| ... | ... | |
| 112 | 113 |
final Relationship r2 = new Relationship(r.getRelatedOrgId(), orgId, RelationType.valueOf(r.getType()).getInverse().toString()); |
| 113 | 114 |
relationshipRepository.save(r1); |
| 114 | 115 |
relationshipRepository.save(r2); |
| 116 |
|
|
| 117 |
if (r.getType().equals(RelationType.Merged_In.toString()) || r.getType().equals(RelationType.Merges.toString())) {
|
|
| 118 |
openaireConflictRepository.findById(new OpenaireConflictPK(orgId, r.getRelatedOrgId())).ifPresent(openaireConflictRepository::delete); |
|
| 119 |
openaireConflictRepository.findById(new OpenaireConflictPK(r.getRelatedOrgId(), orgId)).ifPresent(openaireConflictRepository::delete); |
|
| 120 |
} |
|
| 115 | 121 |
}); |
| 116 | 122 |
} |
| 117 | 123 |
|
Also available in: Unified diff
merges and merged_in relations