From 8a3439ddf5d7f168d3bc7aa8555980f323d9f553 Mon Sep 17 00:00:00 2001
From: Ali Oezyetimoglu <ali.oezyetimoglu@iqser.com>
Date: Fri, 4 Nov 2022 14:39:28 +0100
Subject: [PATCH] RED-5293: 500 for invalid tenant

---
 .../service/v1/api/model/multitenancy/TenantRequest.java    | 4 ++--
 .../v1/server/service/TenantManagementService.java          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java
index 6ae1ee350..c5afa21ec 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java
@@ -22,8 +22,8 @@ public class TenantRequest {
     @NotBlank
     private String jdbcUrl;
     @NotBlank
-    private String databaseUser;
+    private String user;
     @NotBlank
-    private String databasePassword;
+    private String password;
 
 }
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
index 6606ffcc8..cb18c6aa8 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
@@ -58,9 +58,9 @@ public class TenantManagementService {
 
         if (tenantRepository.findById(tenantRequest.getTenantId()).isEmpty()) {
 
-            String encryptedPassword = encryptionService.encrypt(tenantRequest.getDatabasePassword());
+            String encryptedPassword = encryptionService.encrypt(tenantRequest.getPassword());
 
-            try (Connection connection = DriverManager.getConnection(tenantRequest.getJdbcUrl(), tenantRequest.getDatabaseUser(), tenantRequest.getDatabasePassword())) {
+            try (Connection connection = DriverManager.getConnection(tenantRequest.getJdbcUrl(), tenantRequest.getUser(), tenantRequest.getPassword())) {
                 DataSource tenantDataSource = new SingleConnectionDataSource(connection, false);
                 runLiquibase(tenantDataSource);
             } catch (PSQLException e) {
@@ -71,7 +71,7 @@ public class TenantManagementService {
                     .tenantId(tenantRequest.getTenantId())
                     .displayName(tenantRequest.getDisplayName())
                     .guid(UUID.randomUUID().toString())
-                    .username(tenantRequest.getDatabaseUser())
+                    .username(tenantRequest.getUser())
                     .jdbcUrl(tenantRequest.getJdbcUrl())
                     .password(encryptedPassword)
                     .build();