Merge branch 'feature/bugfix_vocabulary_creation' into 'develop'

feature/bugfix_vocabulary_creation See merge request upm-inesdata/inesdata-connector!32
oeg-upm · Aug 1, 2024 · 5403d0a · 5403d0a
2 parents 8f17da7 + b87d45b
commit 5403d0a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/...ary-index-sql/src/main/java/org/upm/inesdata/vocabulary/sql/index/SqlVocabularyIndex.java b/...ary-index-sql/src/main/java/org/upm/inesdata/vocabulary/sql/index/SqlVocabularyIndex.java
@@ -70,9 +70,10 @@ public StoreResult<Void> create(Vocabulary vocabulary) {
         Objects.requireNonNull(vocabulary);
 
         var vocabularyId = vocabulary.getId();
+        var connectorId = vocabulary.getConnectorId();
         return transactionContext.execute(() -> {
             try (var connection = getConnection()) {
-                if (existsById(vocabularyId, connection)) {
+                if (existsByIdAndConnectorId(vocabularyId, connectorId, connection)) {
                     var msg = format(VocabularyIndex.VOCABULARY_EXISTS_TEMPLATE, vocabularyId);
                     return StoreResult.alreadyExists(msg);
                 }
@@ -118,7 +119,8 @@ public StoreResult<Vocabulary> updateVocabulary(Vocabulary vocabulary) {
         return transactionContext.execute(() -> {
             try (var connection = getConnection()) {
                 var vocabularyId = vocabulary.getId();
-                if (existsById(vocabularyId, connection)) {
+                var connectorId = vocabulary.getConnectorId();
+                if (existsByIdAndConnectorId(vocabularyId, connectorId, connection)) {
                     queryExecutor.execute(connection, vocabularyStatements.getUpdateVocabularyTemplate(),
                             vocabulary.getName(),
                             toJson(vocabulary.getJsonSchema()),
@@ -167,9 +169,9 @@ private int mapRowCount(ResultSet resultSet) throws SQLException {
         return resultSet.getInt(vocabularyStatements.getCountVariableName());
     }
 
-    private boolean existsById(String vocabularyId, Connection connection) {
-        var sql = vocabularyStatements.getCountVocabularyByIdClause();
-        try (var stream = queryExecutor.query(connection, false, this::mapRowCount, sql, vocabularyId)) {
+    private boolean existsByIdAndConnectorId(String vocabularyId, String connectorId, Connection connection) {
+        var sql = vocabularyStatements.getCountVocabularyByIdAndConnectorIdClause();
+        try (var stream = queryExecutor.query(connection, false, this::mapRowCount, sql, vocabularyId, connectorId)) {
             return stream.findFirst().orElse(0) > 0;
         }
     }

diff --git a/.../src/main/java/org/upm/inesdata/vocabulary/sql/index/schema/BaseSqlDialectStatements.java b/.../src/main/java/org/upm/inesdata/vocabulary/sql/index/schema/BaseSqlDialectStatements.java
@@ -40,11 +40,12 @@ public String getUpdateVocabularyTemplate() {
     }
 
     @Override
-    public String getCountVocabularyByIdClause() {
-        return format("SELECT COUNT(*) AS %s FROM %s WHERE %s = ?",
+    public String getCountVocabularyByIdAndConnectorIdClause() {
+        return format("SELECT COUNT(*) AS %s FROM %s WHERE %s = ? AND %s = ?",
                 getCountVariableName(),
                 getVocabularyTable(),
-                getVocabularyIdColumn());
+                getVocabularyIdColumn(),
+                getConnectorIdColumn());
     }
 
     @Override

diff --git a/...-sql/src/main/java/org/upm/inesdata/vocabulary/sql/index/schema/VocabularyStatements.java b/...-sql/src/main/java/org/upm/inesdata/vocabulary/sql/index/schema/VocabularyStatements.java
@@ -59,7 +59,7 @@ default String getCreatedAtColumn() {
     /**
      * SELECT COUNT clause for vocabularys.
      */
-    String getCountVocabularyByIdClause();
+    String getCountVocabularyByIdAndConnectorIdClause();
 
     /**
      * SELECT clause for all vocabularys.