Add projections

api-java/src/main/java/javaclasses/mealorder/c/BoundedContexts.java

@@ -26,6 +26,15 @@
 import javaclasses.mealorder.c.order.OrderRepository;
 import javaclasses.mealorder.c.po.PurchaseOrderRepository;
 import javaclasses.mealorder.c.vendor.VendorRepository;
+import javaclasses.mealorder.q.repository.FullMenuViewRepository;
+import javaclasses.mealorder.q.repository.MenuCalendarViewRepository;
+import javaclasses.mealorder.q.repository.MenuListViewRepository;
+import javaclasses.mealorder.q.repository.MonthlySpendingsReportViewRepository;
+import javaclasses.mealorder.q.repository.OrderListViewRepository;
+import javaclasses.mealorder.q.repository.PurchaseOrderDetailsByDishViewRepository;
+import javaclasses.mealorder.q.repository.PurchaseOrderDetailsByUserViewRepository;
+import javaclasses.mealorder.q.repository.PurchaseOrderItemViewRepository;
+import javaclasses.mealorder.q.repository.VendorListViewRepository;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -71,16 +80,36 @@ public static BoundedContext create() {
  */
  public static BoundedContext create(StorageFactory storageFactory) {
  checkNotNull(storageFactory);
- final VendorRepository vendorRepository = VendorRepository.getRepository();
-
+ final VendorRepository vendorRepository = VendorRepository.createRepository();
  final OrderRepository orderRepository = new OrderRepository();
  final PurchaseOrderRepository purchaseOrderRepository = new PurchaseOrderRepository();
 
+ final FullMenuViewRepository fullMenuViewRepository = new FullMenuViewRepository();
+ final MenuCalendarViewRepository menuCalendarViewRepository = new MenuCalendarViewRepository();
+ final MenuListViewRepository menuListViewRepository = new MenuListViewRepository();
+ final MonthlySpendingsReportViewRepository monthlySpendingsReportViewRepository = new MonthlySpendingsReportViewRepository();
+ final OrderListViewRepository orderListViewRepository = new OrderListViewRepository();
+ final PurchaseOrderDetailsByDishViewRepository poDetailsByDishViewRepository = new PurchaseOrderDetailsByDishViewRepository();
+ final PurchaseOrderDetailsByUserViewRepository poDetailsByUserViewRepository = new PurchaseOrderDetailsByUserViewRepository();
+ final PurchaseOrderItemViewRepository poItemViewRepository = new PurchaseOrderItemViewRepository();
+ final VendorListViewRepository vendorListViewRepository = new VendorListViewRepository();
+
  final BoundedContext boundedContext = createBoundedContext(storageFactory);
 
  boundedContext.register(vendorRepository);
  boundedContext.register(orderRepository);
  boundedContext.register(purchaseOrderRepository);
+
+ boundedContext.register(fullMenuViewRepository);
+ boundedContext.register(menuCalendarViewRepository);
+ boundedContext.register(menuListViewRepository);
+ boundedContext.register(monthlySpendingsReportViewRepository);
+ boundedContext.register(orderListViewRepository);
+ boundedContext.register(poDetailsByDishViewRepository);
+ boundedContext.register(poDetailsByUserViewRepository);
+ boundedContext.register(poItemViewRepository);
+ boundedContext.register(vendorListViewRepository);
+
  return boundedContext;
  }
 

api-java/src/main/java/javaclasses/mealorder/c/order/OrderAggregate.java

@@ -99,6 +99,7 @@ OrderCreated handle(CreateOrder cmd) throws OrderAlreadyExists, MenuNotAvailable
  final OrderCreated result = OrderCreated.newBuilder()
  .setOrderId(orderId)
  .setMenuId(menuId)
+ .setWhenCreated(getCurrentTime())
  .build();
  return result;
  }
@@ -125,6 +126,7 @@ DishAddedToOrder handle(AddDishToOrder cmd) throws DishVendorMismatch,
  final DishAddedToOrder result = DishAddedToOrder.newBuilder()
  .setOrderId(orderId)
  .setDish(dish)
+ .setWhenAdded(getCurrentTime())
  .build();
  return result;
  }
@@ -145,6 +147,7 @@ DishRemovedFromOrder handle(RemoveDishFromOrder cmd) throws CannotRemoveMissingD
  DishRemovedFromOrder result = DishRemovedFromOrder.newBuilder()
  .setOrderId(orderId)
  .setDish(dish)
+ .setWhenRemoved(getCurrentTime())
  .build();
  return result;
  }

api-java/src/main/java/javaclasses/mealorder/c/po/PurchaseOrderAggregate.java

@@ -221,7 +221,7 @@ void purchaseOrderCanceled(PurchaseOrderCanceled event) {
  }
 
  @Apply
- void purchaseOrderCanceled(PurchaseOrderDelivered event) {
+ void purchaseOrderDelivered(PurchaseOrderDelivered event) {
  getBuilder().setStatus(DELIVERED);
  }
 

api-java/src/main/java/javaclasses/mealorder/c/po/PurchaseOrders.java

@@ -221,7 +221,7 @@ static PurchaseOrderDelivered createPOMarkedAsDeliveredEvent(MarkPurchaseOrderAs
  .newBuilder()
  .setId(id)
  .setWhoMarkedAsDelivered(whoMarksAsDelivered)
- .setWhenDelievered(getCurrentTime())
+ .setWhenDelivered(getCurrentTime())
  .build();
 
  return result;
@@ -277,6 +277,7 @@ static PurchaseOrderSent createPOSentEvent(PurchaseOrder purchaseOrder,
  .setPurchaseOrder(purchaseOrder)
  .setSenderEmail(senderEmail)
  .setVendorEmail(vendorEmail)
+ .setWhenSent(getCurrentTime())
  .build();
  return result;
  }

api-java/src/main/java/javaclasses/mealorder/c/vendor/VendorAggregate.java

@@ -25,26 +25,20 @@
 import io.spine.server.command.Assign;
 import javaclasses.mealorder.Menu;
 import javaclasses.mealorder.MenuDateRange;
-import javaclasses.mealorder.MenuId;
 import javaclasses.mealorder.Vendor;
 import javaclasses.mealorder.VendorChange;
 import javaclasses.mealorder.VendorId;
 import javaclasses.mealorder.VendorName;
 import javaclasses.mealorder.VendorVBuilder;
 import javaclasses.mealorder.c.command.AddVendor;
 import javaclasses.mealorder.c.command.ImportMenu;
-import javaclasses.mealorder.c.command.SetDateRangeForMenu;
 import javaclasses.mealorder.c.command.UpdateVendor;
-import javaclasses.mealorder.c.event.DateRangeForMenuSet;
 import javaclasses.mealorder.c.event.MenuImported;
 import javaclasses.mealorder.c.event.VendorAdded;
 import javaclasses.mealorder.c.event.VendorUpdated;
 import javaclasses.mealorder.c.rejection.CannotSetDateRange;
 import javaclasses.mealorder.c.rejection.VendorAlreadyExists;
 
-import java.util.List;
-import java.util.stream.IntStream;
-
 import static io.spine.time.Time.getCurrentTime;
 import static javaclasses.mealorder.c.vendor.VendorAggregateRejections.cannotSetDateRange;
 import static javaclasses.mealorder.c.vendor.VendorAggregateRejections.vendorAlreadyExists;
@@ -79,6 +73,7 @@ VendorAdded handle(AddVendor cmd) throws VendorAlreadyExists {
  .setEmail(cmd.getEmail())
  .addAllPhoneNumber(cmd.getPhoneNumberList())
  .setPoDailyDeadline(cmd.getPoDailyDeadline())
+ .setWhenAdded(getCurrentTime())
  .build();
  return vendorAdded;
  }
@@ -95,36 +90,23 @@ VendorUpdated handle(UpdateVendor cmd) {
  }
 
  @Assign
- MenuImported handle(ImportMenu cmd) {
+ MenuImported handle(ImportMenu cmd) throws CannotSetDateRange {
+ final MenuDateRange range = cmd.getMenuDateRange();
+ final Vendor vendor = getState();
+ if (!isValidDateRange(range) || isThereMenuForThisDateRange(vendor, range)) {
+ throw cannotSetDateRange(cmd);
+ }
  final MenuImported menuImported = MenuImported.newBuilder()
  .setVendorId(cmd.getVendorId())
  .setMenuId(cmd.getMenuId())
  .setWhoImported(cmd.getUserId())
  .setWhenImported(getCurrentTime())
  .addAllDish(cmd.getDishList())
+ .setMenuDateRange(cmd.getMenuDateRange())
  .build();
  return menuImported;
  }
 
- @Assign
- DateRangeForMenuSet handle(SetDateRangeForMenu cmd) throws CannotSetDateRange {
- final MenuDateRange range = cmd.getMenuDateRange();
- final Vendor vendor = getState();
-
- if (!isValidDateRange(range) || isThereMenuForThisDateRange(vendor, range)) {
- throw cannotSetDateRange(cmd);
- }
- final DateRangeForMenuSet dateRangeForMenuSet =
- DateRangeForMenuSet.newBuilder()
- .setVendorId(cmd.getVendorId())
- .setMenuId(cmd.getMenuId())
- .setWhoSet(cmd.getUserId())
- .setWhenSet(getCurrentTime())
- .setMenuDateRange(cmd.getMenuDateRange())
- .build();
- return dateRangeForMenuSet;
- }
-
  @Apply
  void vendorAdded(VendorAdded event) {
  getBuilder().setId(event.getVendorId())
@@ -149,24 +131,7 @@ void menuImported(MenuImported event) {
  getBuilder().addMenu(Menu.newBuilder()
  .setId(event.getMenuId())
  .addAllDish(event.getDishList())
+ .setMenuDateRange(event.getMenuDateRange())
  .build());
  }
-
- @Apply
- void dateRangeForMenuSet(DateRangeForMenuSet event) {
- final List<Menu> menus = getBuilder().getMenu();
- final MenuId menuId = event.getMenuId();
-
- final int index = IntStream.range(0, menus.size())
- .filter(i -> menus.get(i)
- .getId()
- .equals(menuId))
- .findFirst()
- .getAsInt();
-
- final Menu menu = menus.get(index);
- getBuilder().setMenu(index, Menu.newBuilder(menu)
- .setMenuDateRange(event.getMenuDateRange())
- .build());
- }
 }

api-java/src/main/java/javaclasses/mealorder/c/vendor/VendorAggregateRejections.java

@@ -21,7 +21,7 @@
 package javaclasses.mealorder.c.vendor;
 
 import javaclasses.mealorder.c.command.AddVendor;
-import javaclasses.mealorder.c.command.SetDateRangeForMenu;
+import javaclasses.mealorder.c.command.ImportMenu;
 import javaclasses.mealorder.c.rejection.CannotSetDateRange;
 import javaclasses.mealorder.c.rejection.VendorAlreadyExists;
 
@@ -62,7 +62,7 @@ static VendorAlreadyExists vendorAlreadyExists(AddVendor cmd) throws
  * @param cmd the {@code SetDateRangeForMenu} command which thrown the rejection
  * @throws CannotSetDateRange the rejection to throw
  */
- static CannotSetDateRange cannotSetDateRange(SetDateRangeForMenu cmd) throws
+ static CannotSetDateRange cannotSetDateRange(ImportMenu cmd) throws
  CannotSetDateRange {
  checkNotNull(cmd);
  final CannotSetDateRange cannotSetDateRange = new CannotSetDateRange(cmd.getVendorId(),

api-java/src/main/java/javaclasses/mealorder/c/vendor/VendorRepository.java

@@ -40,8 +40,12 @@ public static VendorRepository getRepository() {
  return VendorRepositorySingleton.INSTANCE.value;
  }
 
+ public static VendorRepository createRepository() {
+ VendorRepositorySingleton.INSTANCE.value = new VendorRepository();
+ return VendorRepositorySingleton.INSTANCE.value;
+ }
  private enum VendorRepositorySingleton {
  INSTANCE;
- public final VendorRepository value = new VendorRepository();
+ public VendorRepository value = new VendorRepository();
  }
 }

api-java/src/main/java/javaclasses/mealorder/q/FullMenuViewProjection.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2018, TeamDev Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package javaclasses.mealorder.q;
+
+import io.spine.core.Subscribe;
+import io.spine.server.projection.Projection;
+import javaclasses.mealorder.MenuId;
+import javaclasses.mealorder.VendorName;
+import javaclasses.mealorder.c.event.MenuImported;
+import javaclasses.mealorder.q.projection.FullMenuView;
+import javaclasses.mealorder.q.projection.FullMenuViewVBuilder;
+
+import java.util.List;
+
+import static javaclasses.mealorder.q.Projections.getAllDishesByCategories;
+
+public class FullMenuViewProjection extends Projection<MenuId, FullMenuView, FullMenuViewVBuilder> {
+
+ /**
+ * Creates a new instance.
+ *
+ * @param id the ID for the new instance
+ * @throws IllegalArgumentException if the ID is not of one of the supported types
+ */
+ public FullMenuViewProjection(MenuId id) {
+ super(id);
+ }
+
+ @Subscribe
+ public void on(MenuImported event) {
+ final VendorName vendorName = VendorName.newBuilder()
+ .setValue(event.getVendorId()
+ .getValue())
+ .build();
+
+ final List<DishesByCategory> allDishesByCategories = getAllDishesByCategories(
+ event.getDishList());
+
+ getBuilder().addAllDishesByCategory(allDishesByCategories);
+ getBuilder().setVendorName(vendorName);
+ getBuilder().setMenuId(event.getMenuId());
+ getBuilder().setMenuDateRange(event.getMenuDateRange());
+ }
+}

api-java/src/main/java/javaclasses/mealorder/q/MenuCalendarViewProjection.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018, TeamDev Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package javaclasses.mealorder.q;
+
+import io.spine.core.Subscribe;
+import io.spine.server.projection.Projection;
+import javaclasses.mealorder.MenuCalendarId;
+import javaclasses.mealorder.c.event.MenuImported;
+import javaclasses.mealorder.q.projection.MenuCalendarView;
+import javaclasses.mealorder.q.projection.MenuCalendarViewVBuilder;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import static javaclasses.mealorder.q.Projections.getDatesBetween;
+import static javaclasses.mealorder.q.Projections.toLocalDate;
+
+public class MenuCalendarViewProjection extends Projection<MenuCalendarId, MenuCalendarView, MenuCalendarViewVBuilder> {
+
+ /**
+ * {@link MenuCalendarViewProjection} is a singleton.
+ *
+ * <p>The {@code ID} value should be the same for all JVMs
+ * to support work with the same projection from execution to execution.
+ */
+ public static final MenuCalendarId ID = MenuCalendarId.newBuilder()
+ .setValue(
+ "MenuCalendarViewProjectionSingleton")
+ .build();
+
+ /**
+ * Creates a new instance.
+ *
+ * @param id the ID for the new instance
+ * @throws IllegalArgumentException if the ID is not of one of the supported types
+ */
+ public MenuCalendarViewProjection(MenuCalendarId id) {
+ super(id);
+ }
+
+ @Subscribe
+ public void on(MenuImported event) {
+ final List<LocalDate> datesBetween = getDatesBetween(event.getMenuDateRange()
+ .getRangeStart(),
+ event.getMenuDateRange()
+ .getRangeEnd());
+
+ datesBetween.forEach(date -> {
+ getBuilder().addCalendarItem(MenuCalendarItem.newBuilder()
+ .setDate(toLocalDate(date))
+ .setHasMenu(true)
+ .build());
+ });
+ }
+}