Merge branch 'feat/fix-getById' into 'master'

add error handling for getById

See merge request !13

src/main/java/com/ascendfinalproject/warehouse/controllers/WarehouseController.java

@@ -7,7 +7,9 @@ import com.ascendfinalproject.warehouse.services.SessionService;
 import com.ascendfinalproject.warehouse.services.WarehouseOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -27,8 +29,11 @@ public class WarehouseController {
 
   @CrossOrigin
   @GetMapping("/orders/{id}")
-  public Mono<WarehouseOrder> findOrder(@PathVariable String id){
-    return orderService.findOrderById(id);
+  public Mono<ResponseEntity> getById(@PathVariable String id) {
+    return orderService.getById(id)
+            .map(order -> (ResponseEntity.status(HttpStatus.OK).body(order)))
+            .cast(ResponseEntity.class)
+            .defaultIfEmpty(ResponseEntity.status(HttpStatus.NOT_FOUND).body(null));
   }
 
   @CrossOrigin

src/main/java/com/ascendfinalproject/warehouse/services/WarehouseOrderService.java

@@ -21,7 +21,7 @@ public class WarehouseOrderService {
   @Autowired
   WarehouseOrderRepository orderRepository;
 
-  public Mono<WarehouseOrder> findOrderById(String id) {
+  public Mono<WarehouseOrder> getById(String id) {
     return orderRepository.findById(id);
   }