Fixed #56 - added missing event handlers to Order History Service

Author: cer

ftgo-end-to-end-tests/src/test/java/net/chrisrichardson/ftgo/endtoendtests/EndToEndTests.java

@@ -8,6 +8,7 @@
 import net.chrisrichardson.ftgo.common.Money;
 import net.chrisrichardson.ftgo.common.PersonName;
 import net.chrisrichardson.ftgo.consumerservice.api.web.CreateConsumerRequest;
+import net.chrisrichardson.ftgo.orderservice.api.events.OrderState;
 import net.chrisrichardson.ftgo.orderservice.api.web.CreateOrderRequest;
 import net.chrisrichardson.ftgo.orderservice.api.web.ReviseOrderRequest;
 import net.chrisrichardson.ftgo.restaurantservice.events.CreateRestaurantRequest;
@@ -18,6 +19,7 @@
 import org.junit.Test;
 
 import java.util.Collections;
+import java.util.Optional;
 
 import static com.jayway.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -32,7 +34,7 @@ public class EndToEndTests {
   public static final String RESTAURANT_NAME = "My Restaurant";
 
   private final int revisedQuantityOfChickenVindaloo = 10;
-  private String host = System.getenv("DOCKER_HOST_IP");
+  private String host = Optional.ofNullable(System.getenv("DOCKER_HOST_IP")).orElse("localhost");
   private int consumerId;
   private int restaurantId;
   private int orderId;
@@ -166,13 +168,16 @@ private void createOrder() {
 
     verifyOrderAuthorized(orderId);
 
-    verifyOrderHistoryUpdated(orderId, consumerId);
+    verifyOrderHistoryUpdated(orderId, consumerId, OrderState.APPROVED.name());
   }
 
   private void cancelOrder() {
     cancelOrder(orderId);
 
     verifyOrderCancelled(orderId);
+
+    verifyOrderHistoryUpdated(orderId, consumerId, OrderState.CANCELLED.name());
+
   }
 
   private void verifyOrderCancelled(int orderId) {
@@ -291,7 +296,7 @@ private void verifyOrderAuthorized(int orderId) {
   }
 
 
-  private void verifyOrderHistoryUpdated(int orderId, int consumerId) {
+  private void verifyOrderHistoryUpdated(int orderId, int consumerId, String expectedState) {
     Eventually.eventually(String.format("verifyOrderHistoryUpdated %s", orderId), () -> {
       String state = given().
               when().
@@ -301,7 +306,7 @@ private void verifyOrderHistoryUpdated(int orderId, int consumerId) {
               .body("orders[0].restaurantName", equalTo(RESTAURANT_NAME))
               .extract().
                       path("orders[0].status"); // TODO state?
-      assertNotNull(state);
+      assertEquals(expectedState, state);
     });
   }
 

ftgo-order-history-service/src/main/java/net/chrisrichardson/ftgo/cqrs/orderhistory/OrderHistoryDao.java

@@ -3,6 +3,7 @@
 
 import net.chrisrichardson.ftgo.cqrs.orderhistory.dynamodb.SourceEvent;
 import net.chrisrichardson.ftgo.cqrs.orderhistory.dynamodb.Order;
+import net.chrisrichardson.ftgo.orderservice.api.events.OrderState;
 
 import java.util.Optional;
 
@@ -12,7 +13,7 @@ public interface OrderHistoryDao {
 
   OrderHistory findOrderHistory(String consumerId, OrderHistoryFilter filter);
 
-  public boolean cancelOrder(String orderId, Optional<SourceEvent> eventSource);
+  boolean updateOrderState(String orderId, OrderState newState, Optional<SourceEvent> eventSource);
 
   void noteTicketPreparationStarted(String orderId);
 
@@ -25,4 +26,5 @@ public interface OrderHistoryDao {
   void noteDelivered(String orderId);
 
   Optional<Order> findOrder(String orderId);
+
 }

ftgo-order-history-service/src/main/java/net/chrisrichardson/ftgo/cqrs/orderhistory/dynamodb/OrderHistoryDaoDynamoDb.java

@@ -343,15 +343,13 @@ private String keywordFilterExpression(Map<String, Object>
 //  }
 
   @Override
-  public boolean cancelOrder(String orderId, Optional<SourceEvent>
-          eventSource) {
+  public boolean updateOrderState(String orderId, OrderState newState, Optional<SourceEvent> eventSource) {
     UpdateItemSpec spec = new UpdateItemSpec()
             .withPrimaryKey("orderId", orderId)
             .withUpdateExpression("SET #orderStatus = :orderStatus")
             .withNameMap(Collections.singletonMap("#orderStatus",
                     ORDER_STATUS_FIELD))
-            .withValueMap(Collections.singletonMap(":orderStatus", OrderState
-                    .CANCELLED.toString()))
+            .withValueMap(Collections.singletonMap(":orderStatus", newState.toString()))
             .withReturnValues(ReturnValue.NONE);
     return idempotentUpdate(spec, eventSource);
   }
@@ -405,6 +403,7 @@ public Optional<Order> findOrder(String orderId) {
     return Optional.ofNullable(item).map(this::toOrder);
   }
 
+
   private Order toOrder(Item avs) {
     Order order = new Order(avs.getString("orderId"),
             avs.getString("consumerId"),

ftgo-order-history-service/src/main/java/net/chrisrichardson/ftgo/cqrs/orderhistory/messaging/OrderHistoryEventHandlers.java

@@ -3,14 +3,12 @@
 import io.eventuate.tram.events.subscriber.DomainEventEnvelope;
 import io.eventuate.tram.events.subscriber.DomainEventHandlers;
 import io.eventuate.tram.events.subscriber.DomainEventHandlersBuilder;
-import io.eventuate.tram.messaging.common.Message;
 import net.chrisrichardson.ftgo.cqrs.orderhistory.DeliveryPickedUp;
 import net.chrisrichardson.ftgo.cqrs.orderhistory.Location;
 import net.chrisrichardson.ftgo.cqrs.orderhistory.OrderHistoryDao;
 import net.chrisrichardson.ftgo.cqrs.orderhistory.dynamodb.Order;
 import net.chrisrichardson.ftgo.cqrs.orderhistory.dynamodb.SourceEvent;
-import net.chrisrichardson.ftgo.orderservice.api.events.OrderCreatedEvent;
-import net.chrisrichardson.ftgo.orderservice.api.events.OrderState;
+import net.chrisrichardson.ftgo.orderservice.api.events.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,6 +34,9 @@ public DomainEventHandlers domainEventHandlers() {
     return DomainEventHandlersBuilder
             .forAggregateType("net.chrisrichardson.ftgo.orderservice.domain.Order")
             .onEvent(OrderCreatedEvent.class, this::handleOrderCreated)
+            .onEvent(OrderAuthorized.class, this::handleOrderAuthorized)
+            .onEvent(OrderCancelled.class, this::handleOrderCancelled)
+            .onEvent(OrderRejected.class, this::handleOrderRejected)
 //            .onEvent(DeliveryPickedUp.class, this::handleDeliveryPickedUp)
             .build();
   }
@@ -51,6 +52,24 @@ public void handleOrderCreated(DomainEventEnvelope<OrderCreatedEvent> dee) {
     logger.debug("handleOrderCreated result {} {}", dee, result);
   }
 
+  public void handleOrderAuthorized(DomainEventEnvelope<OrderAuthorized> dee) {
+    logger.debug("handleOrderAuthorized called {}", dee);
+    boolean result = orderHistoryDao.updateOrderState(dee.getAggregateId(), OrderState.APPROVED, makeSourceEvent(dee));
+    logger.debug("handleOrderAuthorized result {} {}", dee, result);
+  }
+
+  public void handleOrderCancelled(DomainEventEnvelope<OrderCancelled> dee) {
+    logger.debug("handleOrderAuthorized called {}", dee);
+    boolean result = orderHistoryDao.updateOrderState(dee.getAggregateId(), OrderState.CANCELLED, makeSourceEvent(dee));
+    logger.debug("handleOrderAuthorized result {} {}", dee, result);
+  }
+
+  public void handleOrderRejected(DomainEventEnvelope<OrderRejected> dee) {
+    logger.debug("handleOrderAuthorized called {}", dee);
+    boolean result = orderHistoryDao.updateOrderState(dee.getAggregateId(), OrderState.REJECTED, makeSourceEvent(dee));
+    logger.debug("handleOrderAuthorized result {} {}", dee, result);
+  }
+
   private Order makeOrder(String orderId, OrderCreatedEvent event) {
     return new Order(orderId,
             Long.toString(event.getOrderDetails().getConsumerId()),

ftgo-order-history-service/src/test/java/net/chrisrichardson/ftgo/cqrs/orderhistory/dynamodb/OrderHistoryDaoDynamoDbTest.java

@@ -75,7 +75,7 @@ public void shouldFindOrder() {
 
   @Test
   public void shouldIgnoreDuplicateAdd() {
-    dao.cancelOrder(orderId, Optional.empty());
+    dao.updateOrderState(orderId, OrderState.CANCELLED, Optional.empty());
     assertFalse(dao.addOrder(order1, eventSource));
     Optional<Order> order = dao.findOrder(orderId);
     assertEquals(OrderState.CANCELLED, order.get().getStatus());
@@ -111,15 +111,15 @@ public void shouldFindOrdersWithStatus() throws InterruptedException {
 
   @Test
   public void shouldCancel() throws InterruptedException {
-    dao.cancelOrder(orderId, Optional.of(new SourceEvent("a", "b", "c")));
+    dao.updateOrderState(orderId, OrderState.CANCELLED, Optional.of(new SourceEvent("a", "b", "c")));
     Order order = dao.findOrder(orderId).get();
     assertEquals(OrderState.CANCELLED, order.getStatus());
   }
 
   @Test
   public void shouldHandleCancel() throws InterruptedException {
-    assertTrue(dao.cancelOrder(orderId, Optional.of(new SourceEvent("a", "b", "c"))));
-    assertFalse(dao.cancelOrder(orderId, Optional.of(new SourceEvent("a", "b", "c"))));
+    assertTrue(dao.updateOrderState(orderId, OrderState.CANCELLED, Optional.of(new SourceEvent("a", "b", "c"))));
+    assertFalse(dao.updateOrderState(orderId, OrderState.CANCELLED, Optional.of(new SourceEvent("a", "b", "c"))));
   }
 
   @Test

ftgo-order-service/src/main/java/net/chrisrichardson/ftgo/orderservice/domain/OrderAuthorized.java renamed to ftgo-order-service-api/src/main/java/net/chrisrichardson/ftgo/orderservice/api/events/OrderAuthorized.java

@@ -1,7 +1,5 @@
-package net.chrisrichardson.ftgo.orderservice.domain;
+package net.chrisrichardson.ftgo.orderservice.api.events;
 
-import io.eventuate.tram.events.common.DomainEvent;
-import net.chrisrichardson.ftgo.orderservice.api.events.OrderDomainEvent;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 

ftgo-order-service/src/main/java/net/chrisrichardson/ftgo/orderservice/domain/OrderCancelled.java renamed to ftgo-order-service-api/src/main/java/net/chrisrichardson/ftgo/orderservice/api/events/OrderCancelled.java

@@ -1,4 +1,4 @@
-package net.chrisrichardson.ftgo.orderservice.domain;
+package net.chrisrichardson.ftgo.orderservice.api.events;
 
 import io.eventuate.tram.events.common.DomainEvent;
 import net.chrisrichardson.ftgo.orderservice.api.events.OrderDomainEvent;

ftgo-order-service-api/src/main/java/net/chrisrichardson/ftgo/orderservice/api/events/OrderRejected.java

@@ -0,0 +1,4 @@
+package net.chrisrichardson.ftgo.orderservice.api.events;
+
+public class OrderRejected implements OrderDomainEvent {
+}

ftgo-order-service/src/component-test/java/net/chrisrichardson/ftgo/orderservice/cucumber/OrderServiceComponentTestStepDefinitions.java

@@ -39,6 +39,7 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.ContextConfiguration;
 
+import java.util.Arrays;
 import java.util.Collections;
 
 import static io.eventuate.tram.commands.consumer.CommandHandlerReplyBuilder.withSuccess;
@@ -200,7 +201,18 @@ public void theOrderShouldBeInState(String desiredOrderState) {
   @And("an (.*) event should be published")
   public void verifyEventPublished(String expectedEventClass) {
     messageTracker.assertDomainEventPublished("net.chrisrichardson.ftgo.orderservice.domain.Order",
-            "net.chrisrichardson.ftgo.orderservice.domain." + expectedEventClass);
+            findEventClass(expectedEventClass, "net.chrisrichardson.ftgo.orderservice.domain", "net.chrisrichardson.ftgo.orderservice.api.events"));
+  }
+
+  private String findEventClass(String expectedEventClass, String... packages) {
+    return Arrays.stream(packages).map(p -> p + "." + expectedEventClass).filter(className -> {
+      try {
+        Class.forName(className);
+        return true;
+      } catch (ClassNotFoundException e) {
+        return false;
+      }
+    }).findFirst().orElseThrow(() -> new RuntimeException(String.format("Cannot find class %s in packages %s", expectedEventClass, String.join(",", packages))));
   }
 
 }

ftgo-order-service/src/main/java/net/chrisrichardson/ftgo/orderservice/domain/OrderRejected.java

@@ -2,6 +2,7 @@
 
 import io.eventuate.tram.events.aggregates.ResultWithDomainEvents;
 import net.chrisrichardson.ftgo.orderservice.RestaurantMother;
+import net.chrisrichardson.ftgo.orderservice.api.events.OrderAuthorized;
 import net.chrisrichardson.ftgo.orderservice.api.events.OrderCreatedEvent;
 import net.chrisrichardson.ftgo.orderservice.api.events.OrderDomainEvent;
 import net.chrisrichardson.ftgo.orderservice.api.events.OrderState;
@@ -14,7 +15,6 @@
 
 import static java.util.Collections.singletonList;
 import static net.chrisrichardson.ftgo.orderservice.OrderDetailsMother.*;
-import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.AJANTA_ID;
 import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.AJANTA_RESTAURANT;
 import static net.chrisrichardson.ftgo.orderservice.RestaurantMother.CHICKEN_VINDALOO_PRICE;
 import static org.junit.Assert.assertEquals;