MySQL Exists statement Support (#1760) (#1769)

* Remove custom exists queries and use jpql to have spring do queries based on the drivers which handle all details * Run spotless:apply * Update to recitfy exists statement that had a not clause in it. * Use a converter to ensure that the data is converted correctly from the db to the app and vice versa --------- Signed-off-by: Aindriu Lavelle <[email protected]>
Aiven-Open · Sep 14, 2023 · 487f684 · 487f684
1 parent 693fd74
commit 487f684
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 102 deletions.
diff --git a/core/src/main/java/io/aiven/klaw/dao/Acl.java b/core/src/main/java/io/aiven/klaw/dao/Acl.java
@@ -1,5 +1,6 @@
 package io.aiven.klaw.dao;
 
+import io.aiven.klaw.helpers.AclIPPrincipleTypeConverter;
 import io.aiven.klaw.helpers.AivenAclIdConverter;
 import io.aiven.klaw.model.enums.AclIPPrincipleType;
 import jakarta.persistence.Column;
@@ -72,5 +73,6 @@ public class Acl implements Serializable {
   private Map<String, String> jsonParams;
 
   @Column(name = "aclipprincipletype")
+  @Convert(converter = AclIPPrincipleTypeConverter.class)
   private AclIPPrincipleType aclIpPrincipleType;
 }
diff --git a/core/src/main/java/io/aiven/klaw/dao/AclRequests.java b/core/src/main/java/io/aiven/klaw/dao/AclRequests.java
@@ -1,14 +1,9 @@
 package io.aiven.klaw.dao;
 
+import io.aiven.klaw.helpers.AclIPPrincipleTypeConverter;
 import io.aiven.klaw.helpers.AivenAclIdConverter;
 import io.aiven.klaw.model.enums.AclIPPrincipleType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Convert;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.List;
@@ -107,6 +102,7 @@ public class AclRequests implements Serializable {
   private Map<String, String> jsonParams;
 
   @Column(name = "aclipprincipletype")
+  @Convert(converter = AclIPPrincipleTypeConverter.class)
   private AclIPPrincipleType aclIpPrincipleType;
 
   @Transient private String totalNoPages;

diff --git a/core/src/main/java/io/aiven/klaw/helpers/AclIPPrincipleTypeConverter.java b/core/src/main/java/io/aiven/klaw/helpers/AclIPPrincipleTypeConverter.java
@@ -0,0 +1,32 @@
+package io.aiven.klaw.helpers;
+
+import io.aiven.klaw.model.enums.AclIPPrincipleType;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter
+public class AclIPPrincipleTypeConverter
+    implements AttributeConverter<AclIPPrincipleType, Integer> {
+
+  @Override
+  public Integer convertToDatabaseColumn(AclIPPrincipleType aclIPPrincipleType) {
+    if (aclIPPrincipleType == null) {
+      return null;
+    }
+
+    return aclIPPrincipleType.ordinal();
+  }
+
+  @Override
+  public AclIPPrincipleType convertToEntityAttribute(Integer ordinalAclIpPrincipalType) {
+    if (ordinalAclIpPrincipalType == null) {
+      return null;
+    }
+    return switch (ordinalAclIpPrincipalType) {
+      case 0 -> AclIPPrincipleType.IP_ADDRESS;
+      case 1 -> AclIPPrincipleType.PRINCIPAL;
+      case 2 -> AclIPPrincipleType.USERNAME;
+      default -> null;
+    };
+  }
+}
diff --git a/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java b/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java
@@ -1047,7 +1047,7 @@ public List<Acl> getUniqueConsumerGroups(int tenantId) {
 
   public boolean validateIfConsumerGroupUsedByAnotherTeam(
       Integer teamId, int tenantId, String consumerGroup) {
-    return aclRepo.validateIfConsumerGroupUsedByAnotherTeam(teamId, tenantId, consumerGroup);
+    return aclRepo.existsByTeamIdNotAndTenantIdAndConsumergroup(teamId, tenantId, consumerGroup);
   }
 
   public Team selectTeamDetails(Integer teamId, int tenantId) {
@@ -1468,43 +1468,50 @@ public boolean existsSchemaComponentsForEnv(String env, int tenantId) {
   public boolean existsComponentsCountForTeam(Integer teamId, int tenantId) {
     return Stream.<Supplier<Boolean>>of(
             () -> {
-              boolean res = schemaRequestRepo.existsRecordsCountForTeamId(teamId, tenantId);
+              boolean res =
+                  schemaRequestRepo.existsByTeamIdAndTenantIdAndRequestStatus(
+                      teamId, tenantId, RequestStatus.CREATED.value);
               log.debug("For team {} Active Schema Requests {}", teamId, res);
               return res;
             },
             () -> {
-              boolean res = messageSchemaRepo.existsRecordsCountForTeamId(teamId, tenantId);
+              boolean res = messageSchemaRepo.existsByTeamIdAndTenantId(teamId, tenantId);
               log.debug("For team {} number of Schemas in DB {}", teamId, res);
               return res;
             },
             () -> {
-              boolean res = kafkaConnectorRepo.existsRecordsCountForTeamId(teamId, tenantId);
+              boolean res = kafkaConnectorRepo.existsByTeamIdAndTenantId(teamId, tenantId);
               log.debug("For team {} Active Connector Requests {}", teamId, res);
               return res;
             },
             () -> {
               boolean res =
-                  kafkaConnectorRequestsRepo.existsRecordsCountForTeamId(teamId, tenantId);
+                  kafkaConnectorRequestsRepo.existsByTeamIdAndTenantIdAndRequestStatus(
+                      teamId, tenantId, RequestStatus.CREATED.value);
               log.debug("For team {} number of Connector in DB {}", teamId, res);
               return res;
             },
             () -> {
-              boolean res = topicRepo.existsRecordsCountForTeamId(teamId, tenantId);
+              boolean res = topicRepo.existsByTeamIdAndTenantId(teamId, tenantId);
               log.debug("For team {} Active Topic Requests {}", teamId, res);
               return res;
             },
             () -> {
-              boolean res = topicRequestsRepo.existsRecordsCountForTeamId(teamId, tenantId);
+              boolean res =
+                  topicRequestsRepo.existsByTeamIdAndTenantIdAndRequestStatus(
+                      teamId, tenantId, RequestStatus.CREATED.value);
               log.debug("For team {} number of Topic in DB {}", teamId, res);
               return res;
             },
             () -> {
-              boolean res = aclRepo.existsRecordsCountForTeamId(teamId, tenantId);
+              boolean res = aclRepo.existsByTeamIdAndTenantId(teamId, tenantId);
               log.debug("For team {} Active ACL Requests {}", teamId, res);
               return res;
             },
             () -> {
-              boolean res = aclRequestsRepo.existsRecordsCountForTeamId(teamId, tenantId);
+              boolean res =
+                  aclRequestsRepo.existsByTeamIdAndTenantIdAndRequestStatus(
+                      teamId, tenantId, RequestStatus.CREATED.value);
               log.debug("For team {} number of ACL in DB {}", teamId, res);
               return res;
             })
@@ -1513,10 +1520,18 @@ public boolean existsComponentsCountForTeam(Integer teamId, int tenantId) {
 
   public boolean existsComponentsCountForUser(String userId, int tenantId) {
     return Stream.<Supplier<Boolean>>of(
-            () -> schemaRequestRepo.existsRecordsCountForUserId(userId, tenantId),
-            () -> kafkaConnectorRequestsRepo.existsRecordsCountForUserId(userId, tenantId),
-            () -> topicRequestsRepo.existsRecordsCountForUserId(userId, tenantId),
-            () -> aclRequestsRepo.existsRecordsCountForUserId(userId, tenantId))
+            () ->
+                schemaRequestRepo.existsByRequestorAndTenantIdAndRequestStatus(
+                    userId, tenantId, RequestStatus.CREATED.value),
+            () ->
+                kafkaConnectorRequestsRepo.existsByRequestorAndTenantIdAndRequestStatus(
+                    userId, tenantId, RequestStatus.CREATED.value),
+            () ->
+                topicRequestsRepo.existsByRequestorAndTenantIdAndRequestStatus(
+                    userId, tenantId, RequestStatus.CREATED.value),
+            () ->
+                aclRequestsRepo.existsByRequestorAndTenantIdAndRequestStatus(
+                    userId, tenantId, RequestStatus.CREATED.value))
         .anyMatch(Supplier::get);
   }
 

diff --git a/core/src/main/java/io/aiven/klaw/repository/AclRepo.java b/core/src/main/java/io/aiven/klaw/repository/AclRepo.java
@@ -25,14 +25,8 @@ List<Acl> findAllByEnvironmentAndAclPatternTypeAndTenantId(
 
   List<Acl> findAllByTenantId(int tenantId);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwacls where teamid != :teamId and tenantid = :tenantId and consumergroup = :consumerGroup)",
-      nativeQuery = true)
-  boolean validateIfConsumerGroupUsedByAnotherTeam(
-      @Param("teamId") Integer teamId,
-      @Param("tenantId") Integer tenantId,
-      @Param("consumerGroup") String consumerGroup);
+  boolean existsByTeamIdNotAndTenantIdAndConsumergroup(
+      Integer teamId, Integer tenantId, String consumerGroup);
 
   boolean existsByEnvironmentAndTenantId(
       @Param("envId") String envId, @Param("tenantId") Integer tenantId);
@@ -43,10 +37,7 @@ boolean existsByEnvironmentAndTenantId(
   List<Object[]> findAllAclsCountForEnv(
       @Param("envId") String envId, @Param("tenantId") Integer tenantId);
 
-  @Query(
-      value = "select exists(select 1 from kwacls where teamid = :teamId and tenantid = :tenantId)",
-      nativeQuery = true)
-  boolean existsRecordsCountForTeamId(
+  boolean existsByTeamIdAndTenantId(
       @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId);
 
   @Query(

diff --git a/core/src/main/java/io/aiven/klaw/repository/AclRequestsRepo.java b/core/src/main/java/io/aiven/klaw/repository/AclRequestsRepo.java
@@ -24,12 +24,8 @@ boolean existsByTenantIdAndEnvironmentAndRequestStatus(
   boolean existsByEnvironmentAndTenantId(
       @Param("envId") String envId, @Param("tenantId") Integer tenantId);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwaclrequests where teamid = :teamId and tenantid = :tenantId and topicstatus='created')",
-      nativeQuery = true)
-  boolean existsRecordsCountForTeamId(
-      @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId);
+  boolean existsByTeamIdAndTenantIdAndRequestStatus(
+      @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId, String requestStatus);
 
   @Query(
       value =
@@ -38,12 +34,8 @@ boolean existsRecordsCountForTeamId(
   List<Object[]> findAllRecordsCountForUserId(
       @Param("userId") String userId, @Param("tenantId") Integer tenantId);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwaclrequests where (requestor = :userId) and tenantid = :tenantId and topicstatus='created')",
-      nativeQuery = true)
-  boolean existsRecordsCountForUserId(
-      @Param("userId") String userId, @Param("tenantId") Integer tenantId);
+  boolean existsByRequestorAndTenantIdAndRequestStatus(
+      String requestor, Integer tenantId, String requestStatus);
 
   @Query(
       value = "select max(aclid) from kwaclrequests where tenantid = :tenantId",

diff --git a/core/src/main/java/io/aiven/klaw/repository/KwKafkaConnectorRepo.java b/core/src/main/java/io/aiven/klaw/repository/KwKafkaConnectorRepo.java
@@ -28,12 +28,7 @@ List<KwKafkaConnector> findAllByConnectorNameAndEnvironmentAndTenantId(
   boolean existsByEnvironmentAndTenantId(
       @Param("envId") String envId, @Param("tenantId") Integer tenantId);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwkafkaconnector where teamid = :teamId and tenantid = :tenantId)",
-      nativeQuery = true)
-  boolean existsRecordsCountForTeamId(
-      @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId);
+  boolean existsByTeamIdAndTenantId(Integer teamId, Integer tenantId);
 
   @Query(
       value = "select max(connectorid) from kwkafkaconnector where tenantid = :tenantId",

diff --git a/core/src/main/java/io/aiven/klaw/repository/KwKafkaConnectorRequestsRepo.java b/core/src/main/java/io/aiven/klaw/repository/KwKafkaConnectorRequestsRepo.java
@@ -46,19 +46,11 @@ boolean existsByEnvironmentAndTenantIdAndRequestStatus(
       nativeQuery = true)
   Integer getNextConnectorRequestId(@Param("tenantId") Integer tenantId);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwkafkaconnectorrequests where teamid = :teamId and tenantid = :tenantId and connectorstatus='created')",
-      nativeQuery = true)
-  boolean existsRecordsCountForTeamId(
-      @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId);
+  boolean existsByTeamIdAndTenantIdAndRequestStatus(
+      Integer teamId, Integer tenantId, String requestStatus);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwkafkaconnectorrequests where (requestor = :userId) and tenantid = :tenantId and connectorstatus='created')",
-      nativeQuery = true)
-  boolean existsRecordsCountForUserId(
-      @Param("userId") String userId, @Param("tenantId") Integer tenantId);
+  boolean existsByRequestorAndTenantIdAndRequestStatus(
+      String requestor, Integer tenantId, String requestStatus);
 
   @Query(
       value =

diff --git a/core/src/main/java/io/aiven/klaw/repository/MessageSchemaRepo.java b/core/src/main/java/io/aiven/klaw/repository/MessageSchemaRepo.java
@@ -28,12 +28,7 @@ List<MessageSchema> findAllByTenantIdAndTopicnameAndSchemaversionAndEnvironment(
   boolean existsMessageSchemaByEnvironmentAndTenantId(
       @Param("envId") String envId, @Param("tenantId") Integer tenantId);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwavroschemas where teamid = :teamId and tenantid = :tenantId)",
-      nativeQuery = true)
-  boolean existsRecordsCountForTeamId(
-      @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId);
+  boolean existsByTeamIdAndTenantId(Integer teamId, Integer tenantId);
 
   @Query(
       value = "select max(avroschemaid) from kwavroschemas where tenantid = :tenantId",

diff --git a/core/src/main/java/io/aiven/klaw/repository/SchemaRequestRepo.java b/core/src/main/java/io/aiven/klaw/repository/SchemaRequestRepo.java
@@ -34,19 +34,11 @@ boolean existsSchemaRequestByEnvironmentAndTenantId(
   boolean existsSchemaRequestByEnvironmentAndTenantIdAndRequestStatus(
       String envId, Integer tenantId, String requestStatus);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwschemarequests where teamid = :teamId and tenantid = :tenantId and topicstatus='created')",
-      nativeQuery = true)
-  boolean existsRecordsCountForTeamId(
-      @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId);
+  boolean existsByTeamIdAndTenantIdAndRequestStatus(
+      Integer teamId, Integer tenantId, String topicStatus);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwschemarequests where (requestor = :userId) and tenantid = :tenantId and topicstatus='created')",
-      nativeQuery = true)
-  boolean existsRecordsCountForUserId(
-      @Param("userId") String userId, @Param("tenantId") Integer tenantId);
+  boolean existsByRequestorAndTenantIdAndRequestStatus(
+      String requestor, Integer tenantId, String requestStatus);
 
   List<SchemaRequest> findAllByTenantId(int tenantId);
 

diff --git a/core/src/main/java/io/aiven/klaw/repository/TopicRepo.java b/core/src/main/java/io/aiven/klaw/repository/TopicRepo.java
@@ -50,12 +50,7 @@ List<Object[]> findAllTopicsForTeam(
   boolean existsByEnvironmentAndTenantId(
       @Param("envId") String envId, @Param("tenantId") Integer tenantId);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwtopics where teamid = :teamId and tenantid = :tenantId)",
-      nativeQuery = true)
-  boolean existsRecordsCountForTeamId(
-      @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId);
+  boolean existsByTeamIdAndTenantId(Integer teamId, Integer tenantId);
 
   @Query(
       value =

diff --git a/core/src/main/java/io/aiven/klaw/repository/TopicRequestsRepo.java b/core/src/main/java/io/aiven/klaw/repository/TopicRequestsRepo.java
@@ -37,19 +37,11 @@ List<TopicRequest> findAllByRequestStatusAndTopicnameAndEnvironmentAndTenantId(
   boolean existsByEnvironmentAndTenantId(
       @Param("envId") String envId, @Param("tenantId") Integer tenantId);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwtopicrequests where teamid = :teamId and tenantid = :tenantId and topicstatus='created')",
-      nativeQuery = true)
-  boolean existsRecordsCountForTeamId(
-      @Param("teamId") Integer teamId, @Param("tenantId") Integer tenantId);
+  boolean existsByTeamIdAndTenantIdAndRequestStatus(
+      Integer teamId, Integer tenantId, String requestStatus);
 
-  @Query(
-      value =
-          "select exists(select 1 from kwtopicrequests where (requestor = :userId) and tenantid = :tenantId and topicstatus='created')",
-      nativeQuery = true)
-  boolean existsRecordsCountForUserId(
-      @Param("userId") String userId, @Param("tenantId") Integer tenantId);
+  boolean existsByRequestorAndTenantIdAndRequestStatus(
+      String requestor, Integer tenantId, String requestStatus);
 
   @Query(
       value = "select max(topicid) from kwtopicrequests where tenantid = :tenantId",

diff --git a/core/src/test/java/io/aiven/klaw/helpers/db/rdbms/AclRequestsIntegrationTest.java b/core/src/test/java/io/aiven/klaw/helpers/db/rdbms/AclRequestsIntegrationTest.java
@@ -6,10 +6,7 @@
 import io.aiven.klaw.UtilMethods;
 import io.aiven.klaw.dao.AclRequests;
 import io.aiven.klaw.dao.UserInfo;
-import io.aiven.klaw.model.enums.AclType;
-import io.aiven.klaw.model.enums.RequestMode;
-import io.aiven.klaw.model.enums.RequestOperationType;
-import io.aiven.klaw.model.enums.RequestStatus;
+import io.aiven.klaw.model.enums.*;
 import io.aiven.klaw.repository.AclRequestsRepo;
 import io.aiven.klaw.repository.KwKafkaConnectorRequestsRepo;
 import io.aiven.klaw.repository.SchemaRequestRepo;
@@ -806,6 +803,7 @@ private void generateData(
       acl.setRequestOperationType(aclType.value);
       acl.setRequestOperationType(requestOperationType.value); // Create/Delete ..
       acl.setAclType(aclType.value);
+      acl.setAclIpPrincipleType(AclIPPrincipleType.IP_ADDRESS);
       if (status != null) {
         acl.setRequestStatus(status);
       }