improve getAllTemplatesServiceModelIds query

[vid.git] / vid-app-common / src / main / java / org / onap / vid / dal / AsyncInstantiationRepository.kt

diff --git a/vid-app-common/src/main/java/org/onap/vid/dal/AsyncInstantiationRepository.kt b/vid-app-common/src/main/java/org/onap/vid/dal/AsyncInstantiationRepository.kt
index b638a03..b23a464 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/dal/AsyncInstantiationRepository.kt
+++ b/vid-app-common/src/main/java/org/onap/vid/dal/AsyncInstantiationRepository.kt
@@ -163,11 +163,10 @@ class AsyncInstantiationRepository @Autowired constructor(val dataAccessService:
             dataAccessService.getList(ServiceInfo::class.java, filterInstantiatedServiceByServiceModelId(serviceModelId), orderByCreatedDateAndStatus(), null) as List<ServiceInfo>;
 
     fun getAllTemplatesServiceModelIds(): Set<String> {
-        val allTemplatesInfo =
-                dataAccessService.getList(ServiceInfo::class.java, filterByInstantiateActionStatus(), null, null) as List<ServiceInfo>
-
-        return allTemplatesInfo
-                .map { it.serviceModelId }
-                .toHashSet()
+        val allTemplatesServiceModelID: List<String> =
+            dataAccessService.executeQuery(
+                "select distinct serviceModelId from ServiceInfo ${filterByInstantiateActionStatus()}",
+                null) as List<String>
+        return allTemplatesServiceModelID.toHashSet()
     }
 }