Moved command handlers directly into controller

Author: oskardudycz

samples/unwrapping_onion/src/core/api.ts

@@ -1,7 +1,7 @@
 import express, { Application, Router } from 'express';
 import http from 'http';
 
-export const getApplication = (...routers: Router[]) => {
+export const getApplication = (routers: Router[]) => {
   const app: Application = express();
 
   app.set('etag', false);

samples/unwrapping_onion/src/onion/ecommerce/app.ts

@@ -5,7 +5,7 @@ import controllers from './controllers';
 
 const initApp = (mongo: MongoClient) => {
   registerHandlers(mongo);
-  return getApplication(...controllers);
+  return getApplication(controllers);
 };
 
 export default initApp;

samples/unwrapping_onion/src/unpeeled/ecommerce/app.ts

@@ -1,11 +1,11 @@
 import { getApplication } from '#core/api';
 import { MongoClient } from 'mongodb';
 import registerHandlers from './shoppingCarts/application';
-import controllers from './shoppingCarts/controllers';
+import { getControllers } from './shoppingCarts/controllers';
 
 const initApp = (mongo: MongoClient) => {
   registerHandlers(mongo);
-  return getApplication(...controllers);
+  return getApplication(getControllers(mongo));
 };
 
 export default initApp;

samples/unwrapping_onion/src/unpeeled/ecommerce/shoppingCarts/application/commandHandlers/addProductToShoppingCartHandler.ts

@@ -6,49 +6,18 @@ import { GetShoppingCartById } from 'src/unpeeled/ecommerce/shoppingCarts/applic
 import { AddProductItemToShoppingCart } from 'src/unpeeled/ecommerce/shoppingCarts/application/commands/shoppingCarts/addProductItemToShoppingCart';
 import { RemoveProductItemFromShoppingCart } from './commands/shoppingCarts/removeProductItemFromShoppingCart';
 import { ShoppingCartMapper } from './mappers/shoppingCartMapper';
-import { OpenShoppingCartHandler } from './commandHandlers/openShoppingCartHandler';
-import { AddProductItemToShoppingCartHandler } from './commandHandlers/addProductToShoppingCartHandler';
-import { RemoveProductItemFromShoppingCartHandler } from './commandHandlers/removeProductFromShoppingCartHandler';
 import { GetShoppingCartByIdHandler } from './queryHandlers/getShoppingCartByIdQueryHandler';
 import { ShoppingCartRepository } from 'src/unpeeled/ecommerce/shoppingCarts/infrastructure/shoppingCartRepository';
 import { ConfirmShoppingCart } from './commands/shoppingCarts/confirmShoppingCart';
-import { ConfirmShoppingCartHandler } from './commandHandlers/confirmShoppingCart';
 import { GetCustomerShoppingHistory } from './queries/getCustomerShoppingHistory';
 import { GetCustomerShoppingHistoryHandler } from './queryHandlers/getCustomerShoppingHistoryHandler';
 import { CustomerShoppingHistoryMapper } from './mappers/customerShoppingHistoryMapper';
 import { EventBusFactory } from '#core/events';
 
 const registerHandlers = (mongo: MongoClient) => {
   const repository = new ShoppingCartRepository(mongo);
-  const eventBus = EventBusFactory();
-
-  const shoppingCartMapper = new ShoppingCartMapper();
   const shoppingHistoryMapper = new CustomerShoppingHistoryMapper();
 
-  registerCommandHandler(
-    OpenShoppingCart,
-    new OpenShoppingCartHandler(repository, shoppingCartMapper, eventBus)
-  );
-  registerCommandHandler(
-    AddProductItemToShoppingCart,
-    new AddProductItemToShoppingCartHandler(
-      repository,
-      shoppingCartMapper,
-      eventBus
-    )
-  );
-  registerCommandHandler(
-    RemoveProductItemFromShoppingCart,
-    new RemoveProductItemFromShoppingCartHandler(
-      repository,
-      shoppingCartMapper,
-      eventBus
-    )
-  );
-  registerCommandHandler(
-    ConfirmShoppingCart,
-    new ConfirmShoppingCartHandler(repository, shoppingCartMapper, eventBus)
-  );
   registerQueryHandler(
     GetShoppingCartById,
     new GetShoppingCartByIdHandler(repository)

samples/unwrapping_onion/src/unpeeled/ecommerce/shoppingCarts/application/commandHandlers/confirmShoppingCart.ts

@@ -1,9 +1,19 @@
-import { CommandBusFactory } from '#core/commands';
+import { EventBusFactory } from '#core/events';
 import { QueryBusFactory } from '#core/queries';
+import { MongoClient } from 'mongodb';
+import { ShoppingCartMapper } from '../application/mappers/shoppingCartMapper';
+import { ShoppingCartRepository } from '../infrastructure/shoppingCartRepository';
 import { ShoppingCartController } from './shoppingCartController';
 
-const controllers = [
-  new ShoppingCartController(CommandBusFactory(), QueryBusFactory()).router,
-];
-
-export default controllers;
+export const getControllers = (mongo: MongoClient) => {
+  const repository = new ShoppingCartRepository(mongo);
+  const shoppingCartMapper = new ShoppingCartMapper();
+  return [
+    new ShoppingCartController(
+      repository,
+      shoppingCartMapper,
+      EventBusFactory(),
+      QueryBusFactory()
+    ).router,
+  ];
+};

samples/unwrapping_onion/src/unpeeled/ecommerce/shoppingCarts/application/commandHandlers/openShoppingCartHandler.ts

@@ -13,10 +13,20 @@ import { RemoveProductItemFromShoppingCart } from 'src/unpeeled/ecommerce/shoppi
 import { RemoveProductItemFromShoppingCartRequest } from 'src/unpeeled/ecommerce/shoppingCarts/requests/removeProductItemFromShoppingCartRequest.ts';
 import { ConfirmShoppingCart } from 'src/unpeeled/ecommerce/shoppingCarts/application/commands/shoppingCarts/confirmShoppingCart';
 import { GetCustomerShoppingHistory } from 'src/unpeeled/ecommerce/shoppingCarts/application/queries/getCustomerShoppingHistory';
+import { ShoppingCart } from 'src/unpeeled/ecommerce/shoppingCarts';
+import { ShoppingCartRepository } from '../infrastructure/shoppingCartRepository';
+import { EventBus } from '#core/events';
+import { ShoppingCartModel } from '../models/shoppingCart';
+import { ShoppingCartMapper } from '../application/mappers/shoppingCartMapper';
 export class ShoppingCartController {
   public router = Router();
 
-  constructor(private commandBus: CommandBus, private queryBus: QueryBus) {
+  constructor(
+    private repository: ShoppingCartRepository,
+    private mapper: ShoppingCartMapper,
+    private eventBus: EventBus,
+    private queryBus: QueryBus
+  ) {
     this.router.post('/customers/:customerId/shopping-carts/', this.open);
     this.router.post(
       '/customers/:customerId/shopping-carts/:shoppingCartId/product-items',
@@ -50,7 +60,14 @@ export class ShoppingCartController {
         mongoObjectId(),
         assertNotEmptyString(request.params.customerId)
       );
-      await this.commandBus.send(command);
+      const event = ShoppingCart.open(
+        command.shoppingCartId,
+        command.customerId
+      );
+
+      await this.repository.store({} as ShoppingCartModel, event);
+
+      await this.eventBus.publish(event);
 
       sendCreated(response, command.shoppingCartId);
     } catch (error) {
@@ -72,7 +89,20 @@ export class ShoppingCartController {
           assertPositiveNumber(request.body.quantity)
         )
       );
-      await this.commandBus.send(command);
+      const model = await this.repository.find(command.shoppingCartId);
+
+      if (model === null) {
+        throw Error(
+          `Shopping cart with id ${command.shoppingCartId} not found!`
+        );
+      }
+
+      const aggregate = this.mapper.toAggregate(model);
+      const event = aggregate.addProductItem(command.productItem);
+
+      await this.repository.store(model, event);
+
+      await this.eventBus.publish(event);
 
       response.sendStatus(200);
     } catch (error) {
@@ -94,7 +124,20 @@ export class ShoppingCartController {
           assertPositiveNumber(Number(request.query.quantity))
         )
       );
-      await this.commandBus.send(command);
+      const model = await this.repository.find(command.shoppingCartId);
+
+      if (model === null) {
+        throw Error(
+          `Shopping cart with id ${command.shoppingCartId} not found!`
+        );
+      }
+
+      const aggregate = this.mapper.toAggregate(model);
+      const event = aggregate.removeProductItem(command.productItem);
+
+      await this.repository.store(model, event);
+
+      await this.eventBus.publish(event);
 
       response.sendStatus(200);
     } catch (error) {
@@ -112,7 +155,20 @@ export class ShoppingCartController {
       const command = new ConfirmShoppingCart(
         assertNotEmptyString(request.params.shoppingCartId)
       );
-      await this.commandBus.send(command);
+      const model = await this.repository.find(command.shoppingCartId);
+
+      if (model === null) {
+        throw Error(
+          `Shopping cart with id ${command.shoppingCartId} not found!`
+        );
+      }
+
+      const aggregate = this.mapper.toAggregate(model);
+      const event = aggregate.confirm();
+
+      await this.repository.store(model, event);
+
+      await this.eventBus.publish(event);
 
       response.sendStatus(200);
     } catch (error) {