Refactoring utils class

kaizerpwn · May 12, 2024 · d310f63 · d310f63
1 parent 2485c9c
commit d310f63
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/app/src/main/java/com/ibrahimokic/ordermanagement/adapters/UserConsoleAdapter.java b/app/src/main/java/com/ibrahimokic/ordermanagement/adapters/UserConsoleAdapter.java
@@ -328,12 +328,12 @@ private void processUserInput(String userInput) {
                 return;
             }
 
-            if (!Utils.checkProductQuantity(product.get(), quantity)) {
+            if (Utils.checkProductQuantity(product.get(), quantity)) {
                 System.out.println("ERROR: Quantity available for that product is '" + product.get().getAvailableQuantity() + "', not '" + quantity + "'.");
                 return;
             }
 
-            if (!Utils.checkProductAvailability(product.get())) {
+            if (Utils.checkProductAvailability(product.get())) {
                 System.out.println("ERROR: That product is not currently available, it is available from the date " + product.get().getAvailableFrom() + " to "+ product.get().getAvailableUntil() + ".");
                 return;
             }

diff --git a/app/src/main/java/com/ibrahimokic/ordermanagement/service/impl/OrderServiceImpl.java b/app/src/main/java/com/ibrahimokic/ordermanagement/service/impl/OrderServiceImpl.java
@@ -140,10 +140,10 @@ public Optional<OrderDto> createNewOrder(@Valid OrderDto orderDto) {
 
                 if (productItem.isPresent()) {
                     if(orderItemDto.getQuantity() != 0) {
-                        if (!Utils.checkProductQuantity(productItem.get(), orderItemDto.getQuantity())) {
+                        if (Utils.checkProductQuantity(productItem.get(), orderItemDto.getQuantity())) {
                             throw new RuntimeException("Quantity available for product "+ productItem.get().getProductId() +" is '" + productItem.get().getAvailableQuantity() + "', not '" + orderItemDto.getQuantity() + "'.");
                         }
-                        if (!Utils.checkProductAvailability(productItem.get())) {
+                        if (Utils.checkProductAvailability(productItem.get())) {
                             throw new RuntimeException("Product "+ productItem.get().getProductId() +" is not currently available, it is available from the date " + productItem.get().getAvailableFrom() + " to "+ productItem.get().getAvailableUntil() + ".");
                         }
 

diff --git a/app/src/main/java/com/ibrahimokic/ordermanagement/utils/Utils.java b/app/src/main/java/com/ibrahimokic/ordermanagement/utils/Utils.java
@@ -26,13 +26,10 @@ public static boolean checkIfUserIdIsDifferent(User user, Order retrievedOrderFr
     }
 
     public static boolean checkIfAddressIsDifferent(Address address, AddressDto addressDto) {
-        if (!Objects.equals(address.getStreet(), addressDto.getStreet()) ||
-            !Objects.equals(address.getCity(), addressDto.getCity()) ||
-            !Objects.equals(address.getZip(), addressDto.getZip()) ||
-            !Objects.equals(address.getCountry(), addressDto.getCountry())) {
-            return true;
-        }
-        return false;
+        return !Objects.equals(address.getStreet(), addressDto.getStreet()) ||
+                !Objects.equals(address.getCity(), addressDto.getCity()) ||
+                !Objects.equals(address.getZip(), addressDto.getZip()) ||
+                !Objects.equals(address.getCountry(), addressDto.getCountry());
     }
 
     public static boolean checkIfOrderItemsAreDifferent(List<OrderItem> retrievedOrderItems, List<OrderItem> updatedOrderItems) {
@@ -82,12 +79,11 @@ public static boolean checkProductAvailability(Product product) {
         LocalDate availableFrom = product.getAvailableFrom();
         LocalDate availableUntil = product.getAvailableUntil();
 
-        return currentDate.isAfter(availableFrom) && currentDate.isBefore(availableUntil);
+        return !currentDate.isAfter(availableFrom) || !currentDate.isBefore(availableUntil);
     }
 
     public static boolean checkProductQuantity(Product product, int quantity) {
-        if (product.getAvailableQuantity() < quantity) return false;
-        return true;
+        return product.getAvailableQuantity() < quantity;
     }
 
     public static int getValidInput(Scanner scanner, int max) {