Use find first instead of find all

Signed-off-by: Sergey Nuyanzin <snuyanzin@gmail.com>
Aiven-Open · Aug 18, 2023 · 3a1b31d · 3a1b31d
1 parent b441218
commit 3a1b31d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 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
@@ -1381,17 +1381,11 @@ public String getRegistrationId(String userId) {
   }
 
   public RegisterUserInfo getRegistrationDetails(String registrationId, String status) {
-    List<RegisterUserInfo> registerUserInfoList;
     if ("".equals(status)) {
-      registerUserInfoList = registerInfoRepo.findAllByRegistrationId(registrationId);
+      return registerInfoRepo.findFirstByRegistrationId(registrationId);
     } else {
-      registerUserInfoList =
-          registerInfoRepo.findAllByRegistrationIdAndStatus(registrationId, status);
+      return registerInfoRepo.findFirstByRegistrationIdAndStatus(registrationId, status);
     }
-    if (registerUserInfoList.size() == 1) {
-      return registerUserInfoList.get(0);
-    }
-    return null;
   }
 
   public List<Topic> getTopicsforTeam(Integer teamId, int tenantId) {

diff --git a/core/src/main/java/io/aiven/klaw/repository/RegisterInfoRepo.java b/core/src/main/java/io/aiven/klaw/repository/RegisterInfoRepo.java
@@ -14,13 +14,13 @@ public interface RegisterInfoRepo extends CrudRepository<RegisterUserInfo, Strin
 
   List<RegisterUserInfo> findAllByTenantId(int tenantId);
 
-  List<RegisterUserInfo> findAllByRegistrationIdAndStatus(String registrationId, String status);
-
   RegisterUserInfo findFirstByUsernameAndStatus(String userId, String status);
 
   boolean existsRegisterUserInfoByUsernameAndStatus(String userId, String status);
 
-  List<RegisterUserInfo> findAllByRegistrationId(String registrationId);
+  RegisterUserInfo findFirstByRegistrationId(String registrationId);
+
+  RegisterUserInfo findFirstByRegistrationIdAndStatus(String registrationId, String status);
 
   void deleteByTenantId(int tenantId);
 }
diff --git a/openapi.yaml b/openapi.yaml
@@ -7096,10 +7096,10 @@
             "type" : "integer",
             "format" : "int32"
           },
-          "topicOwner" : {
+          "highestEnv" : {
             "type" : "boolean"
           },
-          "highestEnv" : {
+          "topicOwner" : {
             "type" : "boolean"
           }
         },