From 7c09f1ed30df5ee079a8a45fdf9c52707e4516dd Mon Sep 17 00:00:00 2001
From: Quyen Ly <quocquyenit@gmail.com>
Date: Tue, 11 Jun 2024 11:20:53 +0700
Subject: [PATCH] RAP-85 Updated ModuleDependency automation for Derivative

---
 .../core/data/services/ModuleDependencyService.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 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
index 28de20836..b76238402 100644
--- 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.