RAP-85 Updated ModuleDependency automation for Derivative

IHTSDO · Jun 11, 2024 · 7c09f1e · 7c09f1e
1 parent 7fd309d
commit 7c09f1e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java b/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java
@@ -183,9 +183,13 @@ public Set<ReferenceSetMember> generateModuleDependencies(String branchPath, Str
 		Map<String, Set<String>> mutualDependencies = detectMutualDependencies(rmPage.getContent());
 		modulesRequired.addAll(mutualDependencies.keySet());
 
-		//If we're not an Edition, remove all international modules
+		//If we're not an Edition, remove all international modules, but keep the Derivative modules
 		if (!isEdition) {
-			modulesRequired.removeAll(cachedInternationalModules);
+			for (String module : cachedInternationalModules) {
+				if (modulesIncluded == null || !modulesIncluded.contains(module)) {
+					modulesRequired.remove(module);
+				}
+			}
 		}
 
 		//Recover all these module concepts to find out what module they themselves were defined in.