From 7aef94ed2e1e3b5be32d28e816b37770296804b1 Mon Sep 17 00:00:00 2001 From: Aindriu Lavelle Date: Fri, 18 Aug 2023 11:46:41 +0100 Subject: [PATCH] Update to use a type of String to make queries Signed-off-by: Aindriu Lavelle --- .../java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java | 5 +++-- .../aiven/klaw/repository/KwKafkaConnectorRequestsRepo.java | 3 ++- .../java/io/aiven/klaw/repository/TopicRequestsRepo.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) 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 index b20c6092e0..48e71b189d 100644 --- 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 @@ -1590,9 +1590,10 @@ public Map> getTopicRequestsCounts( operationTypeCountsMap.put(RequestOperationType.CLAIM.value, assignedToClaimReqs); if (RequestMode.MY_APPROVALS == requestMode) { // Make sure to remove any requests which the requestor can not approve + // Using Integer.toString() as it seems to be the fastest method of changing it. Long topicApprovalCount = topicRequestsRepo.countRequestorsTopicRequestsGroupByStatusType( - teamId, tenantId, requestor, RequestStatus.CREATED.value); + teamId, Integer.toString(teamId), tenantId, requestor, RequestStatus.CREATED.value); statusCountsMap.put( RequestStatus.CREATED.value, topicApprovalCount == null ? 0L : topicApprovalCount); @@ -1732,7 +1733,7 @@ public Map> getConnectorRequestsCounts( // Make sure to remove any requests which the requestor can not approve Long connectorApprovalCount = kafkaConnectorRequestsRepo.countRequestorsConnectorRequestsGroupByStatusType( - teamId, tenantId, requestor, RequestStatus.CREATED.value); + teamId, Integer.toString(teamId), tenantId, requestor, RequestStatus.CREATED.value); statusCountsMap.put( RequestStatus.CREATED.value, diff --git a/core/src/main/java/io/aiven/klaw/repository/KwKafkaConnectorRequestsRepo.java b/core/src/main/java/io/aiven/klaw/repository/KwKafkaConnectorRequestsRepo.java index 5f3ab59a4d..0c86791745 100644 --- a/core/src/main/java/io/aiven/klaw/repository/KwKafkaConnectorRequestsRepo.java +++ b/core/src/main/java/io/aiven/klaw/repository/KwKafkaConnectorRequestsRepo.java @@ -79,10 +79,11 @@ List findAllConnectorRequestsGroupByStatus( @Query( value = "select count(*) from kwkafkaconnectorrequests where tenantid = :tenantId" - + " and (teamid = :teamId or approvingteamid = :teamId) and requestor != :requestor and connectorstatus = :connectorStatus group by connectorstatus", + + " and (teamid = :teamId or approvingteamid = :approvingTeamid) and requestor != :requestor and connectorstatus = :connectorStatus group by connectorstatus", nativeQuery = true) Long countRequestorsConnectorRequestsGroupByStatusType( @Param("teamId") Integer teamId, + @Param("approvingTeamid") String approvingTeamid, @Param("tenantId") Integer tenantId, @Param("requestor") String requestor, @Param("connectorStatus") String connectorStatus); diff --git a/core/src/main/java/io/aiven/klaw/repository/TopicRequestsRepo.java b/core/src/main/java/io/aiven/klaw/repository/TopicRequestsRepo.java index 5f2909b44c..058d67f39b 100644 --- a/core/src/main/java/io/aiven/klaw/repository/TopicRequestsRepo.java +++ b/core/src/main/java/io/aiven/klaw/repository/TopicRequestsRepo.java @@ -85,11 +85,12 @@ long countAllTopicRequestsByApprovingTeamAndTopictype( @Query( value = "select count(*) from kwtopicrequests where tenantid = :tenantId" - + " and (teamid = :teamId or approvingteamid = :teamId) and requestor != :requestor " + + " and (teamid = :teamId or approvingteamid = :approvingTeamId) and requestor != :requestor " + "and topicstatus = :topicStatus group by topicstatus", nativeQuery = true) Long countRequestorsTopicRequestsGroupByStatusType( @Param("teamId") Integer teamId, + @Param("approvingTeamId") String approvingTeamId, @Param("tenantId") Integer tenantId, @Param("requestor") String requestor, @Param("topicStatus") String topicStatus);