add condition for owner equals recipient

JewelleryManagement · Apr 12, 2024 · efd0a42 · efd0a42
1 parent 96fe62a
commit efd0a42
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 10 deletions.
diff --git a/src/main/java/jewellery/inventory/service/ProductInOrganizationService.java b/src/main/java/jewellery/inventory/service/ProductInOrganizationService.java
@@ -14,6 +14,7 @@
 import jewellery.inventory.exception.invalid_resource_quantity.InsufficientResourceQuantityException;
 import jewellery.inventory.exception.organization.OrganizationNotOwnerException;
 import jewellery.inventory.exception.organization.ProductIsNotPartOfOrganizationException;
+import jewellery.inventory.exception.product.ProductOwnerEqualsRecipientException;
 import jewellery.inventory.mapper.ProductInOrganizationMapper;
 import jewellery.inventory.model.*;
 import jewellery.inventory.model.resource.Resource;
@@ -50,6 +51,8 @@ public ProductsInOrganizationResponseDto transferProduct(UUID productId, UUID re
     Product product = productService.getProduct(productId);
     productService.throwExceptionIfProductIsSold(product);
     productService.throwExceptionIfProductIsPartOfAnotherProduct(productId, product);
+    throwExceptionIfProductOrganizationEqualsRecipient(recipientId, product);
+
     Organization recipient = organizationService.getOrganization(recipientId);
 
     organizationService.validateCurrentUserPermission(
@@ -331,6 +334,12 @@ private void updateProductOrganizationRecursively(Product product, Organization
     }
   }
 
+  private static void throwExceptionIfProductOrganizationEqualsRecipient(UUID recipientId, Product product) {
+    if (product.getOrganization().getId().equals(recipientId)) {
+      throw new ProductOwnerEqualsRecipientException(product.getOrganization().getId());
+    }
+  }
+
   @Override
   public Object fetchEntity(Object... ids) {
     Product product = productRepository.findById((UUID) ids[0]).orElse(null);

diff --git a/src/test/java/jewellery/inventory/unit/service/ProductInOrganizationServiceTest.java b/src/test/java/jewellery/inventory/unit/service/ProductInOrganizationServiceTest.java
@@ -19,6 +19,7 @@
 import jewellery.inventory.exception.organization.MissingOrganizationPermissionException;
 import jewellery.inventory.exception.product.ProductIsContentException;
 import jewellery.inventory.exception.product.ProductIsSoldException;
+import jewellery.inventory.exception.product.ProductOwnerEqualsRecipientException;
 import jewellery.inventory.helper.*;
 import jewellery.inventory.mapper.ProductInOrganizationMapper;
 import jewellery.inventory.model.*;
@@ -79,22 +80,37 @@ void setUp() {
             List.of(productToResponse(product)));
   }
 
+  @Test
+  void transferProductShouldThrowWhenOwnerOrganizationEqualsRecipient() {
+    when(productService.getProduct(product.getId())).thenReturn(product);
+
+    assertThrows(
+        ProductOwnerEqualsRecipientException.class,
+        () ->
+            productInOrganizationService.transferProduct(
+                product.getId(), product.getOrganization().getId()));
+  }
+
   @Test
   void transferProductShouldThrowWhenProductNotFound() {
     when(productService.getProduct(any())).thenThrow(ProductNotFoundException.class);
 
-    assertThrows(ProductNotFoundException.class, () ->
-            productInOrganizationService.transferProduct(product.getId(), organizationWithProduct.getId()));
+    assertThrows(
+        ProductNotFoundException.class,
+        () ->
+            productInOrganizationService.transferProduct(
+                product.getId(), organizationWithProduct.getId()));
   }
 
   @Test
   void transferProductShouldThrowWhenOrganizationNotFound() {
     when(organizationService.getOrganization(any())).thenThrow(OrganizationNotFoundException.class);
 
     assertThrows(
-            OrganizationNotFoundException.class, () ->
-                    productInOrganizationService.transferProduct(
-                            product.getId(), organizationWithProduct.getId()));
+        OrganizationNotFoundException.class,
+        () ->
+            productInOrganizationService.transferProduct(
+                product.getId(), organizationWithProduct.getId()));
   }
 
   @Test
@@ -133,12 +149,16 @@ void transferProductShouldThrowWhenProductIsPartOfOtherProduct() {
   void transferProductShouldThrowWhenNoPermission() {
     when(productService.getProduct(product.getId())).thenReturn(product);
     when(organizationService.getOrganization(organizationWithProduct.getId()))
-            .thenReturn(organizationWithProduct);
-    when(productInOrganizationService.transferProduct(product.getId(), organizationWithProduct.getId()))
-            .thenThrow(MissingOrganizationPermissionException.class);
+        .thenReturn(organizationWithProduct);
+    when(productInOrganizationService.transferProduct(
+            product.getId(), organizationWithProduct.getId()))
+        .thenThrow(MissingOrganizationPermissionException.class);
 
-    assertThrows(MissingOrganizationPermissionException.class, () ->
-            productInOrganizationService.transferProduct(product.getId(), organizationWithProduct.getId()));
+    assertThrows(
+        MissingOrganizationPermissionException.class,
+        () ->
+            productInOrganizationService.transferProduct(
+                product.getId(), organizationWithProduct.getId()));
   }
 
   @Test