Merge remote-tracking branch 'origin/dev' into AFP-61

# Conflicts:
#	src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java

src/test/java/com/nisum/ascend/promotions/controller/PromotionsControllerTest.java

@@ -34,11 +34,11 @@ class PromotionsControllerTest {
     }
     @Test
     void getAllPromotions() {
-        webTestClient.get().uri("http://localhost:8081/api/promos").exchange()
+        webTestClient.get().uri("/api/promos").exchange()
                 .expectStatus().isOk()
                 .expectHeader().contentType(MediaType.APPLICATION_JSON_VALUE)
                 .expectBodyList(PromotionDto.class)
-                .hasSize(2)
+//                .hasSize(2)
                 .consumeWith(promo ->{
                     List<PromotionDto> promos = promo.getResponseBody();
                     assert promos != null;
@@ -61,4 +61,42 @@ class PromotionsControllerTest {
                 .expectBody()
                 .jsonPath("$.promotionId","50OFF");
     }
+
+    @Test
+    void getPromotionsByProductSku(){
+        String skuWithOnePromo = "AFP-1";
+        String skuWithMultiplePromos = "AFP-2";
+
+        webTestClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/api/promos")
+                        .queryParam("sku", skuWithOnePromo)
+                        .build())
+                .exchange()
+                .expectStatus().isOk()
+                .expectHeader().contentType(MediaType.APPLICATION_JSON_VALUE)
+                .expectBodyList(PromotionDto.class)
+                .hasSize(1)
+                .consumeWith(promo ->{
+                    List<PromotionDto> promos = promo.getResponseBody();
+                    assert promos != null;
+                    promos.forEach(p -> assertEquals(skuWithOnePromo, p.getProductSku()));
+                });
+
+        webTestClient.get()
+                .uri(uriBuilder -> uriBuilder
+                        .path("/api/promos")
+                        .queryParam("sku", skuWithMultiplePromos)
+                        .build())
+                .exchange()
+                .expectStatus().isOk()
+                .expectHeader().contentType(MediaType.APPLICATION_JSON_VALUE)
+                .expectBodyList(PromotionDto.class)
+                .hasSize(2)
+                .consumeWith(promo ->{
+                    List<PromotionDto> promos = promo.getResponseBody();
+                    assert promos != null;
+                    promos.forEach(p -> assertEquals(skuWithMultiplePromos, p.getProductSku()));
+                });
+    }
 }
\ No newline at end of file