2 files changed, 6 insertions, 5 deletions

diff --git a/cps-ri/src/main/java/org/onap/cps/ri/CpsModulePersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/ri/CpsModulePersistenceServiceImpl.java
index 64c9539a01..4f7492ff26 100755
--- a/cps-ri/src/main/java/org/onap/cps/ri/CpsModulePersistenceServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/ri/CpsModulePersistenceServiceImpl.java
@@ -227,8 +227,9 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ
 
     @Override
     @Transactional
-    public void deleteAllUnusedYangModuleData() {
-        schemaSetRepository.deleteOrphanedSchemaSets();
+    public void deleteAllUnusedYangModuleData(final String dataspaceName) {
+        final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
+        schemaSetRepository.deleteOrphanedSchemaSets(dataspaceEntity.getId());
         yangResourceRepository.deleteOrphanedYangResources();
     }
 
diff --git a/cps-ri/src/main/java/org/onap/cps/ri/repository/SchemaSetRepository.java b/cps-ri/src/main/java/org/onap/cps/ri/repository/SchemaSetRepository.java
index b8dd7b755c..fdd72624ba 100644
--- a/cps-ri/src/main/java/org/onap/cps/ri/repository/SchemaSetRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/ri/repository/SchemaSetRepository.java
@@ -83,8 +83,8 @@ public interface SchemaSetRepository extends JpaRepository<SchemaSetEntity, Inte
      */
     @Modifying
     @Query(value = """
-           DELETE FROM schema_set WHERE NOT EXISTS
-           (SELECT 1 FROM anchor WHERE anchor.schema_set_id = schema_set.id)
+           DELETE FROM schema_set WHERE schema_set.dataspace_id = :dataspaceId AND
+           NOT EXISTS (SELECT 1 FROM anchor WHERE anchor.schema_set_id = schema_set.id)
            """, nativeQuery = true)
-    void deleteOrphanedSchemaSets();
+    void deleteOrphanedSchemaSets(@Param("dataspaceId") final int dataspaceId);
 }