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

---
 .../v1/api/model/multitenancy/TenantRequest.java    |  4 ++--
 .../v1/server/service/TenantManagementService.java  | 13 ++++---------
 2 files changed, 6 insertions(+), 11 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 c5afa21ec..6ae1ee350 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 user;
+    private String databaseUser;
     @NotBlank
-    private String password;
+    private String databasePassword;
 
 }
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 24c6c9d57..6606ffcc8 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
@@ -2,7 +2,6 @@ package com.iqser.red.service.peristence.v1.server.service;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -14,13 +13,9 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 import org.springframework.stereotype.Service;
-import org.springframework.web.server.ResponseStatusException;
 
-import com.iqser.red.commons.spring.ErrorMessage;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
@@ -63,20 +58,20 @@ public class TenantManagementService {
 
         if (tenantRepository.findById(tenantRequest.getTenantId()).isEmpty()) {
 
-            String encryptedPassword = encryptionService.encrypt(tenantRequest.getPassword());
+            String encryptedPassword = encryptionService.encrypt(tenantRequest.getDatabasePassword());
 
-            try (Connection connection = DriverManager.getConnection(tenantRequest.getJdbcUrl(), tenantRequest.getUser(), tenantRequest.getPassword())) {
+            try (Connection connection = DriverManager.getConnection(tenantRequest.getJdbcUrl(), tenantRequest.getDatabaseUser(), tenantRequest.getDatabasePassword())) {
                 DataSource tenantDataSource = new SingleConnectionDataSource(connection, false);
                 runLiquibase(tenantDataSource);
             } catch (PSQLException e) {
-                throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
+                throw new BadRequestException(e.getMessage(), e);
             }
 
             TenantEntity tenantEntity = TenantEntity.builder()
                     .tenantId(tenantRequest.getTenantId())
                     .displayName(tenantRequest.getDisplayName())
                     .guid(UUID.randomUUID().toString())
-                    .username(tenantRequest.getUser())
+                    .username(tenantRequest.getDatabaseUser())
                     .jdbcUrl(tenantRequest.getJdbcUrl())
                     .password(encryptedPassword)
                     .build();