[AFP-58] Fix merge conflict with dev

src/main/java/com/nisum/ascend/inventory/controller/ProductController.java

@@ -2,11 +2,13 @@ package com.nisum.ascend.inventory.controller;
 
 import com.nisum.ascend.inventory.dto.ProductDto;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import com.nisum.ascend.inventory.service.ProductService;
-import reactor.core.publisher.Mono;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
 
 @RestController
 @RequestMapping("/api/products")
@@ -19,4 +21,8 @@ public class ProductController {
         productService.removeProductBySku(sku).subscribe();
     }
 
+    @GetMapping()
+    public ResponseEntity<Flux<ProductDto>> getAllProducts() {
+        return ResponseEntity.ok(productService.findAllProducts());
+    }
 }

src/main/java/com/nisum/ascend/inventory/dto/ProductDto.java

@@ -4,6 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import com.nisum.ascend.inventory.model.Product;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Getter
 @AllArgsConstructor
 public class ProductDto {
@@ -16,14 +19,14 @@ public class ProductDto {
     private String brand;
     private String category;
     private int stock;
-    private PromotionDto promotion;
+    private List<PromotionDto> promotions;
 
 
     public static ProductDto generateDtoFromProduct(Product product) {
         // TODO: Fetch the product's promotion from the Promotions com.nisum.ascend.inventory.service
-        PromotionDto promotion = new PromotionDto();
+        List<PromotionDto> promotions = new ArrayList<>();
 
-        return new ProductDto(product.getSku(), product.getUpc(), product.getProductName(), product.getProductDescription(), product.getPrice(), product.getProductImageUrl(), product.getBrand(), product.getCategory(), product.getAvailableStock(), promotion);
+        return new ProductDto(product.getSku(), product.getUpc(), product.getProductName(), product.getProductDescription(), product.getPrice(), product.getProductImageUrl(), product.getBrand(), product.getCategory(), product.getAvailableStock(), promotions);
 
     }
 }

src/main/java/com/nisum/ascend/inventory/model/Product.java

@@ -8,7 +8,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
 
 @Getter
 @Setter
-@Document
+@Document(collection = "products")
 public class Product {
     @Id
     private String id;

src/main/java/com/nisum/ascend/inventory/service/ProductService.java

 package com.nisum.ascend.inventory.service;
-
 import com.nisum.ascend.inventory.dto.ProductDto;
 import com.nisum.ascend.inventory.exception.ResourceNotFoundException;
 import com.nisum.ascend.inventory.model.Product;
@@ -25,4 +24,9 @@ public class ProductService {
                 .switchIfEmpty(Mono.error(new ResourceNotFoundException(HttpStatus.NOT_FOUND, "Product Not Found")));
     }
 
+    public Flux<ProductDto> findAllProducts() {
+        return productRepository.findAll()
+                .map(ProductDto::generateDtoFromProduct);
+    }
+
 }

src/test/java/com/nisum/ascend/inventory/controller/ProductControllerTest.java

+package com.nisum.ascend.inventory.controller;
+
+import com.nisum.ascend.inventory.controller.ProductController;
+import com.nisum.ascend.inventory.model.Product;
+import com.nisum.ascend.inventory.repository.ProductRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@DirtiesContext
+@AutoConfigureWebTestClient
+@ActiveProfiles("test")
+@Slf4j
+class ProductControllerTest {
+
+    @Autowired
+    private WebTestClient webTestClient;
+
+    @BeforeEach
+    void setUp() {
+    }
+
+    @Test
+    void testFindAllProducts(){
+        webTestClient.get()
+                .uri("/api/products")
+                .exchange()
+                .expectStatus().isOk()
+                .expectHeader().contentType(MediaType.APPLICATION_JSON_VALUE)
+                .expectBodyList(Product.class)
+                .consumeWith(product ->{
+                    List<Product> products = product.getResponseBody();
+                    products.forEach( p ->{
+                        assertNotNull(p.getSku());
+                        assertNotNull(p.getUpc());
+                        System.out.println("Product SKU: " + p.getSku());
+                        System.out.println("Product UPC: " + p.getUpc());
+                    });
+                });
+    }
+
+
+}
\ No newline at end of file