Merge pull request #6 from pulnara/restaurant-service-efficiency

Implement Restaurant service efficiency

build.gradle

@@ -30,10 +30,11 @@ subprojects {
  group = "net.chrisrichardson.ftgo"
 
  repositories {
- eventuateMavenRepoUrl.split('[ ,]').each { repoUrl -> maven { url repoUrl.trim() } }
-
  mavenCentral()
  jcenter()
+ eventuateMavenRepoUrl.split('[ ,]').each { repoUrl -> maven { url repoUrl.trim() } }
+
+
 
  maven {
  url 'https://jitpack.io'

ftgo-kitchen-service/src/main/java/net/chrisrichardson/ftgo/kitchenservice/domain/KitchenService.java

@@ -3,13 +3,17 @@
 import io.eventuate.tram.events.aggregates.ResultWithDomainEvents;
 import net.chrisrichardson.ftgo.common.RevisedOrderLineItem;
 import net.chrisrichardson.ftgo.kitchenservice.api.TicketDetails;
+import net.chrisrichardson.ftgo.kitchenservice.api.TicketLineItem;
 import net.chrisrichardson.ftgo.kitchenservice.api.events.TicketDomainEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 public class KitchenService {
 
@@ -22,8 +26,10 @@ public class KitchenService {
  @Autowired
  private RestaurantRepository restaurantRepository;
 
- public void createMenu(long id, RestaurantMenu menu) {
- Restaurant restaurant = new Restaurant(id, menu.getMenuItems());
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ public void createMenu(long id, RestaurantMenu menu, long efficiency) {
+ Restaurant restaurant = new Restaurant(id, menu.getMenuItems(), efficiency);
  restaurantRepository.save(restaurant);
  }
 
@@ -34,6 +40,18 @@ public void reviseMenu(long ticketId, RestaurantMenu revisedMenu) {
  }
 
  public Ticket createTicket(long restaurantId, Long ticketId, TicketDetails ticketDetails) {
+ Optional<Restaurant> restaurant = restaurantRepository.findById(restaurantId);
+ Optional<Integer> totalOrderQuantity = ticketDetails
+ .getLineItems()
+ .stream()
+ .map(TicketLineItem::getQuantity)
+ .reduce(Integer::sum);
+ if (restaurant.isPresent() && totalOrderQuantity.isPresent() &&
+ restaurant.get().getEfficiency() < totalOrderQuantity.get()) {
+ logger.info("Restaurant efficiency exceeded!");
+ throw new RestaurantCapacityExceededException();
+ }
+ logger.info("Creating ticket...");
  ResultWithDomainEvents<Ticket, TicketDomainEvent> rwe = Ticket.create(restaurantId, ticketId, ticketDetails);
  ticketRepository.save(rwe.result);
  domainEventPublisher.publish(rwe.result, rwe.events);

ftgo-kitchen-service/src/main/java/net/chrisrichardson/ftgo/kitchenservice/domain/Restaurant.java

@@ -26,12 +26,23 @@ public class Restaurant {
  @CollectionTable(name = "kitchen_service_restaurant_menu_items")
  private List<MenuItem> menuItems;
 
+ public Long getEfficiency() {
+ return efficiency;
+ }
+
+ public void setEfficiency(Long efficiency) {
+ this.efficiency = efficiency;
+ }
+
+ private Long efficiency;
+
  private Restaurant() {
  }
 
- public Restaurant(long id, List<MenuItem> menuItems) {
+ public Restaurant(long id, List<MenuItem> menuItems, long efficiency) {
  this.id = id;
  this.menuItems = menuItems;
+ this.efficiency = efficiency;
  }
 
  public List<DomainEvent> reviseMenu(RestaurantMenu revisedMenu) {
@@ -40,6 +51,7 @@ public List<DomainEvent> reviseMenu(RestaurantMenu revisedMenu) {
 
  public void verifyRestaurantDetails(TicketDetails ticketDetails) {
  // TODO - implement me
+
  }
 
  public Long getId() {

ftgo-kitchen-service/src/main/java/net/chrisrichardson/ftgo/kitchenservice/domain/RestaurantCapacityExceededException.java

@@ -0,0 +1,4 @@
+package net.chrisrichardson.ftgo.kitchenservice.domain;
+
+public class RestaurantCapacityExceededException extends RuntimeException {
+}

ftgo-kitchen-service/src/main/java/net/chrisrichardson/ftgo/kitchenservice/messagehandlers/KitchenServiceCommandHandler.java

@@ -5,6 +5,7 @@
 import io.eventuate.tram.messaging.common.Message;
 import io.eventuate.tram.sagas.participant.SagaCommandHandlersBuilder;
 import net.chrisrichardson.ftgo.kitchenservice.api.*;
+import net.chrisrichardson.ftgo.kitchenservice.domain.RestaurantCapacityExceededException;
 import net.chrisrichardson.ftgo.kitchenservice.domain.RestaurantDetailsVerificationException;
 import net.chrisrichardson.ftgo.kitchenservice.domain.Ticket;
 import net.chrisrichardson.ftgo.kitchenservice.domain.KitchenService;
@@ -48,7 +49,7 @@ private Message createTicket(CommandMessage<CreateTicket>
  Ticket ticket = kitchenService.createTicket(restaurantId, ticketId, ticketDetails);
  CreateTicketReply reply = new CreateTicketReply(ticket.getId());
  return withLock(Ticket.class, ticket.getId()).withSuccess(reply);
- } catch (RestaurantDetailsVerificationException e) {
+ } catch (RestaurantDetailsVerificationException | RestaurantCapacityExceededException e) {
  return withFailure();
  }
  }

ftgo-kitchen-service/src/main/java/net/chrisrichardson/ftgo/kitchenservice/messagehandlers/KitchenServiceEventConsumer.java

@@ -27,7 +27,7 @@ private void createMenu(DomainEventEnvelope<RestaurantCreated> de) {
  String restaurantIds = de.getAggregateId();
  long id = Long.parseLong(restaurantIds);
  RestaurantMenu menu = new RestaurantMenu(RestaurantEventMapper.toMenuItems(de.getEvent().getMenu().getMenuItems()));
- kitchenService.createMenu(id, menu);
+ kitchenService.createMenu(id, menu, de.getEvent().getEfficiency());
  }
 
  public void reviseMenu(DomainEventEnvelope<RestaurantMenuRevised> de) {

ftgo-kitchen-service/src/test/java/net/chrisrichardson/ftgo/kitchenservice/domain/KitchenServiceInMemoryIntegrationTest.java

@@ -71,7 +71,7 @@ private String baseUrl(String path) {
  public void shouldCreateTicket() {
 
  long restaurantId = System.currentTimeMillis();
- Restaurant restaurant = new Restaurant(restaurantId, Collections.emptyList());
+ Restaurant restaurant = new Restaurant(restaurantId, Collections.emptyList(), 50);
 
  restaurantRepository.save(restaurant);
 

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

@@ -7,4 +7,5 @@ public enum OrderState {
  CANCEL_PENDING,
  CANCELLED,
  REVISION_PENDING,
+ COMPLETED
 }

ftgo-order-service/build.gradle

@@ -131,6 +131,7 @@ dependencies {
  compile project(":common-swagger")
  compile project(":ftgo-common-jpa")
 
+ compile 'org.jetbrains:annotations:13.0'
  compile "io.eventuate.tram.core:eventuate-tram-aggregate-domain-events:$eventuateTramVersion"
  compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka:$eventuateTramVersion"
  compile "io.eventuate.tram.core:eventuate-tram-spring-commands:$eventuateTramVersion"
@@ -154,8 +155,8 @@ dependencies {
  compile "io.grpc:grpc-protobuf:${grpcVersion}"
  compile "io.grpc:grpc-stub:${grpcVersion}"
 
- compile "io.microservices.tools.canvas:microservice-canvas-springmvc:$microserviceCanvasVersion"
- compile "io.microservices.tools.canvas:microservice-canvas-extractor-tram-sagas:$microserviceCanvasVersion"
+ //compile "io.microservices.tools.canvas:microservice-canvas-springmvc:$microserviceCanvasVersion"
+ //compile "io.microservices.tools.canvas:microservice-canvas-extractor-tram-sagas:$microserviceCanvasVersion"
  compile "io.eventuate.tram.core:eventuate-tram-spring-messaging:$eventuateTramVersion"
  compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-orchestration:$eventuateTramSagasVersion"
 

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

@@ -1,8 +1,8 @@
 package net.chrisrichardson.ftgo.orderservice.main;
 
 import io.eventuate.tram.spring.jdbckafka.TramJdbcKafkaConfiguration;
-import io.microservices.canvas.extractor.spring.annotations.ServiceDescription;
-import io.microservices.canvas.springmvc.MicroserviceCanvasWebConfiguration;
+//import io.microservices.canvas.extractor.spring.annotations.ServiceDescription;
+//import io.microservices.canvas.springmvc.MicroserviceCanvasWebConfiguration;
 import net.chrisrichardson.eventstore.examples.customersandorders.commonswagger.CommonSwaggerConfiguration;
 import net.chrisrichardson.ftgo.orderservice.grpc.GrpcConfiguration;
 import net.chrisrichardson.ftgo.orderservice.messaging.OrderServiceMessagingConfiguration;
@@ -14,9 +14,9 @@
 
 @SpringBootApplication
 @Import({OrderWebConfiguration.class, OrderCommandHandlersConfiguration.class, OrderServiceMessagingConfiguration.class,
- TramJdbcKafkaConfiguration.class, CommonSwaggerConfiguration.class, GrpcConfiguration.class,
- MicroserviceCanvasWebConfiguration.class})
-@ServiceDescription(description="Manages Orders", capabilities = "Order Management")
+ TramJdbcKafkaConfiguration.class, CommonSwaggerConfiguration.class, GrpcConfiguration.class/*,
+ MicroserviceCanvasWebConfiguration.class*/})
+//@ServiceDescription(description="Manages Orders", capabilities = "Order Management")
 public class OrderServiceMain {
 
  public static void main(String[] args) {

ftgo-restaurant-service-api-spec/src/main/resources/ftgo-restaurant-service-api-spec/messages/RestaurantCreated.json

@@ -4,6 +4,9 @@
  "name": {
  "type": "string"
  },
+ "efficiency": {
+ "type": "integer"
+ },
  "address": {
  "type": "object",
  "properties": {

ftgo-restaurant-service/src/integration-test/java/net/chrisrichardson/ftgo/restaurantservice/contract/DeliveryserviceMessagingBase.java

@@ -42,11 +42,11 @@ public RestaurantDomainEventPublisher orderAggregateEventPublisher(DomainEventPu
  private RestaurantDomainEventPublisher restaurantDomainEventPublisher;
 
  protected void restaurantCreated() {
- Restaurant restaurant = new Restaurant("Yummy Indian", new RestaurantMenu(Collections.emptyList()));
+ Restaurant restaurant = new Restaurant("Yummy Indian", new RestaurantMenu(Collections.emptyList()), 10L);
  restaurant.setId(99L);
  restaurantDomainEventPublisher.publish(restaurant,
  Collections.singletonList(new RestaurantCreated(restaurant.getName(), new Address("1 Main Street", "Unit 99", "Oakland", "CA", "94611"),
- restaurant.getMenu())));
+ restaurant.getMenu(), restaurant.getEfficiency())));
  }
 
 }

ftgo-restaurant-service/src/main/java/net/chrisrichardson/ftgo/restaurantservice/domain/CreateRestaurantRequest.java

@@ -7,15 +7,17 @@ public class CreateRestaurantRequest {
  private String name;
  private Address address;
  private RestaurantMenu menu;
+ private Long efficiency; // how many orders can be processed within an hour
 
  private CreateRestaurantRequest() {
 
  }
 
- public CreateRestaurantRequest(String name, Address address, RestaurantMenu menu) {
+ public CreateRestaurantRequest(String name, Address address, RestaurantMenu menu, Long efficiency) {
  this.name = name;
  this.address = address;
  this.menu = menu;
+ this.efficiency = efficiency;
  }
 
  public String getName() {
@@ -37,4 +39,13 @@ public void setMenu(RestaurantMenu menu) {
  public Address getAddress() {
  return address;
  }
+
+ public Long getEfficiency() {
+ return efficiency;
+ }
+
+ public void setEfficiency(Long efficiency) {
+ this.efficiency = efficiency;
+ }
+
 }

ftgo-restaurant-service/src/main/java/net/chrisrichardson/ftgo/restaurantservice/domain/Restaurant.java

@@ -19,12 +19,20 @@ public class Restaurant {
 
  private String name;
 
+ private Long efficiency;
+
  @Embedded
  private RestaurantMenu menu;
 
  private Restaurant() {
  }
 
+ public Restaurant(String name, RestaurantMenu menu, Long efficiency) {
+ this.name = name;
+ this.menu = menu;
+ this.efficiency = efficiency;
+ }
+
  public void setId(Long id) {
  this.id = id;
  }
@@ -37,18 +45,20 @@ public void setName(String name) {
  this.name = name;
  }
 
-
- public Restaurant(String name, RestaurantMenu menu) {
- this.name = name;
- this.menu = menu;
- }
-
-
  public Long getId() {
  return id;
  }
 
  public RestaurantMenu getMenu() {
  return menu;
  }
+
+ public Long getEfficiency() {
+ return efficiency;
+ }
+
+ public void setEfficiency(Long efficiency) {
+ this.efficiency = efficiency;
+ }
+
 }

ftgo-restaurant-service/src/main/java/net/chrisrichardson/ftgo/restaurantservice/domain/RestaurantService.java

@@ -19,9 +19,9 @@ public class RestaurantService {
  private RestaurantDomainEventPublisher restaurantDomainEventPublisher;
 
  public Restaurant create(CreateRestaurantRequest request) {
- Restaurant restaurant = new Restaurant(request.getName(), request.getMenu());
+ Restaurant restaurant = new Restaurant(request.getName(), request.getMenu(), request.getEfficiency());
  restaurantRepository.save(restaurant);
- restaurantDomainEventPublisher.publish(restaurant, Collections.singletonList(new RestaurantCreated(request.getName(), request.getAddress(), request.getMenu())));
+ restaurantDomainEventPublisher.publish(restaurant, Collections.singletonList(new RestaurantCreated(request.getName(), request.getAddress(), request.getMenu(), request.getEfficiency())));
  return restaurant;
  }
 

ftgo-restaurant-service/src/main/java/net/chrisrichardson/ftgo/restaurantservice/events/RestaurantCreated.java

@@ -8,17 +8,28 @@ public class RestaurantCreated implements RestaurantDomainEvent {
  private Address address;
  private RestaurantMenu menu;
 
+ public Long getEfficiency() {
+ return efficiency;
+ }
+
+ public void setEfficiency(Long efficiency) {
+ this.efficiency = efficiency;
+ }
+
+ private Long efficiency;
+
  public String getName() {
  return name;
  }
 
  private RestaurantCreated() {
  }
 
- public RestaurantCreated(String name, Address address, RestaurantMenu menu) {
+ public RestaurantCreated(String name, Address address, RestaurantMenu menu, Long efficiency) {
  this.name = name;
  this.address = address;
  this.menu = menu;
+ this.efficiency = efficiency;
  }
 
  public RestaurantMenu getMenu() {

ftgo-restaurant-service/src/test/java/net/chrisrichardson/ftgo/restaurantservice/events/RestaurantCreatedSerializationTest.java

@@ -34,7 +34,7 @@ public void shouldSerialize() throws JSONException {
  ValidatingJSONMapper mapper = ValidatingJSONMapper.forSchema("/ftgo-restaurant-service-api-spec/messages/RestaurantCreated.json");
 
  RestaurantCreated event = new RestaurantCreated(AJANTA_RESTAURANT_NAME, RESTAURANT_ADDRESS,
- new RestaurantMenu(Collections.singletonList(CHICKEN_VINDALOO_MENU_ITEM)));
+ new RestaurantMenu(Collections.singletonList(CHICKEN_VINDALOO_MENU_ITEM)), 10L);
  String json = mapper.toJSON(event);
  assertNotNull(json);
  }

gradle.properties

@@ -1,7 +1,9 @@
 
 deployUrl=file:///Users/cer/.m2/testdeploy
 
-eventuateMavenRepoUrl=https://dl.bintray.com/eventuateio-oss/eventuate-maven-release,https://dl.bintray.com/eventuateio-oss/eventuate-maven-milestone,https://dl.bintray.com/eventuateio-oss/microservice-canvas-tools-release,file:///Users/cer/.m2/testdeploy,https://dl.bintray.com/eventuateio-oss/eventuate-maven-rc,https://dl.bintray.com/eventuateio-oss/microservice-canvas-tools-rc,https://snapshots.repositories.eventuate.io/repository
+#eventuateMavenRepoUrl=https://dl.bintray.com/eventuateio-oss/eventuate-maven-release,https://dl.bintray.com/eventuateio-oss/eventuate-maven-milestone,https://dl.bintray.com/eventuateio-oss/microservice-canvas-tools-release,file:///Users/cer/.m2/testdeploy,https://dl.bintray.com/eventuateio-oss/eventuate-maven-rc,https://dl.bintray.com/eventuateio-oss/microservice-canvas-tools-rc,https://snapshots.repositories.eventuate.io/repository
+eventuateMavenRepoUrl=file:///Users/cer/.m2/testdeploy,https://snapshots.repositories.eventuate.io/repository
+
 
 springBootVersion=2.1.1.RELEASE
 restAssuredVersion=2.9.0