Implemented shopping cart confirmation

oskardudycz · oskardudycz · commit b88aeba94c2b · 2022-11-12T08:25:38.000+01:00
diff --git a/samples/unwrapping_onion/.vscode/launch.json b/samples/unwrapping_onion/.vscode/launch.json
@@ -45,8 +45,7 @@
         "--watchAll"
       ],
       "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "runtimeExecutable": "/home/oskar/.nvm/versions/node/v18.7.0/bin/node"
+      "internalConsoleOptions": "neverOpen"
     }
   ]
 }
diff --git a/samples/unwrapping_onion/src/core/commands/index.ts b/samples/unwrapping_onion/src/core/commands/index.ts
@@ -44,7 +44,7 @@ export const CommandBusFactory = (): CommandBus => {
   return commandBus;
 };
 
-export const RegisterCommandHandler = <C extends Command>(
+export const registerCommandHandler = <C extends Command>(
   commandType: Constructor<C>,
   commandHandler: CommandHandler<C>
 ) => {
diff --git a/samples/unwrapping_onion/src/core/queries/index.ts b/samples/unwrapping_onion/src/core/queries/index.ts
@@ -42,7 +42,7 @@ export const QueryBusFactory = (): QueryBus => {
   return queryBus;
 };
 
-export const RegisterQueryHandler = <C extends Query, Result>(
+export const registerQueryHandler = <C extends Query, Result>(
   queryType: Constructor<C>,
   queryHandler: QueryHandler<C, Result>
 ) => {
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commandHandlers/addProductToShoppingCartHandler.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commandHandlers/addProductToShoppingCartHandler.ts
@@ -1,9 +1,9 @@
 import { CommandHandler } from '#core/commands';
-import ShoppingCartRepository from '../../../infrastructure/shoppingCarts/shoppingCartRepository';
-import AddProductItemToShoppingCart from '../commands/shoppingCarts/addProductItemToShoppingCart';
-import ShoppingCartMapper from '../mapper';
+import { ShoppingCartRepository } from 'src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository';
+import { AddProductItemToShoppingCart } from '../commands/shoppingCarts/addProductItemToShoppingCart';
+import { ShoppingCartMapper } from '../mapper';
 
-export default class AddProductItemToShoppingCartHandler
+export class AddProductItemToShoppingCartHandler
   implements CommandHandler<AddProductItemToShoppingCart>
 {
   constructor(
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commandHandlers/confirmShoppingCart.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commandHandlers/confirmShoppingCart.ts
@@ -0,0 +1,26 @@
+import { CommandHandler } from '#core/commands';
+import { ShoppingCartRepository } from 'src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository';
+import { ConfirmShoppingCart } from '../commands/shoppingCarts/confirmShoppingCart';
+import { ShoppingCartMapper } from '../mapper';
+
+export class ConfirmShoppingCartHandler
+  implements CommandHandler<ConfirmShoppingCart>
+{
+  constructor(
+    private repository: ShoppingCartRepository,
+    private mapper: ShoppingCartMapper
+  ) {}
+
+  async handle(command: ConfirmShoppingCart): Promise<void> {
+    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);
+    aggregate.confirm();
+
+    await this.repository.add(this.mapper.toModel(aggregate));
+  }
+}
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commandHandlers/openShoppingCartHandler.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commandHandlers/openShoppingCartHandler.ts
@@ -1,10 +1,10 @@
 import { CommandHandler } from '#core/commands';
-import OpenShoppingCart from '../commands/shoppingCarts/openShoppingCart';
-import ShoppingCartRepository from '../../../infrastructure/shoppingCarts/shoppingCartRepository';
-import ShoppingCartMapper from '../mapper';
-import ShoppingCart from '../../../domain/aggregates/shoppingCarts';
+import { OpenShoppingCart } from '../commands/shoppingCarts/openShoppingCart';
+import { ShoppingCart } from 'src/ecommerce/domain/aggregates/shoppingCarts';
+import { ShoppingCartRepository } from 'src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository';
+import { ShoppingCartMapper } from '../mapper';
 
-export default class OpenShoppingCartHandler
+export class OpenShoppingCartHandler
   implements CommandHandler<OpenShoppingCart>
 {
   constructor(
@@ -15,7 +15,7 @@ export default class OpenShoppingCartHandler
   handle(command: OpenShoppingCart): Promise<void> {
     const aggregate = ShoppingCart.open(
       command.shoppingCartId,
-      command.clientId
+      command.customerId
     );
 
     return this.repository.add(this.mapper.toModel(aggregate));
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commandHandlers/removeProductFromShoppingCartHandler.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commandHandlers/removeProductFromShoppingCartHandler.ts
@@ -0,0 +1,26 @@
+import { CommandHandler } from '#core/commands';
+import { ShoppingCartRepository } from 'src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository';
+import { RemoveProductItemFromShoppingCart } from '../commands/shoppingCarts/removeProductItemFromShoppingCart';
+import { ShoppingCartMapper } from '../mapper';
+
+export class RemoveProductItemFromShoppingCartHandler
+  implements CommandHandler<RemoveProductItemFromShoppingCart>
+{
+  constructor(
+    private repository: ShoppingCartRepository,
+    private mapper: ShoppingCartMapper
+  ) {}
+
+  async handle(command: RemoveProductItemFromShoppingCart): Promise<void> {
+    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);
+    aggregate.removeProductItem(command.productItem);
+
+    await this.repository.add(this.mapper.toModel(aggregate));
+  }
+}
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart.ts
@@ -1,7 +1,7 @@
 import { Command } from '#core/commands';
 import { ProductItem } from 'src/ecommerce/common/shoppingCarts/productItem';
 
-export default class AddProductItemToShoppingCart extends Command {
+export class AddProductItemToShoppingCart extends Command {
   constructor(
     public readonly shoppingCartId: string,
     public readonly productItem: ProductItem
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commands/shoppingCarts/confirmShoppingCart.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commands/shoppingCarts/confirmShoppingCart.ts
@@ -1,6 +1,6 @@
 import { Command } from '#core/commands';
 
-export default class ConfirmShoppingCart extends Command {
+export class ConfirmShoppingCart extends Command {
   constructor(public readonly shoppingCartId: string) {
     super();
   }
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commands/shoppingCarts/openShoppingCart.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commands/shoppingCarts/openShoppingCart.ts
@@ -1,9 +1,9 @@
 import { Command } from '#core/commands';
 
-export default class OpenShoppingCart extends Command {
+export class OpenShoppingCart extends Command {
   constructor(
     public readonly shoppingCartId: string,
-    public readonly clientId: string
+    public readonly customerId: string
   ) {
     super();
   }
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart.ts
@@ -1,7 +1,7 @@
 import { Command } from '#core/commands';
 import { ProductItem } from 'src/ecommerce/common/shoppingCarts/productItem';
 
-export default class RemoveProductItemFromShoppingCart extends Command {
+export class RemoveProductItemFromShoppingCart extends Command {
   constructor(
     public readonly shoppingCartId: string,
     public readonly productItem: ProductItem
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/index.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/index.ts
@@ -1,28 +1,40 @@
 import { MongoClient } from 'mongodb';
-import { RegisterCommandHandler } from '#core/commands';
-import { RegisterQueryHandler } from '#core/queries';
-import ShoppingCartRepository from 'src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository';
-import OpenShoppingCart from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/openShoppingCart';
-import GetShoppingCartById from 'src/ecommerce/application/shoppingCarts/queries/getShoppingCartById';
-import AddProductItemToShoppingCart from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart';
-import OpenShoppingCartHandler from './commandHandlers/openShoppingCartHandler';
-import GetShoppingCartByIdHandler from './queryHandlers/getShoppingCartByIdQueryHandler';
-import AddProductItemToShoppingCartHandler from './commandHandlers/addProductToShoppingCartHandler';
-import ShoppingCartMapper from './mapper';
+import { registerCommandHandler } from '#core/commands';
+import { registerQueryHandler } from '#core/queries';
+import { OpenShoppingCart } from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/openShoppingCart';
+import { GetShoppingCartById } from 'src/ecommerce/application/shoppingCarts/queries/getShoppingCartById';
+import { AddProductItemToShoppingCart } from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart';
+import { RemoveProductItemFromShoppingCart } from './commands/shoppingCarts/removeProductItemFromShoppingCart';
+import { ShoppingCartMapper } from './mapper';
+import { OpenShoppingCartHandler } from './commandHandlers/openShoppingCartHandler';
+import { AddProductItemToShoppingCartHandler } from './commandHandlers/addProductToShoppingCartHandler';
+import { RemoveProductItemFromShoppingCartHandler } from './commandHandlers/removeProductFromShoppingCartHandler';
+import { GetShoppingCartByIdHandler } from './queryHandlers/getShoppingCartByIdQueryHandler';
+import { ShoppingCartRepository } from 'src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository';
+import { ConfirmShoppingCart } from './commands/shoppingCarts/confirmShoppingCart';
+import { ConfirmShoppingCartHandler } from './commandHandlers/confirmShoppingCart';
 
 const registerHandlers = (mongo: MongoClient) => {
   const repository = new ShoppingCartRepository(mongo);
   const mapper = new ShoppingCartMapper();
 
-  RegisterCommandHandler(
+  registerCommandHandler(
     OpenShoppingCart,
     new OpenShoppingCartHandler(repository, mapper)
   );
-  RegisterCommandHandler(
+  registerCommandHandler(
     AddProductItemToShoppingCart,
     new AddProductItemToShoppingCartHandler(repository, mapper)
   );
-  RegisterQueryHandler(
+  registerCommandHandler(
+    RemoveProductItemFromShoppingCart,
+    new RemoveProductItemFromShoppingCartHandler(repository, mapper)
+  );
+  registerCommandHandler(
+    ConfirmShoppingCart,
+    new ConfirmShoppingCartHandler(repository, mapper)
+  );
+  registerQueryHandler(
     GetShoppingCartById,
     new GetShoppingCartByIdHandler(repository)
   );
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/mapper.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/mapper.ts
@@ -1,15 +1,15 @@
 import { Mapper } from '#core/mapping';
 import { ObjectId } from 'mongodb';
-import ShoppingCart from '../../domain/aggregates/shoppingCarts';
+import { ShoppingCart } from '../../domain/aggregates/shoppingCarts';
 import { ShoppingCartModel } from '../../models/shoppingCarts/shoppingCart';
 
-export default class ShoppingCartMapper
+export class ShoppingCartMapper
   implements Mapper<ShoppingCart, ShoppingCartModel>
 {
   toModel(aggregate: ShoppingCart): ShoppingCartModel {
     return new ShoppingCartModel(
       new ObjectId(aggregate.id),
-      aggregate.clientId,
+      aggregate.customerId,
       aggregate.status,
       aggregate.productItems,
       aggregate.openedAt,
@@ -20,7 +20,7 @@ export default class ShoppingCartMapper
   toAggregate(model: ShoppingCartModel): ShoppingCart {
     return new ShoppingCart(
       model._id.toHexString(),
-      model.clientId,
+      model.customerId,
       model.status,
       model.productItems,
       model.openedAt,
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/queries/getShoppingCartById.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/queries/getShoppingCartById.ts
@@ -1,3 +1,3 @@
-export default class GetShoppingCartById {
+export class GetShoppingCartById {
   constructor(public readonly shoppingCartId: string) {}
 }
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/queryHandlers/getShoppingCartByIdQueryHandler.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/queryHandlers/getShoppingCartByIdQueryHandler.ts
@@ -1,9 +1,9 @@
 import { QueryHandler } from '#core/queries';
-import GetShoppingCartById from 'src/ecommerce/application/shoppingCarts/queries/getShoppingCartById';
-import ShoppingCartRepository from 'src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository';
+import { GetShoppingCartById } from 'src/ecommerce/application/shoppingCarts/queries/getShoppingCartById';
+import { ShoppingCartRepository } from 'src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository';
 import { ShoppingCartModel } from 'src/ecommerce/models/shoppingCarts/shoppingCart';
 
-export default class GetShoppingCartByIdHandler
+export class GetShoppingCartByIdHandler
   implements QueryHandler<GetShoppingCartById, ShoppingCartModel | null>
 {
   constructor(private repository: ShoppingCartRepository) {}
diff --git a/samples/unwrapping_onion/src/ecommerce/controllers/shoppingCartController.ts b/samples/unwrapping_onion/src/ecommerce/controllers/shoppingCartController.ts
@@ -3,32 +3,35 @@ import { CommandBus } from '#core/commands';
 import { sendCreated } from '#core/http';
 import { mongoObjectId } from '#core/mongodb';
 import { QueryBus } from '#core/queries';
-import OpenShoppingCart from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/openShoppingCart';
-import GetShoppingCartById from 'src/ecommerce/application/shoppingCarts/queries/getShoppingCartById';
+import { OpenShoppingCart } from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/openShoppingCart';
+import { GetShoppingCartById } from 'src/ecommerce/application/shoppingCarts/queries/getShoppingCartById';
 import { assertNotEmptyString, assertPositiveNumber } from '#core/validation';
 import { AddProductItemToShoppingCartRequest } from 'src/ecommerce/requests/shoppingCarts/addProductItemToShoppingCartRequest';
-import AddProductItemToShoppingCart from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart';
+import { AddProductItemToShoppingCart } from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/addProductItemToShoppingCart';
 import { ProductItem } from 'src/ecommerce/common/shoppingCarts/productItem';
-import RemoveProductItemFromShoppingCart from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart';
+import { RemoveProductItemFromShoppingCart } from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/removeProductItemFromShoppingCart';
 import { RemoveProductItemFromShoppingCartRequest } from 'src/ecommerce/requests/shoppingCarts/removeProductItemFromShoppingCartRequest.ts';
-import ConfirmShoppingCart from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/confirmShoppingCart';
+import { ConfirmShoppingCart } from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/confirmShoppingCart';
 
 class ShoppingCartController {
   public router = Router();
 
   constructor(private commandBus: CommandBus, private queryBus: QueryBus) {
-    this.router.post('/:clientId/shopping-carts/', this.open);
-    this.router.get('/:clientId/shopping-carts/:shoppingCartId', this.getById);
+    this.router.post('/customers/:customerId/shopping-carts/', this.open);
+    this.router.get(
+      '/customers/:customerId/shopping-carts/:shoppingCartId',
+      this.getById
+    );
     this.router.post(
-      '/:clientId/shopping-carts/:shoppingCartId/product-items',
+      '/customers/:customerId/shopping-carts/:shoppingCartId/product-items',
       this.addProductItem
     );
     this.router.delete(
-      '/:clientId/shopping-carts/:shoppingCartId/product-items',
+      '/customers/:customerId/shopping-carts/:shoppingCartId/product-items',
       this.removeProductItem
     );
     this.router.post(
-      '/:clientId/shopping-carts/:shoppingCartId/confirm',
+      '/customers/:customerId/shopping-carts/:shoppingCartId/confirm',
       this.confirm
     );
   }
@@ -41,7 +44,7 @@ class ShoppingCartController {
     try {
       const command = new OpenShoppingCart(
         mongoObjectId(),
-        assertNotEmptyString(request.params.clientId)
+        assertNotEmptyString(request.params.customerId)
       );
       await this.commandBus.send(command);
 
@@ -84,7 +87,7 @@ class ShoppingCartController {
         assertNotEmptyString(request.params.shoppingCartId),
         new ProductItem(
           assertNotEmptyString(request.query.productId),
-          assertPositiveNumber(request.query.quantity)
+          assertPositiveNumber(Number(request.query.quantity))
         )
       );
       await this.commandBus.send(command);
diff --git a/samples/unwrapping_onion/src/ecommerce/domain/aggregates/shoppingCarts/index.ts b/samples/unwrapping_onion/src/ecommerce/domain/aggregates/shoppingCarts/index.ts
@@ -1,10 +1,10 @@
 import { ProductItem } from 'src/ecommerce/common/shoppingCarts/productItem';
 import { ShoppingCartStatus } from './shoppingCartStatus';
 
-export default class ShoppingCart {
+export class ShoppingCart {
   public constructor(
     private _id: string,
-    private _clientId: string,
+    private _customerId: string,
     private _status: string,
     private _productItems: ProductItem[],
     private _openedAt: Date,
@@ -16,8 +16,8 @@ export default class ShoppingCart {
     return this._id;
   }
 
-  public get clientId() {
-    return this._clientId;
+  public get customerId() {
+    return this._customerId;
   }
 
   public get status() {
@@ -40,10 +40,10 @@ export default class ShoppingCart {
     return this._revision;
   }
 
-  public static open(id: string, clientId: string): ShoppingCart {
+  public static open(id: string, customerId: string): ShoppingCart {
     return new ShoppingCart(
       id,
-      clientId,
+      customerId,
       ShoppingCartStatus.Opened,
       [],
       new Date(),
@@ -53,6 +53,10 @@ export default class ShoppingCart {
   }
 
   public addProductItem(newProductItem: ProductItem): void {
+    if (this.status !== ShoppingCartStatus.Opened) {
+      throw Error('Cannot add product to not opened shopping cart');
+    }
+
     const { productId, quantity } = newProductItem;
 
     const currentProductItem = this.findProductItem(
@@ -74,6 +78,10 @@ export default class ShoppingCart {
   }
 
   public removeProductItem(productItemToRemove: ProductItem): void {
+    if (this.status !== ShoppingCartStatus.Opened) {
+      throw Error('Cannot remove product from not opened shopping cart');
+    }
+
     const { productId, quantity } = productItemToRemove;
 
     const currentProductItem = this.findProductItem(
@@ -99,6 +107,13 @@ export default class ShoppingCart {
     );
   }
 
+  public confirm(): void {
+    if (this.status !== ShoppingCartStatus.Opened) {
+      throw Error('Cannot confirm to not opened shopping cart');
+    }
+    this._status = ShoppingCartStatus.Confirmed;
+  }
+
   private findProductItem(
     productItems: ProductItem[],
     productId: string
diff --git a/samples/unwrapping_onion/src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository.ts b/samples/unwrapping_onion/src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository.ts
diff --git a/samples/unwrapping_onion/src/ecommerce/models/shoppingCarts/shoppingCart.ts b/samples/unwrapping_onion/src/ecommerce/models/shoppingCarts/shoppingCart.ts
diff --git a/samples/unwrapping_onion/src/ecommerce/requests/shoppingCarts/getShoppingCartByIdRequest.ts b/samples/unwrapping_onion/src/ecommerce/requests/shoppingCarts/getShoppingCartByIdRequest.ts
diff --git a/samples/unwrapping_onion/src/ecommerce/requests/shoppingCarts/openShoppingCartRequest.ts b/samples/unwrapping_onion/src/ecommerce/requests/shoppingCarts/openShoppingCartRequest.ts
diff --git a/samples/unwrapping_onion/src/tests/e2e/fullFlow.e2e.test.ts b/samples/unwrapping_onion/src/tests/e2e/fullFlow.e2e.test.ts

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@`
`45`	`45`	`"--watchAll"`
`46`	`46`	`],`
`47`	`47`	`"console": "integratedTerminal",`
`48`		`- "internalConsoleOptions": "neverOpen",`
`49`		`- "runtimeExecutable": "/home/oskar/.nvm/versions/node/v18.7.0/bin/node"`
	`48`	`+ "internalConsoleOptions": "neverOpen"`
`50`	`49`	`}`
`51`	`50`	`]`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { Command } from '#core/commands';`
`2`	`2`
`3`		`-export default class ConfirmShoppingCart extends Command {`
	`3`	`+export class ConfirmShoppingCart extends Command {`
`4`	`4`	`constructor(public readonly shoppingCartId: string) {`
`5`	`5`	`super();`
`6`	`6`	`}`