Moved commands and queries into application layer. Adjusted imports in jest config to respect aboslute paths

oskardudycz · oskardudycz · commit 36bae0fd62e0 · 2022-11-12T08:25:38.000+01:00
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,6 +1,6 @@
 import { CommandHandler } from '#core/commands';
 import ShoppingCartRepository from '../../../infrastructure/shoppingCarts/shoppingCartRepository';
-import AddProductItemToShoppingCart from '../../../domain/commands/shoppingCarts/addProductItemToShoppingCart';
+import AddProductItemToShoppingCart from '../commands/shoppingCarts/addProductItemToShoppingCart';
 import ShoppingCartMapper from '../mapper';
 
 export default class AddProductItemToShoppingCartHandler
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,5 +1,5 @@
 import { CommandHandler } from '#core/commands';
-import OpenShoppingCart from '../../../domain/commands/shoppingCarts/openShoppingCart';
+import OpenShoppingCart from '../commands/shoppingCarts/openShoppingCart';
 import ShoppingCartRepository from '../../../infrastructure/shoppingCarts/shoppingCartRepository';
 import ShoppingCartMapper from '../mapper';
 import ShoppingCart from '../../../domain/aggregates/shoppingCarts';
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,5 +1,5 @@
 import { Command } from '#core/commands';
-import { ProductItem } from '../../../models/shoppingCarts/productItem';
+import { ProductItem } from 'src/ecommerce/common/shoppingCarts/productItem';
 
 export default class AddProductItemToShoppingCart extends Command {
   constructor(
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
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
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,5 +1,5 @@
 import { Command } from '#core/commands';
-import { ProductItem } from '../../../models/shoppingCarts/productItem';
+import { ProductItem } from 'src/ecommerce/common/shoppingCarts/productItem';
 
 export default class RemoveProductItemFromShoppingCart extends Command {
   constructor(
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/index.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/index.ts
@@ -2,9 +2,9 @@ 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/domain/commands/shoppingCarts/openShoppingCart';
-import GetShoppingCartById from 'src/ecommerce/domain/queries/getShoppingCartById';
-import AddProductItemToShoppingCart from 'src/ecommerce/domain/commands/shoppingCarts/addProductItemToShoppingCart';
+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';
diff --git a/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/queries/getShoppingCartById.ts b/samples/unwrapping_onion/src/ecommerce/application/shoppingCarts/queries/getShoppingCartById.ts
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,7 +1,7 @@
 import { QueryHandler } from '#core/queries';
-import GetShoppingCartById from '../../../domain/queries/getShoppingCartById';
-import ShoppingCartRepository from '../../../infrastructure/shoppingCarts/shoppingCartRepository';
-import { ShoppingCartModel } from '../../../models/shoppingCarts/shoppingCart';
+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
   implements QueryHandler<GetShoppingCartById, ShoppingCartModel | null>
diff --git a/samples/unwrapping_onion/src/ecommerce/common/shoppingCarts/productItem.ts b/samples/unwrapping_onion/src/ecommerce/common/shoppingCarts/productItem.ts
diff --git a/samples/unwrapping_onion/src/ecommerce/controllers/shoppingCartController.ts b/samples/unwrapping_onion/src/ecommerce/controllers/shoppingCartController.ts
@@ -1,17 +1,17 @@
 import { NextFunction, Request, Response, Router } from 'express';
 import { CommandBus } from '#core/commands';
 import { sendCreated } from '#core/http';
-import OpenShoppingCart from '../domain/commands/shoppingCarts/openShoppingCart';
 import { mongoObjectId } from '#core/mongodb';
 import { QueryBus } from '#core/queries';
-import GetShoppingCartById from '../domain/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 '../requests/shoppingCarts/addProductItemToShoppingCartRequest';
-import AddProductItemToShoppingCart from '../domain/commands/shoppingCarts/addProductItemToShoppingCart';
-import { ProductItem } from '../models/shoppingCarts/productItem';
-import RemoveProductItemFromShoppingCart from '../domain/commands/shoppingCarts/removeProductItemFromShoppingCart';
-import { RemoveProductItemFromShoppingCartRequest } from '../requests/shoppingCarts/removeProductItemFromShoppingCartRequest.ts';
-import ConfirmShoppingCart from '../domain/commands/shoppingCarts/confirmShoppingCart';
+import { AddProductItemToShoppingCartRequest } from 'src/ecommerce/requests/shoppingCarts/addProductItemToShoppingCartRequest';
+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 { RemoveProductItemFromShoppingCartRequest } from 'src/ecommerce/requests/shoppingCarts/removeProductItemFromShoppingCartRequest.ts';
+import ConfirmShoppingCart from 'src/ecommerce/application/shoppingCarts/commands/shoppingCarts/confirmShoppingCart';
 
 class ShoppingCartController {
   public router = Router();
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,4 +1,4 @@
-import { ProductItem } from 'src/ecommerce/models/shoppingCarts/productItem';
+import { ProductItem } from 'src/ecommerce/common/shoppingCarts/productItem';
 import { ShoppingCartStatus } from './shoppingCartStatus';
 
 export default class ShoppingCart {
diff --git a/samples/unwrapping_onion/src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository.ts b/samples/unwrapping_onion/src/ecommerce/infrastructure/shoppingCarts/shoppingCartRepository.ts
@@ -1,6 +1,6 @@
 import { MongoDbRepository } from '#core/repositories';
 import { MongoClient } from 'mongodb';
-import { ShoppingCartModel } from '../../models/shoppingCarts/shoppingCart';
+import { ShoppingCartModel } from 'src/ecommerce/models/shoppingCarts/shoppingCart';
 
 export default class ShoppingCartRepository extends MongoDbRepository<ShoppingCartModel> {
   constructor(mongo: MongoClient) {
diff --git a/samples/unwrapping_onion/src/ecommerce/models/shoppingCarts/shoppingCart.ts b/samples/unwrapping_onion/src/ecommerce/models/shoppingCarts/shoppingCart.ts
@@ -1,5 +1,5 @@
 import { ObjectId } from 'mongodb';
-import { ProductItem } from './productItem';
+import { ProductItem } from 'src/ecommerce/common/shoppingCarts/productItem';
 
 export class ShoppingCartModel {
   constructor(
