From 052b755e28b160ed26676e720ed922e5a83c300a Mon Sep 17 00:00:00 2001 From: niamhcore Date: Fri, 17 Sep 2021 10:30:56 +0100 Subject: Updating fetch all yang modules queries and tests Issue-ID: CPS-670 Signed-off-by: niamhcore Change-Id: I11e6da303320aea096a135eb93e270a5fd014740 --- .../cps/spi/repository/YangResourceRepository.java | 34 ++++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'cps-ri/src/main/java/org') diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java index b16b284a2..764e2dfc7 100644 --- a/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/YangResourceRepository.java @@ -38,29 +38,31 @@ public interface YangResourceRepository extends JpaRepository findAllByChecksumIn(@NotNull Set checksum); @Query(value = "SELECT DISTINCT\n" - + "yr.module_name AS module_name,\n" - + "yr.revision AS revision\n" + + "yang_resource.module_name AS module_name,\n" + + "yang_resource.revision AS revision\n" + "FROM\n" - + "dataspace d\n" - + "JOIN schema_set ss ON ss.dataspace_id = d.id\n" - + "JOIN schema_set_yang_resources ssyr ON ssyr.schema_set_id = ss.id\n" - + "JOIN yang_resource yr ON yr.id = ssyr.yang_resource_id\n" + + "dataspace dataspace\n" + + "JOIN schema_set schema_set ON schema_set.dataspace_id = dataspace.id\n" + + "JOIN schema_set_yang_resources schema_set_yang_resource ON schema_set_yang_resource.schema_set_id = " + + "schema_set.id\n" + + "JOIN yang_resource yang_resource ON yang_resource.id = schema_set_yang_resource.yang_resource_id\n" + "WHERE\n" - + "d.name = :dataspaceName", nativeQuery = true) + + "dataspace.name = :dataspaceName", nativeQuery = true) Set findAllModuleReferences(@Param("dataspaceName") String dataspaceName); @Query(value = "SELECT DISTINCT\n" - + "yr.module_Name AS module_name,\n" - + "yr.revision AS revision\n" + + "yang_resource.module_Name AS module_name,\n" + + "yang_resource.revision AS revision\n" + "FROM\n" - + "dataspace d\n" - + "JOIN anchor a ON a.dataspace_id = d.id\n" - + "JOIN schema_set ss ON ss.dataspace_id = a.dataspace_id\n" - + "JOIN schema_set_yang_resources ssyr ON ssyr.schema_set_id = ss.id\n" - + "JOIN yang_resource yr ON yr.id = ssyr.yang_resource_id\n" + + "dataspace dataspace\n" + + "JOIN anchor anchor ON anchor.dataspace_id = dataspace.id\n" + + "JOIN schema_set schema_set ON schema_set.id = anchor.schema_set_id\n" + + "JOIN schema_set_yang_resources schema_set_yang_resource ON schema_set_yang_resource.schema_set_id = " + + "schema_set.id\n" + + "JOIN yang_resource yang_resource ON yang_resource.id = schema_set_yang_resource.yang_resource_id\n" + "WHERE\n" - + "d.name = :dataspaceName AND\n" - + "a.name =:anchorName", nativeQuery = true) + + "dataspace.name = :dataspaceName AND\n" + + "anchor.name =:anchorName", nativeQuery = true) Set findAllModuleReferences( @Param("dataspaceName") String dataspaceName, @Param("anchorName") String anchorName); -- cgit 1.2.3-korg