Merge pull request #7 from rkrux/feedback

Improvements
rkrux · Oct 26, 2019 · b698b02 · b698b02
2 parents 0931839 + ef2159a
commit b698b02
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 29 deletions.
diff --git a/src/main/java/com/bank/moneytransfer/controller/BankAccountsController.java b/src/main/java/com/bank/moneytransfer/controller/BankAccountsController.java
@@ -4,7 +4,7 @@
 import com.bank.moneytransfer.exception.types.AccountNotFoundException;
 import com.bank.moneytransfer.exception.types.IllegalAccountParamsException;
 import com.bank.moneytransfer.exception.types.IncompleteRequestParamsException;
-import com.bank.moneytransfer.model.AddBankAccountRequest;
+import com.bank.moneytransfer.dto.AddBankAccountRequest;
 import com.bank.moneytransfer.service.BankAccountsService;
 
 import javax.ws.rs.*;

diff --git a/src/main/java/com/bank/moneytransfer/controller/TransferMoneyController.java b/src/main/java/com/bank/moneytransfer/controller/TransferMoneyController.java
@@ -2,7 +2,7 @@
 
 import com.bank.moneytransfer.exception.ErrorMessages;
 import com.bank.moneytransfer.exception.types.IncompleteRequestParamsException;
-import com.bank.moneytransfer.model.TransferMoneyRequest;
+import com.bank.moneytransfer.dto.TransferMoneyRequest;
 import com.bank.moneytransfer.service.TransferMoneyService;
 
 import javax.ws.rs.Consumes;

diff --git a/...transfer/model/AddBankAccountRequest.java → ...eytransfer/dto/AddBankAccountRequest.java b/...transfer/model/AddBankAccountRequest.java → ...eytransfer/dto/AddBankAccountRequest.java
@@ -1,4 +1,4 @@
-package com.bank.moneytransfer.model;
+package com.bank.moneytransfer.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...ansfer/model/AllBankAccountsResponse.java → ...transfer/dto/AllBankAccountsResponse.java b/...ansfer/model/AllBankAccountsResponse.java → ...transfer/dto/AllBankAccountsResponse.java
@@ -1,5 +1,6 @@
-package com.bank.moneytransfer.model;
+package com.bank.moneytransfer.dto;
 
+import com.bank.moneytransfer.model.BankAccount;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/...ytransfer/model/TransferMoneyRequest.java → ...neytransfer/dto/TransferMoneyRequest.java b/...ytransfer/model/TransferMoneyRequest.java → ...neytransfer/dto/TransferMoneyRequest.java
@@ -1,4 +1,4 @@
-package com.bank.moneytransfer.model;
+package com.bank.moneytransfer.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/...transfer/model/TransferMoneyResponse.java → ...eytransfer/dto/TransferMoneyResponse.java b/...transfer/model/TransferMoneyResponse.java → ...eytransfer/dto/TransferMoneyResponse.java
@@ -1,5 +1,6 @@
-package com.bank.moneytransfer.model;
+package com.bank.moneytransfer.dto;
 
+import com.bank.moneytransfer.model.BankAccount;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/src/main/java/com/bank/moneytransfer/exception/ExceptionHandler.java b/src/main/java/com/bank/moneytransfer/exception/ExceptionHandler.java
@@ -10,14 +10,17 @@ public class ExceptionHandler implements ExceptionMapper<Exception> {
     @Override
     public Response toResponse(Exception ex) {
 
-        if (ex instanceof IncompleteRequestParamsException) {
+        if ((ex instanceof IncompleteRequestParamsException) || (ex instanceof NegativeAmountTransferException) ||
+                (ex instanceof SelfAccountTransferException) || (ex instanceof FundsInsufficientTransferException)) {
             return Response.status(Response.Status.BAD_REQUEST).entity(ex.getMessage()).build();
         }
 
-        if ((ex instanceof AccountNotFoundException) || (ex instanceof FundsInsufficientTransferException) ||
-                    (ex instanceof NegativeAmountTransferException) || (ex instanceof SelfAccountTransferException)
-                        || (ex instanceof AccountPresentException)) {
-            return Response.status(Response.Status.PRECONDITION_FAILED).entity(ex.getMessage()).build();
+        if (ex instanceof AccountNotFoundException) {
+            return Response.status(Response.Status.NOT_FOUND).entity(ex.getMessage()).build();
+        }
+
+        if (ex instanceof AccountPresentException) {
+            return Response.status(Response.Status.CONFLICT).entity(ex.getMessage()).build();
         }
 
         return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ex.getMessage()).build();

diff --git a/src/main/java/com/bank/moneytransfer/service/BankAccountsService.java b/src/main/java/com/bank/moneytransfer/service/BankAccountsService.java
@@ -5,8 +5,8 @@
 import com.bank.moneytransfer.exception.types.AccountNotFoundException;
 import com.bank.moneytransfer.exception.types.AccountPresentException;
 import com.bank.moneytransfer.exception.types.IllegalAccountParamsException;
-import com.bank.moneytransfer.model.AddBankAccountRequest;
-import com.bank.moneytransfer.model.AllBankAccountsResponse;
+import com.bank.moneytransfer.dto.AddBankAccountRequest;
+import com.bank.moneytransfer.dto.AllBankAccountsResponse;
 import com.bank.moneytransfer.model.BankAccount;
 
 import java.math.BigDecimal;

diff --git a/src/main/java/com/bank/moneytransfer/service/TransferMoneyService.java b/src/main/java/com/bank/moneytransfer/service/TransferMoneyService.java
@@ -7,8 +7,8 @@
 import com.bank.moneytransfer.exception.types.NegativeAmountTransferException;
 import com.bank.moneytransfer.exception.types.SelfAccountTransferException;
 import com.bank.moneytransfer.model.BankAccount;
-import com.bank.moneytransfer.model.TransferMoneyRequest;
-import com.bank.moneytransfer.model.TransferMoneyResponse;
+import com.bank.moneytransfer.dto.TransferMoneyRequest;
+import com.bank.moneytransfer.dto.TransferMoneyResponse;
 
 import java.math.BigDecimal;
 

diff --git a/src/test/java/com/bank/moneytransfer/controller/AddAndGetBankAccountsIntegrationTest.java b/src/test/java/com/bank/moneytransfer/controller/AddAndGetBankAccountsIntegrationTest.java
@@ -3,7 +3,7 @@
 import com.bank.moneytransfer.TestUtil;
 import com.bank.moneytransfer.exception.ErrorMessages;
 import com.bank.moneytransfer.exception.ExceptionHandler;
-import com.bank.moneytransfer.model.AddBankAccountRequest;
+import com.bank.moneytransfer.dto.AddBankAccountRequest;
 import com.bank.moneytransfer.model.BankAccount;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
@@ -66,7 +66,7 @@ public void testBankAccountController() {
         response = target(TestUtil.BANK_ACCOUNT_ADD_PATH)
                 .request()
                 .post(Entity.json(buildPostRequest(bankAccountId, "30")));
-        assertEquals(Response.Status.PRECONDITION_FAILED.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.CONFLICT.getStatusCode(), response.getStatus());
         assertEquals(ErrorMessages.ACCOUNT_PRESENT.getValue(), response.readEntity(String.class));
     }
 

diff --git a/src/test/java/com/bank/moneytransfer/controller/TransferAndGetIntegrationParallelTest.java b/src/test/java/com/bank/moneytransfer/controller/TransferAndGetIntegrationParallelTest.java
@@ -4,9 +4,9 @@
 import com.bank.moneytransfer.TestUtil;
 import com.bank.moneytransfer.datastore.BankAccountStorage;
 import com.bank.moneytransfer.exception.ExceptionHandler;
-import com.bank.moneytransfer.model.AllBankAccountsResponse;
+import com.bank.moneytransfer.dto.AllBankAccountsResponse;
 import com.bank.moneytransfer.model.BankAccount;
-import com.bank.moneytransfer.model.TransferMoneyRequest;
+import com.bank.moneytransfer.dto.TransferMoneyRequest;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.After;

diff --git a/src/test/java/com/bank/moneytransfer/controller/TransferMoneyFunctionalTest.java b/src/test/java/com/bank/moneytransfer/controller/TransferMoneyFunctionalTest.java
@@ -5,8 +5,8 @@
 import com.bank.moneytransfer.exception.ErrorMessages;
 import com.bank.moneytransfer.exception.ExceptionHandler;
 import com.bank.moneytransfer.model.BankAccount;
-import com.bank.moneytransfer.model.TransferMoneyRequest;
-import com.bank.moneytransfer.model.TransferMoneyResponse;
+import com.bank.moneytransfer.dto.TransferMoneyRequest;
+import com.bank.moneytransfer.dto.TransferMoneyResponse;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.BeforeClass;
@@ -104,7 +104,7 @@ public void testAccountNotFound() {
                 .request()
                 .post(Entity.json(buildTransferRequest(20, toId, transferAmounts[2])));
 
-        assertEquals(Response.Status.PRECONDITION_FAILED.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
         assertNotNull(response.getEntity());
         assertEquals(ErrorMessages.ACCOUNT_NOT_FOUND.getValue(), response.readEntity(String.class));
     }
@@ -115,7 +115,7 @@ public void testFundsInsufficientTransfer() {
                 .request()
                 .post(Entity.json(buildTransferRequest(fromId, toId, transferAmounts[3])));
 
-        assertEquals(Response.Status.PRECONDITION_FAILED.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
         assertNotNull(response.getEntity());
         assertEquals(ErrorMessages.FUNDS_INSUFFICIENT_TRANSFER.getValue(), response.readEntity(String.class));
     }
@@ -126,7 +126,7 @@ public void testNegativeAmountTransfer() {
                 .request()
                 .post(Entity.json(buildTransferRequest(fromId, toId, transferAmounts[4])));
 
-        assertEquals(Response.Status.PRECONDITION_FAILED.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
         assertNotNull(response.getEntity());
         assertEquals(ErrorMessages.NOT_POSITIVE_AMOUNT_TRANSFER.getValue(), response.readEntity(String.class));
     }
@@ -137,7 +137,7 @@ public void testSelfAccountTransfer() {
                 .request()
                 .post(Entity.json(buildTransferRequest(fromId, fromId, transferAmounts[4])));
 
-        assertEquals(Response.Status.PRECONDITION_FAILED.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
         assertNotNull(response.getEntity());
         assertEquals(ErrorMessages.SELF_ACCOUNT_TRANSFER.getValue(), response.readEntity(String.class));
     }

diff --git a/src/test/java/com/bank/moneytransfer/service/BankAccountsServiceTest.java b/src/test/java/com/bank/moneytransfer/service/BankAccountsServiceTest.java
@@ -3,8 +3,8 @@
 import com.bank.moneytransfer.exception.ErrorMessages;
 import com.bank.moneytransfer.exception.types.AccountPresentException;
 import com.bank.moneytransfer.exception.types.IllegalAccountParamsException;
-import com.bank.moneytransfer.model.AddBankAccountRequest;
-import com.bank.moneytransfer.model.AllBankAccountsResponse;
+import com.bank.moneytransfer.dto.AddBankAccountRequest;
+import com.bank.moneytransfer.dto.AllBankAccountsResponse;
 import com.bank.moneytransfer.model.BankAccount;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/com/bank/moneytransfer/service/TransferMoneyServiceTest.java b/src/test/java/com/bank/moneytransfer/service/TransferMoneyServiceTest.java
@@ -6,8 +6,8 @@
 import com.bank.moneytransfer.exception.types.NegativeAmountTransferException;
 import com.bank.moneytransfer.exception.types.SelfAccountTransferException;
 import com.bank.moneytransfer.model.BankAccount;
-import com.bank.moneytransfer.model.TransferMoneyRequest;
-import com.bank.moneytransfer.model.TransferMoneyResponse;
+import com.bank.moneytransfer.dto.TransferMoneyRequest;
+import com.bank.moneytransfer.dto.TransferMoneyResponse;
 import org.junit.Before;
 import org.junit.Test;