feat: remove transient and use response (#625)

* feat: remove transient and use response * feat: adds negative test case
rajadilipkolli · Dec 8, 2023 · 6569b8b · 6569b8b
1 parent 0312da4
commit 6569b8b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 35 deletions.
diff --git a/catalog-service/src/main/java/com/example/catalogservice/entities/Product.java b/catalog-service/src/main/java/com/example/catalogservice/entities/Product.java
@@ -9,7 +9,6 @@ Licensed under MIT License Copyright (c) 2021-2023 Raja Kolli.
 import java.io.Serial;
 import java.io.Serializable;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.Transient;
 import org.springframework.data.relational.core.mapping.Table;
 
 @Table(name = "products")
@@ -27,23 +26,14 @@ public class Product implements Serializable {
 
     private double price;
 
-    @Transient private boolean inStock;
-
     public Product() {}
 
-    public Product(
-            Long id,
-            String code,
-            String productName,
-            String description,
-            double price,
-            boolean inStock) {
+    public Product(Long id, String code, String productName, String description, double price) {
         this.id = id;
         this.code = code;
         this.productName = productName;
         this.description = description;
         this.price = price;
-        this.inStock = inStock;
     }
 
     public Long getId() {
@@ -85,12 +75,4 @@ public double getPrice() {
     public void setPrice(double price) {
         this.price = price;
     }
-
-    public boolean isInStock() {
-        return inStock;
-    }
-
-    public void setInStock(boolean inStock) {
-        this.inStock = inStock;
-    }
 }
diff --git a/catalog-service/src/main/java/com/example/catalogservice/mapper/ProductMapper.java b/catalog-service/src/main/java/com/example/catalogservice/mapper/ProductMapper.java
@@ -17,16 +17,15 @@ Licensed under MIT License Copyright (c) 2021-2023 Raja Kolli.
 @Mapper(componentModel = "spring")
 public interface ProductMapper {
 
+    @Mapping(target = "inStock", ignore = true)
     @Mapping(target = "withInStock", ignore = true)
     ProductResponse toProductResponse(Product product);
 
     @Mapping(target = "id", ignore = true)
-    @Mapping(target = "inStock", ignore = true)
     Product toEntity(ProductRequest productRequest);
 
     ProductDto toProductDto(ProductRequest productRequest);
 
-    @Mapping(target = "inStock", ignore = true)
     @Mapping(target = "id", ignore = true)
     void mapProductWithRequest(ProductRequest productRequest, @MappingTarget Product product);
 }
diff --git a/catalog-service/src/main/java/com/example/catalogservice/services/ProductService.java b/catalog-service/src/main/java/com/example/catalogservice/services/ProductService.java
@@ -130,16 +130,15 @@ public Mono<ProductResponse> findProductById(Long id) {
         return productRepository
                 .findById(id)
                 .switchIfEmpty(Mono.error(new ProductNotFoundException(id)))
+                .map(productMapper::toProductResponse)
                 .flatMap(
-                        product ->
-                                getInventoryByProductCode(product.getCode())
+                        productResponse ->
+                                getInventoryByProductCode(productResponse.code())
                                         .map(
                                                 inventoryDto -> {
-                                                    product.setInStock(
+                                                    return productResponse.withInStock(
                                                             inventoryDto.availableQuantity() > 0);
-                                                    return product;
-                                                }))
-                .map(productMapper::toProductResponse);
+                                                }));
     }
 
     private Mono<InventoryResponse> getInventoryByProductCode(String code) {

diff --git a/...service/src/test/java/com/example/catalogservice/web/controllers/ProductControllerIT.java b/...service/src/test/java/com/example/catalogservice/web/controllers/ProductControllerIT.java
@@ -68,9 +68,9 @@ void setUp() {
 
         List<Product> productList =
                 List.of(
-                        new Product(null, "P001", "name 1", "description 1", 9.0, false),
-                        new Product(null, "P002", "name 2", "description 2", 10.0, false),
-                        new Product(null, "P003", "name 3", "description 3", 11.0, false));
+                        new Product(null, "P001", "name 1", "description 1", 9.0),
+                        new Product(null, "P002", "name 2", "description 2", 10.0),
+                        new Product(null, "P003", "name 3", "description 3", 11.0));
         savedProductList =
                 productRepository
                         .deleteAll()
@@ -201,7 +201,7 @@ void shouldFindProductById() throws JsonProcessingException {
         Product product = savedProductList.getFirst();
         Long productId = product.getId();
         mockBackendEndpoint(
-                200, objectMapper.writeValueAsString(new InventoryResponse(product.getCode(), 10)));
+                200, objectMapper.writeValueAsString(new InventoryResponse(product.getCode(), 0)));
         webTestClient
                 .get()
                 .uri("/api/catalog/id/{id}", productId)
@@ -220,7 +220,9 @@ void shouldFindProductById() throws JsonProcessingException {
                 .jsonPath("$.description")
                 .isEqualTo(product.getDescription())
                 .jsonPath("$.price")
-                .isEqualTo(product.getPrice());
+                .isEqualTo(product.getPrice())
+                .jsonPath("$.inStock")
+                .isEqualTo(false);
         checkHealthStatus("default", CircuitBreaker.State.CLOSED);
     }
 

diff --git a/...rvice/src/test/java/com/example/catalogservice/web/controllers/ProductControllerTest.java b/...rvice/src/test/java/com/example/catalogservice/web/controllers/ProductControllerTest.java
@@ -189,8 +189,7 @@ void shouldReturn400WhenCreateNewProductWithoutCode() throws Exception {
     @Test
     void shouldUpdateProduct() {
         Long productId = 1L;
-        Product product =
-                new Product(productId, "code 1", "Updated name", "description 1", 9.0, true);
+        Product product = new Product(productId, "code 1", "Updated name", "description 1", 9.0);
         ProductRequest productRequest =
                 new ProductRequest("code 1", "Updated name", "description 1", 9.0);
         ProductResponse productResponse =
@@ -241,7 +240,7 @@ void shouldReturn404WhenUpdatingNonExistingProduct() {
     @Test
     void shouldDeleteProduct() {
         Long productId = 1L;
-        Product product = new Product(1L, "code 1", "Updated name", "description 1", 9.0, true);
+        Product product = new Product(1L, "code 1", "Updated name", "description 1", 9.0);
         ProductResponse productResponse =
                 new ProductResponse(1L, "code 1", "Updated name", "description 1", 9.0, true);
         given(productService.findByIdWithMapping(productId)).willReturn(Mono.just(productResponse));