Merge pull request #1335 from b2ihealthcare/issue/SO-6307-module_depe…

…ndency_member_conflicts SO-6307: Do not report module dependency member conflicts
b2ihealthcare · Oct 14, 2024 · a39a06a · a39a06a
2 parents 8fe28ff + 30b8eea
commit a39a06a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...m/b2international/snowowl/snomed/core/merge/SnomedComponentRevisionConflictProcessor.java b/...m/b2international/snowowl/snomed/core/merge/SnomedComponentRevisionConflictProcessor.java
@@ -146,6 +146,7 @@ public List<Conflict> filterConflicts(StagingArea staging, List<Conflict> confli
 		}
 
 		final Multimap<Class<?>, String> donatedComponentsByType = HashMultimap.create();
+		final Set<String> componentIdsToSkip = Sets.newHashSet();
 
 		// collect components from known donation conflicts
 		for (Conflict conflict : conflicts) {
@@ -160,6 +161,11 @@ public List<Conflict> filterConflicts(StagingArea staging, List<Conflict> confli
 						|| SnomedRf2Headers.FIELD_MODULE_ID.equals(changedInSourceAndTarget.getSourceChange().getProperty())) {
 					donatedComponentsByType.put(DocumentMapping.getClass(objectId.type()), objectId.id());
 				}
+
+				if (SnomedRf2Headers.FIELD_TARGET_EFFECTIVE_TIME.equals(changedInSourceAndTarget.getSourceChange().getProperty())
+						|| SnomedRf2Headers.FIELD_SOURCE_EFFECTIVE_TIME.equals(changedInSourceAndTarget.getSourceChange().getProperty())) {
+					componentIdsToSkip.add(objectId.id());
+				}
 			}
 		}
 
@@ -174,14 +180,13 @@ public List<Conflict> filterConflicts(StagingArea staging, List<Conflict> confli
 				.stream()
 				.filter(conflict -> {
 					ObjectId objectId = conflict.getObjectId();
-					if (donatedComponentIds.contains(objectId.id())) {
+					if (donatedComponentIds.contains(objectId.id()) || componentIdsToSkip.contains(objectId.id())) {
 						// filter out all conflicts reported around donated content
 						// revise all donated content on merge source, so new parent revision will take place instead
 						staging.reviseOnMergeSource(DocumentMapping.getClass(objectId.type()), objectId.id());
 						return false;
-					} else {
-						return true;
 					}
+					return true;
 				})
 				.collect(Collectors.toList());
 	}