[AFP-58] Fix merge conflict with AFP-56

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

@@ -2,14 +2,16 @@ 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 org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.publisher.Flux;
 
 @RestController
 @RequestMapping("/api/products")
@@ -20,10 +22,17 @@ public class ProductController {
     @DeleteMapping(value = "/{sku}")
     public Mono<ResponseEntity<Void>> deleteProduct(@PathVariable String sku) {
         return productService.removeProductBySku(sku)
-                .map( res -> ResponseEntity.ok().<Void>build())
+                .map(res -> ResponseEntity.ok().<Void>build())
                 .defaultIfEmpty(ResponseEntity.notFound().build());
     }
 
+    @GetMapping("/{sku}")
+    public ResponseEntity<Mono<ProductDto>> getProductBySku(@PathVariable String sku) {
+        Mono<ProductDto> monoProd = productService.getProductBySku(sku);
+        HttpStatus status = monoProd != null ? HttpStatus.OK : HttpStatus.NOT_FOUND;
+        return new ResponseEntity<>(monoProd, status);
+    }
+
     @GetMapping()
     public ResponseEntity<Flux<ProductDto>> getAllProducts() {
         return ResponseEntity.ok(productService.findAllProducts());

src/main/java/com/nisum/ascend/inventory/repository/ProductRepository.java

@@ -2,6 +2,7 @@ package com.nisum.ascend.inventory.repository;
 
 import com.nisum.ascend.inventory.dto.ProductDto;
 import com.nisum.ascend.inventory.model.Product;
+import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Mono;

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

@@ -16,7 +16,8 @@ public class ProductService {
     @Autowired
     ProductRepository productRepository;
 
-    public Mono<Product> removeProductBySku(String sku){
+
+    public Mono<Product> removeProductBySku(String sku) {
         return productRepository
                 .findBySku(sku)
                 .flatMap(existingProduct -> productRepository.delete(existingProduct)
@@ -24,6 +25,12 @@ public class ProductService {
                 .switchIfEmpty(Mono.error(new ResourceNotFoundException(HttpStatus.NOT_FOUND, "Product Not Found")));
     }
 
+    public Mono<ProductDto> getProductBySku(String sku){
+        return productRepository.findBySku(sku)
+                .map(existingProduct -> generateDtoFromProduct(existingProduct))
+                .switchIfEmpty(Mono.error(new ResourceNotFoundException(HttpStatus.NOT_FOUND, "product not found")));
+    }
+
     public Flux<ProductDto> findAllProducts() {
         return productRepository.findAll()
                 .map(ProductDto::generateDtoFromProduct);

src/main/resources/application-test.properties

+spring.config.import=classpath:secret.properties
+
+spring.data.mongodb.uri=mongodb+srv://admin:${db.password}@inventory-promotions.d4nfz.mongodb\
+  .net/${spring.data.mongodb.database}?retryWrites=true&w=majority
+spring.data.mongodb.database=test

src/main/resources/application.properties

@@ -3,4 +3,4 @@ spring.config.import=classpath:secret.properties
 server.port=8080
 spring.data.mongodb.uri=mongodb+srv://admin:${db.password}@inventory-promotions.d4nfz.mongodb\
   .net/${spring.data.mongodb.database}?retryWrites=true&w=majority
-spring.data.mongodb.database=products-promotions-DB
+spring.data.mongodb.database=test

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.dto.ProductDto;
 import com.nisum.ascend.inventory.model.Product;
 import com.nisum.ascend.inventory.repository.ProductRepository;
+import com.nisum.ascend.inventory.service.ProductService;
+import com.nisum.ascend.inventory.controller.ProductController;
+
 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.http.ResponseEntity;
+import org.mockito.Mock;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -18,6 +22,12 @@ 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.bind.annotation.ResponseBody;
+import reactor.core.publisher.Mono;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+
 import org.springframework.web.reactive.function.client.WebClient;
 
 import java.util.List;
@@ -36,10 +46,36 @@ class ProductControllerTest {
     @Autowired
     private WebTestClient webTestClient;
 
+
     @BeforeEach
-    void setUp() {
+    public  void setup(){
+
     }
 
+    @Test
+    void testProductInvalidSkuNotFound() {
+        webTestClient
+                .get()
+                .uri("/api/products/".concat("{sku}"), "invalid")
+                .exchange()
+                .expectStatus()
+                .isNotFound();
+    }
+
+    @Test
+    void testProductBySkuFound() {
+        String sku = "000001";
+
+        webTestClient.get()
+                .uri("/api/products/".concat("/{sku}"), sku)
+                .exchange()
+                .expectStatus()
+                .isOk()
+                .expectBody()
+                .jsonPath("$.sku", sku);
+    }
+
+
     @Test
     void testFindAllProducts(){
         webTestClient.get()