Merge branch 'main' into improve-docs-setup

Aiven-Open · Aug 7, 2023 · f71c290 · f71c290
2 parents b34b402 + db535d2
commit f71c290
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/core/src/main/java/io/aiven/klaw/helpers/HandleDbRequests.java b/core/src/main/java/io/aiven/klaw/helpers/HandleDbRequests.java
@@ -228,7 +228,7 @@ List<SchemaRequest> getAllSchemaRequests(
 
   List<RegisterUserInfo> getAllRegisterUsersInformation();
 
-  List<RegisterUserInfo> getAllStagingRegisterUsersInfo(String userId);
+  RegisterUserInfo getFirstStagingRegisterUsersInfo(String userName);
 
   UserInfo getUsersInfo(String username);
 

diff --git a/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/HandleDbRequestsJdbc.java b/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/HandleDbRequestsJdbc.java
@@ -517,8 +517,8 @@ public List<RegisterUserInfo> getAllRegisterUsersInformation() {
   }
 
   @Override
-  public List<RegisterUserInfo> getAllStagingRegisterUsersInfo(String userName) {
-    return jdbcSelectHelper.selectAllStagingRegisterUsersInfo(userName);
+  public RegisterUserInfo getFirstStagingRegisterUsersInfo(String userName) {
+    return jdbcSelectHelper.selectFirstStagingRegisterUsersInfo(userName);
   }
 
   public UserInfo getUsersInfo(String username) {

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
@@ -1030,8 +1030,8 @@ public List<RegisterUserInfo> selectAllRegisterUsersInfo() {
     return registerInfoRepo.findAllByStatus("PENDING");
   }
 
-  public List<RegisterUserInfo> selectAllStagingRegisterUsersInfo(String userId) {
-    return registerInfoRepo.findAllByUsernameAndStatus(userId, "STAGING");
+  public RegisterUserInfo selectFirstStagingRegisterUsersInfo(String userId) {
+    return registerInfoRepo.findFirstByUsernameAndStatus(userId, "STAGING");
   }
 
   public RegisterUserInfo selectRegisterUsersInfo(String username) {
@@ -1376,17 +1376,17 @@ public List<KafkaConnectorRequest> selectConnectorRequests(
   }
 
   public String getRegistrationId(String userId) {
-    List<RegisterUserInfo> registerInfoList =
-        registerInfoRepo.findAllByUsernameAndStatus(userId, "STAGING");
-    List<RegisterUserInfo> registerInfoList1 =
-        registerInfoRepo.findAllByUsernameAndStatus(userId, "PENDING");
-    if (registerInfoList.size() > 0) {
-      return registerInfoList.get(0).getRegistrationId();
-    } else if (registerInfoList1.size() > 0) {
+    RegisterUserInfo registerInfoStaging =
+        registerInfoRepo.findFirstByUsernameAndStatus(userId, "STAGING");
+    if (registerInfoStaging != null) {
+      return registerInfoStaging.getRegistrationId();
+    }
+    boolean pendingArePresent =
+        registerInfoRepo.existsRegisterUserInfoByUsernameAndStatus(userId, "PENDING");
+    if (pendingArePresent) {
       return "PENDING_ACTIVATION";
-    } else {
-      return null;
     }
+    return null;
   }
 
   public RegisterUserInfo getRegistrationDetails(String registrationId, String status) {

diff --git a/core/src/main/java/io/aiven/klaw/repository/RegisterInfoRepo.java b/core/src/main/java/io/aiven/klaw/repository/RegisterInfoRepo.java
@@ -16,7 +16,9 @@ public interface RegisterInfoRepo extends CrudRepository<RegisterUserInfo, Strin
 
   List<RegisterUserInfo> findAllByRegistrationIdAndStatus(String registrationId, String status);
 
-  List<RegisterUserInfo> findAllByUsernameAndStatus(String userId, String status);
+  RegisterUserInfo findFirstByUsernameAndStatus(String userId, String status);
+
+  boolean existsRegisterUserInfoByUsernameAndStatus(String userId, String status);
 
   List<RegisterUserInfo> findAllByRegistrationId(String registrationId);
 

diff --git a/core/src/main/java/io/aiven/klaw/service/UsersTeamsControllerService.java b/core/src/main/java/io/aiven/klaw/service/UsersTeamsControllerService.java
@@ -923,18 +923,19 @@ public ApiResponse registerUser(RegisterUserInfoModel newUser, boolean isExterna
     }
 
     // get the user details from db
-    List<RegisterUserInfo> stagingRegisterUsersInfo =
-        manageDatabase.getHandleDbRequests().getAllStagingRegisterUsersInfo(newUser.getUsername());
+    RegisterUserInfo stagingRegisterUserInfo =
+        manageDatabase
+            .getHandleDbRequests()
+            .getFirstStagingRegisterUsersInfo(newUser.getUsername());
 
     // enrich user info
-    if (!stagingRegisterUsersInfo.isEmpty()) {
-      RegisterUserInfo registerUserInfo = stagingRegisterUsersInfo.get(0);
-      newUser.setTeamId(registerUserInfo.getTeamId());
+    if (stagingRegisterUserInfo != null) {
+      newUser.setTeamId(stagingRegisterUserInfo.getTeamId());
       newUser.setTeam(
           manageDatabase.getTeamNameFromTeamId(
-              registerUserInfo.getTenantId(), registerUserInfo.getTeamId()));
-      newUser.setRole(registerUserInfo.getRole());
-      newUser.setTenantId(registerUserInfo.getTenantId());
+              stagingRegisterUserInfo.getTenantId(), stagingRegisterUserInfo.getTeamId()));
+      newUser.setRole(stagingRegisterUserInfo.getRole());
+      newUser.setTenantId(stagingRegisterUserInfo.getTenantId());
     }
 
     try {