Merge branch 'AFP-65' into 'AFP-64'

# Conflicts:
#   src/main/java/com/nisum/ascend/promotions/controller/PromotionsController.java

src/main/java/com/nisum/ascend/promotions/controller/PromotionsController.java

@@ -21,8 +21,10 @@ public class PromotionsController {
 
     @GetMapping()
     public ResponseEntity<Flux<PromotionDto>> getAllPromotions(@RequestParam(required = false) String sku){
-        //TODO: test once we have real data
-        return ResponseEntity.ok(promotionService.findAll());
+        if (sku != null){
+            return ResponseEntity.ok(promotionService.findPromotionsByProductSku(sku));
+        }
+        else return ResponseEntity.ok(promotionService.findAll());
     }
 
     @GetMapping("/{id}")

src/main/java/com/nisum/ascend/promotions/repository/PromotionRepository.java

@@ -4,7 +4,9 @@ package com.nisum.ascend.promotions.repository;
 import com.nisum.ascend.promotions.model.Promotion;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Repository;
+import reactor.core.publisher.Flux;
 
 @Repository
 public interface PromotionRepository extends ReactiveMongoRepository<Promotion, String> {
+    Flux<Promotion> findByProductSku(String sku);
 }

src/main/java/com/nisum/ascend/promotions/service/PromotionService.java

@@ -15,4 +15,8 @@ public class PromotionService {
     public Flux<PromotionDto> findAll(){
         return promotionRepository.findAll().map(PromotionDto::generateDtoFromPromotion);
     }
+
+    public Flux<PromotionDto> findPromotionsByProductSku(String sku){
+        return promotionRepository.findByProductSku(sku).map(PromotionDto::generateDtoFromPromotion);
+    }
 }