From: sourabh_sourabh <sourabh.sourabh@est.tech>
Date: Wed, 7 Feb 2024 10:26:33 +0000 (+0000)
Subject: Orphaned modules are removed from the DB before cmhandle removal
X-Git-Tag: 3.4.4~38^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=311b5fa28ae1c9934124c77730e05db9e6f8868f;p=cps.git

Orphaned modules are removed from the DB before cmhandle removal

- changed sequence of delete schema set by cascade to remove unused yang
  resource modules at last.

Issue-ID: CPS-2031
Change-Id: Icefc075165231cc4b9b170e04a2d12af645529e9
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
---

diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java
index 0f9eb3c64..14b949e5a 100644
--- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java
+++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java
@@ -117,8 +117,8 @@ public class CpsModuleServiceImpl implements CpsModuleService {
         final Collection<String> anchorNames = cpsAnchorService.getAnchors(dataspaceName, schemaSetNames)
             .stream().map(Anchor::getName).collect(Collectors.toSet());
         cpsAnchorService.deleteAnchors(dataspaceName, anchorNames);
-        cpsModulePersistenceService.deleteUnusedYangResourceModules();
         cpsModulePersistenceService.deleteSchemaSets(dataspaceName, schemaSetNames);
+        cpsModulePersistenceService.deleteUnusedYangResourceModules();
         for (final String schemaSetName : schemaSetNames) {
             yangTextSchemaSourceSetCache.removeFromCache(dataspaceName, schemaSetName);
         }