Replaced ResponseEntity<Void> by void. Reorganized enums. Refactored calculations in OrderLineItems

Author: dartartem

ftgo-common/src/main/java/net/chrisrichardson/ftgo/common/DeliveryActionType.java

@@ -1,7 +1,5 @@
 package net.chrisrichardson.ftgo.deliveryservice.api.web;
 
-import net.chrisrichardson.ftgo.common.DeliveryActionType;
-
 public class ActionInfo {
   private DeliveryActionType type;
 

ftgo-delivery-service-api/src/main/java/net/chrisrichardson/ftgo/deliveryservice/api/web/ActionInfo.java

@@ -0,0 +1,4 @@
+package net.chrisrichardson.ftgo.deliveryservice.api.web;
+
+public enum DeliveryActionType { PICKUP, DROPOFF
+}

ftgo-delivery-service-api/src/main/java/net/chrisrichardson/ftgo/deliveryservice/api/web/DeliveryActionType.java

@@ -1,7 +1,5 @@
 package net.chrisrichardson.ftgo.deliveryservice.api.web;
 
-import net.chrisrichardson.ftgo.common.DeliveryState;
-
 public class DeliveryInfo {
 
   private long id;

ftgo-delivery-service-api/src/main/java/net/chrisrichardson/ftgo/deliveryservice/api/web/DeliveryInfo.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.ftgo.common;
+package net.chrisrichardson.ftgo.deliveryservice.api.web;
 
 public enum DeliveryState {
   CANCELLED, SCHEDULED, PENDING

ftgo-common/src/main/java/net/chrisrichardson/ftgo/common/DeliveryState.java ftgo-delivery-service-api/src/main/java/net/chrisrichardson/ftgo/deliveryservice/api/web/DeliveryState.java

@@ -1,6 +1,6 @@
 package net.chrisrichardson.ftgo.deliveryservice.domain;
 
-import net.chrisrichardson.ftgo.common.DeliveryActionType;
+import net.chrisrichardson.ftgo.deliveryservice.api.web.DeliveryActionType;
 import net.chrisrichardson.ftgo.common.Address;
 
 import javax.persistence.Embeddable;

ftgo-delivery-service/src/main/java/net/chrisrichardson/ftgo/deliveryservice/domain/Action.java

@@ -1,7 +1,7 @@
 package net.chrisrichardson.ftgo.deliveryservice.domain;
 
 import net.chrisrichardson.ftgo.common.Address;
-import net.chrisrichardson.ftgo.common.DeliveryState;
+import net.chrisrichardson.ftgo.deliveryservice.api.web.DeliveryState;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;

ftgo-delivery-service/src/main/java/net/chrisrichardson/ftgo/deliveryservice/domain/Delivery.java

@@ -17,9 +17,8 @@ public DeliveryServiceController(DeliveryService deliveryService) {
   }
 
   @RequestMapping(path="/couriers/{courierId}/availability", method= RequestMethod.POST)
-  public ResponseEntity<Void> updateCourierLocation(@PathVariable long courierId, @RequestBody CourierAvailability availability) {
+  public void updateCourierLocation(@PathVariable long courierId, @RequestBody CourierAvailability availability) {
     deliveryService.updateAvailability(courierId, availability.isAvailable());
-    return new ResponseEntity<>(HttpStatus.OK);
   }
 
   @RequestMapping(path="/deliveries/{deliveryId}", method= RequestMethod.GET)

ftgo-delivery-service/src/main/java/net/chrisrichardson/ftgo/deliveryservice/web/DeliveryServiceController.java

@@ -1,7 +1,7 @@
 package net.chrisrichardson.ftgo.deliveryservice.domain;
 
-import net.chrisrichardson.ftgo.common.DeliveryActionType;
-import net.chrisrichardson.ftgo.common.DeliveryState;
+import net.chrisrichardson.ftgo.deliveryservice.api.web.DeliveryActionType;
+import net.chrisrichardson.ftgo.deliveryservice.api.web.DeliveryState;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;

ftgo-delivery-service/src/test/java/net/chrisrichardson/ftgo/deliveryservice/domain/DeliveryServiceTest.java

@@ -16,8 +16,7 @@ public KitchenController(KitchenService kitchenService) {
   }
 
   @RequestMapping(path="/tickets/{ticketId}/accept", method= RequestMethod.POST)
-  public ResponseEntity<Void> acceptTicket(@PathVariable long ticketId, @RequestBody TicketAcceptance ticketAcceptance) {
+  public void acceptTicket(@PathVariable long ticketId, @RequestBody TicketAcceptance ticketAcceptance) {
     kitchenService.accept(ticketId, ticketAcceptance.getReadyBy());
-    return new ResponseEntity<>(HttpStatus.OK);
   }
 }

ftgo-kitchen-service/src/main/java/net/chrisrichardson/ftgo/kitchenservice/web/KitchenController.java

@@ -7,11 +7,9 @@
 import javax.persistence.CollectionTable;
 import javax.persistence.ElementCollection;
 import javax.persistence.Embeddable;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
 
 @Embeddable
 public class OrderLineItems {
@@ -40,13 +38,14 @@ OrderLineItem findOrderLineItem(String lineItemId) {
   }
 
   Money changeToOrderTotal(OrderRevision orderRevision) {
-    AtomicReference<Money> delta = new AtomicReference<>(Money.ZERO);
-
-    orderRevision.getRevisedOrderLineItems().forEach(item -> {
-      OrderLineItem lineItem = findOrderLineItem(item.getMenuItemId());
-      delta.set(delta.get().add(lineItem.deltaForChangedQuantity(item.getQuantity())));
-    });
-    return delta.get();
+    return orderRevision
+            .getRevisedOrderLineItems()
+            .stream()
+            .map(item -> {
+              OrderLineItem lineItem = findOrderLineItem(item.getMenuItemId());
+              return lineItem.deltaForChangedQuantity(item.getQuantity());
+            })
+            .reduce(new Money(0), Money::add);
   }
 
   void updateLineItems(OrderRevision orderRevision) {