Merge branch 'master' of https://gitlab.mynisum.com/ascend/ecommerce-maven into swagger-ui

ecom-service/src/main/java/com/nisum/ecomservice/controller/OrdersController.java

 package com.nisum.ecomservice.controller;
 
+import com.nisum.ecomservice.dto.CartDTO;
 import com.nisum.ecomservice.dto.Order;
 import com.nisum.ecomservice.dto.OrderRequest;
 import com.nisum.ecomservice.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @RestController
@@ -18,6 +21,9 @@ public class OrdersController {
     private Mono<Order> postOrder(@RequestBody OrderRequest orderRequest){
         return orderService.postOrder(orderRequest);
     }
-
+    @GetMapping("/byUser/{userId}")
+    private ResponseEntity<Flux<Order>> getUserOrderHistory(@PathVariable String userId){
+        return ResponseEntity.ok(orderService.getOrderFromOmsAPI(userId));
+    }
 
 }

ecom-service/src/main/java/com/nisum/ecomservice/service/OrderService.java

@@ -78,6 +78,13 @@ public class OrderService {
                 .retrieve()
                 .bodyToMono(Order.class);
     }
+
+    public Flux<Order> getOrderFromOmsAPI(String userId){
+        return WebClient.create(String.format("%s/orders/byCustomer/%s", AppConfig.getOrderManagementAPI(),userId))
+                .get()
+                .retrieve()
+                .bodyToFlux(Order.class);
+    }
 }
 /*
  .map(productMono -> {