Merge branch 'feature/434618_datasets_count' into 'develop'

feature/434618_datasets_count See merge request upm-inesdata/inesdata-connector!23
oeg-upm · Jun 19, 2024 · 007ba89 · 007ba89
2 parents 31bf6d2 + 74cf770
commit 007ba89
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...i/src/main/java/org/upm/inesdata/countelements/controller/CountElementsApiController.java b/...i/src/main/java/org/upm/inesdata/countelements/controller/CountElementsApiController.java
@@ -30,7 +30,8 @@ public long countElements(@QueryParam("type") String entityType) {
         if (!Objects.equals(entityType, "asset") && !Objects.equals(entityType, "policyDefinition")
                 && !Objects.equals(entityType, "contractDefinition")
                 && !Objects.equals(entityType, "contractAgreement")
-                && !Objects.equals(entityType, "transferProcess")) {
+                && !Objects.equals(entityType, "transferProcess")
+                && !Objects.equals(entityType, "federatedCatalog")) {
             throw new BadRequestException("Entity type provided is not valid");
         }
 

diff --git a/...c/main/java/org/upm/inesdata/countelements/sql/index/schema/BaseSqlDialectStatements.java b/...c/main/java/org/upm/inesdata/countelements/sql/index/schema/BaseSqlDialectStatements.java
@@ -34,6 +34,9 @@ public String getCount(String entityType) {
             case "transferProcess":
                 tableName = getTransferProcessTable();
                 break;
+            case "federatedCatalog":
+                tableName = getDatasetTable();
+                break;
         }
         return format("SELECT COUNT(*) FROM %s",
                 tableName);

diff --git a/...rc/main/java/org/upm/inesdata/countelements/sql/index/schema/CountElementsStatements.java b/...rc/main/java/org/upm/inesdata/countelements/sql/index/schema/CountElementsStatements.java
@@ -38,12 +38,19 @@ default String getContractDefinitionTable() {
     }
 
     /**
-     * The vocabulary table name.
+     * The transfer process table name.
      */
     default String getTransferProcessTable() {
         return "edc_transfer_process";
     }
 
+    /**
+     * The dataset table name.
+     */
+    default String getDatasetTable() {
+        return "edc_dataset";
+    }
+
     /**
      * SELECT COUNT clause.
      */