diff --git a/.nycrc b/.nycrc deleted file mode 100644 index ce1ed272..00000000 --- a/.nycrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "exclude": [ - "dist/**/*.spec.js" - ], - "exclude-after-remap": false, - "sourceMap": true, - "cache": false -} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..fc88da34 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,26 @@ +{ + "eslint.workingDirectories": [ + { "pattern": "./packages/core/*" }, + { "pattern": "./packages/project-config/*" }, + { "pattern": "./packages/service/*" }, + ], + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#1f6fd0", + "activityBar.background": "#1f6fd0", + "activityBar.foreground": "#e7e7e7", + "activityBar.inactiveForeground": "#e7e7e799", + "activityBarBadge.background": "#ee90bb", + "activityBarBadge.foreground": "#15202b", + "commandCenter.border": "#e7e7e799", + "sash.hoverBorder": "#1f6fd0", + "statusBar.background": "#1857a4", + "statusBar.foreground": "#e7e7e7", + "statusBarItem.hoverBackground": "#1f6fd0", + "statusBarItem.remoteBackground": "#1857a4", + "statusBarItem.remoteForeground": "#e7e7e7", + "titleBar.activeBackground": "#1857a4", + "titleBar.activeForeground": "#e7e7e7", + "titleBar.inactiveBackground": "#1857a499", + "titleBar.inactiveForeground": "#e7e7e799" + }, +} \ No newline at end of file diff --git a/packages/api-graphql/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts deleted file mode 100644 index f2e084e4..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatDeleteCommandFixtures { - public static get any(): CatDeleteCommand { - const catDeleteCommand: CatDeleteCommand = new CatDeleteCommand({}); - - return catDeleteCommand; - } - - public static get withId(): CatDeleteCommand { - const catDeleteCommand: CatDeleteCommand = new CatDeleteCommand({ - id: CatFixtures.any.id, - }); - - return catDeleteCommand; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts deleted file mode 100644 index 72ee92a6..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { CatInsertCommand } from '@nestjs-api-example/core/commands'; - -import { CatInsertOneCommandFixtures } from './CatInsertOneCommandFixtures'; - -export class CatInsertCommandFixtures { - public static get any(): CatInsertCommand { - const catInsertCommand: CatInsertCommand = new CatInsertCommand([CatInsertOneCommandFixtures.any]); - - return catInsertCommand; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts deleted file mode 100644 index cfa3468c..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatInsertOneCommandFixtures { - public static get any(): CatInsertOneCommand { - const catInsertOneCommand: CatInsertOneCommand = new CatInsertOneCommand({ - bornDate: CatFixtures.any.bornDate, - color: CatFixtures.any.color, - name: CatFixtures.any.name, - }); - - return catInsertOneCommand; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts deleted file mode 100644 index 1e8f6a3c..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { CatSetCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatSetCommandFixtures { - public static get any(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({}); - - return catSetCommand; - } - - public static get withBornDate(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - bornDate: CatFixtures.any.bornDate, - }); - - return catSetCommand; - } - - public static get withColor(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - color: CatFixtures.any.color, - }); - - return catSetCommand; - } - - public static get withName(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - name: CatFixtures.any.name, - }); - - return catSetCommand; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts deleted file mode 100644 index db408ca2..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { CatUpdateCommand } from '@nestjs-api-example/core/commands'; - -import { CatUpdateOneCommandFixtures } from './CatUpdateOneCommandFixtures'; - -export class CatUpdateCommandFixtures { - public static get any(): CatUpdateCommand { - const catUpdateCommand: CatUpdateCommand = new CatUpdateCommand([CatUpdateOneCommandFixtures.any]); - - return catUpdateCommand; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts deleted file mode 100644 index 312ef82a..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; - -import { CatSetCommandFixtures } from './CatSetCommandFixtures'; -import { CatFindQueryFixtures } from '../query/CatFindQueryFixtures'; - -export class CatUpdateOneCommandFixtures { - public static get any(): CatUpdateOneCommand { - const catUpdateOneCommand: CatUpdateOneCommand = new CatUpdateOneCommand( - CatFindQueryFixtures.withIds, - CatSetCommandFixtures.any, - ); - - return catUpdateOneCommand; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/model/CatFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/model/CatFixtures.ts deleted file mode 100644 index ae5c582f..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/model/CatFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Cat } from '@nestjs-api-example/core/models'; - -import { DateFixtures } from '../../../../common/fixtures/domain/model/DateFixtures'; - -export class CatFixtures { - public static get any(): Cat { - const cat: Cat = { - bornDate: DateFixtures.any, - color: 'color-example', - createdAt: DateFixtures.createdAt, - id: 'cat-id-example', - name: 'name-example', - updatedAt: undefined, - version: 0, - }; - - return cat; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts deleted file mode 100644 index d8fc0a0c..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { CatSortKeyAndOrderType } from '@nestjs-api-example/core/models'; - -export class CatSortKeyAndOrderTypeFixtures { - public static get any(): CatSortKeyAndOrderType { - const catSortKeyAndOrderType: CatSortKeyAndOrderType = {}; - - return catSortKeyAndOrderType; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts deleted file mode 100644 index 084c798c..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatFindOneQueryFixtures { - public static get any(): CatFindOneQuery { - const catFindOneQuery: CatFindOneQuery = new CatFindOneQuery({}); - - return catFindOneQuery; - } - - public static get withIds(): CatFindOneQuery { - const catFindOneQuery: CatFindOneQuery = new CatFindOneQuery({ - ids: [CatFixtures.any.id], - }); - - return catFindOneQuery; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts deleted file mode 100644 index 47ccbb99..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatFindQuery } from '@nestjs-api-example/core/queries'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatFindQueryFixtures { - public static get any(): CatFindQuery { - const catFindQuery: CatFindQuery = new CatFindQuery({}); - - return catFindQuery; - } - - public static get withIds(): CatFindQuery { - const catFindQuery: CatFindQuery = new CatFindQuery({ - ids: [CatFixtures.any.id], - }); - - return catFindQuery; - } -} diff --git a/packages/api-graphql/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts b/packages/api-graphql/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts deleted file mode 100644 index 20aa41e9..00000000 --- a/packages/api-graphql/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; - -import { CatFindQueryFixtures } from './CatFindQueryFixtures'; - -export class CatPaginateFindQueryFixtures { - public static get any(): CatPaginateFindQuery { - const catPaginateFindQuery: CatPaginateFindQuery = new CatPaginateFindQuery(CatFindQueryFixtures.any, { - limit: 10, - page: 1, - }); - - return catPaginateFindQuery; - } - - public static get withIds(): CatPaginateFindQuery { - const catPaginateFindQuery: CatPaginateFindQuery = new CatPaginateFindQuery(CatFindQueryFixtures.withIds, { - limit: 10, - page: 1, - }); - - return catPaginateFindQuery; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts deleted file mode 100644 index f2e084e4..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatDeleteCommandFixtures { - public static get any(): CatDeleteCommand { - const catDeleteCommand: CatDeleteCommand = new CatDeleteCommand({}); - - return catDeleteCommand; - } - - public static get withId(): CatDeleteCommand { - const catDeleteCommand: CatDeleteCommand = new CatDeleteCommand({ - id: CatFixtures.any.id, - }); - - return catDeleteCommand; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts deleted file mode 100644 index 72ee92a6..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { CatInsertCommand } from '@nestjs-api-example/core/commands'; - -import { CatInsertOneCommandFixtures } from './CatInsertOneCommandFixtures'; - -export class CatInsertCommandFixtures { - public static get any(): CatInsertCommand { - const catInsertCommand: CatInsertCommand = new CatInsertCommand([CatInsertOneCommandFixtures.any]); - - return catInsertCommand; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts deleted file mode 100644 index cfa3468c..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatInsertOneCommandFixtures { - public static get any(): CatInsertOneCommand { - const catInsertOneCommand: CatInsertOneCommand = new CatInsertOneCommand({ - bornDate: CatFixtures.any.bornDate, - color: CatFixtures.any.color, - name: CatFixtures.any.name, - }); - - return catInsertOneCommand; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts deleted file mode 100644 index 1e8f6a3c..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { CatSetCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatSetCommandFixtures { - public static get any(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({}); - - return catSetCommand; - } - - public static get withBornDate(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - bornDate: CatFixtures.any.bornDate, - }); - - return catSetCommand; - } - - public static get withColor(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - color: CatFixtures.any.color, - }); - - return catSetCommand; - } - - public static get withName(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - name: CatFixtures.any.name, - }); - - return catSetCommand; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts deleted file mode 100644 index db408ca2..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { CatUpdateCommand } from '@nestjs-api-example/core/commands'; - -import { CatUpdateOneCommandFixtures } from './CatUpdateOneCommandFixtures'; - -export class CatUpdateCommandFixtures { - public static get any(): CatUpdateCommand { - const catUpdateCommand: CatUpdateCommand = new CatUpdateCommand([CatUpdateOneCommandFixtures.any]); - - return catUpdateCommand; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts deleted file mode 100644 index 312ef82a..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; - -import { CatSetCommandFixtures } from './CatSetCommandFixtures'; -import { CatFindQueryFixtures } from '../query/CatFindQueryFixtures'; - -export class CatUpdateOneCommandFixtures { - public static get any(): CatUpdateOneCommand { - const catUpdateOneCommand: CatUpdateOneCommand = new CatUpdateOneCommand( - CatFindQueryFixtures.withIds, - CatSetCommandFixtures.any, - ); - - return catUpdateOneCommand; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/model/CatFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/model/CatFixtures.ts deleted file mode 100644 index ae5c582f..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/model/CatFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Cat } from '@nestjs-api-example/core/models'; - -import { DateFixtures } from '../../../../common/fixtures/domain/model/DateFixtures'; - -export class CatFixtures { - public static get any(): Cat { - const cat: Cat = { - bornDate: DateFixtures.any, - color: 'color-example', - createdAt: DateFixtures.createdAt, - id: 'cat-id-example', - name: 'name-example', - updatedAt: undefined, - version: 0, - }; - - return cat; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts deleted file mode 100644 index d8fc0a0c..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { CatSortKeyAndOrderType } from '@nestjs-api-example/core/models'; - -export class CatSortKeyAndOrderTypeFixtures { - public static get any(): CatSortKeyAndOrderType { - const catSortKeyAndOrderType: CatSortKeyAndOrderType = {}; - - return catSortKeyAndOrderType; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts deleted file mode 100644 index 084c798c..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatFindOneQueryFixtures { - public static get any(): CatFindOneQuery { - const catFindOneQuery: CatFindOneQuery = new CatFindOneQuery({}); - - return catFindOneQuery; - } - - public static get withIds(): CatFindOneQuery { - const catFindOneQuery: CatFindOneQuery = new CatFindOneQuery({ - ids: [CatFixtures.any.id], - }); - - return catFindOneQuery; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts deleted file mode 100644 index 47ccbb99..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatFindQuery } from '@nestjs-api-example/core/queries'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatFindQueryFixtures { - public static get any(): CatFindQuery { - const catFindQuery: CatFindQuery = new CatFindQuery({}); - - return catFindQuery; - } - - public static get withIds(): CatFindQuery { - const catFindQuery: CatFindQuery = new CatFindQuery({ - ids: [CatFixtures.any.id], - }); - - return catFindQuery; - } -} diff --git a/packages/api-grpc/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts b/packages/api-grpc/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts deleted file mode 100644 index 20aa41e9..00000000 --- a/packages/api-grpc/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; - -import { CatFindQueryFixtures } from './CatFindQueryFixtures'; - -export class CatPaginateFindQueryFixtures { - public static get any(): CatPaginateFindQuery { - const catPaginateFindQuery: CatPaginateFindQuery = new CatPaginateFindQuery(CatFindQueryFixtures.any, { - limit: 10, - page: 1, - }); - - return catPaginateFindQuery; - } - - public static get withIds(): CatPaginateFindQuery { - const catPaginateFindQuery: CatPaginateFindQuery = new CatPaginateFindQuery(CatFindQueryFixtures.withIds, { - limit: 10, - page: 1, - }); - - return catPaginateFindQuery; - } -} diff --git a/packages/api-grpc/src/common/domain/model/CommonConstants.ts b/packages/api-grpc/src/common/domain/model/CommonConstants.ts deleted file mode 100644 index dedd3658..00000000 --- a/packages/api-grpc/src/common/domain/model/CommonConstants.ts +++ /dev/null @@ -1,6 +0,0 @@ -export class CommonConstants { - public static readonly DEFAULT_PAGINATION_ITEMS: number = 10; - public static readonly MAX_PAGINATION_ITEMS: number = 200; - public static readonly MIN_PAGE: number = 1; - public static readonly MIN_PAGINATION_ITEMS: number = 1; -} diff --git a/packages/api-grpc/src/common/fixtures/domain/model/DateFixtures.ts b/packages/api-grpc/src/common/fixtures/domain/model/DateFixtures.ts deleted file mode 100644 index 4e44faaf..00000000 --- a/packages/api-grpc/src/common/fixtures/domain/model/DateFixtures.ts +++ /dev/null @@ -1,13 +0,0 @@ -export class DateFixtures { - public static get any(): Date { - return new Date('2022-01-01'); - } - - public static get createdAt(): Date { - return new Date('2020-01-01'); - } - - public static get updatedAt(): Date { - return new Date('2020-02-01'); - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts deleted file mode 100644 index f2e084e4..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatDeleteCommandFixtures { - public static get any(): CatDeleteCommand { - const catDeleteCommand: CatDeleteCommand = new CatDeleteCommand({}); - - return catDeleteCommand; - } - - public static get withId(): CatDeleteCommand { - const catDeleteCommand: CatDeleteCommand = new CatDeleteCommand({ - id: CatFixtures.any.id, - }); - - return catDeleteCommand; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts deleted file mode 100644 index 72ee92a6..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { CatInsertCommand } from '@nestjs-api-example/core/commands'; - -import { CatInsertOneCommandFixtures } from './CatInsertOneCommandFixtures'; - -export class CatInsertCommandFixtures { - public static get any(): CatInsertCommand { - const catInsertCommand: CatInsertCommand = new CatInsertCommand([CatInsertOneCommandFixtures.any]); - - return catInsertCommand; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts deleted file mode 100644 index cfa3468c..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatInsertOneCommandFixtures { - public static get any(): CatInsertOneCommand { - const catInsertOneCommand: CatInsertOneCommand = new CatInsertOneCommand({ - bornDate: CatFixtures.any.bornDate, - color: CatFixtures.any.color, - name: CatFixtures.any.name, - }); - - return catInsertOneCommand; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts deleted file mode 100644 index 1e8f6a3c..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { CatSetCommand } from '@nestjs-api-example/core/commands'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatSetCommandFixtures { - public static get any(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({}); - - return catSetCommand; - } - - public static get withBornDate(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - bornDate: CatFixtures.any.bornDate, - }); - - return catSetCommand; - } - - public static get withColor(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - color: CatFixtures.any.color, - }); - - return catSetCommand; - } - - public static get withName(): CatSetCommand { - const catSetCommand: CatSetCommand = new CatSetCommand({ - name: CatFixtures.any.name, - }); - - return catSetCommand; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts deleted file mode 100644 index db408ca2..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { CatUpdateCommand } from '@nestjs-api-example/core/commands'; - -import { CatUpdateOneCommandFixtures } from './CatUpdateOneCommandFixtures'; - -export class CatUpdateCommandFixtures { - public static get any(): CatUpdateCommand { - const catUpdateCommand: CatUpdateCommand = new CatUpdateCommand([CatUpdateOneCommandFixtures.any]); - - return catUpdateCommand; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts deleted file mode 100644 index 312ef82a..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; - -import { CatSetCommandFixtures } from './CatSetCommandFixtures'; -import { CatFindQueryFixtures } from '../query/CatFindQueryFixtures'; - -export class CatUpdateOneCommandFixtures { - public static get any(): CatUpdateOneCommand { - const catUpdateOneCommand: CatUpdateOneCommand = new CatUpdateOneCommand( - CatFindQueryFixtures.withIds, - CatSetCommandFixtures.any, - ); - - return catUpdateOneCommand; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/model/CatFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/model/CatFixtures.ts deleted file mode 100644 index ae5c582f..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/model/CatFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Cat } from '@nestjs-api-example/core/models'; - -import { DateFixtures } from '../../../../common/fixtures/domain/model/DateFixtures'; - -export class CatFixtures { - public static get any(): Cat { - const cat: Cat = { - bornDate: DateFixtures.any, - color: 'color-example', - createdAt: DateFixtures.createdAt, - id: 'cat-id-example', - name: 'name-example', - updatedAt: undefined, - version: 0, - }; - - return cat; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts deleted file mode 100644 index d8fc0a0c..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { CatSortKeyAndOrderType } from '@nestjs-api-example/core/models'; - -export class CatSortKeyAndOrderTypeFixtures { - public static get any(): CatSortKeyAndOrderType { - const catSortKeyAndOrderType: CatSortKeyAndOrderType = {}; - - return catSortKeyAndOrderType; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts deleted file mode 100644 index 084c798c..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatFindOneQueryFixtures { - public static get any(): CatFindOneQuery { - const catFindOneQuery: CatFindOneQuery = new CatFindOneQuery({}); - - return catFindOneQuery; - } - - public static get withIds(): CatFindOneQuery { - const catFindOneQuery: CatFindOneQuery = new CatFindOneQuery({ - ids: [CatFixtures.any.id], - }); - - return catFindOneQuery; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts deleted file mode 100644 index 47ccbb99..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CatFindQuery } from '@nestjs-api-example/core/queries'; - -import { CatFixtures } from '../model/CatFixtures'; - -export class CatFindQueryFixtures { - public static get any(): CatFindQuery { - const catFindQuery: CatFindQuery = new CatFindQuery({}); - - return catFindQuery; - } - - public static get withIds(): CatFindQuery { - const catFindQuery: CatFindQuery = new CatFindQuery({ - ids: [CatFixtures.any.id], - }); - - return catFindQuery; - } -} diff --git a/packages/api-rest/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts b/packages/api-rest/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts deleted file mode 100644 index 20aa41e9..00000000 --- a/packages/api-rest/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; - -import { CatFindQueryFixtures } from './CatFindQueryFixtures'; - -export class CatPaginateFindQueryFixtures { - public static get any(): CatPaginateFindQuery { - const catPaginateFindQuery: CatPaginateFindQuery = new CatPaginateFindQuery(CatFindQueryFixtures.any, { - limit: 10, - page: 1, - }); - - return catPaginateFindQuery; - } - - public static get withIds(): CatPaginateFindQuery { - const catPaginateFindQuery: CatPaginateFindQuery = new CatPaginateFindQuery(CatFindQueryFixtures.withIds, { - limit: 10, - page: 1, - }); - - return catPaginateFindQuery; - } -} diff --git a/packages/api-rest/src/common/domain/exception/EntityNotFoundException.ts b/packages/api-rest/src/common/domain/exception/EntityNotFoundException.ts deleted file mode 100644 index 309a7481..00000000 --- a/packages/api-rest/src/common/domain/exception/EntityNotFoundException.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { NotFoundException } from '@nestjs/common'; - -export class EntityNotFoundException extends NotFoundException { - public constructor(message: string) { - super(message); - } -} diff --git a/packages/api-rest/src/common/domain/model/CommonConstants.ts b/packages/api-rest/src/common/domain/model/CommonConstants.ts deleted file mode 100644 index dedd3658..00000000 --- a/packages/api-rest/src/common/domain/model/CommonConstants.ts +++ /dev/null @@ -1,6 +0,0 @@ -export class CommonConstants { - public static readonly DEFAULT_PAGINATION_ITEMS: number = 10; - public static readonly MAX_PAGINATION_ITEMS: number = 200; - public static readonly MIN_PAGE: number = 1; - public static readonly MIN_PAGINATION_ITEMS: number = 1; -} diff --git a/packages/api-rest/src/common/fixtures/domain/model/DateFixtures.ts b/packages/api-rest/src/common/fixtures/domain/model/DateFixtures.ts deleted file mode 100644 index 4e44faaf..00000000 --- a/packages/api-rest/src/common/fixtures/domain/model/DateFixtures.ts +++ /dev/null @@ -1,13 +0,0 @@ -export class DateFixtures { - public static get any(): Date { - return new Date('2022-01-01'); - } - - public static get createdAt(): Date { - return new Date('2020-01-01'); - } - - public static get updatedAt(): Date { - return new Date('2020-02-01'); - } -} diff --git a/packages/api-graphql/.eslintignore b/packages/core/core-cat/.eslintignore similarity index 100% rename from packages/api-graphql/.eslintignore rename to packages/core/core-cat/.eslintignore diff --git a/packages/api-graphql/.eslintrc.js b/packages/core/core-cat/.eslintrc.js similarity index 100% rename from packages/api-graphql/.eslintrc.js rename to packages/core/core-cat/.eslintrc.js diff --git a/packages/api-graphql/.gitignore b/packages/core/core-cat/.gitignore similarity index 100% rename from packages/api-graphql/.gitignore rename to packages/core/core-cat/.gitignore diff --git a/packages/api-graphql/.lintstagedrc.json b/packages/core/core-cat/.lintstagedrc.json similarity index 100% rename from packages/api-graphql/.lintstagedrc.json rename to packages/core/core-cat/.lintstagedrc.json diff --git a/packages/api-graphql/.npmignore b/packages/core/core-cat/.npmignore similarity index 100% rename from packages/api-graphql/.npmignore rename to packages/core/core-cat/.npmignore diff --git a/packages/api-graphql/jest.config.mjs b/packages/core/core-cat/jest.config.mjs similarity index 100% rename from packages/api-graphql/jest.config.mjs rename to packages/core/core-cat/jest.config.mjs diff --git a/packages/api-graphql/jest.js.config.mjs b/packages/core/core-cat/jest.js.config.mjs similarity index 100% rename from packages/api-graphql/jest.js.config.mjs rename to packages/core/core-cat/jest.js.config.mjs diff --git a/packages/core/core-cat/package.json b/packages/core/core-cat/package.json new file mode 100644 index 00000000..54b5af4e --- /dev/null +++ b/packages/core/core-cat/package.json @@ -0,0 +1,77 @@ +{ + "name": "@nestjs-api-example/core-cat", + "version": "1.0.0", + "description": "meow meow meow", + "author": "Adrián Martínez Jiménez ", + "homepage": "https://github.com/Adrianmjim/nestjs-api-example#readme", + "license": "ISC", + "repository": { + "type": "git", + "url": "git+https://github.com/Adrianmjim/nestjs-api-example.git" + }, + "bugs": { + "url": "https://github.com/Adrianmjim/nestjs-api-example/issues" + }, + "dependencies": { + "@nestjs-api-example/core-common": "workspace:*", + "@nestjs-api-example/core-config": "workspace:*", + "@nestjs-api-example/core-entity": "workspace:*", + "@nestjs-api-example/core-entity-orm": "workspace:*", + "@mikro-orm/core": "5.9.4", + "@mikro-orm/migrations": "5.9.4", + "@mikro-orm/nestjs": "5.2.2", + "@mikro-orm/postgresql": "5.9.4", + "@nestjs/common": "10.2.10", + "@nestjs/core": "10.2.10", + "@nestjs/cqrs": "10.2.6", + "dotenv": "16.3.1", + "envalid": "8.0.0", + "reflect-metadata": "0.1.14", + "rxjs": "7.8.1" + }, + "devDependencies": { + "@mikro-orm/cli": "5.9.4", + "@jest/globals": "29.7.0", + "@types/node": "20.10.4", + "@typescript-eslint/eslint-plugin": "6.13.2", + "@typescript-eslint/parser": "6.13.2", + "eslint": "8.55.0", + "eslint-import-resolver-typescript": "3.6.1", + "eslint-plugin-import": "2.29.0", + "eslint-plugin-jest": "27.6.0", + "eslint-plugin-prettier": "5.0.1", + "jest": "29.7.0", + "prettier": "3.1.1", + "rimraf": "5.0.5", + "ts-jest": "29.1.1", + "ts-node": "10.9.2", + "typescript": "5.3.3" + }, + "exports": { + "./command": "./lib/command.js", + "./fixture": "./lib/fixture.js", + "./module": "./lib/module.js", + "./query": "./lib/query.js" + }, + "mikro-orm": { + "useTsNode": true, + "configPaths": [ + "./src/config/infrastructure/mikroOrm/MikroOrmCliConfig.ts", + "./lib/config/infrastructure/mikroOrm/MikroOrmCliConfig.js" + ] + }, + "scripts": { + "build": "tsc --build tsconfig.json", + "build:clean": "rimraf lib", + "format": "prettier --write ./src/**/*.ts", + "format:check": "prettier --check ./src/**/*.ts", + "lint": "eslint --ext ts --ignore-path .gitignore ./src", + "prebuild": "pnpm run build:clean", + "test": "jest --config=jest.config.mjs --runInBand", + "test:integration:js": "pnpm run test:js --selectProjects Integration", + "test:js": "jest --config=jest.js.config.mjs --runInBand", + "test:js:coverage": "pnpm run test:js --coverage", + "test:uncommitted": "pnpm run test --changedSince=HEAD", + "test:unit:js": "pnpm run test:js --selectProjects Unit" + } +} diff --git a/packages/api-graphql/prettier.config.js b/packages/core/core-cat/prettier.config.js similarity index 100% rename from packages/api-graphql/prettier.config.js rename to packages/core/core-cat/prettier.config.js diff --git a/packages/core/src/cat/application/commandHandler/CatDeleteCommandHandler.ts b/packages/core/core-cat/src/cat/application/commandHandler/CatDeleteCommandHandler.ts similarity index 73% rename from packages/core/src/cat/application/commandHandler/CatDeleteCommandHandler.ts rename to packages/core/core-cat/src/cat/application/commandHandler/CatDeleteCommandHandler.ts index 4a31d3bc..c7cde594 100644 --- a/packages/core/src/cat/application/commandHandler/CatDeleteCommandHandler.ts +++ b/packages/core/core-cat/src/cat/application/commandHandler/CatDeleteCommandHandler.ts @@ -1,8 +1,8 @@ import { Inject } from '@nestjs/common'; import { CommandHandler } from '@nestjs/cqrs'; +import { DeleteCommandHandler } from '@nestjs-api-example/core-common/command-handler'; +import { ManagerAsync } from '@nestjs-api-example/core-common/manager'; -import { DeleteCommandHandler } from '../../../common/application/commandHandler/DeleteCommandHandler'; -import { ManagerAsync } from '../../../common/domain/manager/ManagerAsync'; import { CatDeleteCommand } from '../../domain/command/CatDeleteCommand'; import { DeleteCatManager } from '../../domain/manager/DeleteCatManager'; diff --git a/packages/core/src/cat/application/commandHandler/CatInsertCommandHandler.ts b/packages/core/core-cat/src/cat/application/commandHandler/CatInsertCommandHandler.ts similarity index 69% rename from packages/core/src/cat/application/commandHandler/CatInsertCommandHandler.ts rename to packages/core/core-cat/src/cat/application/commandHandler/CatInsertCommandHandler.ts index 83010e79..0b7e6bad 100644 --- a/packages/core/src/cat/application/commandHandler/CatInsertCommandHandler.ts +++ b/packages/core/core-cat/src/cat/application/commandHandler/CatInsertCommandHandler.ts @@ -1,11 +1,11 @@ import { Inject } from '@nestjs/common'; import { CommandHandler } from '@nestjs/cqrs'; +import { InsertCommandHandler } from '@nestjs-api-example/core-common/command-handler'; +import { ManagerAsync } from '@nestjs-api-example/core-common/manager'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { InsertCommandHandler } from '../../../common/application/commandHandler/InsertCommandHandler'; -import { ManagerAsync } from '../../../common/domain/manager/ManagerAsync'; import { CatInsertCommand } from '../../domain/command/CatInsertCommand'; import { InsertCatManager } from '../../domain/manager/InsertCatManager'; -import { Cat } from '../../domain/model/Cat'; @CommandHandler(CatInsertCommand) export class CatInsertCommandHandler extends InsertCommandHandler { diff --git a/packages/core/src/cat/application/commandHandler/CatInsertOneCommandHandler.ts b/packages/core/core-cat/src/cat/application/commandHandler/CatInsertOneCommandHandler.ts similarity index 70% rename from packages/core/src/cat/application/commandHandler/CatInsertOneCommandHandler.ts rename to packages/core/core-cat/src/cat/application/commandHandler/CatInsertOneCommandHandler.ts index 99839eb9..ec8b923e 100644 --- a/packages/core/src/cat/application/commandHandler/CatInsertOneCommandHandler.ts +++ b/packages/core/core-cat/src/cat/application/commandHandler/CatInsertOneCommandHandler.ts @@ -1,11 +1,11 @@ import { Inject } from '@nestjs/common'; import { CommandHandler } from '@nestjs/cqrs'; +import { InsertOneCommandHandler } from '@nestjs-api-example/core-common/command-handler'; +import { ManagerAsync } from '@nestjs-api-example/core-common/manager'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { InsertOneCommandHandler } from '../../../common/application/commandHandler/InsertOneCommandHandler'; -import { ManagerAsync } from '../../../common/domain/manager/ManagerAsync'; import { CatInsertOneCommand } from '../../domain/command/CatInsertOneCommand'; import { InsertOneCatManager } from '../../domain/manager/InsertOneCatManager'; -import { Cat } from '../../domain/model/Cat'; @CommandHandler(CatInsertOneCommand) export class CatInsertOneCommandHandler extends InsertOneCommandHandler { diff --git a/packages/core/src/cat/application/commandHandler/CatUpdateCommandHandler.ts b/packages/core/core-cat/src/cat/application/commandHandler/CatUpdateCommandHandler.ts similarity index 73% rename from packages/core/src/cat/application/commandHandler/CatUpdateCommandHandler.ts rename to packages/core/core-cat/src/cat/application/commandHandler/CatUpdateCommandHandler.ts index 14869d90..aaac89fb 100644 --- a/packages/core/src/cat/application/commandHandler/CatUpdateCommandHandler.ts +++ b/packages/core/core-cat/src/cat/application/commandHandler/CatUpdateCommandHandler.ts @@ -1,8 +1,8 @@ import { Inject } from '@nestjs/common'; import { CommandHandler } from '@nestjs/cqrs'; +import { UpdateCommandHandler } from '@nestjs-api-example/core-common/command-handler'; +import { ManagerAsync } from '@nestjs-api-example/core-common/manager'; -import { UpdateCommandHandler } from '../../../common/application/commandHandler/UpdateCommandHandler'; -import { ManagerAsync } from '../../../common/domain/manager/ManagerAsync'; import { CatUpdateCommand } from '../../domain/command/CatUpdateCommand'; import { UpdateCatManager } from '../../domain/manager/UpdateCatManager'; diff --git a/packages/core/src/cat/application/commandHandler/CatUpdateOneCommandHandler.ts b/packages/core/core-cat/src/cat/application/commandHandler/CatUpdateOneCommandHandler.ts similarity index 74% rename from packages/core/src/cat/application/commandHandler/CatUpdateOneCommandHandler.ts rename to packages/core/core-cat/src/cat/application/commandHandler/CatUpdateOneCommandHandler.ts index c44c44fc..6a95214e 100644 --- a/packages/core/src/cat/application/commandHandler/CatUpdateOneCommandHandler.ts +++ b/packages/core/core-cat/src/cat/application/commandHandler/CatUpdateOneCommandHandler.ts @@ -1,8 +1,8 @@ import { Inject } from '@nestjs/common'; import { CommandHandler } from '@nestjs/cqrs'; +import { UpdateOneCommandHandler } from '@nestjs-api-example/core-common/command-handler'; +import { ManagerAsync } from '@nestjs-api-example/core-common/manager'; -import { UpdateOneCommandHandler } from '../../../common/application/commandHandler/UpdateOneCommandHandler'; -import { ManagerAsync } from '../../../common/domain/manager/ManagerAsync'; import { CatUpdateOneCommand } from '../../domain/command/CatUpdateOneCommand'; import { UpdateOneCatManager } from '../../domain/manager/UpdateOneCatManager'; diff --git a/packages/core/src/cat/application/queryHandler/CatFindOneQueryHandler.ts b/packages/core/core-cat/src/cat/application/queryHandler/CatFindOneQueryHandler.ts similarity index 70% rename from packages/core/src/cat/application/queryHandler/CatFindOneQueryHandler.ts rename to packages/core/core-cat/src/cat/application/queryHandler/CatFindOneQueryHandler.ts index d3fe6b09..4dbb2f92 100644 --- a/packages/core/src/cat/application/queryHandler/CatFindOneQueryHandler.ts +++ b/packages/core/core-cat/src/cat/application/queryHandler/CatFindOneQueryHandler.ts @@ -1,10 +1,10 @@ import { Inject } from '@nestjs/common'; import { QueryHandler } from '@nestjs/cqrs'; +import { ManagerAsync } from '@nestjs-api-example/core-common/manager'; +import { FindOneQueryHandler } from '@nestjs-api-example/core-common/query-handler'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { FindOneQueryHandler } from '../../../common/application/queryHandler/FindOneQueryHandler'; -import { ManagerAsync } from '../../../common/domain/manager/ManagerAsync'; import { FindOneCatManager } from '../../domain/manager/FindOneCatManager'; -import { Cat } from '../../domain/model/Cat'; import { CatFindOneQuery } from '../../domain/query/CatFindOneQuery'; @QueryHandler(CatFindOneQuery) diff --git a/packages/core/src/cat/application/queryHandler/CatFindQueryHandler.ts b/packages/core/core-cat/src/cat/application/queryHandler/CatFindQueryHandler.ts similarity index 68% rename from packages/core/src/cat/application/queryHandler/CatFindQueryHandler.ts rename to packages/core/core-cat/src/cat/application/queryHandler/CatFindQueryHandler.ts index 51531209..4ee8bb72 100644 --- a/packages/core/src/cat/application/queryHandler/CatFindQueryHandler.ts +++ b/packages/core/core-cat/src/cat/application/queryHandler/CatFindQueryHandler.ts @@ -1,10 +1,10 @@ import { Inject } from '@nestjs/common'; import { QueryHandler } from '@nestjs/cqrs'; +import { ManagerAsync } from '@nestjs-api-example/core-common/manager'; +import { FindQueryHandler } from '@nestjs-api-example/core-common/query-handler'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { FindQueryHandler } from '../../../common/application/queryHandler/FindQueryHandler'; -import { ManagerAsync } from '../../../common/domain/manager/ManagerAsync'; import { FindCatManager } from '../../domain/manager/FindCatManager'; -import { Cat } from '../../domain/model/Cat'; import { CatFindQuery } from '../../domain/query/CatFindQuery'; @QueryHandler(CatFindQuery) diff --git a/packages/core/src/cat/application/queryHandler/CatPaginateFindQueryHandler.ts b/packages/core/core-cat/src/cat/application/queryHandler/CatPaginateFindQueryHandler.ts similarity index 65% rename from packages/core/src/cat/application/queryHandler/CatPaginateFindQueryHandler.ts rename to packages/core/core-cat/src/cat/application/queryHandler/CatPaginateFindQueryHandler.ts index c4ad9451..2e9f49ee 100644 --- a/packages/core/src/cat/application/queryHandler/CatPaginateFindQueryHandler.ts +++ b/packages/core/core-cat/src/cat/application/queryHandler/CatPaginateFindQueryHandler.ts @@ -1,11 +1,10 @@ import { Inject } from '@nestjs/common'; import { QueryHandler } from '@nestjs/cqrs'; +import { ManagerAsync } from '@nestjs-api-example/core-common/manager'; +import { PaginateFindQueryHandler } from '@nestjs-api-example/core-common/query-handler'; +import { Cat, Pagination } from '@nestjs-api-example/core-entity/model'; -import { PaginateFindQueryHandler } from '../../../common/application/queryHandler/PaginateFindQueryHandler'; -import { ManagerAsync } from '../../../common/domain/manager/ManagerAsync'; -import { Pagination } from '../../../common/domain/model/Pagination'; import { PaginateFindCatManager } from '../../domain/manager/PaginateFindCatManager'; -import { Cat } from '../../domain/model/Cat'; import { CatPaginateFindQuery } from '../../domain/query/CatPaginateFindQuery'; @QueryHandler(CatPaginateFindQuery) diff --git a/packages/core/src/cat/domain/command/CatDeleteCommand.ts b/packages/core/core-cat/src/cat/domain/command/CatDeleteCommand.ts similarity index 68% rename from packages/core/src/cat/domain/command/CatDeleteCommand.ts rename to packages/core/core-cat/src/cat/domain/command/CatDeleteCommand.ts index 56fcf6a6..9136f56c 100644 --- a/packages/core/src/cat/domain/command/CatDeleteCommand.ts +++ b/packages/core/core-cat/src/cat/domain/command/CatDeleteCommand.ts @@ -1,4 +1,4 @@ -import { BaseEntityDeleteCommand } from '../../../common/domain/command/BaseEntityDeleteCommand'; +import { BaseEntityDeleteCommand } from '@nestjs-api-example/core-common/command'; export class CatDeleteCommand implements BaseEntityDeleteCommand { public readonly id: string | undefined = undefined; diff --git a/packages/core/src/cat/domain/command/CatInsertCommand.ts b/packages/core/core-cat/src/cat/domain/command/CatInsertCommand.ts similarity index 67% rename from packages/core/src/cat/domain/command/CatInsertCommand.ts rename to packages/core/core-cat/src/cat/domain/command/CatInsertCommand.ts index b182f0f4..c15e059d 100644 --- a/packages/core/src/cat/domain/command/CatInsertCommand.ts +++ b/packages/core/core-cat/src/cat/domain/command/CatInsertCommand.ts @@ -1,5 +1,6 @@ +import { BaseEntityInsertCommand } from '@nestjs-api-example/core-common/command'; + import { CatInsertOneCommand } from './CatInsertOneCommand'; -import { BaseEntityInsertCommand } from '../../../common/domain/command/BaseEntityInsertCommand'; export class CatInsertCommand implements BaseEntityInsertCommand { public constructor(public readonly commands: CatInsertOneCommand[]) {} diff --git a/packages/core/src/cat/domain/command/CatInsertOneCommand.ts b/packages/core/core-cat/src/cat/domain/command/CatInsertOneCommand.ts similarity index 72% rename from packages/core/src/cat/domain/command/CatInsertOneCommand.ts rename to packages/core/core-cat/src/cat/domain/command/CatInsertOneCommand.ts index 5e9c7844..d480531f 100644 --- a/packages/core/src/cat/domain/command/CatInsertOneCommand.ts +++ b/packages/core/core-cat/src/cat/domain/command/CatInsertOneCommand.ts @@ -1,4 +1,4 @@ -import { BaseEntityInsertOneCommand } from '../../../common/domain/command/BaseEntityInsertOneCommand'; +import { BaseEntityInsertOneCommand } from '@nestjs-api-example/core-common/command'; export class CatInsertOneCommand implements BaseEntityInsertOneCommand { public readonly bornDate!: Date; diff --git a/packages/core/src/cat/domain/command/CatSetCommand.ts b/packages/core/core-cat/src/cat/domain/command/CatSetCommand.ts similarity index 66% rename from packages/core/src/cat/domain/command/CatSetCommand.ts rename to packages/core/core-cat/src/cat/domain/command/CatSetCommand.ts index f6ff5c93..a8adfd24 100644 --- a/packages/core/src/cat/domain/command/CatSetCommand.ts +++ b/packages/core/core-cat/src/cat/domain/command/CatSetCommand.ts @@ -1,5 +1,5 @@ -import { BaseEntitySetCommand } from '../../../common/domain/command/BaseEntitySetCommand'; -import { PartialAndRequired } from '../../../common/domain/model/PartialAndRequired'; +import { BaseEntitySetCommand } from '@nestjs-api-example/core-common/command'; +import { PartialAndRequired } from '@nestjs-api-example/core-entity/model'; export class CatSetCommand implements BaseEntitySetCommand { public readonly bornDate: Date | undefined = undefined; diff --git a/packages/core/src/cat/domain/command/CatUpdateCommand.ts b/packages/core/core-cat/src/cat/domain/command/CatUpdateCommand.ts similarity index 67% rename from packages/core/src/cat/domain/command/CatUpdateCommand.ts rename to packages/core/core-cat/src/cat/domain/command/CatUpdateCommand.ts index 59b7f803..f5c65c0d 100644 --- a/packages/core/src/cat/domain/command/CatUpdateCommand.ts +++ b/packages/core/core-cat/src/cat/domain/command/CatUpdateCommand.ts @@ -1,5 +1,6 @@ +import { BaseEntityUpdateCommand } from '@nestjs-api-example/core-common/command'; + import { CatUpdateOneCommand } from './CatUpdateOneCommand'; -import { BaseEntityUpdateCommand } from '../../../common/domain/command/BaseEntityUpdateCommand'; export class CatUpdateCommand implements BaseEntityUpdateCommand { public constructor(public readonly commands: CatUpdateOneCommand[]) {} diff --git a/packages/core/src/cat/domain/command/CatUpdateOneCommand.ts b/packages/core/core-cat/src/cat/domain/command/CatUpdateOneCommand.ts similarity index 74% rename from packages/core/src/cat/domain/command/CatUpdateOneCommand.ts rename to packages/core/core-cat/src/cat/domain/command/CatUpdateOneCommand.ts index 12ffe3e2..7bb38fc3 100644 --- a/packages/core/src/cat/domain/command/CatUpdateOneCommand.ts +++ b/packages/core/core-cat/src/cat/domain/command/CatUpdateOneCommand.ts @@ -1,5 +1,6 @@ +import { BaseEntityUpdateOneCommand } from '@nestjs-api-example/core-common/command'; + import { CatSetCommand } from './CatSetCommand'; -import { BaseEntityUpdateOneCommand } from '../../../common/domain/command/BaseEntityUpdateOneCommand'; import { CatFindQuery } from '../query/CatFindQuery'; export class CatUpdateOneCommand implements BaseEntityUpdateOneCommand { diff --git a/packages/core/src/cat/domain/manager/DeleteCatManager.ts b/packages/core/core-cat/src/cat/domain/manager/DeleteCatManager.ts similarity index 75% rename from packages/core/src/cat/domain/manager/DeleteCatManager.ts rename to packages/core/core-cat/src/cat/domain/manager/DeleteCatManager.ts index f27e5712..a53e167f 100644 --- a/packages/core/src/cat/domain/manager/DeleteCatManager.ts +++ b/packages/core/core-cat/src/cat/domain/manager/DeleteCatManager.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from '@nestjs/common'; +import { DeleteAdapter } from '@nestjs-api-example/core-common/adapter'; +import { DeleteManager } from '@nestjs-api-example/core-common/manager'; -import { DeleteAdapter } from '../../../common/domain/adapter/DeleteAdapter'; -import { DeleteManager } from '../../../common/domain/manager/DeleteManager'; import { DeleteCatMikroOrmAdapter } from '../../infrastructure/mikroOrm/adapter/DeleteCatMikroOrmAdapter'; import { CatDeleteCommand } from '../command/CatDeleteCommand'; diff --git a/packages/core/src/cat/domain/manager/FindCatManager.ts b/packages/core/core-cat/src/cat/domain/manager/FindCatManager.ts similarity index 69% rename from packages/core/src/cat/domain/manager/FindCatManager.ts rename to packages/core/core-cat/src/cat/domain/manager/FindCatManager.ts index fbc8842f..d87d90f9 100644 --- a/packages/core/src/cat/domain/manager/FindCatManager.ts +++ b/packages/core/core-cat/src/cat/domain/manager/FindCatManager.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; +import { FindAdapter } from '@nestjs-api-example/core-common/adapter'; +import { FindManager } from '@nestjs-api-example/core-common/manager'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { FindAdapter } from '../../../common/domain/adapter/FindAdapter'; -import { FindManager } from '../../../common/domain/manager/FindManager'; import { FindCatMikroOrmAdapter } from '../../infrastructure/mikroOrm/adapter/FindCatMikroOrmAdapter'; -import { Cat } from '../model/Cat'; import { CatFindQuery } from '../query/CatFindQuery'; @Injectable() diff --git a/packages/core/src/cat/domain/manager/FindOneCatManager.ts b/packages/core/core-cat/src/cat/domain/manager/FindOneCatManager.ts similarity index 70% rename from packages/core/src/cat/domain/manager/FindOneCatManager.ts rename to packages/core/core-cat/src/cat/domain/manager/FindOneCatManager.ts index a4474295..bf7ae4e3 100644 --- a/packages/core/src/cat/domain/manager/FindOneCatManager.ts +++ b/packages/core/core-cat/src/cat/domain/manager/FindOneCatManager.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; +import { FindOneAdapter } from '@nestjs-api-example/core-common/adapter'; +import { FindOneManager } from '@nestjs-api-example/core-common/manager'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { FindOneAdapter } from '../../../common/domain/adapter/FindOneAdapter'; -import { FindOneManager } from '../../../common/domain/manager/FindOneManager'; import { FindOneCatMikroOrmAdapter } from '../../infrastructure/mikroOrm/adapter/FindOneCatMikroOrmAdapter'; -import { Cat } from '../model/Cat'; import { CatFindOneQuery } from '../query/CatFindOneQuery'; @Injectable() diff --git a/packages/core/src/cat/domain/manager/InsertCatManager.ts b/packages/core/core-cat/src/cat/domain/manager/InsertCatManager.ts similarity index 70% rename from packages/core/src/cat/domain/manager/InsertCatManager.ts rename to packages/core/core-cat/src/cat/domain/manager/InsertCatManager.ts index 7c94cbe6..cdf4e9b7 100644 --- a/packages/core/src/cat/domain/manager/InsertCatManager.ts +++ b/packages/core/core-cat/src/cat/domain/manager/InsertCatManager.ts @@ -1,10 +1,10 @@ import { Inject, Injectable } from '@nestjs/common'; +import { InsertAdapter } from '@nestjs-api-example/core-common/adapter'; +import { InsertManager } from '@nestjs-api-example/core-common/manager'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { InsertAdapter } from '../../../common/domain/adapter/InsertAdapter'; -import { InsertManager } from '../../../common/domain/manager/InsertManager'; import { InsertCatMikroOrmAdapter } from '../../infrastructure/mikroOrm/adapter/InsertCatMikroOrmAdapter'; import { CatInsertCommand } from '../command/CatInsertCommand'; -import { Cat } from '../model/Cat'; @Injectable() export class InsertCatManager extends InsertManager { diff --git a/packages/core/src/cat/domain/manager/InsertOneCatManager.ts b/packages/core/core-cat/src/cat/domain/manager/InsertOneCatManager.ts similarity index 71% rename from packages/core/src/cat/domain/manager/InsertOneCatManager.ts rename to packages/core/core-cat/src/cat/domain/manager/InsertOneCatManager.ts index 62f8dc2c..d69707c3 100644 --- a/packages/core/src/cat/domain/manager/InsertOneCatManager.ts +++ b/packages/core/core-cat/src/cat/domain/manager/InsertOneCatManager.ts @@ -1,10 +1,10 @@ import { Inject, Injectable } from '@nestjs/common'; +import { InsertOneAdapter } from '@nestjs-api-example/core-common/adapter'; +import { InsertOneManager } from '@nestjs-api-example/core-common/manager'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { InsertOneAdapter } from '../../../common/domain/adapter/InsertOneAdapter'; -import { InsertOneManager } from '../../../common/domain/manager/InsertOneManager'; import { InsertOneCatMikroOrmAdapter } from '../../infrastructure/mikroOrm/adapter/InsertOneCatMikroOrmAdapter'; import { CatInsertOneCommand } from '../command/CatInsertOneCommand'; -import { Cat } from '../model/Cat'; @Injectable() export class InsertOneCatManager extends InsertOneManager { diff --git a/packages/core/src/cat/domain/manager/PaginateFindCatManager.ts b/packages/core/core-cat/src/cat/domain/manager/PaginateFindCatManager.ts similarity index 71% rename from packages/core/src/cat/domain/manager/PaginateFindCatManager.ts rename to packages/core/core-cat/src/cat/domain/manager/PaginateFindCatManager.ts index 545b075d..f2d9b529 100644 --- a/packages/core/src/cat/domain/manager/PaginateFindCatManager.ts +++ b/packages/core/core-cat/src/cat/domain/manager/PaginateFindCatManager.ts @@ -1,9 +1,9 @@ import { Inject, Injectable } from '@nestjs/common'; +import { PaginateFindAdapter } from '@nestjs-api-example/core-common/adapter'; +import { PaginateFindManager } from '@nestjs-api-example/core-common/manager'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { PaginateFindAdapter } from '../../../common/domain/adapter/PaginateFindAdapter'; -import { PaginateFindManager } from '../../../common/domain/manager/PaginateFindManager'; import { PaginateFindCatMikroOrmAdapter } from '../../infrastructure/mikroOrm/adapter/PaginateFindCatMikroOrmAdapter'; -import { Cat } from '../model/Cat'; import { CatPaginateFindQuery } from '../query/CatPaginateFindQuery'; @Injectable() diff --git a/packages/core/src/cat/domain/manager/UpdateCatManager.ts b/packages/core/core-cat/src/cat/domain/manager/UpdateCatManager.ts similarity index 75% rename from packages/core/src/cat/domain/manager/UpdateCatManager.ts rename to packages/core/core-cat/src/cat/domain/manager/UpdateCatManager.ts index 26f0ef6e..084d6f6b 100644 --- a/packages/core/src/cat/domain/manager/UpdateCatManager.ts +++ b/packages/core/core-cat/src/cat/domain/manager/UpdateCatManager.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from '@nestjs/common'; +import { UpdateAdapter } from '@nestjs-api-example/core-common/adapter'; +import { UpdateManager } from '@nestjs-api-example/core-common/manager'; -import { UpdateAdapter } from '../../../common/domain/adapter/UpdateAdapter'; -import { UpdateManager } from '../../../common/domain/manager/UpdateManager'; import { UpdateCatMikroOrmAdapter } from '../../infrastructure/mikroOrm/adapter/UpdateCatMikroOrmAdapter'; import { CatUpdateCommand } from '../command/CatUpdateCommand'; diff --git a/packages/core/src/cat/domain/manager/UpdateOneCatManager.ts b/packages/core/core-cat/src/cat/domain/manager/UpdateOneCatManager.ts similarity index 75% rename from packages/core/src/cat/domain/manager/UpdateOneCatManager.ts rename to packages/core/core-cat/src/cat/domain/manager/UpdateOneCatManager.ts index e6957239..b1d21703 100644 --- a/packages/core/src/cat/domain/manager/UpdateOneCatManager.ts +++ b/packages/core/core-cat/src/cat/domain/manager/UpdateOneCatManager.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from '@nestjs/common'; +import { UpdateOneAdapter } from '@nestjs-api-example/core-common/adapter'; +import { UpdateOneManager } from '@nestjs-api-example/core-common/manager'; -import { UpdateOneAdapter } from '../../../common/domain/adapter/UpdateOneAdapter'; -import { UpdateOneManager } from '../../../common/domain/manager/UpdateOneManager'; import { UpdateOneCatMikroOrmAdapter } from '../../infrastructure/mikroOrm/adapter/UpdateOneCatMikroOrmAdapter'; import { CatUpdateOneCommand } from '../command/CatUpdateOneCommand'; diff --git a/packages/core/src/cat/domain/query/CatFindOneQuery.ts b/packages/core/core-cat/src/cat/domain/query/CatFindOneQuery.ts similarity index 100% rename from packages/core/src/cat/domain/query/CatFindOneQuery.ts rename to packages/core/core-cat/src/cat/domain/query/CatFindOneQuery.ts diff --git a/packages/core/src/cat/domain/query/CatFindQuery.ts b/packages/core/core-cat/src/cat/domain/query/CatFindQuery.ts similarity index 64% rename from packages/core/src/cat/domain/query/CatFindQuery.ts rename to packages/core/core-cat/src/cat/domain/query/CatFindQuery.ts index b450d859..17d541a5 100644 --- a/packages/core/src/cat/domain/query/CatFindQuery.ts +++ b/packages/core/core-cat/src/cat/domain/query/CatFindQuery.ts @@ -1,5 +1,5 @@ -import { BaseEntityFindQuery } from '../../../common/domain/query/BaseEntityFindQuery'; -import { CatSortKeyAndOrderType } from '../model/CatSortKeyAndOrderType'; +import { BaseEntityFindQuery } from '@nestjs-api-example/core-common/query'; +import { CatSortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; export class CatFindQuery implements BaseEntityFindQuery { public readonly ids: string[] | undefined = undefined; diff --git a/packages/core/src/cat/domain/query/CatPaginateFindQuery.ts b/packages/core/core-cat/src/cat/domain/query/CatPaginateFindQuery.ts similarity index 57% rename from packages/core/src/cat/domain/query/CatPaginateFindQuery.ts rename to packages/core/core-cat/src/cat/domain/query/CatPaginateFindQuery.ts index 10314761..0e713c8f 100644 --- a/packages/core/src/cat/domain/query/CatPaginateFindQuery.ts +++ b/packages/core/core-cat/src/cat/domain/query/CatPaginateFindQuery.ts @@ -1,6 +1,7 @@ +import { BaseEntityPaginateFindQuery } from '@nestjs-api-example/core-common/query'; +import { PaginationOptions } from '@nestjs-api-example/core-entity/model'; + import { CatFindQuery } from './CatFindQuery'; -import { PaginationOptions } from '../../../common/domain/model/PaginationOptions'; -import { BaseEntityPaginateFindQuery } from '../../../common/domain/query/BaseEntityPaginateFindQuery'; export class CatPaginateFindQuery implements BaseEntityPaginateFindQuery { public constructor( diff --git a/packages/core/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts similarity index 86% rename from packages/core/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts index eb1128f5..c7f73e18 100644 --- a/packages/core/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/domain/command/CatDeleteCommandFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { CatDeleteCommand } from '../../../domain/command/CatDeleteCommand'; -import { CatFixtures } from '../model/CatFixtures'; export class CatDeleteCommandFixtures { public static get any(): CatDeleteCommand { diff --git a/packages/core/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts similarity index 100% rename from packages/core/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/command/CatInsertCommandFixtures.ts diff --git a/packages/core/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts similarity index 85% rename from packages/core/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts index 05701a84..3d388582 100644 --- a/packages/core/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/domain/command/CatInsertOneCommandFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { CatInsertOneCommand } from '../../../domain/command/CatInsertOneCommand'; -import { CatFixtures } from '../model/CatFixtures'; export class CatInsertOneCommandFixtures { public static get any(): CatInsertOneCommand { diff --git a/packages/core/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts similarity index 91% rename from packages/core/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts index cd1f7d7c..37c34e7c 100644 --- a/packages/core/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/domain/command/CatSetCommandFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { CatSetCommand } from '../../../domain/command/CatSetCommand'; -import { CatFixtures } from '../model/CatFixtures'; export class CatSetCommandFixtures { public static get any(): CatSetCommand { diff --git a/packages/core/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts similarity index 100% rename from packages/core/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/command/CatUpdateCommandFixtures.ts diff --git a/packages/core/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts similarity index 100% rename from packages/core/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/command/CatUpdateOneCommandFixtures.ts diff --git a/packages/core/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts similarity index 86% rename from packages/core/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts index 10d94421..3848c4c8 100644 --- a/packages/core/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/domain/query/CatFindOneQueryFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { CatFindOneQuery } from '../../../domain/query/CatFindOneQuery'; -import { CatFixtures } from '../model/CatFixtures'; export class CatFindOneQueryFixtures { public static get any(): CatFindOneQuery { diff --git a/packages/core/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts similarity index 85% rename from packages/core/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts index ca0ca9cb..1e4bbebf 100644 --- a/packages/core/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/domain/query/CatFindQueryFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { CatFindQuery } from '../../../domain/query/CatFindQuery'; -import { CatFixtures } from '../model/CatFixtures'; export class CatFindQueryFixtures { public static get any(): CatFindQuery { diff --git a/packages/core/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts b/packages/core/core-cat/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts similarity index 100% rename from packages/core/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/domain/query/CatPaginateFindQueryFixtures.ts diff --git a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatDeleteQueryMikroOrmFixtures.ts b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatDeleteQueryMikroOrmFixtures.ts similarity index 74% rename from packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatDeleteQueryMikroOrmFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatDeleteQueryMikroOrmFixtures.ts index 39c58673..8d449073 100644 --- a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatDeleteQueryMikroOrmFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatDeleteQueryMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { ObjectQuery } from '@mikro-orm/core'; - -import { CatMikroOrm } from '../../../../infrastructure/mikroOrm/model/CatMikroOrm'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class CatDeleteQueryMikroOrmFixtures { public static get any(): ObjectQuery { diff --git a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatInsertOneQueryTypeOrmFixtures.ts b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatInsertOneQueryTypeOrmFixtures.ts similarity index 72% rename from packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatInsertOneQueryTypeOrmFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatInsertOneQueryTypeOrmFixtures.ts index 91fa794f..fa391715 100644 --- a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatInsertOneQueryTypeOrmFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatInsertOneQueryTypeOrmFixtures.ts @@ -1,7 +1,6 @@ import { RequiredEntityData } from '@mikro-orm/core'; - -import { CatMikroOrm } from '../../../../infrastructure/mikroOrm/model/CatMikroOrm'; -import { CatFixtures } from '../../../domain/model/CatFixtures'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class CatInsertOneQueryMikroOrmFixtures { public static get any(): RequiredEntityData { diff --git a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatSetQueryMikroOrmFixtures.ts b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatSetQueryMikroOrmFixtures.ts similarity index 82% rename from packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatSetQueryMikroOrmFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatSetQueryMikroOrmFixtures.ts index f0099ddf..c9f1cb46 100644 --- a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/command/CatSetQueryMikroOrmFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/command/CatSetQueryMikroOrmFixtures.ts @@ -1,7 +1,6 @@ import { EntityData } from '@mikro-orm/core'; - -import { CatMikroOrm } from '../../../../infrastructure/mikroOrm/model/CatMikroOrm'; -import { CatFixtures } from '../../../domain/model/CatFixtures'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class CatSetQueryMikroOrmFixtures { public static get withBornDate(): EntityData { diff --git a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOneOptionsQueryMikroOrmFixtures.ts b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOneOptionsQueryMikroOrmFixtures.ts similarity index 77% rename from packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOneOptionsQueryMikroOrmFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOneOptionsQueryMikroOrmFixtures.ts index cc74a2c8..552995d3 100644 --- a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOneOptionsQueryMikroOrmFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOneOptionsQueryMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { FindOneOptions } from '@mikro-orm/core'; - -import { CatMikroOrm } from '../../../../infrastructure/mikroOrm/model/CatMikroOrm'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class CatFindOneOptionsQueryMikroOrmFixtures { public static get any(): FindOneOptions { diff --git a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOptionsQueryMikroOrmFixtures.ts b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOptionsQueryMikroOrmFixtures.ts similarity index 75% rename from packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOptionsQueryMikroOrmFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOptionsQueryMikroOrmFixtures.ts index a83de36c..80a26175 100644 --- a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOptionsQueryMikroOrmFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindOptionsQueryMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { FindOptions } from '@mikro-orm/core'; - -import { CatMikroOrm } from '../../../../infrastructure/mikroOrm/model/CatMikroOrm'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class CatFindOptionsQueryMikroOrmFixtures { public static get any(): FindOptions { diff --git a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindQueryMikroOrmFixtures.ts b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindQueryMikroOrmFixtures.ts similarity index 74% rename from packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindQueryMikroOrmFixtures.ts rename to packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindQueryMikroOrmFixtures.ts index 38df12dd..e954e6a1 100644 --- a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindQueryMikroOrmFixtures.ts +++ b/packages/core/core-cat/src/cat/fixtures/infrastructure/mikroOrm/query/CatFindQueryMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { ObjectQuery } from '@mikro-orm/core'; - -import { CatMikroOrm } from '../../../../infrastructure/mikroOrm/model/CatMikroOrm'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class CatFindQueryMikroOrmFixtures { public static get any(): ObjectQuery { diff --git a/packages/core/src/cat/infrastructure/injection/CatCoreModule.ts b/packages/core/core-cat/src/cat/infrastructure/injection/CatCoreModule.ts similarity index 92% rename from packages/core/src/cat/infrastructure/injection/CatCoreModule.ts rename to packages/core/core-cat/src/cat/infrastructure/injection/CatCoreModule.ts index eb6d7452..5b8041b6 100644 --- a/packages/core/src/cat/infrastructure/injection/CatCoreModule.ts +++ b/packages/core/core-cat/src/cat/infrastructure/injection/CatCoreModule.ts @@ -1,13 +1,14 @@ import { MikroOrmModule } from '@mikro-orm/nestjs'; import { Module, Provider } from '@nestjs/common'; import { ICommandHandler, IQueryHandler } from '@nestjs/cqrs'; +import { Converter } from '@nestjs-api-example/core-common/converter'; +import { Manager } from '@nestjs-api-example/core-common/manager'; +import { CommonCoreModule } from '@nestjs-api-example/core-common/module'; +import { DatabaseConfig } from '@nestjs-api-example/core-config/model'; +import { DatabaseConfigModule } from '@nestjs-api-example/core-config/module'; +import { getMikroOrmModuleOptions } from '@nestjs-api-example/core-config/util'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { Converter } from '../../../common/domain/converter/Converter'; -import { Manager } from '../../../common/domain/manager/Manager'; -import { CommonModule } from '../../../common/infrastructure/injection/CommonModule'; -import { DatabaseConfig } from '../../../config/infrastructure/database/DatabaseConfig'; -import { getMikroOrmModuleOptions } from '../../../config/infrastructure/database/getMikroOrmModuleOptions'; -import { DatabaseConfigModule } from '../../../config/infrastructure/injection/DatabaseConfigModule'; import { CatDeleteCommandHandler } from '../../application/commandHandler/CatDeleteCommandHandler'; import { CatInsertCommandHandler } from '../../application/commandHandler/CatInsertCommandHandler'; import { CatInsertOneCommandHandler } from '../../application/commandHandler/CatInsertOneCommandHandler'; @@ -49,7 +50,6 @@ import { CatUpdateCommandToCatFindQueryMikroOrmConverterAsync } from '../mikroOr import { CatUpdateCommandToCatSetQueryMikroOrmConverterAsync } from '../mikroOrm/converter/CatUpdateCommandToCatSetQueryMikroOrmConverterAsync'; import { CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync } from '../mikroOrm/converter/CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync'; import { CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync } from '../mikroOrm/converter/CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync'; -import { CatMikroOrm } from '../mikroOrm/model/CatMikroOrm'; const adapters: Provider[] = [ DeleteCatMikroOrmAdapter, @@ -109,7 +109,7 @@ const queryHandlers: Provider[] = [ @Module({ imports: [ - CommonModule, + CommonCoreModule, MikroOrmModule.forFeature([CatMikroOrm]), MikroOrmModule.forRootAsync({ imports: [DatabaseConfigModule], diff --git a/packages/core/src/cat/infrastructure/mikroOrm/adapter/DeleteCatMikroOrmAdapter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/DeleteCatMikroOrmAdapter.ts similarity index 78% rename from packages/core/src/cat/infrastructure/mikroOrm/adapter/DeleteCatMikroOrmAdapter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/DeleteCatMikroOrmAdapter.ts index 3ab21d06..ab399042 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/adapter/DeleteCatMikroOrmAdapter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/DeleteCatMikroOrmAdapter.ts @@ -1,12 +1,12 @@ import { EntityRepository, ObjectQuery } from '@mikro-orm/core'; import { InjectRepository } from '@mikro-orm/nestjs'; import { Inject, Injectable } from '@nestjs/common'; +import { DeleteMikroOrmAdapter } from '@nestjs-api-example/core-common/adapter'; +import { ConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { DeleteMikroOrmAdapter } from '../../../../common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter'; import { CatDeleteCommand } from '../../../domain/command/CatDeleteCommand'; import { CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync } from '../converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class DeleteCatMikroOrmAdapter extends DeleteMikroOrmAdapter { diff --git a/packages/core/src/cat/infrastructure/mikroOrm/adapter/FindCatMikroOrmAdapter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/FindCatMikroOrmAdapter.ts similarity index 83% rename from packages/core/src/cat/infrastructure/mikroOrm/adapter/FindCatMikroOrmAdapter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/FindCatMikroOrmAdapter.ts index c26ea3a1..d00db2fd 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/adapter/FindCatMikroOrmAdapter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/FindCatMikroOrmAdapter.ts @@ -1,15 +1,15 @@ import { EntityRepository, FindOptions, ObjectQuery } from '@mikro-orm/core'; import { InjectRepository } from '@mikro-orm/nestjs'; import { Inject, Injectable } from '@nestjs/common'; +import { FindMikroOrmAdapter } from '@nestjs-api-example/core-common/adapter'; +import { ConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { Cat } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { FindMikroOrmAdapter } from '../../../../common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter'; -import { Cat } from '../../../domain/model/Cat'; import { CatFindQuery } from '../../../domain/query/CatFindQuery'; import { CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync } from '../converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync'; import { CatFindQueryToCatFindQueryMikroOrmConverterAsync } from '../converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync'; import { CatMikroOrmToCatConverterAsync } from '../converter/CatMikroOrmToCatConverterAsync'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class FindCatMikroOrmAdapter extends FindMikroOrmAdapter { diff --git a/packages/core/src/cat/infrastructure/mikroOrm/adapter/FindOneCatMikroOrmAdapter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/FindOneCatMikroOrmAdapter.ts similarity index 84% rename from packages/core/src/cat/infrastructure/mikroOrm/adapter/FindOneCatMikroOrmAdapter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/FindOneCatMikroOrmAdapter.ts index 417bf8d4..c3b3ed41 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/adapter/FindOneCatMikroOrmAdapter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/FindOneCatMikroOrmAdapter.ts @@ -1,15 +1,15 @@ import { EntityRepository, FindOneOptions, ObjectQuery } from '@mikro-orm/core'; import { InjectRepository } from '@mikro-orm/nestjs'; import { Inject, Injectable } from '@nestjs/common'; +import { FindOneMikroOrmAdapter } from '@nestjs-api-example/core-common/adapter'; +import { ConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { Cat } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { FindOneMikroOrmAdapter } from '../../../../common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter'; -import { Cat } from '../../../domain/model/Cat'; import { CatFindOneQuery } from '../../../domain/query/CatFindOneQuery'; import { CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync } from '../converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync'; import { CatFindQueryToCatFindQueryMikroOrmConverterAsync } from '../converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync'; import { CatMikroOrmToCatConverterAsync } from '../converter/CatMikroOrmToCatConverterAsync'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class FindOneCatMikroOrmAdapter extends FindOneMikroOrmAdapter { diff --git a/packages/core/src/cat/infrastructure/mikroOrm/adapter/InsertCatMikroOrmAdapter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/InsertCatMikroOrmAdapter.ts similarity index 80% rename from packages/core/src/cat/infrastructure/mikroOrm/adapter/InsertCatMikroOrmAdapter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/InsertCatMikroOrmAdapter.ts index 36f50f99..4b096841 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/adapter/InsertCatMikroOrmAdapter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/InsertCatMikroOrmAdapter.ts @@ -1,14 +1,14 @@ import { EntityRepository, RequiredEntityData } from '@mikro-orm/core'; import { InjectRepository } from '@mikro-orm/nestjs'; import { Inject, Injectable } from '@nestjs/common'; +import { InsertMikroOrmAdapter } from '@nestjs-api-example/core-common/adapter'; +import { ConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { Cat } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { InsertMikroOrmAdapter } from '../../../../common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter'; import { CatInsertCommand } from '../../../domain/command/CatInsertCommand'; -import { Cat } from '../../../domain/model/Cat'; import { CatInsertCommandToCatInsertQueryMikroOrmConverterAsync } from '../converter/CatInsertCommandToCatInsertQueryMikroOrmConverterAsync'; import { CatMikroOrmToCatConverterAsync } from '../converter/CatMikroOrmToCatConverterAsync'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class InsertCatMikroOrmAdapter extends InsertMikroOrmAdapter { diff --git a/packages/core/src/cat/infrastructure/mikroOrm/adapter/InsertOneCatMikroOrmAdapter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/InsertOneCatMikroOrmAdapter.ts similarity index 80% rename from packages/core/src/cat/infrastructure/mikroOrm/adapter/InsertOneCatMikroOrmAdapter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/InsertOneCatMikroOrmAdapter.ts index aaf315c5..58358fa7 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/adapter/InsertOneCatMikroOrmAdapter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/InsertOneCatMikroOrmAdapter.ts @@ -1,14 +1,14 @@ import { EntityRepository, RequiredEntityData } from '@mikro-orm/core'; import { InjectRepository } from '@mikro-orm/nestjs'; import { Inject, Injectable } from '@nestjs/common'; +import { InsertOneMikroOrmAdapter } from '@nestjs-api-example/core-common/adapter'; +import { ConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { Cat } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { InsertOneMikroOrmAdapter } from '../../../../common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter'; import { CatInsertOneCommand } from '../../../domain/command/CatInsertOneCommand'; -import { Cat } from '../../../domain/model/Cat'; import { CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync } from '../converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync'; import { CatMikroOrmToCatConverterAsync } from '../converter/CatMikroOrmToCatConverterAsync'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class InsertOneCatMikroOrmAdapter extends InsertOneMikroOrmAdapter { diff --git a/packages/core/src/cat/infrastructure/mikroOrm/adapter/PaginateFindCatMikroOrmAdapter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/PaginateFindCatMikroOrmAdapter.ts similarity index 82% rename from packages/core/src/cat/infrastructure/mikroOrm/adapter/PaginateFindCatMikroOrmAdapter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/PaginateFindCatMikroOrmAdapter.ts index db20fc99..716e69ba 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/adapter/PaginateFindCatMikroOrmAdapter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/PaginateFindCatMikroOrmAdapter.ts @@ -1,16 +1,15 @@ import { EntityRepository, FindOptions, ObjectQuery } from '@mikro-orm/core'; import { InjectRepository } from '@mikro-orm/nestjs'; import { Inject, Injectable } from '@nestjs/common'; +import { PaginateFindMikroOrmAdapter } from '@nestjs-api-example/core-common/adapter'; +import { ConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { Cat, Pagination } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { Pagination } from '../../../../common/domain/model/Pagination'; -import { PaginateFindMikroOrmAdapter } from '../../../../common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter'; -import { Cat } from '../../../domain/model/Cat'; import { CatPaginateFindQuery } from '../../../domain/query/CatPaginateFindQuery'; import { CatMikroOrmToPaginationCatConverterAsync } from '../converter/CatMikroOrmToPaginationCatConverterAsync'; import { CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync } from '../converter/CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync'; import { CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync } from '../converter/CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class PaginateFindCatMikroOrmAdapter extends PaginateFindMikroOrmAdapter< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/adapter/UpdateCatMikroOrmAdapter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/UpdateCatMikroOrmAdapter.ts similarity index 83% rename from packages/core/src/cat/infrastructure/mikroOrm/adapter/UpdateCatMikroOrmAdapter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/UpdateCatMikroOrmAdapter.ts index b837599e..1e748ea9 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/adapter/UpdateCatMikroOrmAdapter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/UpdateCatMikroOrmAdapter.ts @@ -1,13 +1,13 @@ import { EntityRepository, ObjectQuery, EntityData } from '@mikro-orm/core'; import { InjectRepository } from '@mikro-orm/nestjs'; import { Inject, Injectable } from '@nestjs/common'; +import { UpdateMikroOrmAdapter } from '@nestjs-api-example/core-common/adapter'; +import { ConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { UpdateMikroOrmAdapter } from '../../../../common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter'; import { CatUpdateCommand } from '../../../domain/command/CatUpdateCommand'; import { CatUpdateCommandToCatFindQueryMikroOrmConverterAsync } from '../converter/CatUpdateCommandToCatFindQueryMikroOrmConverterAsync'; import { CatUpdateCommandToCatSetQueryMikroOrmConverterAsync } from '../converter/CatUpdateCommandToCatSetQueryMikroOrmConverterAsync'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class UpdateCatMikroOrmAdapter extends UpdateMikroOrmAdapter { diff --git a/packages/core/src/cat/infrastructure/mikroOrm/adapter/UpdateOneCatMikroOrmAdapter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/UpdateOneCatMikroOrmAdapter.ts similarity index 84% rename from packages/core/src/cat/infrastructure/mikroOrm/adapter/UpdateOneCatMikroOrmAdapter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/UpdateOneCatMikroOrmAdapter.ts index d7b50376..fa7dd6ca 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/adapter/UpdateOneCatMikroOrmAdapter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/adapter/UpdateOneCatMikroOrmAdapter.ts @@ -1,13 +1,13 @@ import { EntityData, EntityRepository, ObjectQuery } from '@mikro-orm/core'; import { InjectRepository } from '@mikro-orm/nestjs'; import { Inject, Injectable } from '@nestjs/common'; +import { UpdateOneMikroOrmAdapter } from '@nestjs-api-example/core-common/adapter'; +import { ConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { UpdateOneMikroOrmAdapter } from '../../../../common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter'; import { CatUpdateOneCommand } from '../../../domain/command/CatUpdateOneCommand'; import { CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync } from '../converter/CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync'; import { CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync } from '../converter/CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class UpdateOneCatMikroOrmAdapter extends UpdateOneMikroOrmAdapter { diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.spec.ts similarity index 95% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.spec.ts index 50398f97..c5c85045 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.spec.ts @@ -1,12 +1,12 @@ import { beforeAll, describe, expect, it } from '@jest/globals'; import { ObjectQuery } from '@mikro-orm/core'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync } from './CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync'; import { CatDeleteCommand } from '../../../domain/command/CatDeleteCommand'; import { CatDeleteCommandFixtures } from '../../../fixtures/domain/command/CatDeleteCommandFixtures'; import { CatDeleteQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/command/CatDeleteQueryMikroOrmFixtures'; -import { CatMikroOrm } from '../model/CatMikroOrm'; describe(CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.name, () => { let catDeleteCommandToCatDeleteQueryMikroOrmConverterAsync: CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync; diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.ts similarity index 73% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.ts index be064170..e1091182 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync.ts @@ -1,10 +1,9 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm, BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync'; -import { BaseEntityMikroOrm } from '../../../../common/infrastructure/mikroOrm/model/BaseEntityMikroOrm'; import { CatDeleteCommand } from '../../../domain/command/CatDeleteCommand'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatDeleteCommandToCatDeleteQueryMikroOrmConverterAsync extends BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.spec.ts similarity index 90% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.spec.ts index 7a191645..a55a9e6f 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.spec.ts @@ -1,14 +1,14 @@ import { beforeAll, describe, expect, it, jest } from '@jest/globals'; import { FindOneOptions, QueryOrderMap } from '@mikro-orm/core'; +import { Converter } from '@nestjs-api-example/core-common/converter'; +import { CatSortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync } from './CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync'; -import { Converter } from '../../../../common/domain/converter/Converter'; -import { CatSortKeyAndOrderType } from '../../../domain/model/CatSortKeyAndOrderType'; import { CatFindOneQuery } from '../../../domain/query/CatFindOneQuery'; import { CatFindOneQueryFixtures } from '../../../fixtures/domain/query/CatFindOneQueryFixtures'; import { CatFindOneOptionsQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/CatFindOneOptionsQueryMikroOrmFixtures'; -import { CatMikroOrm } from '../model/CatMikroOrm'; describe(CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.name, () => { let catFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync: CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync; diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.ts similarity index 71% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.ts index 2d926a0a..0212ebdf 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync.ts @@ -1,13 +1,14 @@ import { FindOneOptions, QueryOrderMap } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; +import { + BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync, + Converter, +} from '@nestjs-api-example/core-common/converter'; +import { CatSortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm, BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter } from './CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter'; -import { Converter } from '../../../../common/domain/converter/Converter'; -import { BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync'; -import { BaseEntityMikroOrm } from '../../../../common/infrastructure/mikroOrm/model/BaseEntityMikroOrm'; -import { CatSortKeyAndOrderType } from '../../../domain/model/CatSortKeyAndOrderType'; import { CatFindOneQuery } from '../../../domain/query/CatFindOneQuery'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatFindOneQueryToCatFindOneOptionsQueryMikroOrmConverterAsync extends BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.spec.ts similarity index 89% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.spec.ts index 60aa7bba..e29f3d66 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.spec.ts @@ -1,14 +1,14 @@ import { beforeAll, describe, expect, it, jest } from '@jest/globals'; import { FindOptions, QueryOrderMap } from '@mikro-orm/core'; +import { Converter } from '@nestjs-api-example/core-common/converter'; +import { CatSortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync } from './CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync'; -import { Converter } from '../../../../common/domain/converter/Converter'; -import { CatSortKeyAndOrderType } from '../../../domain/model/CatSortKeyAndOrderType'; import { CatFindQuery } from '../../../domain/query/CatFindQuery'; import { CatFindQueryFixtures } from '../../../fixtures/domain/query/CatFindQueryFixtures'; import { CatFindOptionsQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/CatFindOptionsQueryMikroOrmFixtures'; -import { CatMikroOrm } from '../model/CatMikroOrm'; describe(CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.name, () => { let catFindQueryToCatFindOptionsQueryMikroOrmConverterAsync: CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync; diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts similarity index 71% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts index 47c6fa6a..c3fc513f 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts @@ -1,13 +1,14 @@ import { FindOptions, QueryOrderMap } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; +import { + BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync, + Converter, +} from '@nestjs-api-example/core-common/converter'; +import { CatSortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm, BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter } from './CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter'; -import { Converter } from '../../../../common/domain/converter/Converter'; -import { BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync'; -import { BaseEntityMikroOrm } from '../../../../common/infrastructure/mikroOrm/model/BaseEntityMikroOrm'; -import { CatSortKeyAndOrderType } from '../../../domain/model/CatSortKeyAndOrderType'; import { CatFindQuery } from '../../../domain/query/CatFindQuery'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync extends BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.spec.ts similarity index 95% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.spec.ts index d5951415..a06a4c0c 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.spec.ts @@ -1,12 +1,12 @@ import { beforeAll, describe, expect, it } from '@jest/globals'; import { ObjectQuery } from '@mikro-orm/core'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatFindQueryToCatFindQueryMikroOrmConverterAsync } from './CatFindQueryToCatFindQueryMikroOrmConverterAsync'; import { CatFindQuery } from '../../../domain/query/CatFindQuery'; import { CatFindQueryFixtures } from '../../../fixtures/domain/query/CatFindQueryFixtures'; import { CatFindQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/CatFindQueryMikroOrmFixtures'; -import { CatMikroOrm } from '../model/CatMikroOrm'; describe(CatFindQueryToCatFindQueryMikroOrmConverterAsync.name, () => { let catFindQueryToCatFindQueryMikroOrmConverterAsync: CatFindQueryToCatFindQueryMikroOrmConverterAsync; diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.ts similarity index 72% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.ts index dc16639f..8d7ae6f2 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.ts @@ -1,10 +1,9 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { BaseEntityMikroOrm, CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync'; -import { BaseEntityMikroOrm } from '../../../../common/infrastructure/mikroOrm/model/BaseEntityMikroOrm'; import { CatFindQuery } from '../../../domain/query/CatFindQuery'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatFindQueryToCatFindQueryMikroOrmConverterAsync extends BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertCommandToCatInsertQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertCommandToCatInsertQueryMikroOrmConverterAsync.ts similarity index 73% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertCommandToCatInsertQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertCommandToCatInsertQueryMikroOrmConverterAsync.ts index 0dff6184..9a3d6987 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertCommandToCatInsertQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertCommandToCatInsertQueryMikroOrmConverterAsync.ts @@ -1,12 +1,14 @@ import { RequiredEntityData } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; +import { + BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync, + ConverterAsync, +} from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync } from './CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync'; import { CatInsertCommand } from '../../../domain/command/CatInsertCommand'; import { CatInsertOneCommand } from '../../../domain/command/CatInsertOneCommand'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatInsertCommandToCatInsertQueryMikroOrmConverterAsync extends BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.spec.ts similarity index 95% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.spec.ts index 0a1cb801..90a93058 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.spec.ts @@ -1,12 +1,12 @@ import { beforeAll, describe, expect, it } from '@jest/globals'; import { RequiredEntityData } from '@mikro-orm/core'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync } from './CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync'; import { CatInsertOneCommand } from '../../../domain/command/CatInsertOneCommand'; import { CatInsertOneCommandFixtures } from '../../../fixtures/domain/command/CatInsertOneCommandFixtures'; import { CatInsertOneQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/command/CatInsertOneQueryTypeOrmFixtures'; -import { CatMikroOrm } from '../model/CatMikroOrm'; describe(CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.name, () => { let catInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsyncTest: CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync; diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.ts similarity index 75% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.ts index cdebc5f7..de7ee6e5 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync.ts @@ -1,10 +1,9 @@ import { RequiredEntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm, BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync'; -import { BaseEntityMikroOrm } from '../../../../common/infrastructure/mikroOrm/model/BaseEntityMikroOrm'; import { CatInsertOneCommand } from '../../../domain/command/CatInsertOneCommand'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatInsertOneCommandToCatInsertOneQueryMikroOrmConverterAsync extends BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.spec.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.spec.ts similarity index 75% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.spec.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.spec.ts index c35bf6eb..15ced6c7 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.spec.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.spec.ts @@ -1,10 +1,11 @@ import { beforeAll, describe, expect, it } from '@jest/globals'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrmFixtures } from '@nestjs-api-example/core-entity-orm/fixture'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; + import { CatMikroOrmToCatConverterAsync } from './CatMikroOrmToCatConverterAsync'; -import { Cat } from '../../../domain/model/Cat'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/model/CatMikroOrmFixtures'; -import { CatMikroOrm } from '../model/CatMikroOrm'; describe(CatMikroOrmToCatConverterAsync.name, () => { let catMikroOrmToCatConverterAsync: CatMikroOrmToCatConverterAsync; diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.ts similarity index 56% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.ts index ad3640c8..f1aa097f 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToCatConverterAsync.ts @@ -1,9 +1,7 @@ import { Injectable } from '@nestjs/common'; - -import { BaseEntity } from '../../../../common/domain/model/BaseEntity'; -import { BaseEntityMikroOrmToBaseEntityConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync'; -import { Cat } from '../../../domain/model/Cat'; -import { CatMikroOrm } from '../model/CatMikroOrm'; +import { BaseEntityMikroOrmToBaseEntityConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { BaseEntity, Cat } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; @Injectable() export class CatMikroOrmToCatConverterAsync extends BaseEntityMikroOrmToBaseEntityConverterAsync { diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToPaginationCatConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToPaginationCatConverterAsync.ts similarity index 53% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToPaginationCatConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToPaginationCatConverterAsync.ts index 6b93f35d..a977c5b2 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToPaginationCatConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatMikroOrmToPaginationCatConverterAsync.ts @@ -1,11 +1,12 @@ import { Inject, Injectable } from '@nestjs/common'; +import { + AnyEntityMikroOrmToPaginationEntityConverterAsync, + ConverterAsync, +} from '@nestjs-api-example/core-common/converter'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatMikroOrmToCatConverterAsync } from './CatMikroOrmToCatConverterAsync'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { Pagination } from '../../../../common/domain/model/Pagination'; -import { AnyEntityMikroOrmToPaginationEntityConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync'; -import { Cat } from '../../../domain/model/Cat'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatMikroOrmToPaginationCatConverterAsync extends AnyEntityMikroOrmToPaginationEntityConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts similarity index 71% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts index a028040f..3ff88690 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync.ts @@ -1,12 +1,14 @@ import { FindOptions } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; +import { + AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync, + ConverterAsync, +} from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync } from './CatFindQueryToCatFindOptionsQueryMikroOrmConverterAsync'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync'; import { CatFindQuery } from '../../../domain/query/CatFindQuery'; import { CatPaginateFindQuery } from '../../../domain/query/CatPaginateFindQuery'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatPaginateFindQueryToCatFindOptionsQueryMikroOrmConverterAsync extends AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync.ts similarity index 71% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync.ts index 028146a7..dfb2560c 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync.ts @@ -1,12 +1,14 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; +import { + AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync, + ConverterAsync, +} from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatFindQueryToCatFindQueryMikroOrmConverterAsync } from './CatFindQueryToCatFindQueryMikroOrmConverterAsync'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync'; import { CatFindQuery } from '../../../domain/query/CatFindQuery'; import { CatPaginateFindQuery } from '../../../domain/query/CatPaginateFindQuery'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatPaginateFindQueryToCatFindQueryMikroOrmConverterAsync extends AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.spec.ts index 976a8929..dff45cb3 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.spec.ts @@ -1,12 +1,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { EntityData } from '@mikro-orm/core'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatSetCommandToCatSetQueryMikroOrmConverterAsync } from './CatSetCommandToCatSetQueryMikroOrmConverterAsync'; import { CatSetCommand } from '../../../domain/command/CatSetCommand'; import { CatSetCommandFixtures } from '../../../fixtures/domain/command/CatSetCommandFixtures'; import { CatSetQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/command/CatSetQueryMikroOrmFixtures'; -import { CatMikroOrm } from '../model/CatMikroOrm'; describe(CatSetCommandToCatSetQueryMikroOrmConverterAsync.name, () => { let catSetCommandToCatSetQueryMikroOrmConverterAsync: CatSetCommandToCatSetQueryMikroOrmConverterAsync; diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.ts similarity index 77% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.ts index 80661fe1..c2c46362 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.ts @@ -1,10 +1,9 @@ import { EntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync } from '@nestjs-api-example/core-common/converter'; +import { BaseEntityMikroOrm, CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; -import { BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync'; -import { BaseEntityMikroOrm } from '../../../../common/infrastructure/mikroOrm/model/BaseEntityMikroOrm'; import { CatSetCommand } from '../../../domain/command/CatSetCommand'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatSetCommandToCatSetQueryMikroOrmConverterAsync extends BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter.ts similarity index 64% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter.ts index a3087e39..61bcf45d 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter.ts @@ -1,11 +1,13 @@ import { QueryOrderMap } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; +import { + BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter, + Converter, +} from '@nestjs-api-example/core-common/converter'; +import { CatSortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter } from './CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter'; -import { Converter } from '../../../../common/domain/converter/Converter'; -import { BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter'; -import { CatSortKeyAndOrderType } from '../../../domain/model/CatSortKeyAndOrderType'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatSortKeyAndOrderTypeArrayToCatQueryOrderMapMikroOrmArrayConverter extends BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.spec.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.spec.ts similarity index 74% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.spec.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.spec.ts index b1127e8a..a680fda7 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.spec.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.spec.ts @@ -1,14 +1,13 @@ import { beforeAll, describe, expect, it, jest } from '@jest/globals'; import { QueryOrder, QueryOrderMap } from '@mikro-orm/core'; +import { Converter } from '@nestjs-api-example/core-common/converter'; +import { CatSortKeyAndOrderTypeFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { OrderType, CatSortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { CatQueryOrderMapMikroOrmFixtures } from '@nestjs-api-example/core-entity-orm/fixture'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter } from './CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter'; -import { Converter } from '../../../../common/domain/converter/Converter'; -import { OrderType } from '../../../../common/domain/model/OrderType'; -import { CatSortKeyAndOrderType } from '../../../domain/model/CatSortKeyAndOrderType'; -import { CatSortKeyAndOrderTypeFixtures } from '../../../fixtures/domain/model/CatSortKeyAndOrderTypeFixtures'; -import { CatQueryOrderMapMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/model/CatQueryOrderMapMikroOrmFixtures'; -import { CatMikroOrm } from '../model/CatMikroOrm'; describe(CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.name, () => { let orderTypeToQueryOrderMikroOrmConverterMock: jest.Mocked>; diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.ts similarity index 54% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.ts index b9cd1be1..08ae19fe 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter.ts @@ -1,13 +1,12 @@ import { QueryOrder, QueryOrderMap } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; - -import { Converter } from '../../../../common/domain/converter/Converter'; -import { OrderType } from '../../../../common/domain/model/OrderType'; -import { BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter'; -import { OrderTypeToQueryOrderMikroOrmConverter } from '../../../../common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter'; -import { BaseEntityMikroOrm } from '../../../../common/infrastructure/mikroOrm/model/BaseEntityMikroOrm'; -import { CatSortKeyAndOrderType } from '../../../domain/model/CatSortKeyAndOrderType'; -import { CatMikroOrm } from '../model/CatMikroOrm'; +import { + BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter, + Converter, + OrderTypeToQueryOrderMikroOrmConverter, +} from '@nestjs-api-example/core-common/converter'; +import { CatSortKeyAndOrderType, OrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm, CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; @Injectable() export class CatSortKeyAndOrderTypeToCatQueryOrderMapMikroOrmConverter extends BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatFindQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatFindQueryMikroOrmConverterAsync.ts similarity index 72% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatFindQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatFindQueryMikroOrmConverterAsync.ts index fc2faa3a..76e6487b 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatFindQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatFindQueryMikroOrmConverterAsync.ts @@ -1,12 +1,14 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Injectable, Inject } from '@nestjs/common'; +import { + BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync, + ConverterAsync, +} from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync } from './CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync'; import { CatUpdateCommand } from '../../../domain/command/CatUpdateCommand'; import { CatUpdateOneCommand } from '../../../domain/command/CatUpdateOneCommand'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatUpdateCommandToCatFindQueryMikroOrmConverterAsync extends BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatSetQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatSetQueryMikroOrmConverterAsync.ts similarity index 72% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatSetQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatSetQueryMikroOrmConverterAsync.ts index 039b6d4d..090c1a55 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatSetQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateCommandToCatSetQueryMikroOrmConverterAsync.ts @@ -1,12 +1,14 @@ import { EntityData } from '@mikro-orm/core'; import { Injectable, Inject } from '@nestjs/common'; +import { + BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync, + ConverterAsync, +} from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync } from './CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync'; import { CatUpdateCommand } from '../../../domain/command/CatUpdateCommand'; import { CatUpdateOneCommand } from '../../../domain/command/CatUpdateOneCommand'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatUpdateCommandToCatSetQueryMikroOrmConverterAsync extends BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync.ts similarity index 70% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync.ts index 654b6a34..a5318d01 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync.ts @@ -1,12 +1,14 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; +import { + BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync, + ConverterAsync, +} from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatFindQueryToCatFindQueryMikroOrmConverterAsync } from './CatFindQueryToCatFindQueryMikroOrmConverterAsync'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync'; import { CatUpdateOneCommand } from '../../../domain/command/CatUpdateOneCommand'; import { CatFindQuery } from '../../../domain/query/CatFindQuery'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatUpdateOneCommandToCatFindQueryMikroOrmConverterAsync extends BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync< diff --git a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync.ts b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync.ts similarity index 71% rename from packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync.ts rename to packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync.ts index 595ff4fc..dfd9817a 100644 --- a/packages/core/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-cat/src/cat/infrastructure/mikroOrm/converter/CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync.ts @@ -1,12 +1,14 @@ import { EntityData } from '@mikro-orm/core'; import { Inject, Injectable } from '@nestjs/common'; +import { + BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync, + ConverterAsync, +} from '@nestjs-api-example/core-common/converter'; +import { CatMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CatSetCommandToCatSetQueryMikroOrmConverterAsync } from './CatSetCommandToCatSetQueryMikroOrmConverterAsync'; -import { ConverterAsync } from '../../../../common/domain/converter/ConverterAsync'; -import { BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync } from '../../../../common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync'; import { CatSetCommand } from '../../../domain/command/CatSetCommand'; import { CatUpdateOneCommand } from '../../../domain/command/CatUpdateOneCommand'; -import { CatMikroOrm } from '../model/CatMikroOrm'; @Injectable() export class CatUpdateOneCommandToCatSetQueryMikroOrmConverterAsync extends BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync< diff --git a/packages/core/src/commands.ts b/packages/core/core-cat/src/command.ts similarity index 100% rename from packages/core/src/commands.ts rename to packages/core/core-cat/src/command.ts diff --git a/packages/core/core-cat/src/fixture.ts b/packages/core/core-cat/src/fixture.ts new file mode 100644 index 00000000..384d68c6 --- /dev/null +++ b/packages/core/core-cat/src/fixture.ts @@ -0,0 +1,9 @@ +export { CatDeleteCommandFixtures } from './cat/fixtures/domain/command/CatDeleteCommandFixtures'; +export { CatInsertCommandFixtures } from './cat/fixtures/domain/command/CatInsertCommandFixtures'; +export { CatInsertOneCommandFixtures } from './cat/fixtures/domain/command/CatInsertOneCommandFixtures'; +export { CatSetCommandFixtures } from './cat/fixtures/domain/command/CatSetCommandFixtures'; +export { CatUpdateCommandFixtures } from './cat/fixtures/domain/command/CatUpdateCommandFixtures'; +export { CatUpdateOneCommandFixtures } from './cat/fixtures/domain/command/CatUpdateOneCommandFixtures'; +export { CatFindOneQueryFixtures } from './cat/fixtures/domain/query/CatFindOneQueryFixtures'; +export { CatFindQueryFixtures } from './cat/fixtures/domain/query/CatFindQueryFixtures'; +export { CatPaginateFindQueryFixtures } from './cat/fixtures/domain/query/CatPaginateFindQueryFixtures'; diff --git a/packages/core/core-cat/src/module.ts b/packages/core/core-cat/src/module.ts new file mode 100644 index 00000000..bfa0cb4b --- /dev/null +++ b/packages/core/core-cat/src/module.ts @@ -0,0 +1,3 @@ +import { CatCoreModule } from './cat/infrastructure/injection/CatCoreModule'; + +export { CatCoreModule }; diff --git a/packages/core/src/queries.ts b/packages/core/core-cat/src/query.ts similarity index 100% rename from packages/core/src/queries.ts rename to packages/core/core-cat/src/query.ts diff --git a/packages/core/tsconfig.json b/packages/core/core-cat/tsconfig.json similarity index 100% rename from packages/core/tsconfig.json rename to packages/core/core-cat/tsconfig.json diff --git a/packages/api-grpc/.eslintignore b/packages/core/core-common/.eslintignore similarity index 100% rename from packages/api-grpc/.eslintignore rename to packages/core/core-common/.eslintignore diff --git a/packages/api-grpc/.eslintrc.js b/packages/core/core-common/.eslintrc.js similarity index 100% rename from packages/api-grpc/.eslintrc.js rename to packages/core/core-common/.eslintrc.js diff --git a/packages/api-grpc/.gitignore b/packages/core/core-common/.gitignore similarity index 100% rename from packages/api-grpc/.gitignore rename to packages/core/core-common/.gitignore diff --git a/packages/api-grpc/.lintstagedrc.json b/packages/core/core-common/.lintstagedrc.json similarity index 100% rename from packages/api-grpc/.lintstagedrc.json rename to packages/core/core-common/.lintstagedrc.json diff --git a/packages/api-grpc/.npmignore b/packages/core/core-common/.npmignore similarity index 100% rename from packages/api-grpc/.npmignore rename to packages/core/core-common/.npmignore diff --git a/packages/api-grpc/jest.config.mjs b/packages/core/core-common/jest.config.mjs similarity index 100% rename from packages/api-grpc/jest.config.mjs rename to packages/core/core-common/jest.config.mjs diff --git a/packages/api-grpc/jest.js.config.mjs b/packages/core/core-common/jest.js.config.mjs similarity index 100% rename from packages/api-grpc/jest.js.config.mjs rename to packages/core/core-common/jest.js.config.mjs diff --git a/packages/core/core-common/package.json b/packages/core/core-common/package.json new file mode 100644 index 00000000..c95666ec --- /dev/null +++ b/packages/core/core-common/package.json @@ -0,0 +1,80 @@ +{ + "name": "@nestjs-api-example/core-common", + "version": "1.0.0", + "description": "meow meow meow", + "author": "Adrián Martínez Jiménez ", + "homepage": "https://github.com/Adrianmjim/nestjs-api-example#readme", + "license": "ISC", + "repository": { + "type": "git", + "url": "git+https://github.com/Adrianmjim/nestjs-api-example.git" + }, + "bugs": { + "url": "https://github.com/Adrianmjim/nestjs-api-example/issues" + }, + "dependencies": { + "@nestjs-api-example/core-entity": "workspace:*", + "@nestjs-api-example/core-entity-orm": "workspace:*", + "@mikro-orm/core": "5.9.4", + "@mikro-orm/migrations": "5.9.4", + "@mikro-orm/nestjs": "5.2.2", + "@mikro-orm/postgresql": "5.9.4", + "@nestjs/common": "10.2.10", + "@nestjs/core": "10.2.10", + "@nestjs/cqrs": "10.2.6", + "dotenv": "16.3.1", + "envalid": "8.0.0", + "reflect-metadata": "0.1.14", + "rxjs": "7.8.1" + }, + "devDependencies": { + "@mikro-orm/cli": "5.9.4", + "@jest/globals": "29.7.0", + "@types/node": "20.10.4", + "@typescript-eslint/eslint-plugin": "6.13.2", + "@typescript-eslint/parser": "6.13.2", + "eslint": "8.55.0", + "eslint-import-resolver-typescript": "3.6.1", + "eslint-plugin-import": "2.29.0", + "eslint-plugin-jest": "27.6.0", + "eslint-plugin-prettier": "5.0.1", + "jest": "29.7.0", + "prettier": "3.1.1", + "rimraf": "5.0.5", + "ts-jest": "29.1.1", + "ts-node": "10.9.2", + "typescript": "5.3.3" + }, + "exports": { + "./adapter": "./lib/adapter.js", + "./command": "./lib/command.js", + "./command-handler": "./lib/commandHandler.js", + "./converter": "./lib/converter.js", + "./exception": "./lib/exception.js", + "./manager": "./lib/manager.js", + "./module": "./lib/module.js", + "./query": "./lib/query.js", + "./query-handler": "./lib/queryHandler.js" + }, + "mikro-orm": { + "useTsNode": true, + "configPaths": [ + "./src/config/infrastructure/mikroOrm/MikroOrmCliConfig.ts", + "./lib/config/infrastructure/mikroOrm/MikroOrmCliConfig.js" + ] + }, + "scripts": { + "build": "tsc --build tsconfig.json", + "build:clean": "rimraf lib", + "format": "prettier --write ./src/**/*.ts", + "format:check": "prettier --check ./src/**/*.ts", + "lint": "eslint --ext ts --ignore-path .gitignore ./src", + "prebuild": "pnpm run build:clean", + "test": "jest --config=jest.config.mjs --runInBand", + "test:integration:js": "pnpm run test:js --selectProjects Integration", + "test:js": "jest --config=jest.js.config.mjs --runInBand", + "test:js:coverage": "pnpm run test:js --coverage", + "test:uncommitted": "pnpm run test --changedSince=HEAD", + "test:unit:js": "pnpm run test:js --selectProjects Unit" + } +} diff --git a/packages/api-grpc/prettier.config.js b/packages/core/core-common/prettier.config.js similarity index 100% rename from packages/api-grpc/prettier.config.js rename to packages/core/core-common/prettier.config.js diff --git a/packages/core/core-common/src/adapter.ts b/packages/core/core-common/src/adapter.ts new file mode 100644 index 00000000..b9cceb44 --- /dev/null +++ b/packages/core/core-common/src/adapter.ts @@ -0,0 +1,39 @@ +import { CountAdapter } from './common/domain/adapter/CountAdapter'; +import { DeleteAdapter } from './common/domain/adapter/DeleteAdapter'; +import { FindAdapter } from './common/domain/adapter/FindAdapter'; +import { FindOneAdapter } from './common/domain/adapter/FindOneAdapter'; +import { InsertAdapter } from './common/domain/adapter/InsertAdapter'; +import { InsertOneAdapter } from './common/domain/adapter/InsertOneAdapter'; +import { PaginateFindAdapter } from './common/domain/adapter/PaginateFindAdapter'; +import { UpdateAdapter } from './common/domain/adapter/UpdateAdapter'; +import { UpdateOneAdapter } from './common/domain/adapter/UpdateOneAdapter'; +import { CountMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter'; +import { DeleteMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter'; +import { FindMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter'; +import { FindOneMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter'; +import { InsertMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter'; +import { InsertOneMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter'; +import { PaginateFindMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter'; +import { UpdateMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter'; +import { UpdateOneMikroOrmAdapter } from './common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter'; + +export { + CountAdapter, + CountMikroOrmAdapter, + DeleteAdapter, + DeleteMikroOrmAdapter, + FindAdapter, + FindMikroOrmAdapter, + FindOneAdapter, + FindOneMikroOrmAdapter, + InsertAdapter, + InsertMikroOrmAdapter, + InsertOneAdapter, + InsertOneMikroOrmAdapter, + PaginateFindAdapter, + PaginateFindMikroOrmAdapter, + UpdateAdapter, + UpdateMikroOrmAdapter, + UpdateOneAdapter, + UpdateOneMikroOrmAdapter, +}; diff --git a/packages/core/core-common/src/command.ts b/packages/core/core-common/src/command.ts new file mode 100644 index 00000000..d2d7c6d8 --- /dev/null +++ b/packages/core/core-common/src/command.ts @@ -0,0 +1,6 @@ +export { BaseEntityDeleteCommand } from './common/domain/command/BaseEntityDeleteCommand'; +export { BaseEntityInsertOneCommand } from './common/domain/command/BaseEntityInsertOneCommand'; +export { BaseEntityInsertCommand } from './common/domain/command/BaseEntityInsertCommand'; +export { BaseEntitySetCommand } from './common/domain/command/BaseEntitySetCommand'; +export { BaseEntityUpdateCommand } from './common/domain/command/BaseEntityUpdateCommand'; +export { BaseEntityUpdateOneCommand } from './common/domain/command/BaseEntityUpdateOneCommand'; diff --git a/packages/core/core-common/src/commandHandler.ts b/packages/core/core-common/src/commandHandler.ts new file mode 100644 index 00000000..e651d55c --- /dev/null +++ b/packages/core/core-common/src/commandHandler.ts @@ -0,0 +1,5 @@ +export { DeleteCommandHandler } from './common/application/commandHandler/DeleteCommandHandler'; +export { InsertCommandHandler } from './common/application/commandHandler/InsertCommandHandler'; +export { InsertOneCommandHandler } from './common/application/commandHandler/InsertOneCommandHandler'; +export { UpdateCommandHandler } from './common/application/commandHandler/UpdateCommandHandler'; +export { UpdateOneCommandHandler } from './common/application/commandHandler/UpdateOneCommandHandler'; diff --git a/packages/core/src/common/application/commandHandler/DeleteCommandHandler.spec.ts b/packages/core/core-common/src/common/application/commandHandler/DeleteCommandHandler.spec.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/DeleteCommandHandler.spec.ts rename to packages/core/core-common/src/common/application/commandHandler/DeleteCommandHandler.spec.ts diff --git a/packages/core/src/common/application/commandHandler/DeleteCommandHandler.ts b/packages/core/core-common/src/common/application/commandHandler/DeleteCommandHandler.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/DeleteCommandHandler.ts rename to packages/core/core-common/src/common/application/commandHandler/DeleteCommandHandler.ts diff --git a/packages/core/src/common/application/commandHandler/InsertCommandHandler.spec.ts b/packages/core/core-common/src/common/application/commandHandler/InsertCommandHandler.spec.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/InsertCommandHandler.spec.ts rename to packages/core/core-common/src/common/application/commandHandler/InsertCommandHandler.spec.ts diff --git a/packages/core/src/common/application/commandHandler/InsertCommandHandler.ts b/packages/core/core-common/src/common/application/commandHandler/InsertCommandHandler.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/InsertCommandHandler.ts rename to packages/core/core-common/src/common/application/commandHandler/InsertCommandHandler.ts diff --git a/packages/core/src/common/application/commandHandler/InsertOneCommandHandler.spec.ts b/packages/core/core-common/src/common/application/commandHandler/InsertOneCommandHandler.spec.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/InsertOneCommandHandler.spec.ts rename to packages/core/core-common/src/common/application/commandHandler/InsertOneCommandHandler.spec.ts diff --git a/packages/core/src/common/application/commandHandler/InsertOneCommandHandler.ts b/packages/core/core-common/src/common/application/commandHandler/InsertOneCommandHandler.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/InsertOneCommandHandler.ts rename to packages/core/core-common/src/common/application/commandHandler/InsertOneCommandHandler.ts diff --git a/packages/core/src/common/application/commandHandler/UpdateCommandHandler.spec.ts b/packages/core/core-common/src/common/application/commandHandler/UpdateCommandHandler.spec.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/UpdateCommandHandler.spec.ts rename to packages/core/core-common/src/common/application/commandHandler/UpdateCommandHandler.spec.ts diff --git a/packages/core/src/common/application/commandHandler/UpdateCommandHandler.ts b/packages/core/core-common/src/common/application/commandHandler/UpdateCommandHandler.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/UpdateCommandHandler.ts rename to packages/core/core-common/src/common/application/commandHandler/UpdateCommandHandler.ts diff --git a/packages/core/src/common/application/commandHandler/UpdateOneCommandHandler.spec.ts b/packages/core/core-common/src/common/application/commandHandler/UpdateOneCommandHandler.spec.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/UpdateOneCommandHandler.spec.ts rename to packages/core/core-common/src/common/application/commandHandler/UpdateOneCommandHandler.spec.ts diff --git a/packages/core/src/common/application/commandHandler/UpdateOneCommandHandler.ts b/packages/core/core-common/src/common/application/commandHandler/UpdateOneCommandHandler.ts similarity index 100% rename from packages/core/src/common/application/commandHandler/UpdateOneCommandHandler.ts rename to packages/core/core-common/src/common/application/commandHandler/UpdateOneCommandHandler.ts diff --git a/packages/core/src/common/application/queryHandler/CountQueryHandler.spec.ts b/packages/core/core-common/src/common/application/queryHandler/CountQueryHandler.spec.ts similarity index 100% rename from packages/core/src/common/application/queryHandler/CountQueryHandler.spec.ts rename to packages/core/core-common/src/common/application/queryHandler/CountQueryHandler.spec.ts diff --git a/packages/core/src/common/application/queryHandler/CountQueryHandler.ts b/packages/core/core-common/src/common/application/queryHandler/CountQueryHandler.ts similarity index 100% rename from packages/core/src/common/application/queryHandler/CountQueryHandler.ts rename to packages/core/core-common/src/common/application/queryHandler/CountQueryHandler.ts diff --git a/packages/core/src/common/application/queryHandler/FindOneQueryHandler.spec.ts b/packages/core/core-common/src/common/application/queryHandler/FindOneQueryHandler.spec.ts similarity index 100% rename from packages/core/src/common/application/queryHandler/FindOneQueryHandler.spec.ts rename to packages/core/core-common/src/common/application/queryHandler/FindOneQueryHandler.spec.ts diff --git a/packages/core/src/common/application/queryHandler/FindOneQueryHandler.ts b/packages/core/core-common/src/common/application/queryHandler/FindOneQueryHandler.ts similarity index 100% rename from packages/core/src/common/application/queryHandler/FindOneQueryHandler.ts rename to packages/core/core-common/src/common/application/queryHandler/FindOneQueryHandler.ts diff --git a/packages/core/src/common/application/queryHandler/FindQueryHandler.spec.ts b/packages/core/core-common/src/common/application/queryHandler/FindQueryHandler.spec.ts similarity index 100% rename from packages/core/src/common/application/queryHandler/FindQueryHandler.spec.ts rename to packages/core/core-common/src/common/application/queryHandler/FindQueryHandler.spec.ts diff --git a/packages/core/src/common/application/queryHandler/FindQueryHandler.ts b/packages/core/core-common/src/common/application/queryHandler/FindQueryHandler.ts similarity index 100% rename from packages/core/src/common/application/queryHandler/FindQueryHandler.ts rename to packages/core/core-common/src/common/application/queryHandler/FindQueryHandler.ts diff --git a/packages/core/src/common/application/queryHandler/PaginateFindQueryHandler.spec.ts b/packages/core/core-common/src/common/application/queryHandler/PaginateFindQueryHandler.spec.ts similarity index 96% rename from packages/core/src/common/application/queryHandler/PaginateFindQueryHandler.spec.ts rename to packages/core/core-common/src/common/application/queryHandler/PaginateFindQueryHandler.spec.ts index 39b62f00..e19e4141 100644 --- a/packages/core/src/common/application/queryHandler/PaginateFindQueryHandler.spec.ts +++ b/packages/core/core-common/src/common/application/queryHandler/PaginateFindQueryHandler.spec.ts @@ -1,8 +1,9 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; +import { Pagination } from '@nestjs-api-example/core-entity/model'; + import { PaginateFindQueryHandler } from './PaginateFindQueryHandler'; import { ManagerAsync } from '../../domain/manager/ManagerAsync'; -import { Pagination } from '../../domain/model/Pagination'; interface QueryTest { foo: unknown; diff --git a/packages/core/src/common/application/queryHandler/PaginateFindQueryHandler.ts b/packages/core/core-common/src/common/application/queryHandler/PaginateFindQueryHandler.ts similarity index 91% rename from packages/core/src/common/application/queryHandler/PaginateFindQueryHandler.ts rename to packages/core/core-common/src/common/application/queryHandler/PaginateFindQueryHandler.ts index 8e354069..5f6f535c 100644 --- a/packages/core/src/common/application/queryHandler/PaginateFindQueryHandler.ts +++ b/packages/core/core-common/src/common/application/queryHandler/PaginateFindQueryHandler.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; import { IQuery, IQueryHandler } from '@nestjs/cqrs'; +import { Pagination } from '@nestjs-api-example/core-entity/model'; import { Manager } from '../../domain/manager/Manager'; import { ManagerAsync } from '../../domain/manager/ManagerAsync'; -import { Pagination } from '../../domain/model/Pagination'; @Injectable() export class PaginateFindQueryHandler diff --git a/packages/core/src/common/domain/adapter/CountAdapter.ts b/packages/core/core-common/src/common/domain/adapter/CountAdapter.ts similarity index 100% rename from packages/core/src/common/domain/adapter/CountAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/CountAdapter.ts diff --git a/packages/core/src/common/domain/adapter/DeleteAdapter.ts b/packages/core/core-common/src/common/domain/adapter/DeleteAdapter.ts similarity index 100% rename from packages/core/src/common/domain/adapter/DeleteAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/DeleteAdapter.ts diff --git a/packages/core/src/common/domain/adapter/FindAdapter.ts b/packages/core/core-common/src/common/domain/adapter/FindAdapter.ts similarity index 100% rename from packages/core/src/common/domain/adapter/FindAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/FindAdapter.ts diff --git a/packages/core/src/common/domain/adapter/FindOneAdapter.ts b/packages/core/core-common/src/common/domain/adapter/FindOneAdapter.ts similarity index 100% rename from packages/core/src/common/domain/adapter/FindOneAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/FindOneAdapter.ts diff --git a/packages/core/src/common/domain/adapter/InsertAdapter.ts b/packages/core/core-common/src/common/domain/adapter/InsertAdapter.ts similarity index 100% rename from packages/core/src/common/domain/adapter/InsertAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/InsertAdapter.ts diff --git a/packages/core/src/common/domain/adapter/InsertOneAdapter.ts b/packages/core/core-common/src/common/domain/adapter/InsertOneAdapter.ts similarity index 100% rename from packages/core/src/common/domain/adapter/InsertOneAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/InsertOneAdapter.ts diff --git a/packages/core/src/common/domain/adapter/PaginateFindAdapter.ts b/packages/core/core-common/src/common/domain/adapter/PaginateFindAdapter.ts similarity index 63% rename from packages/core/src/common/domain/adapter/PaginateFindAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/PaginateFindAdapter.ts index bda07e02..c22587fa 100644 --- a/packages/core/src/common/domain/adapter/PaginateFindAdapter.ts +++ b/packages/core/core-common/src/common/domain/adapter/PaginateFindAdapter.ts @@ -1,4 +1,4 @@ -import { Pagination } from '../model/Pagination'; +import { Pagination } from '@nestjs-api-example/core-entity/model'; export interface PaginateFindAdapter { paginateFind(query: TQuery): Promise>; diff --git a/packages/core/src/common/domain/adapter/UpdateAdapter.ts b/packages/core/core-common/src/common/domain/adapter/UpdateAdapter.ts similarity index 100% rename from packages/core/src/common/domain/adapter/UpdateAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/UpdateAdapter.ts diff --git a/packages/core/src/common/domain/adapter/UpdateOneAdapter.ts b/packages/core/core-common/src/common/domain/adapter/UpdateOneAdapter.ts similarity index 100% rename from packages/core/src/common/domain/adapter/UpdateOneAdapter.ts rename to packages/core/core-common/src/common/domain/adapter/UpdateOneAdapter.ts diff --git a/packages/core/src/common/domain/command/BaseEntityDeleteCommand.ts b/packages/core/core-common/src/common/domain/command/BaseEntityDeleteCommand.ts similarity index 100% rename from packages/core/src/common/domain/command/BaseEntityDeleteCommand.ts rename to packages/core/core-common/src/common/domain/command/BaseEntityDeleteCommand.ts diff --git a/packages/core/src/common/domain/command/BaseEntityInsertCommand.ts b/packages/core/core-common/src/common/domain/command/BaseEntityInsertCommand.ts similarity index 100% rename from packages/core/src/common/domain/command/BaseEntityInsertCommand.ts rename to packages/core/core-common/src/common/domain/command/BaseEntityInsertCommand.ts diff --git a/packages/core/src/common/domain/command/BaseEntityInsertOneCommand.ts b/packages/core/core-common/src/common/domain/command/BaseEntityInsertOneCommand.ts similarity index 100% rename from packages/core/src/common/domain/command/BaseEntityInsertOneCommand.ts rename to packages/core/core-common/src/common/domain/command/BaseEntityInsertOneCommand.ts diff --git a/packages/core/src/common/domain/command/BaseEntitySetCommand.ts b/packages/core/core-common/src/common/domain/command/BaseEntitySetCommand.ts similarity index 100% rename from packages/core/src/common/domain/command/BaseEntitySetCommand.ts rename to packages/core/core-common/src/common/domain/command/BaseEntitySetCommand.ts diff --git a/packages/core/src/common/domain/command/BaseEntityUpdateCommand.ts b/packages/core/core-common/src/common/domain/command/BaseEntityUpdateCommand.ts similarity index 100% rename from packages/core/src/common/domain/command/BaseEntityUpdateCommand.ts rename to packages/core/core-common/src/common/domain/command/BaseEntityUpdateCommand.ts diff --git a/packages/core/src/common/domain/command/BaseEntityUpdateOneCommand.ts b/packages/core/core-common/src/common/domain/command/BaseEntityUpdateOneCommand.ts similarity index 100% rename from packages/core/src/common/domain/command/BaseEntityUpdateOneCommand.ts rename to packages/core/core-common/src/common/domain/command/BaseEntityUpdateOneCommand.ts diff --git a/packages/core/src/common/domain/converter/Converter.ts b/packages/core/core-common/src/common/domain/converter/Converter.ts similarity index 100% rename from packages/core/src/common/domain/converter/Converter.ts rename to packages/core/core-common/src/common/domain/converter/Converter.ts diff --git a/packages/core/src/common/domain/converter/ConverterAsync.ts b/packages/core/core-common/src/common/domain/converter/ConverterAsync.ts similarity index 100% rename from packages/core/src/common/domain/converter/ConverterAsync.ts rename to packages/core/core-common/src/common/domain/converter/ConverterAsync.ts diff --git a/packages/api-graphql/src/common/domain/exception/EntityNotFoundException.ts b/packages/core/core-common/src/common/domain/exception/EntityNotFoundException.ts similarity index 100% rename from packages/api-graphql/src/common/domain/exception/EntityNotFoundException.ts rename to packages/core/core-common/src/common/domain/exception/EntityNotFoundException.ts diff --git a/packages/core/src/common/domain/exception/InvalidArgumentException.ts b/packages/core/core-common/src/common/domain/exception/InvalidArgumentException.ts similarity index 100% rename from packages/core/src/common/domain/exception/InvalidArgumentException.ts rename to packages/core/core-common/src/common/domain/exception/InvalidArgumentException.ts diff --git a/packages/core/src/common/domain/manager/CountManager.spec.ts b/packages/core/core-common/src/common/domain/manager/CountManager.spec.ts similarity index 100% rename from packages/core/src/common/domain/manager/CountManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/CountManager.spec.ts diff --git a/packages/core/src/common/domain/manager/CountManager.ts b/packages/core/core-common/src/common/domain/manager/CountManager.ts similarity index 100% rename from packages/core/src/common/domain/manager/CountManager.ts rename to packages/core/core-common/src/common/domain/manager/CountManager.ts diff --git a/packages/core/src/common/domain/manager/DeleteManager.spec.ts b/packages/core/core-common/src/common/domain/manager/DeleteManager.spec.ts similarity index 100% rename from packages/core/src/common/domain/manager/DeleteManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/DeleteManager.spec.ts diff --git a/packages/core/src/common/domain/manager/DeleteManager.ts b/packages/core/core-common/src/common/domain/manager/DeleteManager.ts similarity index 100% rename from packages/core/src/common/domain/manager/DeleteManager.ts rename to packages/core/core-common/src/common/domain/manager/DeleteManager.ts diff --git a/packages/core/src/common/domain/manager/FindManager.spec.ts b/packages/core/core-common/src/common/domain/manager/FindManager.spec.ts similarity index 100% rename from packages/core/src/common/domain/manager/FindManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/FindManager.spec.ts diff --git a/packages/core/src/common/domain/manager/FindManager.ts b/packages/core/core-common/src/common/domain/manager/FindManager.ts similarity index 100% rename from packages/core/src/common/domain/manager/FindManager.ts rename to packages/core/core-common/src/common/domain/manager/FindManager.ts diff --git a/packages/core/src/common/domain/manager/FindOneManager.spec.ts b/packages/core/core-common/src/common/domain/manager/FindOneManager.spec.ts similarity index 100% rename from packages/core/src/common/domain/manager/FindOneManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/FindOneManager.spec.ts diff --git a/packages/core/src/common/domain/manager/FindOneManager.ts b/packages/core/core-common/src/common/domain/manager/FindOneManager.ts similarity index 100% rename from packages/core/src/common/domain/manager/FindOneManager.ts rename to packages/core/core-common/src/common/domain/manager/FindOneManager.ts diff --git a/packages/core/src/common/domain/manager/InsertManager.spec.ts b/packages/core/core-common/src/common/domain/manager/InsertManager.spec.ts similarity index 100% rename from packages/core/src/common/domain/manager/InsertManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/InsertManager.spec.ts diff --git a/packages/core/src/common/domain/manager/InsertManager.ts b/packages/core/core-common/src/common/domain/manager/InsertManager.ts similarity index 100% rename from packages/core/src/common/domain/manager/InsertManager.ts rename to packages/core/core-common/src/common/domain/manager/InsertManager.ts diff --git a/packages/core/src/common/domain/manager/InsertOneManager.spec.ts b/packages/core/core-common/src/common/domain/manager/InsertOneManager.spec.ts similarity index 100% rename from packages/core/src/common/domain/manager/InsertOneManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/InsertOneManager.spec.ts diff --git a/packages/core/src/common/domain/manager/InsertOneManager.ts b/packages/core/core-common/src/common/domain/manager/InsertOneManager.ts similarity index 100% rename from packages/core/src/common/domain/manager/InsertOneManager.ts rename to packages/core/core-common/src/common/domain/manager/InsertOneManager.ts diff --git a/packages/core/src/common/domain/manager/Manager.ts b/packages/core/core-common/src/common/domain/manager/Manager.ts similarity index 100% rename from packages/core/src/common/domain/manager/Manager.ts rename to packages/core/core-common/src/common/domain/manager/Manager.ts diff --git a/packages/core/src/common/domain/manager/ManagerAsync.ts b/packages/core/core-common/src/common/domain/manager/ManagerAsync.ts similarity index 100% rename from packages/core/src/common/domain/manager/ManagerAsync.ts rename to packages/core/core-common/src/common/domain/manager/ManagerAsync.ts diff --git a/packages/core/src/common/domain/manager/PaginateFindManager.spec.ts b/packages/core/core-common/src/common/domain/manager/PaginateFindManager.spec.ts similarity index 96% rename from packages/core/src/common/domain/manager/PaginateFindManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/PaginateFindManager.spec.ts index 35c4b8dc..66c29913 100644 --- a/packages/core/src/common/domain/manager/PaginateFindManager.spec.ts +++ b/packages/core/core-common/src/common/domain/manager/PaginateFindManager.spec.ts @@ -1,8 +1,9 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; +import { Pagination } from '@nestjs-api-example/core-entity/model'; + import { PaginateFindManager } from './PaginateFindManager'; import { PaginateFindAdapter } from '../adapter/PaginateFindAdapter'; -import { Pagination } from '../model/Pagination'; interface QueryTest { foo: unknown; diff --git a/packages/core/src/common/domain/manager/PaginateFindManager.ts b/packages/core/core-common/src/common/domain/manager/PaginateFindManager.ts similarity index 89% rename from packages/core/src/common/domain/manager/PaginateFindManager.ts rename to packages/core/core-common/src/common/domain/manager/PaginateFindManager.ts index ceddd85b..82298aff 100644 --- a/packages/core/src/common/domain/manager/PaginateFindManager.ts +++ b/packages/core/core-common/src/common/domain/manager/PaginateFindManager.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; +import { Pagination } from '@nestjs-api-example/core-entity/model'; import { ManagerAsync } from './ManagerAsync'; import { PaginateFindAdapter } from '../adapter/PaginateFindAdapter'; -import { Pagination } from '../model/Pagination'; @Injectable() export class PaginateFindManager implements ManagerAsync> { diff --git a/packages/core/src/common/domain/manager/UpdateManager.spec.ts b/packages/core/core-common/src/common/domain/manager/UpdateManager.spec.ts similarity index 100% rename from packages/core/src/common/domain/manager/UpdateManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/UpdateManager.spec.ts diff --git a/packages/core/src/common/domain/manager/UpdateManager.ts b/packages/core/core-common/src/common/domain/manager/UpdateManager.ts similarity index 100% rename from packages/core/src/common/domain/manager/UpdateManager.ts rename to packages/core/core-common/src/common/domain/manager/UpdateManager.ts diff --git a/packages/core/src/common/domain/manager/UpdateOneManager.spec.ts b/packages/core/core-common/src/common/domain/manager/UpdateOneManager.spec.ts similarity index 100% rename from packages/core/src/common/domain/manager/UpdateOneManager.spec.ts rename to packages/core/core-common/src/common/domain/manager/UpdateOneManager.spec.ts diff --git a/packages/core/src/common/domain/manager/UpdateOneManager.ts b/packages/core/core-common/src/common/domain/manager/UpdateOneManager.ts similarity index 100% rename from packages/core/src/common/domain/manager/UpdateOneManager.ts rename to packages/core/core-common/src/common/domain/manager/UpdateOneManager.ts diff --git a/packages/core/src/common/domain/query/AnyEntityCountQuery.ts b/packages/core/core-common/src/common/domain/query/AnyEntityCountQuery.ts similarity index 100% rename from packages/core/src/common/domain/query/AnyEntityCountQuery.ts rename to packages/core/core-common/src/common/domain/query/AnyEntityCountQuery.ts diff --git a/packages/core/src/common/domain/query/AnyEntityFindQuery.ts b/packages/core/core-common/src/common/domain/query/AnyEntityFindQuery.ts similarity index 100% rename from packages/core/src/common/domain/query/AnyEntityFindQuery.ts rename to packages/core/core-common/src/common/domain/query/AnyEntityFindQuery.ts diff --git a/packages/core/src/common/domain/query/AnyEntityPaginateFindQuery.ts b/packages/core/core-common/src/common/domain/query/AnyEntityPaginateFindQuery.ts similarity index 70% rename from packages/core/src/common/domain/query/AnyEntityPaginateFindQuery.ts rename to packages/core/core-common/src/common/domain/query/AnyEntityPaginateFindQuery.ts index 7f41b96e..cba003aa 100644 --- a/packages/core/src/common/domain/query/AnyEntityPaginateFindQuery.ts +++ b/packages/core/core-common/src/common/domain/query/AnyEntityPaginateFindQuery.ts @@ -1,5 +1,6 @@ +import { PaginationOptions } from '@nestjs-api-example/core-entity/model'; + import { AnyEntityFindQuery } from './AnyEntityFindQuery'; -import { PaginationOptions } from '../model/PaginationOptions'; export interface AnyEntityPaginateFindQuery { findQuery: AnyEntityFindQuery; diff --git a/packages/core/src/common/domain/query/BaseEntityFindOneQuery.ts b/packages/core/core-common/src/common/domain/query/BaseEntityFindOneQuery.ts similarity index 100% rename from packages/core/src/common/domain/query/BaseEntityFindOneQuery.ts rename to packages/core/core-common/src/common/domain/query/BaseEntityFindOneQuery.ts diff --git a/packages/core/src/common/domain/query/BaseEntityFindQuery.ts b/packages/core/core-common/src/common/domain/query/BaseEntityFindQuery.ts similarity index 61% rename from packages/core/src/common/domain/query/BaseEntityFindQuery.ts rename to packages/core/core-common/src/common/domain/query/BaseEntityFindQuery.ts index e6d44b08..4951333f 100644 --- a/packages/core/src/common/domain/query/BaseEntityFindQuery.ts +++ b/packages/core/core-common/src/common/domain/query/BaseEntityFindQuery.ts @@ -1,4 +1,4 @@ -import { BaseEntitySortKeyAndOrderType } from '../model/BaseEntitySortKeyAndOrderType'; +import { BaseEntitySortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; export interface BaseEntityFindQuery { ids: string[] | undefined; diff --git a/packages/core/src/common/domain/query/BaseEntityPaginateFindQuery.ts b/packages/core/core-common/src/common/domain/query/BaseEntityPaginateFindQuery.ts similarity index 70% rename from packages/core/src/common/domain/query/BaseEntityPaginateFindQuery.ts rename to packages/core/core-common/src/common/domain/query/BaseEntityPaginateFindQuery.ts index 977d4d03..8aac5b1b 100644 --- a/packages/core/src/common/domain/query/BaseEntityPaginateFindQuery.ts +++ b/packages/core/core-common/src/common/domain/query/BaseEntityPaginateFindQuery.ts @@ -1,5 +1,6 @@ +import { PaginationOptions } from '@nestjs-api-example/core-entity/model'; + import { BaseEntityFindQuery } from './BaseEntityFindQuery'; -import { PaginationOptions } from '../model/PaginationOptions'; export interface BaseEntityPaginateFindQuery { findQuery: BaseEntityFindQuery; diff --git a/packages/core/src/common/fixtures/domain/command/BaseEntityDeleteCommandFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/command/BaseEntityDeleteCommandFixtures.ts similarity index 81% rename from packages/core/src/common/fixtures/domain/command/BaseEntityDeleteCommandFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/command/BaseEntityDeleteCommandFixtures.ts index 96e4955c..aa36123a 100644 --- a/packages/core/src/common/fixtures/domain/command/BaseEntityDeleteCommandFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/domain/command/BaseEntityDeleteCommandFixtures.ts @@ -1,5 +1,6 @@ +import { BaseEntityFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { BaseEntityDeleteCommand } from '../../../domain/command/BaseEntityDeleteCommand'; -import { BaseEntityFixtures } from '../model/BaseEntityFixtures'; export class BaseEntityDeleteCommandFixtures { public static get withId(): BaseEntityDeleteCommand { diff --git a/packages/core/src/common/fixtures/domain/command/BaseEntityInsertCommandFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/command/BaseEntityInsertCommandFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/command/BaseEntityInsertCommandFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/command/BaseEntityInsertCommandFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/command/BaseEntityInsertOneCommandFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/command/BaseEntityInsertOneCommandFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/command/BaseEntityInsertOneCommandFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/command/BaseEntityInsertOneCommandFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/command/BaseEntitySetCommandFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/command/BaseEntitySetCommandFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/command/BaseEntitySetCommandFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/command/BaseEntitySetCommandFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/command/BaseEntityUpdateOneCommandFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/command/BaseEntityUpdateOneCommandFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/command/BaseEntityUpdateOneCommandFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/command/BaseEntityUpdateOneCommandFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/query/AnyEntityFindQueryFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/query/AnyEntityFindQueryFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/query/AnyEntityFindQueryFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/query/AnyEntityFindQueryFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/query/AnyEntityPaginateFindQueryFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/query/AnyEntityPaginateFindQueryFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/query/AnyEntityPaginateFindQueryFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/query/AnyEntityPaginateFindQueryFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/query/BaseEntityFindOneQueryFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/query/BaseEntityFindOneQueryFixtures.ts similarity index 85% rename from packages/core/src/common/fixtures/domain/query/BaseEntityFindOneQueryFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/query/BaseEntityFindOneQueryFixtures.ts index d3556bcf..daa96f8c 100644 --- a/packages/core/src/common/fixtures/domain/query/BaseEntityFindOneQueryFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/domain/query/BaseEntityFindOneQueryFixtures.ts @@ -1,5 +1,6 @@ +import { BaseEntitySortKeyAndOrderTypeFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { BaseEntityFindOneQuery } from '../../../domain/query/BaseEntityFindOneQuery'; -import { BaseEntitySortKeyAndOrderTypeFixtures } from '../model/BaseEntitySortKeyAndOrderTypeFixtures'; export class BaseEntityFindOneQueryFixtures { public static get any(): BaseEntityFindOneQuery { diff --git a/packages/core/src/common/fixtures/domain/query/BaseEntityFindQueryFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/query/BaseEntityFindQueryFixtures.ts similarity index 83% rename from packages/core/src/common/fixtures/domain/query/BaseEntityFindQueryFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/query/BaseEntityFindQueryFixtures.ts index d8b3ecfe..68f19bf7 100644 --- a/packages/core/src/common/fixtures/domain/query/BaseEntityFindQueryFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/domain/query/BaseEntityFindQueryFixtures.ts @@ -1,6 +1,6 @@ +import { BaseEntityFixtures, BaseEntitySortKeyAndOrderTypeFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { BaseEntityFindQuery } from '../../../domain/query/BaseEntityFindQuery'; -import { BaseEntityFixtures } from '../model/BaseEntityFixtures'; -import { BaseEntitySortKeyAndOrderTypeFixtures } from '../model/BaseEntitySortKeyAndOrderTypeFixtures'; export class BaseEntityFindQueryFixtures { public static get any(): BaseEntityFindQuery { diff --git a/packages/core/src/common/fixtures/domain/query/BaseEntityPaginateFindQueryFixtures.ts b/packages/core/core-common/src/common/fixtures/domain/query/BaseEntityPaginateFindQueryFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/query/BaseEntityPaginateFindQueryFixtures.ts rename to packages/core/core-common/src/common/fixtures/domain/query/BaseEntityPaginateFindQueryFixtures.ts diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityDeleteQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityDeleteQueryMikroOrmFixtures.ts similarity index 65% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityDeleteQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityDeleteQueryMikroOrmFixtures.ts index efbb4aef..20c15612 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityDeleteQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityDeleteQueryMikroOrmFixtures.ts @@ -1,7 +1,6 @@ import { ObjectQuery } from '@mikro-orm/core'; - -import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; -import { BaseEntityMikroOrmFixtures } from '../model/BaseEntityMikroOrmFixtures'; +import { BaseEntityMikroOrmFixtures } from '@nestjs-api-example/core-entity-orm/fixture'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class BaseEntityDeleteQueryMikroOrmFixtures { public static get withId(): ObjectQuery { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertOneQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertOneQueryMikroOrmFixtures.ts similarity index 76% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertOneQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertOneQueryMikroOrmFixtures.ts index a76bd8c3..7dce6c59 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertOneQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertOneQueryMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { RequiredEntityData } from '@mikro-orm/core'; - -import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class BaseEntityInsertOneQueryMikroOrmFixtures { public static get any(): RequiredEntityData { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertQueryMikroOrmFixtures.ts similarity index 88% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertQueryMikroOrmFixtures.ts index 8a567126..e622d333 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntityInsertQueryMikroOrmFixtures.ts @@ -1,7 +1,7 @@ import { RequiredEntityData } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityInsertOneQueryMikroOrmFixtures } from './BaseEntityInsertOneQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; export class BaseEntityInsertQueryMikroOrmFixtures { public static get any(): RequiredEntityData[] { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntitySetQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntitySetQueryMikroOrmFixtures.ts similarity index 73% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntitySetQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntitySetQueryMikroOrmFixtures.ts index f3c963b0..6bbfe4a9 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntitySetQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/command/BaseEntitySetQueryMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { EntityData } from '@mikro-orm/core'; - -import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class BaseEntitySetQueryMikroOrmFixtures { public static get any(): EntityData { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindOptionsQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindOptionsQueryMikroOrmFixtures.ts similarity index 84% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindOptionsQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindOptionsQueryMikroOrmFixtures.ts index 3c1d63a1..24e489a0 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindOptionsQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindOptionsQueryMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { FindOptions } from '@mikro-orm/core'; - -import { AnyEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/AnyEntityMikroOrm'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class AnyEntityFindOptionsQueryMikroOrmFixtures { public static get any(): FindOptions { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindQueryMikroOrmFixtures.ts similarity index 74% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindQueryMikroOrmFixtures.ts index 9817a04c..78fc260e 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/AnyEntityFindQueryMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { ObjectQuery } from '@mikro-orm/core'; - -import { AnyEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/AnyEntityMikroOrm'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class AnyEntityFindQueryMikroOrmFixtures { public static get any(): ObjectQuery { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOneOptionsQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOneOptionsQueryMikroOrmFixtures.ts similarity index 87% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOneOptionsQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOneOptionsQueryMikroOrmFixtures.ts index 014588db..f996d1e7 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOneOptionsQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOneOptionsQueryMikroOrmFixtures.ts @@ -1,7 +1,7 @@ import { FindOneOptions } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityQueryOrderMapMikroOrmFixtures } from './BaseEntityQueryOrderMapMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; export class BaseEntityFindOneOptionsQueryMikroOrmFixtures { public static get any(): FindOneOptions { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOptionsQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOptionsQueryMikroOrmFixtures.ts similarity index 90% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOptionsQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOptionsQueryMikroOrmFixtures.ts index 4da6e70f..03e712a6 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOptionsQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindOptionsQueryMikroOrmFixtures.ts @@ -1,7 +1,7 @@ import { FindOptions } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityQueryOrderMapMikroOrmFixtures } from './BaseEntityQueryOrderMapMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; export class BaseEntityFindOptionsQueryMikroOrmFixtures { public static get any(): FindOptions { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindQueryMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindQueryMikroOrmFixtures.ts similarity index 74% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindQueryMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindQueryMikroOrmFixtures.ts index 96dba20f..cc54a4a6 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindQueryMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityFindQueryMikroOrmFixtures.ts @@ -1,7 +1,6 @@ import { ObjectQuery } from '@mikro-orm/core'; - -import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; -import { BaseEntityMikroOrmFixtures } from '../model/BaseEntityMikroOrmFixtures'; +import { BaseEntityMikroOrmFixtures } from '@nestjs-api-example/core-entity-orm/fixture'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class BaseEntityFindQueryMikroOrmFixtures { public static get any(): ObjectQuery { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityQueryOrderMapMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityQueryOrderMapMikroOrmFixtures.ts similarity index 91% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityQueryOrderMapMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityQueryOrderMapMikroOrmFixtures.ts index 897817a7..0a4cfc51 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityQueryOrderMapMikroOrmFixtures.ts +++ b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/BaseEntityQueryOrderMapMikroOrmFixtures.ts @@ -1,6 +1,5 @@ import { QueryOrder, QueryOrderMap } from '@mikro-orm/core'; - -import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; export class BaseEntityQueryOrderMapMikroOrmFixtures { public static get any(): QueryOrderMap { diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/query/QueryOrderMikroOrmFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/QueryOrderMikroOrmFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/query/QueryOrderMikroOrmFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/mikroOrm/query/QueryOrderMikroOrmFixtures.ts diff --git a/packages/core/src/common/fixtures/infrastructure/postgresql/model/PostgreSqlErrorFixtures.ts b/packages/core/core-common/src/common/fixtures/infrastructure/postgresql/model/PostgreSqlErrorFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/infrastructure/postgresql/model/PostgreSqlErrorFixtures.ts rename to packages/core/core-common/src/common/fixtures/infrastructure/postgresql/model/PostgreSqlErrorFixtures.ts diff --git a/packages/core/src/common/infrastructure/injection/CommonModule.ts b/packages/core/core-common/src/common/infrastructure/injection/CommonCoreModule.ts similarity index 92% rename from packages/core/src/common/infrastructure/injection/CommonModule.ts rename to packages/core/core-common/src/common/infrastructure/injection/CommonCoreModule.ts index 9015e838..84e6781e 100644 --- a/packages/core/src/common/infrastructure/injection/CommonModule.ts +++ b/packages/core/core-common/src/common/infrastructure/injection/CommonCoreModule.ts @@ -9,4 +9,4 @@ const converters: Provider>[] = [OrderTypeToQueryOrd exports: [...converters], providers: [...converters], }) -export class CommonModule {} +export class CommonCoreModule {} diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.spec.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.ts similarity index 91% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.ts index 8ea46e86..c393022b 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/CountMikroOrmAdapter.ts @@ -1,9 +1,9 @@ import { EntityRepository, ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { CountAdapter } from '../../../domain/adapter/CountAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class CountMikroOrmAdapter implements CountAdapter { diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.spec.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.ts similarity index 94% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.ts index e4255927..d30a9e6a 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/DeleteMikroOrmAdapter.ts @@ -1,12 +1,12 @@ import { EntityRepository, ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { DeleteAdapter } from '../../../domain/adapter/DeleteAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { InvalidArgumentException } from '../../../domain/exception/InvalidArgumentException'; import { PostgreSqlErrorType } from '../../postgresql/model/PostgreSqlErrorType'; import { isPostgreSqlErrorWithErrorType } from '../../postgresql/typeguard/isPostgreSqlErrorWithErrorType'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class DeleteMikroOrmAdapter implements DeleteAdapter { diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.spec.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.ts similarity index 94% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.ts index 4ba9eb59..51c170f6 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindMikroOrmAdapter.ts @@ -1,9 +1,9 @@ import { EntityRepository, FindOptions, ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { FindAdapter } from '../../../domain/adapter/FindAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class FindMikroOrmAdapter diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter.spec.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/FindOneMikroOrmAdapter.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.spec.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.ts similarity index 96% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.ts index 07e70323..512af715 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertMikroOrmAdapter.ts @@ -1,12 +1,12 @@ import { EntityManager, EntityRepository, RequiredEntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { InsertAdapter } from '../../../domain/adapter/InsertAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { InvalidArgumentException } from '../../../domain/exception/InvalidArgumentException'; import { PostgreSqlErrorType } from '../../postgresql/model/PostgreSqlErrorType'; import { isPostgreSqlErrorWithErrorType } from '../../postgresql/typeguard/isPostgreSqlErrorWithErrorType'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class InsertMikroOrmAdapter diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.spec.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.ts similarity index 96% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.ts index dcf5ed2b..276a21a0 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/InsertOneMikroOrmAdapter.ts @@ -1,12 +1,12 @@ import { EntityManager, EntityRepository, RequiredEntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { InsertOneAdapter } from '../../../domain/adapter/InsertOneAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { InvalidArgumentException } from '../../../domain/exception/InvalidArgumentException'; import { PostgreSqlErrorType } from '../../postgresql/model/PostgreSqlErrorType'; import { isPostgreSqlErrorWithErrorType } from '../../postgresql/typeguard/isPostgreSqlErrorWithErrorType'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class InsertOneMikroOrmAdapter diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.spec.ts similarity index 98% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.spec.ts index 5f996236..d9b41c61 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.spec.ts @@ -1,10 +1,10 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { EntityRepository, FindOptions, Loaded, ObjectQuery } from '@mikro-orm/core'; +import { Pagination } from '@nestjs-api-example/core-entity/model'; import { PaginateFindMikroOrmAdapter } from './PaginateFindMikroOrmAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { Pagination } from '../../../domain/model/Pagination'; interface QueryTest { foo: unknown; diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.ts similarity index 92% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.ts index 1bc760d6..d35e788d 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/PaginateFindMikroOrmAdapter.ts @@ -1,10 +1,10 @@ import { EntityRepository, FindOptions, ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { Pagination } from '@nestjs-api-example/core-entity/model'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { PaginateFindAdapter } from '../../../domain/adapter/PaginateFindAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { Pagination } from '../../../domain/model/Pagination'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class PaginateFindMikroOrmAdapter diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.spec.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.ts similarity index 96% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.ts index 746c0633..f875eba4 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateMikroOrmAdapter.ts @@ -1,12 +1,12 @@ import { EntityData, EntityManager, EntityRepository, ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { UpdateAdapter } from '../../../domain/adapter/UpdateAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { InvalidArgumentException } from '../../../domain/exception/InvalidArgumentException'; import { PostgreSqlErrorType } from '../../postgresql/model/PostgreSqlErrorType'; import { isPostgreSqlErrorWithErrorType } from '../../postgresql/typeguard/isPostgreSqlErrorWithErrorType'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class UpdateMikroOrmAdapter implements UpdateAdapter { diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.spec.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.ts similarity index 96% rename from packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.ts index 11b023a8..7b1fb79e 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/adapter/UpdateOneMikroOrmAdapter.ts @@ -1,12 +1,12 @@ import { EntityData, EntityManager, EntityRepository, ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { UpdateOneAdapter } from '../../../domain/adapter/UpdateOneAdapter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { InvalidArgumentException } from '../../../domain/exception/InvalidArgumentException'; import { PostgreSqlErrorType } from '../../postgresql/model/PostgreSqlErrorType'; import { isPostgreSqlErrorWithErrorType } from '../../postgresql/typeguard/isPostgreSqlErrorWithErrorType'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class UpdateOneMikroOrmAdapter diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.spec.ts similarity index 89% rename from packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.spec.ts index caceda79..eeb1b063 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.spec.ts @@ -1,14 +1,15 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; +import { AnyEntity } from '@mikro-orm/core'; +import { AnyEntityFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Pagination } from '@nestjs-api-example/core-entity/model'; +import { AnyEntityMikroOrmFixtures } from '@nestjs-api-example/core-entity-orm/fixture'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; + import { AnyEntityMikroOrmToPaginationEntityConverterAsync } from './AnyEntityMikroOrmToPaginationEntityConverterAsync'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { AnyEntity } from '../../../domain/model/AnyEntity'; -import { Pagination } from '../../../domain/model/Pagination'; import { AnyEntityPaginateFindQuery } from '../../../domain/query/AnyEntityPaginateFindQuery'; -import { AnyEntityFixtures } from '../../../fixtures/domain/model/AnyEntityFixtures'; import { AnyEntityPaginateFindQueryFixtures } from '../../../fixtures/domain/query/AnyEntityPaginateFindQueryFixtures'; -import { AnyEntityMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/model/AnyEntityMikroOrmFixtures'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; describe(AnyEntityMikroOrmToPaginationEntityConverterAsync.name, () => { let modelDbToModelConverterAsyncMock: jest.Mocked>; diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.ts similarity index 84% rename from packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.ts index 1b1ac4ec..ee2455a2 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync.ts @@ -1,11 +1,10 @@ +import { AnyEntity } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { Pagination, PaginationMeta } from '@nestjs-api-example/core-entity/model'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { AnyEntity } from '../../../domain/model/AnyEntity'; -import { Pagination } from '../../../domain/model/Pagination'; -import { PaginationMeta } from '../../../domain/model/PaginationMeta'; import { AnyEntityPaginateFindQuery } from '../../../domain/query/AnyEntityPaginateFindQuery'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class AnyEntityMikroOrmToPaginationEntityConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts index ef3f9385..740388fa 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts @@ -1,6 +1,7 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { FindOptions } from '@mikro-orm/core'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync } from './AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; @@ -8,7 +9,6 @@ import { AnyEntityFindQuery } from '../../../domain/query/AnyEntityFindQuery'; import { AnyEntityPaginateFindQuery } from '../../../domain/query/AnyEntityPaginateFindQuery'; import { AnyEntityPaginateFindQueryFixtures } from '../../../fixtures/domain/query/AnyEntityPaginateFindQueryFixtures'; import { AnyEntityFindOptionsQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/AnyEntityFindOptionsQueryMikroOrmFixtures'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; describe(AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.name, () => { let anyEntityFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsyncMock: jest.Mocked< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.spec.ts index 60353a9b..fb189106 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.spec.ts @@ -1,6 +1,7 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { ObjectQuery } from '@mikro-orm/core'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync } from './AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; @@ -8,7 +9,6 @@ import { AnyEntityFindQuery } from '../../../domain/query/AnyEntityFindQuery'; import { AnyEntityPaginateFindQuery } from '../../../domain/query/AnyEntityPaginateFindQuery'; import { AnyEntityPaginateFindQueryFixtures } from '../../../fixtures/domain/query/AnyEntityPaginateFindQueryFixtures'; import { AnyEntityFindQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/AnyEntityFindQueryMikroOrmFixtures'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; describe(AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.name, () => { let anyEntityFindQueryToAnyEntityFindQueryMikroOrmConverterAsyncMock: jest.Mocked< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.ts similarity index 92% rename from packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.ts index b05097d4..544dd5f6 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync.ts @@ -1,10 +1,10 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { AnyEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { AnyEntityFindQuery } from '../../../domain/query/AnyEntityFindQuery'; import { AnyEntityPaginateFindQuery } from '../../../domain/query/AnyEntityPaginateFindQuery'; -import { AnyEntityMikroOrm } from '../model/AnyEntityMikroOrm'; @Injectable() export class AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.spec.ts index 0737073a..e8412f23 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.spec.ts @@ -1,12 +1,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { ObjectQuery } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync } from './BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync'; import { BaseEntityDeleteCommand } from '../../../domain/command/BaseEntityDeleteCommand'; import { BaseEntityDeleteCommandFixtures } from '../../../fixtures/domain/command/BaseEntityDeleteCommandFixtures'; import { BaseEntityDeleteQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/command/BaseEntityDeleteQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; class BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsyncTest extends BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync< BaseEntityDeleteCommand, diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.ts similarity index 94% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.ts index bc9dd792..7d76d5c4 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync.ts @@ -1,9 +1,9 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityDeleteCommand } from '../../../domain/command/BaseEntityDeleteCommand'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export abstract class BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.spec.ts index 96e9158c..e57bdf66 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.spec.ts @@ -1,14 +1,14 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { FindOneOptions, QueryOrderMap } from '@mikro-orm/core'; +import { BaseEntitySortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync } from './BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync'; import { Converter } from '../../../domain/converter/Converter'; -import { BaseEntitySortKeyAndOrderType } from '../../../domain/model/BaseEntitySortKeyAndOrderType'; import { BaseEntityFindOneQuery } from '../../../domain/query/BaseEntityFindOneQuery'; import { BaseEntityFindOneQueryFixtures } from '../../../fixtures/domain/query/BaseEntityFindOneQueryFixtures'; import { BaseEntityFindOneOptionsQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/BaseEntityFindOneOptionsQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; class BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsyncTest extends BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync< BaseEntityFindOneQuery, diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.ts similarity index 92% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.ts index 7d9b3a0f..28800e05 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync.ts @@ -1,11 +1,11 @@ import { AnyEntity, FindOneOptions, QueryOrderMap } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntitySortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { Converter } from '../../../domain/converter/Converter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntitySortKeyAndOrderType } from '../../../domain/model/BaseEntitySortKeyAndOrderType'; import { BaseEntityFindOneQuery } from '../../../domain/query/BaseEntityFindOneQuery'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export abstract class BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts similarity index 96% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts index fc33eb06..117fdc35 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.spec.ts @@ -1,14 +1,14 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { FindOptions, QueryOrderMap } from '@mikro-orm/core'; +import { BaseEntitySortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync } from './BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync'; import { Converter } from '../../../domain/converter/Converter'; -import { BaseEntitySortKeyAndOrderType } from '../../../domain/model/BaseEntitySortKeyAndOrderType'; import { BaseEntityFindQuery } from '../../../domain/query/BaseEntityFindQuery'; import { BaseEntityFindQueryFixtures } from '../../../fixtures/domain/query/BaseEntityFindQueryFixtures'; import { BaseEntityFindOptionsQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/BaseEntityFindOptionsQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; class BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsyncTest extends BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync< BaseEntityFindQuery, diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.ts similarity index 92% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.ts index 21cf7dce..786a2241 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync.ts @@ -1,11 +1,11 @@ import { AnyEntity, FindOptions, QueryOrderMap } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntitySortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { Converter } from '../../../domain/converter/Converter'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntitySortKeyAndOrderType } from '../../../domain/model/BaseEntitySortKeyAndOrderType'; import { BaseEntityFindQuery } from '../../../domain/query/BaseEntityFindQuery'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export abstract class BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts index 8a144b28..2863b99f 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts @@ -1,12 +1,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { ObjectQuery } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync } from './BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync'; import { BaseEntityFindQuery } from '../../../domain/query/BaseEntityFindQuery'; import { BaseEntityFindQueryFixtures } from '../../../fixtures/domain/query/BaseEntityFindQueryFixtures'; import { BaseEntityFindQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/BaseEntityFindQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; class BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsyncTest extends BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync< BaseEntityFindQuery, diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.ts similarity index 94% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.ts index 2438ad3b..cfd84add 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.ts @@ -1,9 +1,9 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { BaseEntityFindQuery } from '../../../domain/query/BaseEntityFindQuery'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export abstract class BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.spec.ts index d5b6adc2..8c207ece 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.spec.ts @@ -1,6 +1,7 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { RequiredEntityData } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync } from './BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync'; import { BaseEntityInsertCommand } from '../../../domain/command/BaseEntityInsertCommand'; @@ -8,7 +9,6 @@ import { BaseEntityInsertOneCommand } from '../../../domain/command/BaseEntityIn import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { BaseEntityInsertCommandFixtures } from '../../../fixtures/domain/command/BaseEntityInsertCommandFixtures'; import { BaseEntityInsertQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/command/BaseEntityInsertQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; describe(BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.name, () => { let baseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsyncMock: jest.Mocked< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.ts similarity index 93% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.ts index 55a94d96..723e2ed5 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync.ts @@ -1,10 +1,10 @@ import { RequiredEntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityInsertCommand } from '../../../domain/command/BaseEntityInsertCommand'; import { BaseEntityInsertOneCommand } from '../../../domain/command/BaseEntityInsertOneCommand'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export class BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.spec.ts similarity index 98% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.spec.ts index 60be97fc..8a1dea0f 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.spec.ts @@ -1,12 +1,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { RequiredEntityData } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync } from './BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync'; import { BaseEntityInsertOneCommand } from '../../../domain/command/BaseEntityInsertOneCommand'; import { BaseEntityInsertOneCommandFixtures } from '../../../fixtures/domain/command/BaseEntityInsertOneCommandFixtures'; import { BaseEntityInsertOneQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/command/BaseEntityInsertOneQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; class BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsyncTest extends BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync< BaseEntityInsertOneCommand, diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.ts similarity index 94% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.ts index 8fc9ad68..a50ff882 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync.ts @@ -1,9 +1,9 @@ import { RequiredEntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityInsertOneCommand } from '../../../domain/command/BaseEntityInsertOneCommand'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export abstract class BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.spec.ts similarity index 90% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.spec.ts index 8fd22795..be1d0432 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.spec.ts @@ -1,10 +1,11 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; +import { BaseEntityFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { BaseEntity } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrmFixtures } from '@nestjs-api-example/core-entity-orm/fixture'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; + import { BaseEntityMikroOrmToBaseEntityConverterAsync } from './BaseEntityMikroOrmToBaseEntityConverterAsync'; -import { BaseEntity } from '../../../domain/model/BaseEntity'; -import { BaseEntityFixtures } from '../../../fixtures/domain/model/BaseEntityFixtures'; -import { BaseEntityMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/model/BaseEntityMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; class BaseEntityMikroOrmToBaseEntityConverterAsyncTest extends BaseEntityMikroOrmToBaseEntityConverterAsync< BaseEntityMikroOrm, diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.ts similarity index 85% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.ts index 435ef4f0..90a30ad5 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; +import { BaseEntity } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntity } from '../../../domain/model/BaseEntity'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export abstract class BaseEntityMikroOrmToBaseEntityConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts index 9c5b2ee5..8f4b84be 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts @@ -1,12 +1,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { EntityData } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync } from './BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync'; import { BaseEntitySetCommand } from '../../../domain/command/BaseEntitySetCommand'; import { BaseEntitySetCommandFixtures } from '../../../fixtures/domain/command/BaseEntitySetCommandFixtures'; import { BaseEntitySetQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/command/BaseEntitySetQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; class BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsyncTest extends BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync< BaseEntitySetCommand, diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts similarity index 93% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts index d3b45100..9d9a3dd2 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts @@ -1,9 +1,9 @@ import { EntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntitySetCommand } from '../../../domain/command/BaseEntitySetCommand'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export abstract class BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.spec.ts similarity index 91% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.spec.ts index 3a4f1dcc..61f87188 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.spec.ts @@ -1,13 +1,13 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { QueryOrderMap } from '@mikro-orm/core'; +import { BaseEntitySortKeyAndOrderTypeFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { BaseEntitySortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter } from './BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter'; import { Converter } from '../../../domain/converter/Converter'; -import { BaseEntitySortKeyAndOrderType } from '../../../domain/model/BaseEntitySortKeyAndOrderType'; -import { BaseEntitySortKeyAndOrderTypeFixtures } from '../../../fixtures/domain/model/BaseEntitySortKeyAndOrderTypeFixtures'; import { BaseEntityQueryOrderMapMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/BaseEntityQueryOrderMapMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; describe(BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.name, () => { let baseEntitySortKeyAndOrderTypeOfToBaseEntityQueryOrderMapMikroOrmConverterMock: jest.Mocked< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.ts similarity index 88% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.ts index c77b85a0..5045e93f 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter.ts @@ -1,9 +1,9 @@ import { QueryOrderMap } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntitySortKeyAndOrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { Converter } from '../../../domain/converter/Converter'; -import { BaseEntitySortKeyAndOrderType } from '../../../domain/model/BaseEntitySortKeyAndOrderType'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export class BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.spec.ts similarity index 95% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.spec.ts index 98506b0f..07c59bb6 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.spec.ts @@ -1,14 +1,13 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { QueryOrder, QueryOrderMap } from '@mikro-orm/core'; +import { BaseEntitySortKeyAndOrderTypeFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { BaseEntitySortKeyAndOrderType, OrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter } from './BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter'; import { Converter } from '../../../domain/converter/Converter'; -import { BaseEntitySortKeyAndOrderType } from '../../../domain/model/BaseEntitySortKeyAndOrderType'; -import { OrderType } from '../../../domain/model/OrderType'; -import { BaseEntitySortKeyAndOrderTypeFixtures } from '../../../fixtures/domain/model/BaseEntitySortKeyAndOrderTypeFixtures'; import { BaseEntityQueryOrderMapMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/BaseEntityQueryOrderMapMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; class BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverterTest extends BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter< BaseEntitySortKeyAndOrderType, diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.ts similarity index 88% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.ts index 63021111..c9b16b83 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter.ts @@ -1,10 +1,9 @@ import { QueryOrder, QueryOrderMap } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntitySortKeyAndOrderType, OrderType } from '@nestjs-api-example/core-entity/model'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { Converter } from '../../../domain/converter/Converter'; -import { BaseEntitySortKeyAndOrderType } from '../../../domain/model/BaseEntitySortKeyAndOrderType'; -import { OrderType } from '../../../domain/model/OrderType'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export abstract class BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts similarity index 93% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts index 7e235b40..12d3d313 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts @@ -1,10 +1,10 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityUpdateCommand } from '../../../domain/command/BaseEntityUpdateCommand'; import { BaseEntityUpdateOneCommand } from '../../../domain/command/BaseEntityUpdateOneCommand'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export class BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts similarity index 93% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts index a0281ab0..77b73b00 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts @@ -1,10 +1,10 @@ import { EntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityUpdateCommand } from '../../../domain/command/BaseEntityUpdateCommand'; import { BaseEntityUpdateOneCommand } from '../../../domain/command/BaseEntityUpdateOneCommand'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export class BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts index 033a6b64..6cd3c559 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.spec.ts @@ -1,6 +1,7 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { ObjectQuery } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync } from './BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync'; import { BaseEntityUpdateOneCommand } from '../../../domain/command/BaseEntityUpdateOneCommand'; @@ -8,7 +9,6 @@ import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { BaseEntityFindQuery } from '../../../domain/query/BaseEntityFindQuery'; import { BaseEntityUpdateOneCommandFixtures } from '../../../fixtures/domain/command/BaseEntityUpdateOneCommandFixtures'; import { BaseEntityFindQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/BaseEntityFindQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; describe(BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.name, () => { let baseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsyncMock: jest.Mocked< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts similarity index 92% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts index b3b01ce5..406bb691 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync.ts @@ -1,10 +1,10 @@ import { ObjectQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityUpdateOneCommand } from '../../../domain/command/BaseEntityUpdateOneCommand'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { BaseEntityFindQuery } from '../../../domain/query/BaseEntityFindQuery'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export class BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts index c20e067f..2839775a 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.spec.ts @@ -1,6 +1,7 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { EntityData } from '@mikro-orm/core'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync } from './BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync'; import { BaseEntitySetCommand } from '../../../domain/command/BaseEntitySetCommand'; @@ -8,7 +9,6 @@ import { BaseEntityUpdateOneCommand } from '../../../domain/command/BaseEntityUp import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; import { BaseEntityUpdateOneCommandFixtures } from '../../../fixtures/domain/command/BaseEntityUpdateOneCommandFixtures'; import { BaseEntitySetQueryMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/command/BaseEntitySetQueryMikroOrmFixtures'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; describe(BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.name, () => { let baseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsyncMock: jest.Mocked< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts similarity index 92% rename from packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts index e567fe32..d90269b2 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts @@ -1,10 +1,10 @@ import { EntityData } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { BaseEntityMikroOrm } from '@nestjs-api-example/core-entity-orm/model'; import { BaseEntitySetCommand } from '../../../domain/command/BaseEntitySetCommand'; import { BaseEntityUpdateOneCommand } from '../../../domain/command/BaseEntityUpdateOneCommand'; import { ConverterAsync } from '../../../domain/converter/ConverterAsync'; -import { BaseEntityMikroOrm } from '../model/BaseEntityMikroOrm'; @Injectable() export class BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync< diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.spec.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.spec.ts similarity index 97% rename from packages/core/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.spec.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.spec.ts index 7bfc551c..deb69ce0 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.spec.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.spec.ts @@ -1,10 +1,10 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { QueryOrder } from '@mikro-orm/core'; +import { OrderTypeFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { OrderType } from '@nestjs-api-example/core-entity/model'; import { OrderTypeToQueryOrderMikroOrmConverter } from './OrderTypeToQueryOrderMikroOrmConverter'; -import { OrderType } from '../../../domain/model/OrderType'; -import { OrderTypeFixtures } from '../../../fixtures/domain/model/OrderTypeFixtures'; import { QueryOrderMikroOrmFixtures } from '../../../fixtures/infrastructure/mikroOrm/query/QueryOrderMikroOrmFixtures'; describe(OrderTypeToQueryOrderMikroOrmConverter.name, () => { diff --git a/packages/core/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.ts b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.ts similarity index 93% rename from packages/core/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.ts rename to packages/core/core-common/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.ts index 535ef50d..741e7a0b 100644 --- a/packages/core/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.ts +++ b/packages/core/core-common/src/common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter.ts @@ -1,8 +1,8 @@ import { QueryOrder } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; +import { OrderType } from '@nestjs-api-example/core-entity/model'; import { Converter } from '../../../domain/converter/Converter'; -import { OrderType } from '../../../domain/model/OrderType'; @Injectable() export class OrderTypeToQueryOrderMikroOrmConverter implements Converter { diff --git a/packages/core/src/common/infrastructure/postgresql/model/PostgreSqlError.ts b/packages/core/core-common/src/common/infrastructure/postgresql/model/PostgreSqlError.ts similarity index 100% rename from packages/core/src/common/infrastructure/postgresql/model/PostgreSqlError.ts rename to packages/core/core-common/src/common/infrastructure/postgresql/model/PostgreSqlError.ts diff --git a/packages/core/src/common/infrastructure/postgresql/model/PostgreSqlErrorType.ts b/packages/core/core-common/src/common/infrastructure/postgresql/model/PostgreSqlErrorType.ts similarity index 100% rename from packages/core/src/common/infrastructure/postgresql/model/PostgreSqlErrorType.ts rename to packages/core/core-common/src/common/infrastructure/postgresql/model/PostgreSqlErrorType.ts diff --git a/packages/core/src/common/infrastructure/postgresql/typeguard/isPostgreSqlError.spec.ts b/packages/core/core-common/src/common/infrastructure/postgresql/typeguard/isPostgreSqlError.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/postgresql/typeguard/isPostgreSqlError.spec.ts rename to packages/core/core-common/src/common/infrastructure/postgresql/typeguard/isPostgreSqlError.spec.ts diff --git a/packages/core/src/common/infrastructure/postgresql/typeguard/isPostgreSqlError.ts b/packages/core/core-common/src/common/infrastructure/postgresql/typeguard/isPostgreSqlError.ts similarity index 100% rename from packages/core/src/common/infrastructure/postgresql/typeguard/isPostgreSqlError.ts rename to packages/core/core-common/src/common/infrastructure/postgresql/typeguard/isPostgreSqlError.ts diff --git a/packages/core/src/common/infrastructure/postgresql/typeguard/isPostgreSqlErrorWithErrorType.spec.ts b/packages/core/core-common/src/common/infrastructure/postgresql/typeguard/isPostgreSqlErrorWithErrorType.spec.ts similarity index 100% rename from packages/core/src/common/infrastructure/postgresql/typeguard/isPostgreSqlErrorWithErrorType.spec.ts rename to packages/core/core-common/src/common/infrastructure/postgresql/typeguard/isPostgreSqlErrorWithErrorType.spec.ts diff --git a/packages/core/src/common/infrastructure/postgresql/typeguard/isPostgreSqlErrorWithErrorType.ts b/packages/core/core-common/src/common/infrastructure/postgresql/typeguard/isPostgreSqlErrorWithErrorType.ts similarity index 100% rename from packages/core/src/common/infrastructure/postgresql/typeguard/isPostgreSqlErrorWithErrorType.ts rename to packages/core/core-common/src/common/infrastructure/postgresql/typeguard/isPostgreSqlErrorWithErrorType.ts diff --git a/packages/core/core-common/src/converter.ts b/packages/core/core-common/src/converter.ts new file mode 100644 index 00000000..c59247fd --- /dev/null +++ b/packages/core/core-common/src/converter.ts @@ -0,0 +1,20 @@ +export { Converter } from './common/domain/converter/Converter'; +export { ConverterAsync } from './common/domain/converter/ConverterAsync'; +export { AnyEntityMikroOrmToPaginationEntityConverterAsync } from './common/infrastructure/mikroOrm/converter/AnyEntityMikroOrmToPaginationEntityConverterAsync'; +export { AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindOptionsQueryMikroOrmConverterAsync'; +export { AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/AnyEntityPaginateFindQueryToAnyEntityFindQueryMikroOrmConverterAsync'; +export { BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityDeleteCommandToBaseEntityDeleteQueryMikroOrmConverterAsync'; +export { BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityFindOneQueryToBaseEntityFindOneOptionsQueryMikroOrmConverterAsync'; +export { BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindOptionsQueryMikroOrmConverterAsync'; +export { BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync'; +export { BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityInsertCommandToBaseEntityInsertQueryMikroOrmConverterAsync'; +export { BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityInsertOneCommandToBaseEntityInsertOneQueryMikroOrmConverterAsync'; +export { BaseEntityMikroOrmToBaseEntityConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityMikroOrmToBaseEntityConverterAsync'; +export { BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync'; +export { BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter } from './common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeArrayToBaseEntityQueryOrderMapMikroOrmArrayConverter'; +export { BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter } from './common/infrastructure/mikroOrm/converter/BaseEntitySortKeyAndOrderTypeToBaseEntityQueryOrderMapMikroOrmConverter'; +export { BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntityFindQueryMikroOrmConverterAsync'; +export { BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityUpdateCommandToBaseEntitySetQueryMikroOrmConverterAsync'; +export { BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntityFindQueryMikroOrmConverterAsync'; +export { BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync } from './common/infrastructure/mikroOrm/converter/BaseEntityUpdateOneCommandToBaseEntitySetQueryMikroOrmConverterAsync'; +export { OrderTypeToQueryOrderMikroOrmConverter } from './common/infrastructure/mikroOrm/converter/OrderTypeToQueryOrderMikroOrmConverter'; diff --git a/packages/core/core-common/src/exception.ts b/packages/core/core-common/src/exception.ts new file mode 100644 index 00000000..f5776b72 --- /dev/null +++ b/packages/core/core-common/src/exception.ts @@ -0,0 +1,4 @@ +import { EntityNotFoundException } from './common/domain/exception/EntityNotFoundException'; +import { InvalidArgumentException } from './common/domain/exception/InvalidArgumentException'; + +export { EntityNotFoundException, InvalidArgumentException }; diff --git a/packages/core/core-common/src/manager.ts b/packages/core/core-common/src/manager.ts new file mode 100644 index 00000000..d2ee9802 --- /dev/null +++ b/packages/core/core-common/src/manager.ts @@ -0,0 +1,25 @@ +import { CountManager } from './common/domain/manager/CountManager'; +import { DeleteManager } from './common/domain/manager/DeleteManager'; +import { FindManager } from './common/domain/manager/FindManager'; +import { FindOneManager } from './common/domain/manager/FindOneManager'; +import { InsertManager } from './common/domain/manager/InsertManager'; +import { InsertOneManager } from './common/domain/manager/InsertOneManager'; +import { Manager } from './common/domain/manager/Manager'; +import { ManagerAsync } from './common/domain/manager/ManagerAsync'; +import { PaginateFindManager } from './common/domain/manager/PaginateFindManager'; +import { UpdateManager } from './common/domain/manager/UpdateManager'; +import { UpdateOneManager } from './common/domain/manager/UpdateOneManager'; + +export { + CountManager, + DeleteManager, + FindManager, + FindOneManager, + InsertManager, + InsertOneManager, + Manager, + ManagerAsync, + PaginateFindManager, + UpdateManager, + UpdateOneManager, +}; diff --git a/packages/core/core-common/src/module.ts b/packages/core/core-common/src/module.ts new file mode 100644 index 00000000..bf3453f5 --- /dev/null +++ b/packages/core/core-common/src/module.ts @@ -0,0 +1 @@ +export { CommonCoreModule } from './common/infrastructure/injection/CommonCoreModule'; diff --git a/packages/core/core-common/src/query.ts b/packages/core/core-common/src/query.ts new file mode 100644 index 00000000..122059d8 --- /dev/null +++ b/packages/core/core-common/src/query.ts @@ -0,0 +1,6 @@ +export { AnyEntityCountQuery } from './common/domain/query/AnyEntityCountQuery'; +export { AnyEntityFindQuery } from './common/domain/query/AnyEntityFindQuery'; +export { AnyEntityPaginateFindQuery } from './common/domain/query/AnyEntityPaginateFindQuery'; +export { BaseEntityFindOneQuery } from './common/domain/query/BaseEntityFindOneQuery'; +export { BaseEntityFindQuery } from './common/domain/query/BaseEntityFindQuery'; +export { BaseEntityPaginateFindQuery } from './common/domain/query/BaseEntityPaginateFindQuery'; diff --git a/packages/core/core-common/src/queryHandler.ts b/packages/core/core-common/src/queryHandler.ts new file mode 100644 index 00000000..1891b788 --- /dev/null +++ b/packages/core/core-common/src/queryHandler.ts @@ -0,0 +1,4 @@ +export { CountQueryHandler } from './common/application/queryHandler/CountQueryHandler'; +export { FindOneQueryHandler } from './common/application/queryHandler/FindOneQueryHandler'; +export { FindQueryHandler } from './common/application/queryHandler/FindQueryHandler'; +export { PaginateFindQueryHandler } from './common/application/queryHandler/PaginateFindQueryHandler'; diff --git a/packages/core/core-common/tsconfig.json b/packages/core/core-common/tsconfig.json new file mode 100644 index 00000000..9ae89d77 --- /dev/null +++ b/packages/core/core-common/tsconfig.json @@ -0,0 +1,10 @@ +{ + "$schema": "http://json.schemastore.org/tsconfig", + "extends": "@nestjs-api-example/typescript-config/tsconfig.base.cjs.json", + "compilerOptions": { + "emitDecoratorMetadata": true, + "outDir": "./lib", + "rootDir": "./src" + }, + "include": ["src"] +} \ No newline at end of file diff --git a/packages/api-rest/.eslintignore b/packages/core/core-config/.eslintignore similarity index 100% rename from packages/api-rest/.eslintignore rename to packages/core/core-config/.eslintignore diff --git a/packages/api-rest/.eslintrc.js b/packages/core/core-config/.eslintrc.js similarity index 100% rename from packages/api-rest/.eslintrc.js rename to packages/core/core-config/.eslintrc.js diff --git a/packages/api-rest/.gitignore b/packages/core/core-config/.gitignore similarity index 100% rename from packages/api-rest/.gitignore rename to packages/core/core-config/.gitignore diff --git a/packages/api-rest/.lintstagedrc.json b/packages/core/core-config/.lintstagedrc.json similarity index 100% rename from packages/api-rest/.lintstagedrc.json rename to packages/core/core-config/.lintstagedrc.json diff --git a/packages/api-rest/.npmignore b/packages/core/core-config/.npmignore similarity index 100% rename from packages/api-rest/.npmignore rename to packages/core/core-config/.npmignore diff --git a/packages/api-rest/jest.config.mjs b/packages/core/core-config/jest.config.mjs similarity index 100% rename from packages/api-rest/jest.config.mjs rename to packages/core/core-config/jest.config.mjs diff --git a/packages/api-rest/jest.js.config.mjs b/packages/core/core-config/jest.js.config.mjs similarity index 100% rename from packages/api-rest/jest.js.config.mjs rename to packages/core/core-config/jest.js.config.mjs diff --git a/packages/core/package.json b/packages/core/core-config/package.json similarity index 92% rename from packages/core/package.json rename to packages/core/core-config/package.json index 5cca103a..ec3f69bb 100644 --- a/packages/core/package.json +++ b/packages/core/core-config/package.json @@ -1,5 +1,5 @@ { - "name": "@nestjs-api-example/core", + "name": "@nestjs-api-example/core-config", "version": "1.0.0", "description": "meow meow meow", "author": "Adrián Martínez Jiménez ", @@ -44,10 +44,9 @@ "typescript": "5.3.3" }, "exports": { - "./commands": "./lib/commands.js", - "./models": "./lib/models.js", - "./modules": "./lib/modules.js", - "./queries": "./lib/queries.js" + "./model": "./lib/model.js", + "./module": "./lib/module.js", + "./util": "./lib/util.js" }, "mikro-orm": { "useTsNode": true, diff --git a/packages/api-rest/prettier.config.js b/packages/core/core-config/prettier.config.js similarity index 100% rename from packages/api-rest/prettier.config.js rename to packages/core/core-config/prettier.config.js diff --git a/packages/core/src/config/fixtures/infrastructure/database/DatabaseConfigFixtures.ts b/packages/core/core-config/src/config/fixtures/infrastructure/database/DatabaseConfigFixtures.ts similarity index 100% rename from packages/core/src/config/fixtures/infrastructure/database/DatabaseConfigFixtures.ts rename to packages/core/core-config/src/config/fixtures/infrastructure/database/DatabaseConfigFixtures.ts diff --git a/packages/core/src/config/fixtures/infrastructure/mikroOrm/MikroOrmModuleOptionsFixtures.ts b/packages/core/core-config/src/config/fixtures/infrastructure/mikroOrm/MikroOrmModuleOptionsFixtures.ts similarity index 100% rename from packages/core/src/config/fixtures/infrastructure/mikroOrm/MikroOrmModuleOptionsFixtures.ts rename to packages/core/core-config/src/config/fixtures/infrastructure/mikroOrm/MikroOrmModuleOptionsFixtures.ts diff --git a/packages/core/src/config/infrastructure/app/AppConfig.spec.ts b/packages/core/core-config/src/config/infrastructure/app/AppConfig.spec.ts similarity index 100% rename from packages/core/src/config/infrastructure/app/AppConfig.spec.ts rename to packages/core/core-config/src/config/infrastructure/app/AppConfig.spec.ts diff --git a/packages/core/src/config/infrastructure/app/AppConfig.ts b/packages/core/core-config/src/config/infrastructure/app/AppConfig.ts similarity index 100% rename from packages/core/src/config/infrastructure/app/AppConfig.ts rename to packages/core/core-config/src/config/infrastructure/app/AppConfig.ts diff --git a/packages/core/src/config/infrastructure/database/DatabaseConfig.spec.ts b/packages/core/core-config/src/config/infrastructure/database/DatabaseConfig.spec.ts similarity index 100% rename from packages/core/src/config/infrastructure/database/DatabaseConfig.spec.ts rename to packages/core/core-config/src/config/infrastructure/database/DatabaseConfig.spec.ts diff --git a/packages/core/src/config/infrastructure/database/DatabaseConfig.ts b/packages/core/core-config/src/config/infrastructure/database/DatabaseConfig.ts similarity index 100% rename from packages/core/src/config/infrastructure/database/DatabaseConfig.ts rename to packages/core/core-config/src/config/infrastructure/database/DatabaseConfig.ts diff --git a/packages/core/src/config/infrastructure/database/getMikroOrmModuleOptions.spec.ts b/packages/core/core-config/src/config/infrastructure/database/getMikroOrmModuleOptions.spec.ts similarity index 100% rename from packages/core/src/config/infrastructure/database/getMikroOrmModuleOptions.spec.ts rename to packages/core/core-config/src/config/infrastructure/database/getMikroOrmModuleOptions.spec.ts diff --git a/packages/core/src/config/infrastructure/database/getMikroOrmModuleOptions.ts b/packages/core/core-config/src/config/infrastructure/database/getMikroOrmModuleOptions.ts similarity index 100% rename from packages/core/src/config/infrastructure/database/getMikroOrmModuleOptions.ts rename to packages/core/core-config/src/config/infrastructure/database/getMikroOrmModuleOptions.ts diff --git a/packages/core/src/config/infrastructure/injection/AppConfigModule.ts b/packages/core/core-config/src/config/infrastructure/injection/AppConfigModule.ts similarity index 100% rename from packages/core/src/config/infrastructure/injection/AppConfigModule.ts rename to packages/core/core-config/src/config/infrastructure/injection/AppConfigModule.ts diff --git a/packages/core/src/config/infrastructure/injection/DatabaseConfigModule.ts b/packages/core/core-config/src/config/infrastructure/injection/DatabaseConfigModule.ts similarity index 100% rename from packages/core/src/config/infrastructure/injection/DatabaseConfigModule.ts rename to packages/core/core-config/src/config/infrastructure/injection/DatabaseConfigModule.ts diff --git a/packages/core/src/config/infrastructure/mikroOrm/MikroOrmCliConfig.ts b/packages/core/core-config/src/config/infrastructure/mikroOrm/MikroOrmCliConfig.ts similarity index 100% rename from packages/core/src/config/infrastructure/mikroOrm/MikroOrmCliConfig.ts rename to packages/core/core-config/src/config/infrastructure/mikroOrm/MikroOrmCliConfig.ts diff --git a/packages/core/src/env/domain/adapter/LoadDataAdapter.ts b/packages/core/core-config/src/env/domain/adapter/LoadDataAdapter.ts similarity index 100% rename from packages/core/src/env/domain/adapter/LoadDataAdapter.ts rename to packages/core/core-config/src/env/domain/adapter/LoadDataAdapter.ts diff --git a/packages/core/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.int.spec.env b/packages/core/core-config/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.int.spec.env similarity index 100% rename from packages/core/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.int.spec.env rename to packages/core/core-config/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.int.spec.env diff --git a/packages/core/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.int.spec.ts b/packages/core/core-config/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.int.spec.ts similarity index 100% rename from packages/core/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.int.spec.ts rename to packages/core/core-config/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.int.spec.ts diff --git a/packages/core/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.spec.ts b/packages/core/core-config/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.spec.ts similarity index 100% rename from packages/core/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.spec.ts rename to packages/core/core-config/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.spec.ts diff --git a/packages/core/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.ts b/packages/core/core-config/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.ts similarity index 100% rename from packages/core/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.ts rename to packages/core/core-config/src/env/infrastructure/dotenv/adapter/LoadDataDotenvAdapter.ts diff --git a/packages/core/src/env/infrastructure/envalid/model/EnvToEnvValidatorEnvalidMap.ts b/packages/core/core-config/src/env/infrastructure/envalid/model/EnvToEnvValidatorEnvalidMap.ts similarity index 100% rename from packages/core/src/env/infrastructure/envalid/model/EnvToEnvValidatorEnvalidMap.ts rename to packages/core/core-config/src/env/infrastructure/envalid/model/EnvToEnvValidatorEnvalidMap.ts diff --git a/packages/core/src/envVariable/domain/model/AppEnvVariables.ts b/packages/core/core-config/src/envVariable/domain/model/AppEnvVariables.ts similarity index 100% rename from packages/core/src/envVariable/domain/model/AppEnvVariables.ts rename to packages/core/core-config/src/envVariable/domain/model/AppEnvVariables.ts diff --git a/packages/core/src/envVariable/domain/model/DatabaseEnvVariables.ts b/packages/core/core-config/src/envVariable/domain/model/DatabaseEnvVariables.ts similarity index 100% rename from packages/core/src/envVariable/domain/model/DatabaseEnvVariables.ts rename to packages/core/core-config/src/envVariable/domain/model/DatabaseEnvVariables.ts diff --git a/packages/core/src/envVariable/fixtures/domain/model/AppEnvVariablesFixtures.ts b/packages/core/core-config/src/envVariable/fixtures/domain/model/AppEnvVariablesFixtures.ts similarity index 100% rename from packages/core/src/envVariable/fixtures/domain/model/AppEnvVariablesFixtures.ts rename to packages/core/core-config/src/envVariable/fixtures/domain/model/AppEnvVariablesFixtures.ts diff --git a/packages/core/src/envVariable/fixtures/domain/model/DatabaseEnvVariablesFixtures.ts b/packages/core/core-config/src/envVariable/fixtures/domain/model/DatabaseEnvVariablesFixtures.ts similarity index 100% rename from packages/core/src/envVariable/fixtures/domain/model/DatabaseEnvVariablesFixtures.ts rename to packages/core/core-config/src/envVariable/fixtures/domain/model/DatabaseEnvVariablesFixtures.ts diff --git a/packages/core/src/envVariable/infrastructure/adapter/LoadAppEnvVariablesDotenvAdapter.ts b/packages/core/core-config/src/envVariable/infrastructure/adapter/LoadAppEnvVariablesDotenvAdapter.ts similarity index 100% rename from packages/core/src/envVariable/infrastructure/adapter/LoadAppEnvVariablesDotenvAdapter.ts rename to packages/core/core-config/src/envVariable/infrastructure/adapter/LoadAppEnvVariablesDotenvAdapter.ts diff --git a/packages/core/src/envVariable/infrastructure/adapter/LoadDatabaseEnvVariablesDotenvAdapter.ts b/packages/core/core-config/src/envVariable/infrastructure/adapter/LoadDatabaseEnvVariablesDotenvAdapter.ts similarity index 100% rename from packages/core/src/envVariable/infrastructure/adapter/LoadDatabaseEnvVariablesDotenvAdapter.ts rename to packages/core/core-config/src/envVariable/infrastructure/adapter/LoadDatabaseEnvVariablesDotenvAdapter.ts diff --git a/packages/core/src/envVariable/infrastructure/envalid/model/appEnvVariablesToEnvVariablesValidatorEnvalidMap.ts b/packages/core/core-config/src/envVariable/infrastructure/envalid/model/appEnvVariablesToEnvVariablesValidatorEnvalidMap.ts similarity index 100% rename from packages/core/src/envVariable/infrastructure/envalid/model/appEnvVariablesToEnvVariablesValidatorEnvalidMap.ts rename to packages/core/core-config/src/envVariable/infrastructure/envalid/model/appEnvVariablesToEnvVariablesValidatorEnvalidMap.ts diff --git a/packages/core/src/envVariable/infrastructure/envalid/model/databaseEnvVariablesToEnvVariablesValidatorEnvalidMap.ts b/packages/core/core-config/src/envVariable/infrastructure/envalid/model/databaseEnvVariablesToEnvVariablesValidatorEnvalidMap.ts similarity index 100% rename from packages/core/src/envVariable/infrastructure/envalid/model/databaseEnvVariablesToEnvVariablesValidatorEnvalidMap.ts rename to packages/core/core-config/src/envVariable/infrastructure/envalid/model/databaseEnvVariablesToEnvVariablesValidatorEnvalidMap.ts diff --git a/packages/core/src/envVariable/infrastructure/injection/AppEnvVariableModule.ts b/packages/core/core-config/src/envVariable/infrastructure/injection/AppEnvVariableModule.ts similarity index 100% rename from packages/core/src/envVariable/infrastructure/injection/AppEnvVariableModule.ts rename to packages/core/core-config/src/envVariable/infrastructure/injection/AppEnvVariableModule.ts diff --git a/packages/core/src/envVariable/infrastructure/injection/DatabaseEnvVariableModule.ts b/packages/core/core-config/src/envVariable/infrastructure/injection/DatabaseEnvVariableModule.ts similarity index 100% rename from packages/core/src/envVariable/infrastructure/injection/DatabaseEnvVariableModule.ts rename to packages/core/core-config/src/envVariable/infrastructure/injection/DatabaseEnvVariableModule.ts diff --git a/packages/core/core-config/src/model.ts b/packages/core/core-config/src/model.ts new file mode 100644 index 00000000..903e00ec --- /dev/null +++ b/packages/core/core-config/src/model.ts @@ -0,0 +1,2 @@ +export { AppConfig } from './config/infrastructure/app/AppConfig'; +export { DatabaseConfig } from './config/infrastructure/database/DatabaseConfig'; diff --git a/packages/core/core-config/src/module.ts b/packages/core/core-config/src/module.ts new file mode 100644 index 00000000..0852b5f8 --- /dev/null +++ b/packages/core/core-config/src/module.ts @@ -0,0 +1,2 @@ +export { AppConfigModule } from './config/infrastructure/injection/AppConfigModule'; +export { DatabaseConfigModule } from './config/infrastructure/injection/DatabaseConfigModule'; diff --git a/packages/core/core-config/src/util.ts b/packages/core/core-config/src/util.ts new file mode 100644 index 00000000..a5a0778e --- /dev/null +++ b/packages/core/core-config/src/util.ts @@ -0,0 +1 @@ +export { getMikroOrmModuleOptions } from './config/infrastructure/database/getMikroOrmModuleOptions'; diff --git a/packages/core/core-config/tsconfig.json b/packages/core/core-config/tsconfig.json new file mode 100644 index 00000000..9ae89d77 --- /dev/null +++ b/packages/core/core-config/tsconfig.json @@ -0,0 +1,10 @@ +{ + "$schema": "http://json.schemastore.org/tsconfig", + "extends": "@nestjs-api-example/typescript-config/tsconfig.base.cjs.json", + "compilerOptions": { + "emitDecoratorMetadata": true, + "outDir": "./lib", + "rootDir": "./src" + }, + "include": ["src"] +} \ No newline at end of file diff --git a/packages/core/.eslintignore b/packages/core/core-entity-orm/.eslintignore similarity index 100% rename from packages/core/.eslintignore rename to packages/core/core-entity-orm/.eslintignore diff --git a/packages/core/.eslintrc.js b/packages/core/core-entity-orm/.eslintrc.js similarity index 100% rename from packages/core/.eslintrc.js rename to packages/core/core-entity-orm/.eslintrc.js diff --git a/packages/core/.gitignore b/packages/core/core-entity-orm/.gitignore similarity index 100% rename from packages/core/.gitignore rename to packages/core/core-entity-orm/.gitignore diff --git a/packages/core/.lintstagedrc.json b/packages/core/core-entity-orm/.lintstagedrc.json similarity index 100% rename from packages/core/.lintstagedrc.json rename to packages/core/core-entity-orm/.lintstagedrc.json diff --git a/packages/core/.npmignore b/packages/core/core-entity-orm/.npmignore similarity index 100% rename from packages/core/.npmignore rename to packages/core/core-entity-orm/.npmignore diff --git a/packages/core/jest.config.mjs b/packages/core/core-entity-orm/jest.config.mjs similarity index 100% rename from packages/core/jest.config.mjs rename to packages/core/core-entity-orm/jest.config.mjs diff --git a/packages/core/jest.js.config.mjs b/packages/core/core-entity-orm/jest.js.config.mjs similarity index 100% rename from packages/core/jest.js.config.mjs rename to packages/core/core-entity-orm/jest.js.config.mjs diff --git a/packages/core/core-entity-orm/package.json b/packages/core/core-entity-orm/package.json new file mode 100644 index 00000000..1d04395e --- /dev/null +++ b/packages/core/core-entity-orm/package.json @@ -0,0 +1,72 @@ +{ + "name": "@nestjs-api-example/core-entity-orm", + "version": "1.0.0", + "description": "meow meow meow", + "author": "Adrián Martínez Jiménez ", + "homepage": "https://github.com/Adrianmjim/nestjs-api-example#readme", + "license": "ISC", + "repository": { + "type": "git", + "url": "git+https://github.com/Adrianmjim/nestjs-api-example.git" + }, + "bugs": { + "url": "https://github.com/Adrianmjim/nestjs-api-example/issues" + }, + "dependencies": { + "@nestjs-api-example/core-entity": "workspace:*", + "@mikro-orm/core": "5.9.4", + "@mikro-orm/migrations": "5.9.4", + "@mikro-orm/nestjs": "5.2.2", + "@mikro-orm/postgresql": "5.9.4", + "@nestjs/common": "10.2.10", + "@nestjs/core": "10.2.10", + "@nestjs/cqrs": "10.2.6", + "dotenv": "16.3.1", + "envalid": "8.0.0", + "reflect-metadata": "0.1.14", + "rxjs": "7.8.1" + }, + "devDependencies": { + "@mikro-orm/cli": "5.9.4", + "@jest/globals": "29.7.0", + "@types/node": "20.10.4", + "@typescript-eslint/eslint-plugin": "6.13.2", + "@typescript-eslint/parser": "6.13.2", + "eslint": "8.55.0", + "eslint-import-resolver-typescript": "3.6.1", + "eslint-plugin-import": "2.29.0", + "eslint-plugin-jest": "27.6.0", + "eslint-plugin-prettier": "5.0.1", + "jest": "29.7.0", + "prettier": "3.1.1", + "rimraf": "5.0.5", + "ts-jest": "29.1.1", + "ts-node": "10.9.2", + "typescript": "5.3.3" + }, + "exports": { + "./fixture": "./lib/fixture.js", + "./model": "./lib/model.js" + }, + "mikro-orm": { + "useTsNode": true, + "configPaths": [ + "./src/config/infrastructure/mikroOrm/MikroOrmCliConfig.ts", + "./lib/config/infrastructure/mikroOrm/MikroOrmCliConfig.js" + ] + }, + "scripts": { + "build": "tsc --build tsconfig.json", + "build:clean": "rimraf lib", + "format": "prettier --write ./src/**/*.ts", + "format:check": "prettier --check ./src/**/*.ts", + "lint": "eslint --ext ts --ignore-path .gitignore ./src", + "prebuild": "pnpm run build:clean", + "test": "jest --config=jest.config.mjs --runInBand", + "test:integration:js": "pnpm run test:js --selectProjects Integration", + "test:js": "jest --config=jest.js.config.mjs --runInBand", + "test:js:coverage": "pnpm run test:js --coverage", + "test:uncommitted": "pnpm run test --changedSince=HEAD", + "test:unit:js": "pnpm run test:js --selectProjects Unit" + } +} diff --git a/packages/core/prettier.config.js b/packages/core/core-entity-orm/prettier.config.js similarity index 100% rename from packages/core/prettier.config.js rename to packages/core/core-entity-orm/prettier.config.js diff --git a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/model/CatMikroOrmFixtures.ts b/packages/core/core-entity-orm/src/cat/fixtures/infrastructure/mikroOrm/model/CatMikroOrmFixtures.ts similarity index 88% rename from packages/core/src/cat/fixtures/infrastructure/mikroOrm/model/CatMikroOrmFixtures.ts rename to packages/core/core-entity-orm/src/cat/fixtures/infrastructure/mikroOrm/model/CatMikroOrmFixtures.ts index c8d3a213..701fba78 100644 --- a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/model/CatMikroOrmFixtures.ts +++ b/packages/core/core-entity-orm/src/cat/fixtures/infrastructure/mikroOrm/model/CatMikroOrmFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { CatMikroOrm } from '../../../../infrastructure/mikroOrm/model/CatMikroOrm'; -import { CatFixtures } from '../../../domain/model/CatFixtures'; export class CatMikroOrmFixtures { public static get any(): CatMikroOrm { diff --git a/packages/core/src/cat/fixtures/infrastructure/mikroOrm/model/CatQueryOrderMapMikroOrmFixtures.ts b/packages/core/core-entity-orm/src/cat/fixtures/infrastructure/mikroOrm/model/CatQueryOrderMapMikroOrmFixtures.ts similarity index 100% rename from packages/core/src/cat/fixtures/infrastructure/mikroOrm/model/CatQueryOrderMapMikroOrmFixtures.ts rename to packages/core/core-entity-orm/src/cat/fixtures/infrastructure/mikroOrm/model/CatQueryOrderMapMikroOrmFixtures.ts diff --git a/packages/core/src/cat/infrastructure/mikroOrm/model/CatMikroOrm.ts b/packages/core/core-entity-orm/src/cat/infrastructure/mikroOrm/model/CatMikroOrm.ts similarity index 100% rename from packages/core/src/cat/infrastructure/mikroOrm/model/CatMikroOrm.ts rename to packages/core/core-entity-orm/src/cat/infrastructure/mikroOrm/model/CatMikroOrm.ts diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/model/AnyEntityMikroOrmFixtures.ts b/packages/core/core-entity-orm/src/common/fixtures/infrastructure/mikroOrm/model/AnyEntityMikroOrmFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/model/AnyEntityMikroOrmFixtures.ts rename to packages/core/core-entity-orm/src/common/fixtures/infrastructure/mikroOrm/model/AnyEntityMikroOrmFixtures.ts diff --git a/packages/core/src/common/fixtures/infrastructure/mikroOrm/model/BaseEntityMikroOrmFixtures.ts b/packages/core/core-entity-orm/src/common/fixtures/infrastructure/mikroOrm/model/BaseEntityMikroOrmFixtures.ts similarity index 92% rename from packages/core/src/common/fixtures/infrastructure/mikroOrm/model/BaseEntityMikroOrmFixtures.ts rename to packages/core/core-entity-orm/src/common/fixtures/infrastructure/mikroOrm/model/BaseEntityMikroOrmFixtures.ts index f38c221c..14d23595 100644 --- a/packages/core/src/common/fixtures/infrastructure/mikroOrm/model/BaseEntityMikroOrmFixtures.ts +++ b/packages/core/core-entity-orm/src/common/fixtures/infrastructure/mikroOrm/model/BaseEntityMikroOrmFixtures.ts @@ -1,5 +1,6 @@ +import { BaseEntityFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { BaseEntityMikroOrm } from '../../../../infrastructure/mikroOrm/model/BaseEntityMikroOrm'; -import { BaseEntityFixtures } from '../../../domain/model/BaseEntityFixtures'; export class BaseEntityMikroOrmFixtures { public static get any(): BaseEntityMikroOrm { diff --git a/packages/core/src/common/infrastructure/mikroOrm/migrations/.snapshot-database.json b/packages/core/core-entity-orm/src/common/infrastructure/mikroOrm/migrations/.snapshot-database.json similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/migrations/.snapshot-database.json rename to packages/core/core-entity-orm/src/common/infrastructure/mikroOrm/migrations/.snapshot-database.json diff --git a/packages/core/src/common/infrastructure/mikroOrm/migrations/Migration20230927191758.ts b/packages/core/core-entity-orm/src/common/infrastructure/mikroOrm/migrations/Migration20230927191758.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/migrations/Migration20230927191758.ts rename to packages/core/core-entity-orm/src/common/infrastructure/mikroOrm/migrations/Migration20230927191758.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/model/AnyEntityMikroOrm.ts b/packages/core/core-entity-orm/src/common/infrastructure/mikroOrm/model/AnyEntityMikroOrm.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/model/AnyEntityMikroOrm.ts rename to packages/core/core-entity-orm/src/common/infrastructure/mikroOrm/model/AnyEntityMikroOrm.ts diff --git a/packages/core/src/common/infrastructure/mikroOrm/model/BaseEntityMikroOrm.ts b/packages/core/core-entity-orm/src/common/infrastructure/mikroOrm/model/BaseEntityMikroOrm.ts similarity index 100% rename from packages/core/src/common/infrastructure/mikroOrm/model/BaseEntityMikroOrm.ts rename to packages/core/core-entity-orm/src/common/infrastructure/mikroOrm/model/BaseEntityMikroOrm.ts diff --git a/packages/core/core-entity-orm/src/fixture.ts b/packages/core/core-entity-orm/src/fixture.ts new file mode 100644 index 00000000..e4bb75b5 --- /dev/null +++ b/packages/core/core-entity-orm/src/fixture.ts @@ -0,0 +1,4 @@ +export { CatMikroOrmFixtures } from './cat/fixtures/infrastructure/mikroOrm/model/CatMikroOrmFixtures'; +export { CatQueryOrderMapMikroOrmFixtures } from './cat/fixtures/infrastructure/mikroOrm/model/CatQueryOrderMapMikroOrmFixtures'; +export { AnyEntityMikroOrmFixtures } from './common/fixtures/infrastructure/mikroOrm/model/AnyEntityMikroOrmFixtures'; +export { BaseEntityMikroOrmFixtures } from './common/fixtures/infrastructure/mikroOrm/model/BaseEntityMikroOrmFixtures'; diff --git a/packages/core/core-entity-orm/src/model.ts b/packages/core/core-entity-orm/src/model.ts new file mode 100644 index 00000000..ca92142c --- /dev/null +++ b/packages/core/core-entity-orm/src/model.ts @@ -0,0 +1,3 @@ +export { AnyEntityMikroOrm } from './common/infrastructure/mikroOrm/model/AnyEntityMikroOrm'; +export { BaseEntityMikroOrm } from './common/infrastructure/mikroOrm/model/BaseEntityMikroOrm'; +export { CatMikroOrm } from './cat/infrastructure/mikroOrm/model/CatMikroOrm'; diff --git a/packages/core/core-entity-orm/tsconfig.json b/packages/core/core-entity-orm/tsconfig.json new file mode 100644 index 00000000..9ae89d77 --- /dev/null +++ b/packages/core/core-entity-orm/tsconfig.json @@ -0,0 +1,10 @@ +{ + "$schema": "http://json.schemastore.org/tsconfig", + "extends": "@nestjs-api-example/typescript-config/tsconfig.base.cjs.json", + "compilerOptions": { + "emitDecoratorMetadata": true, + "outDir": "./lib", + "rootDir": "./src" + }, + "include": ["src"] +} \ No newline at end of file diff --git a/packages/core/core-entity/.eslintignore b/packages/core/core-entity/.eslintignore new file mode 100644 index 00000000..e8e77702 --- /dev/null +++ b/packages/core/core-entity/.eslintignore @@ -0,0 +1,2 @@ +**/*.js +**/*.mjs diff --git a/packages/core/core-entity/.eslintrc.js b/packages/core/core-entity/.eslintrc.js new file mode 100644 index 00000000..49fe91d1 --- /dev/null +++ b/packages/core/core-entity/.eslintrc.js @@ -0,0 +1,8 @@ +/** @type { import("eslint").ESLint.ConfigData } */ +module.exports = { + extends: '@nestjs-api-example/eslint-config', + parserOptions: { + project: ['./tsconfig.json'], + tsconfigRootDir: __dirname, + }, +}; diff --git a/packages/core/core-entity/.gitignore b/packages/core/core-entity/.gitignore new file mode 100644 index 00000000..1bfe5ecc --- /dev/null +++ b/packages/core/core-entity/.gitignore @@ -0,0 +1,14 @@ +# Typescript compiled files +/lib/** + +# node modules +/node_modules/ + +# test coverage reports +/coverage + +# Turborepo files +.turbo/ + +# env file +.env diff --git a/packages/core/core-entity/.lintstagedrc.json b/packages/core/core-entity/.lintstagedrc.json new file mode 100644 index 00000000..0061dfc2 --- /dev/null +++ b/packages/core/core-entity/.lintstagedrc.json @@ -0,0 +1,9 @@ +{ + "*.js": [ + "prettier --write" + ], + "*.ts": [ + "prettier --write", + "eslint" + ] +} diff --git a/packages/core/core-entity/.npmignore b/packages/core/core-entity/.npmignore new file mode 100644 index 00000000..126a35b5 --- /dev/null +++ b/packages/core/core-entity/.npmignore @@ -0,0 +1,15 @@ +# Typescript compiled files +/src/** +/lib/**.spec.* + +# node modules +/node_modules/ + +# test coverage reports +/coverage + +# Turborepo files +.turbo/ + +# env file +.env \ No newline at end of file diff --git a/packages/core/core-entity/jest.config.mjs b/packages/core/core-entity/jest.config.mjs new file mode 100644 index 00000000..496a0af2 --- /dev/null +++ b/packages/core/core-entity/jest.config.mjs @@ -0,0 +1,3 @@ +import { tsGlobalConfig } from '@nestjs-api-example/jest-config'; + +export default tsGlobalConfig; diff --git a/packages/core/core-entity/jest.js.config.mjs b/packages/core/core-entity/jest.js.config.mjs new file mode 100644 index 00000000..94ac18cd --- /dev/null +++ b/packages/core/core-entity/jest.js.config.mjs @@ -0,0 +1,3 @@ +import { jsGlobalConfig } from '@nestjs-api-example/jest-config'; + +export default jsGlobalConfig; diff --git a/packages/core/core-entity/package.json b/packages/core/core-entity/package.json new file mode 100644 index 00000000..b0211aee --- /dev/null +++ b/packages/core/core-entity/package.json @@ -0,0 +1,71 @@ +{ + "name": "@nestjs-api-example/core-entity", + "version": "1.0.0", + "description": "meow meow meow", + "author": "Adrián Martínez Jiménez ", + "homepage": "https://github.com/Adrianmjim/nestjs-api-example#readme", + "license": "ISC", + "repository": { + "type": "git", + "url": "git+https://github.com/Adrianmjim/nestjs-api-example.git" + }, + "bugs": { + "url": "https://github.com/Adrianmjim/nestjs-api-example/issues" + }, + "dependencies": { + "@mikro-orm/core": "5.9.4", + "@mikro-orm/migrations": "5.9.4", + "@mikro-orm/nestjs": "5.2.2", + "@mikro-orm/postgresql": "5.9.4", + "@nestjs/common": "10.2.10", + "@nestjs/core": "10.2.10", + "@nestjs/cqrs": "10.2.6", + "dotenv": "16.3.1", + "envalid": "8.0.0", + "reflect-metadata": "0.1.14", + "rxjs": "7.8.1" + }, + "devDependencies": { + "@mikro-orm/cli": "5.9.4", + "@jest/globals": "29.7.0", + "@types/node": "20.10.4", + "@typescript-eslint/eslint-plugin": "6.13.2", + "@typescript-eslint/parser": "6.13.2", + "eslint": "8.55.0", + "eslint-import-resolver-typescript": "3.6.1", + "eslint-plugin-import": "2.29.0", + "eslint-plugin-jest": "27.6.0", + "eslint-plugin-prettier": "5.0.1", + "jest": "29.7.0", + "prettier": "3.1.1", + "rimraf": "5.0.5", + "ts-jest": "29.1.1", + "ts-node": "10.9.2", + "typescript": "5.3.3" + }, + "exports": { + "./fixture": "./lib/fixture.js", + "./model": "./lib/model.js" + }, + "mikro-orm": { + "useTsNode": true, + "configPaths": [ + "./src/config/infrastructure/mikroOrm/MikroOrmCliConfig.ts", + "./lib/config/infrastructure/mikroOrm/MikroOrmCliConfig.js" + ] + }, + "scripts": { + "build": "tsc --build tsconfig.json", + "build:clean": "rimraf lib", + "format": "prettier --write ./src/**/*.ts", + "format:check": "prettier --check ./src/**/*.ts", + "lint": "eslint --ext ts --ignore-path .gitignore ./src", + "prebuild": "pnpm run build:clean", + "test": "jest --config=jest.config.mjs --runInBand", + "test:integration:js": "pnpm run test:js --selectProjects Integration", + "test:js": "jest --config=jest.js.config.mjs --runInBand", + "test:js:coverage": "pnpm run test:js --coverage", + "test:uncommitted": "pnpm run test --changedSince=HEAD", + "test:unit:js": "pnpm run test:js --selectProjects Unit" + } +} diff --git a/packages/eslint-config/prettier.config.js b/packages/core/core-entity/prettier.config.js similarity index 100% rename from packages/eslint-config/prettier.config.js rename to packages/core/core-entity/prettier.config.js diff --git a/packages/core/src/cat/domain/model/Cat.ts b/packages/core/core-entity/src/cat/domain/model/Cat.ts similarity index 100% rename from packages/core/src/cat/domain/model/Cat.ts rename to packages/core/core-entity/src/cat/domain/model/Cat.ts diff --git a/packages/core/src/cat/domain/model/CatSortKeyAndOrderType.ts b/packages/core/core-entity/src/cat/domain/model/CatSortKeyAndOrderType.ts similarity index 100% rename from packages/core/src/cat/domain/model/CatSortKeyAndOrderType.ts rename to packages/core/core-entity/src/cat/domain/model/CatSortKeyAndOrderType.ts diff --git a/packages/core/src/cat/fixtures/domain/model/CatFixtures.ts b/packages/core/core-entity/src/cat/fixtures/domain/model/CatFixtures.ts similarity index 100% rename from packages/core/src/cat/fixtures/domain/model/CatFixtures.ts rename to packages/core/core-entity/src/cat/fixtures/domain/model/CatFixtures.ts diff --git a/packages/core/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts b/packages/core/core-entity/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts similarity index 100% rename from packages/core/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts rename to packages/core/core-entity/src/cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures.ts diff --git a/packages/core/src/common/domain/model/AnyEntity.ts b/packages/core/core-entity/src/common/domain/model/AnyEntity.ts similarity index 100% rename from packages/core/src/common/domain/model/AnyEntity.ts rename to packages/core/core-entity/src/common/domain/model/AnyEntity.ts diff --git a/packages/core/src/common/domain/model/BaseEntity.ts b/packages/core/core-entity/src/common/domain/model/BaseEntity.ts similarity index 100% rename from packages/core/src/common/domain/model/BaseEntity.ts rename to packages/core/core-entity/src/common/domain/model/BaseEntity.ts diff --git a/packages/core/src/common/domain/model/BaseEntitySortKeyAndOrderType.ts b/packages/core/core-entity/src/common/domain/model/BaseEntitySortKeyAndOrderType.ts similarity index 100% rename from packages/core/src/common/domain/model/BaseEntitySortKeyAndOrderType.ts rename to packages/core/core-entity/src/common/domain/model/BaseEntitySortKeyAndOrderType.ts diff --git a/packages/api-graphql/src/common/domain/model/CommonConstants.ts b/packages/core/core-entity/src/common/domain/model/CommonConstants.ts similarity index 100% rename from packages/api-graphql/src/common/domain/model/CommonConstants.ts rename to packages/core/core-entity/src/common/domain/model/CommonConstants.ts diff --git a/packages/core/src/common/domain/model/OrderType.ts b/packages/core/core-entity/src/common/domain/model/OrderType.ts similarity index 100% rename from packages/core/src/common/domain/model/OrderType.ts rename to packages/core/core-entity/src/common/domain/model/OrderType.ts diff --git a/packages/core/src/common/domain/model/Pagination.ts b/packages/core/core-entity/src/common/domain/model/Pagination.ts similarity index 100% rename from packages/core/src/common/domain/model/Pagination.ts rename to packages/core/core-entity/src/common/domain/model/Pagination.ts diff --git a/packages/core/src/common/domain/model/PaginationMeta.ts b/packages/core/core-entity/src/common/domain/model/PaginationMeta.ts similarity index 100% rename from packages/core/src/common/domain/model/PaginationMeta.ts rename to packages/core/core-entity/src/common/domain/model/PaginationMeta.ts diff --git a/packages/core/src/common/domain/model/PaginationOptions.ts b/packages/core/core-entity/src/common/domain/model/PaginationOptions.ts similarity index 100% rename from packages/core/src/common/domain/model/PaginationOptions.ts rename to packages/core/core-entity/src/common/domain/model/PaginationOptions.ts diff --git a/packages/core/src/common/domain/model/PartialAndRequired.ts b/packages/core/core-entity/src/common/domain/model/PartialAndRequired.ts similarity index 100% rename from packages/core/src/common/domain/model/PartialAndRequired.ts rename to packages/core/core-entity/src/common/domain/model/PartialAndRequired.ts diff --git a/packages/core/src/common/fixtures/domain/model/AnyEntityFixtures.ts b/packages/core/core-entity/src/common/fixtures/domain/model/AnyEntityFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/model/AnyEntityFixtures.ts rename to packages/core/core-entity/src/common/fixtures/domain/model/AnyEntityFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/model/BaseEntityFixtures.ts b/packages/core/core-entity/src/common/fixtures/domain/model/BaseEntityFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/model/BaseEntityFixtures.ts rename to packages/core/core-entity/src/common/fixtures/domain/model/BaseEntityFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/model/BaseEntitySortKeyAndOrderTypeFixtures.ts b/packages/core/core-entity/src/common/fixtures/domain/model/BaseEntitySortKeyAndOrderTypeFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/model/BaseEntitySortKeyAndOrderTypeFixtures.ts rename to packages/core/core-entity/src/common/fixtures/domain/model/BaseEntitySortKeyAndOrderTypeFixtures.ts diff --git a/packages/api-graphql/src/common/fixtures/domain/model/DateFixtures.ts b/packages/core/core-entity/src/common/fixtures/domain/model/DateFixtures.ts similarity index 100% rename from packages/api-graphql/src/common/fixtures/domain/model/DateFixtures.ts rename to packages/core/core-entity/src/common/fixtures/domain/model/DateFixtures.ts diff --git a/packages/core/src/common/fixtures/domain/model/OrderTypeFixtures.ts b/packages/core/core-entity/src/common/fixtures/domain/model/OrderTypeFixtures.ts similarity index 100% rename from packages/core/src/common/fixtures/domain/model/OrderTypeFixtures.ts rename to packages/core/core-entity/src/common/fixtures/domain/model/OrderTypeFixtures.ts diff --git a/packages/core/core-entity/src/fixture.ts b/packages/core/core-entity/src/fixture.ts new file mode 100644 index 00000000..fa2ba555 --- /dev/null +++ b/packages/core/core-entity/src/fixture.ts @@ -0,0 +1,7 @@ +export { CatFixtures } from './cat/fixtures/domain/model/CatFixtures'; +export { CatSortKeyAndOrderTypeFixtures } from './cat/fixtures/domain/model/CatSortKeyAndOrderTypeFixtures'; +export { AnyEntityFixtures } from './common/fixtures/domain/model/AnyEntityFixtures'; +export { BaseEntityFixtures } from './common/fixtures/domain/model/BaseEntityFixtures'; +export { BaseEntitySortKeyAndOrderTypeFixtures } from './common/fixtures/domain/model/BaseEntitySortKeyAndOrderTypeFixtures'; +export { DateFixtures } from './common/fixtures/domain/model/DateFixtures'; +export { OrderTypeFixtures } from './common/fixtures/domain/model/OrderTypeFixtures'; diff --git a/packages/core/core-entity/src/model.ts b/packages/core/core-entity/src/model.ts new file mode 100644 index 00000000..e4376c03 --- /dev/null +++ b/packages/core/core-entity/src/model.ts @@ -0,0 +1,11 @@ +export { CommonConstants } from './common/domain/model/CommonConstants'; +export { AnyEntity } from './common/domain/model/AnyEntity'; +export { BaseEntity } from './common/domain/model/BaseEntity'; +export { Cat } from './cat/domain/model/Cat'; +export { BaseEntitySortKeyAndOrderType } from './common/domain/model/BaseEntitySortKeyAndOrderType'; +export { CatSortKeyAndOrderType } from './cat/domain/model/CatSortKeyAndOrderType'; +export { OrderType } from './common/domain/model/OrderType'; +export { Pagination } from './common/domain/model/Pagination'; +export { PaginationMeta } from './common/domain/model/PaginationMeta'; +export { PaginationOptions } from './common/domain/model/PaginationOptions'; +export { PartialAndRequired } from './common/domain/model/PartialAndRequired'; diff --git a/packages/core/core-entity/tsconfig.json b/packages/core/core-entity/tsconfig.json new file mode 100644 index 00000000..9ae89d77 --- /dev/null +++ b/packages/core/core-entity/tsconfig.json @@ -0,0 +1,10 @@ +{ + "$schema": "http://json.schemastore.org/tsconfig", + "extends": "@nestjs-api-example/typescript-config/tsconfig.base.cjs.json", + "compilerOptions": { + "emitDecoratorMetadata": true, + "outDir": "./lib", + "rootDir": "./src" + }, + "include": ["src"] +} \ No newline at end of file diff --git a/packages/core/src/common/domain/exception/EntityNotFoundException.ts b/packages/core/src/common/domain/exception/EntityNotFoundException.ts deleted file mode 100644 index 309a7481..00000000 --- a/packages/core/src/common/domain/exception/EntityNotFoundException.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { NotFoundException } from '@nestjs/common'; - -export class EntityNotFoundException extends NotFoundException { - public constructor(message: string) { - super(message); - } -} diff --git a/packages/core/src/common/domain/model/CommonConstants.ts b/packages/core/src/common/domain/model/CommonConstants.ts deleted file mode 100644 index 8ab8174c..00000000 --- a/packages/core/src/common/domain/model/CommonConstants.ts +++ /dev/null @@ -1 +0,0 @@ -export class CommonConstants {} diff --git a/packages/core/src/common/fixtures/domain/model/DateFixtures.ts b/packages/core/src/common/fixtures/domain/model/DateFixtures.ts deleted file mode 100644 index 4e44faaf..00000000 --- a/packages/core/src/common/fixtures/domain/model/DateFixtures.ts +++ /dev/null @@ -1,13 +0,0 @@ -export class DateFixtures { - public static get any(): Date { - return new Date('2022-01-01'); - } - - public static get createdAt(): Date { - return new Date('2020-01-01'); - } - - public static get updatedAt(): Date { - return new Date('2020-02-01'); - } -} diff --git a/packages/core/src/models.ts b/packages/core/src/models.ts deleted file mode 100644 index 8e9b945d..00000000 --- a/packages/core/src/models.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { Cat } from './cat/domain/model/Cat'; -import { CatSortKeyAndOrderType } from './cat/domain/model/CatSortKeyAndOrderType'; -import { Pagination } from './common/domain/model/Pagination'; -import { AppConfig } from './config/infrastructure/app/AppConfig'; - -export { AppConfig, Cat, CatSortKeyAndOrderType, Pagination }; diff --git a/packages/core/src/modules.ts b/packages/core/src/modules.ts deleted file mode 100644 index 8f92878e..00000000 --- a/packages/core/src/modules.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { CatCoreModule } from './cat/infrastructure/injection/CatCoreModule'; -import { AppConfigModule } from './config/infrastructure/injection/AppConfigModule'; - -export { AppConfigModule, CatCoreModule }; diff --git a/packages/eslint-config/.gitignore b/packages/project-config/eslint-config/.gitignore similarity index 100% rename from packages/eslint-config/.gitignore rename to packages/project-config/eslint-config/.gitignore diff --git a/packages/eslint-config/.lintstagedrc.json b/packages/project-config/eslint-config/.lintstagedrc.json similarity index 100% rename from packages/eslint-config/.lintstagedrc.json rename to packages/project-config/eslint-config/.lintstagedrc.json diff --git a/packages/eslint-config/LICENSE b/packages/project-config/eslint-config/LICENSE similarity index 100% rename from packages/eslint-config/LICENSE rename to packages/project-config/eslint-config/LICENSE diff --git a/packages/eslint-config/index.js b/packages/project-config/eslint-config/index.js similarity index 94% rename from packages/eslint-config/index.js rename to packages/project-config/eslint-config/index.js index 4db5facd..27444c70 100644 --- a/packages/eslint-config/index.js +++ b/packages/project-config/eslint-config/index.js @@ -25,15 +25,15 @@ module.exports = { '@typescript-eslint/explicit-member-accessibility': [ 'error', { - 'accessibility': 'explicit', - 'overrides': { - 'accessors': 'explicit', - 'constructors': 'explicit', - 'methods': 'explicit', - 'properties': 'off', - 'parameterProperties': 'off' - } - } + accessibility: 'explicit', + overrides: { + accessors: 'explicit', + constructors: 'explicit', + methods: 'explicit', + properties: 'off', + parameterProperties: 'off', + }, + }, ], '@typescript-eslint/member-ordering': ['warn'], '@typescript-eslint/naming-convention': [ diff --git a/packages/eslint-config/package.json b/packages/project-config/eslint-config/package.json similarity index 100% rename from packages/eslint-config/package.json rename to packages/project-config/eslint-config/package.json diff --git a/packages/typescript-config/prettier.config.js b/packages/project-config/eslint-config/prettier.config.js similarity index 100% rename from packages/typescript-config/prettier.config.js rename to packages/project-config/eslint-config/prettier.config.js diff --git a/packages/jest-config/.gitignore b/packages/project-config/jest-config/.gitignore similarity index 100% rename from packages/jest-config/.gitignore rename to packages/project-config/jest-config/.gitignore diff --git a/packages/jest-config/.lintstagedrc.json b/packages/project-config/jest-config/.lintstagedrc.json similarity index 100% rename from packages/jest-config/.lintstagedrc.json rename to packages/project-config/jest-config/.lintstagedrc.json diff --git a/packages/jest-config/LICENSE b/packages/project-config/jest-config/LICENSE similarity index 100% rename from packages/jest-config/LICENSE rename to packages/project-config/jest-config/LICENSE diff --git a/packages/jest-config/lib/config/getJestJsProjectConfig.js b/packages/project-config/jest-config/lib/config/getJestJsProjectConfig.js similarity index 100% rename from packages/jest-config/lib/config/getJestJsProjectConfig.js rename to packages/project-config/jest-config/lib/config/getJestJsProjectConfig.js diff --git a/packages/jest-config/lib/config/getJestProjectConfig.js b/packages/project-config/jest-config/lib/config/getJestProjectConfig.js similarity index 100% rename from packages/jest-config/lib/config/getJestProjectConfig.js rename to packages/project-config/jest-config/lib/config/getJestProjectConfig.js diff --git a/packages/jest-config/lib/config/getJestTsProjectConfig.js b/packages/project-config/jest-config/lib/config/getJestTsProjectConfig.js similarity index 100% rename from packages/jest-config/lib/config/getJestTsProjectConfig.js rename to packages/project-config/jest-config/lib/config/getJestTsProjectConfig.js diff --git a/packages/jest-config/lib/config/getTestMatch.js b/packages/project-config/jest-config/lib/config/getTestMatch.js similarity index 100% rename from packages/jest-config/lib/config/getTestMatch.js rename to packages/project-config/jest-config/lib/config/getTestMatch.js diff --git a/packages/jest-config/lib/config/projectRoot.js b/packages/project-config/jest-config/lib/config/projectRoot.js similarity index 100% rename from packages/jest-config/lib/config/projectRoot.js rename to packages/project-config/jest-config/lib/config/projectRoot.js diff --git a/packages/jest-config/lib/index.js b/packages/project-config/jest-config/lib/index.js similarity index 50% rename from packages/jest-config/lib/index.js rename to packages/project-config/jest-config/lib/index.js index a0c42973..9ce7c316 100644 --- a/packages/jest-config/lib/index.js +++ b/packages/project-config/jest-config/lib/index.js @@ -1,17 +1,9 @@ import getJestJsProjectConfig from './config/getJestJsProjectConfig.js'; import getJestTsProjectConfig from './config/getJestTsProjectConfig.js'; -const jsUnitProject = getJestJsProjectConfig( - 'Unit', - ['.int.spec.js'], - '.spec.js', -); +const jsUnitProject = getJestJsProjectConfig('Unit', ['.int.spec.js'], '.spec.js'); -const jsIntegrationProject = getJestJsProjectConfig( - 'Integration', - [], - '.int.spec.js', -); +const jsIntegrationProject = getJestJsProjectConfig('Integration', [], '.int.spec.js'); /** @type {!import("@jest/types").Config.InitialOptions} */ const jsGlobalConfig = { @@ -19,17 +11,9 @@ const jsGlobalConfig = { projects: [jsIntegrationProject, jsUnitProject], }; -const tsUnitProject = getJestTsProjectConfig( - 'Unit', - ['.int.spec.ts'], - '.spec.ts', -); +const tsUnitProject = getJestTsProjectConfig('Unit', ['.int.spec.ts'], '.spec.ts'); -const tsIntegrationProject = getJestTsProjectConfig( - 'Integration', - [], - '.int.spec.ts', -); +const tsIntegrationProject = getJestTsProjectConfig('Integration', [], '.int.spec.ts'); /** @type {!import("@jest/types").Config.InitialOptions} */ const tsGlobalConfig = { @@ -37,9 +21,4 @@ const tsGlobalConfig = { projects: [tsIntegrationProject, tsUnitProject], }; -export { - getJestJsProjectConfig, - getJestTsProjectConfig, - jsGlobalConfig, - tsGlobalConfig, -}; +export { getJestJsProjectConfig, getJestTsProjectConfig, jsGlobalConfig, tsGlobalConfig }; diff --git a/packages/jest-config/package.json b/packages/project-config/jest-config/package.json similarity index 100% rename from packages/jest-config/package.json rename to packages/project-config/jest-config/package.json diff --git a/packages/jest-config/prettier.config.cjs b/packages/project-config/jest-config/prettier.config.cjs similarity index 100% rename from packages/jest-config/prettier.config.cjs rename to packages/project-config/jest-config/prettier.config.cjs diff --git a/packages/prettier-config/.gitignore b/packages/project-config/prettier-config/.gitignore similarity index 100% rename from packages/prettier-config/.gitignore rename to packages/project-config/prettier-config/.gitignore diff --git a/packages/prettier-config/LICENSE b/packages/project-config/prettier-config/LICENSE similarity index 100% rename from packages/prettier-config/LICENSE rename to packages/project-config/prettier-config/LICENSE diff --git a/packages/prettier-config/index.d.ts b/packages/project-config/prettier-config/index.d.ts similarity index 100% rename from packages/prettier-config/index.d.ts rename to packages/project-config/prettier-config/index.d.ts diff --git a/packages/prettier-config/index.js b/packages/project-config/prettier-config/index.js similarity index 100% rename from packages/prettier-config/index.js rename to packages/project-config/prettier-config/index.js diff --git a/packages/prettier-config/package.json b/packages/project-config/prettier-config/package.json similarity index 100% rename from packages/prettier-config/package.json rename to packages/project-config/prettier-config/package.json diff --git a/packages/typescript-config/.gitignore b/packages/project-config/typescript-config/.gitignore similarity index 100% rename from packages/typescript-config/.gitignore rename to packages/project-config/typescript-config/.gitignore diff --git a/packages/typescript-config/.lintstagedrc.json b/packages/project-config/typescript-config/.lintstagedrc.json similarity index 100% rename from packages/typescript-config/.lintstagedrc.json rename to packages/project-config/typescript-config/.lintstagedrc.json diff --git a/packages/typescript-config/package.json b/packages/project-config/typescript-config/package.json similarity index 100% rename from packages/typescript-config/package.json rename to packages/project-config/typescript-config/package.json diff --git a/packages/project-config/typescript-config/prettier.config.js b/packages/project-config/typescript-config/prettier.config.js new file mode 100644 index 00000000..56b4980c --- /dev/null +++ b/packages/project-config/typescript-config/prettier.config.js @@ -0,0 +1,3 @@ +module.exports = { + ...require('@nestjs-api-example/prettier-config'), +}; diff --git a/packages/typescript-config/tsconfig.base.cjs.json b/packages/project-config/typescript-config/tsconfig.base.cjs.json similarity index 100% rename from packages/typescript-config/tsconfig.base.cjs.json rename to packages/project-config/typescript-config/tsconfig.base.cjs.json diff --git a/packages/typescript-config/tsconfig.base.esm.json b/packages/project-config/typescript-config/tsconfig.base.esm.json similarity index 100% rename from packages/typescript-config/tsconfig.base.esm.json rename to packages/project-config/typescript-config/tsconfig.base.esm.json diff --git a/packages/typescript-config/tsconfig.base.json b/packages/project-config/typescript-config/tsconfig.base.json similarity index 100% rename from packages/typescript-config/tsconfig.base.json rename to packages/project-config/typescript-config/tsconfig.base.json diff --git a/packages/service/api-graphql/.eslintignore b/packages/service/api-graphql/.eslintignore new file mode 100644 index 00000000..e8e77702 --- /dev/null +++ b/packages/service/api-graphql/.eslintignore @@ -0,0 +1,2 @@ +**/*.js +**/*.mjs diff --git a/packages/service/api-graphql/.eslintrc.js b/packages/service/api-graphql/.eslintrc.js new file mode 100644 index 00000000..49fe91d1 --- /dev/null +++ b/packages/service/api-graphql/.eslintrc.js @@ -0,0 +1,8 @@ +/** @type { import("eslint").ESLint.ConfigData } */ +module.exports = { + extends: '@nestjs-api-example/eslint-config', + parserOptions: { + project: ['./tsconfig.json'], + tsconfigRootDir: __dirname, + }, +}; diff --git a/packages/service/api-graphql/.gitignore b/packages/service/api-graphql/.gitignore new file mode 100644 index 00000000..1bfe5ecc --- /dev/null +++ b/packages/service/api-graphql/.gitignore @@ -0,0 +1,14 @@ +# Typescript compiled files +/lib/** + +# node modules +/node_modules/ + +# test coverage reports +/coverage + +# Turborepo files +.turbo/ + +# env file +.env diff --git a/packages/service/api-graphql/.lintstagedrc.json b/packages/service/api-graphql/.lintstagedrc.json new file mode 100644 index 00000000..0061dfc2 --- /dev/null +++ b/packages/service/api-graphql/.lintstagedrc.json @@ -0,0 +1,9 @@ +{ + "*.js": [ + "prettier --write" + ], + "*.ts": [ + "prettier --write", + "eslint" + ] +} diff --git a/packages/service/api-graphql/.npmignore b/packages/service/api-graphql/.npmignore new file mode 100644 index 00000000..126a35b5 --- /dev/null +++ b/packages/service/api-graphql/.npmignore @@ -0,0 +1,15 @@ +# Typescript compiled files +/src/** +/lib/**.spec.* + +# node modules +/node_modules/ + +# test coverage reports +/coverage + +# Turborepo files +.turbo/ + +# env file +.env \ No newline at end of file diff --git a/packages/service/api-graphql/jest.config.mjs b/packages/service/api-graphql/jest.config.mjs new file mode 100644 index 00000000..496a0af2 --- /dev/null +++ b/packages/service/api-graphql/jest.config.mjs @@ -0,0 +1,3 @@ +import { tsGlobalConfig } from '@nestjs-api-example/jest-config'; + +export default tsGlobalConfig; diff --git a/packages/service/api-graphql/jest.js.config.mjs b/packages/service/api-graphql/jest.js.config.mjs new file mode 100644 index 00000000..94ac18cd --- /dev/null +++ b/packages/service/api-graphql/jest.js.config.mjs @@ -0,0 +1,3 @@ +import { jsGlobalConfig } from '@nestjs-api-example/jest-config'; + +export default jsGlobalConfig; diff --git a/packages/api-graphql/package.json b/packages/service/api-graphql/package.json similarity index 91% rename from packages/api-graphql/package.json rename to packages/service/api-graphql/package.json index 3842a5a8..c09c0f8c 100644 --- a/packages/api-graphql/package.json +++ b/packages/service/api-graphql/package.json @@ -16,7 +16,10 @@ "dependencies": { "@apollo/server": "4.9.5", "@as-integrations/fastify": "2.1.1", - "@nestjs-api-example/core": "workspace:*", + "@nestjs-api-example/core-cat": "workspace:*", + "@nestjs-api-example/core-common": "workspace:*", + "@nestjs-api-example/core-config": "workspace:*", + "@nestjs-api-example/core-entity": "workspace:*", "@nestjs/apollo": "12.0.11", "@nestjs/common": "10.2.10", "@nestjs/core": "10.2.10", diff --git a/packages/service/api-graphql/prettier.config.js b/packages/service/api-graphql/prettier.config.js new file mode 100644 index 00000000..56b4980c --- /dev/null +++ b/packages/service/api-graphql/prettier.config.js @@ -0,0 +1,3 @@ +module.exports = { + ...require('@nestjs-api-example/prettier-config'), +}; diff --git a/packages/api-graphql/schema/BaseEntity.graphql b/packages/service/api-graphql/schema/BaseEntity.graphql similarity index 100% rename from packages/api-graphql/schema/BaseEntity.graphql rename to packages/service/api-graphql/schema/BaseEntity.graphql diff --git a/packages/api-graphql/schema/Cat.graphql b/packages/service/api-graphql/schema/Cat.graphql similarity index 100% rename from packages/api-graphql/schema/Cat.graphql rename to packages/service/api-graphql/schema/Cat.graphql diff --git a/packages/api-graphql/src/AppController.spec.ts b/packages/service/api-graphql/src/AppController.spec.ts similarity index 100% rename from packages/api-graphql/src/AppController.spec.ts rename to packages/service/api-graphql/src/AppController.spec.ts diff --git a/packages/api-graphql/src/AppController.ts b/packages/service/api-graphql/src/AppController.ts similarity index 100% rename from packages/api-graphql/src/AppController.ts rename to packages/service/api-graphql/src/AppController.ts diff --git a/packages/api-graphql/src/AppModule.ts b/packages/service/api-graphql/src/AppModule.ts similarity index 91% rename from packages/api-graphql/src/AppModule.ts rename to packages/service/api-graphql/src/AppModule.ts index 2aaeafdc..a3babca0 100644 --- a/packages/api-graphql/src/AppModule.ts +++ b/packages/service/api-graphql/src/AppModule.ts @@ -1,7 +1,7 @@ import { ApolloDriver } from '@nestjs/apollo'; import { Module } from '@nestjs/common'; import { GraphQLModule } from '@nestjs/graphql'; -import { AppConfigModule } from '@nestjs-api-example/core/modules'; +import { AppConfigModule } from '@nestjs-api-example/core-config/module'; import { DateTimeResolver, PositiveIntResolver, UUIDResolver, VoidResolver } from 'graphql-scalars'; import { AppController } from './AppController'; diff --git a/packages/api-graphql/src/cat/fixtures/infrastructure/graphql/model/InsertOneCatGraphQlInputFixtures.ts b/packages/service/api-graphql/src/cat/fixtures/infrastructure/graphql/model/InsertOneCatGraphQlInputFixtures.ts similarity index 88% rename from packages/api-graphql/src/cat/fixtures/infrastructure/graphql/model/InsertOneCatGraphQlInputFixtures.ts rename to packages/service/api-graphql/src/cat/fixtures/infrastructure/graphql/model/InsertOneCatGraphQlInputFixtures.ts index 4e8ffaec..ad9fe2e9 100644 --- a/packages/api-graphql/src/cat/fixtures/infrastructure/graphql/model/InsertOneCatGraphQlInputFixtures.ts +++ b/packages/service/api-graphql/src/cat/fixtures/infrastructure/graphql/model/InsertOneCatGraphQlInputFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { InsertOneCatGraphQlInput } from '../../../../infrastructure/graphql/model/InsertOneCatGraphQlInput'; -import { CatFixtures } from '../../../domain/model/CatFixtures'; export class InsertOneCatGraphQlInputFixtures { public static get any(): InsertOneCatGraphQlInput { diff --git a/packages/api-graphql/src/cat/fixtures/infrastructure/graphql/model/PaginateFindCatGraphQlInputFixtures.ts b/packages/service/api-graphql/src/cat/fixtures/infrastructure/graphql/model/PaginateFindCatGraphQlInputFixtures.ts similarity index 100% rename from packages/api-graphql/src/cat/fixtures/infrastructure/graphql/model/PaginateFindCatGraphQlInputFixtures.ts rename to packages/service/api-graphql/src/cat/fixtures/infrastructure/graphql/model/PaginateFindCatGraphQlInputFixtures.ts diff --git a/packages/api-graphql/src/cat/fixtures/infrastructure/graphql/model/UpdateOneCatGraphQlInputFixtures.ts b/packages/service/api-graphql/src/cat/fixtures/infrastructure/graphql/model/UpdateOneCatGraphQlInputFixtures.ts similarity index 100% rename from packages/api-graphql/src/cat/fixtures/infrastructure/graphql/model/UpdateOneCatGraphQlInputFixtures.ts rename to packages/service/api-graphql/src/cat/fixtures/infrastructure/graphql/model/UpdateOneCatGraphQlInputFixtures.ts diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/model/InsertOneCatGraphQlInput.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/model/InsertOneCatGraphQlInput.ts similarity index 100% rename from packages/api-graphql/src/cat/infrastructure/graphql/model/InsertOneCatGraphQlInput.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/model/InsertOneCatGraphQlInput.ts diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/model/PaginateFindCatGraphQlInput.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/model/PaginateFindCatGraphQlInput.ts similarity index 100% rename from packages/api-graphql/src/cat/infrastructure/graphql/model/PaginateFindCatGraphQlInput.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/model/PaginateFindCatGraphQlInput.ts diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/model/UpdateOneCatGraphQlInput.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/model/UpdateOneCatGraphQlInput.ts similarity index 100% rename from packages/api-graphql/src/cat/infrastructure/graphql/model/UpdateOneCatGraphQlInput.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/model/UpdateOneCatGraphQlInput.ts diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.spec.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.spec.ts similarity index 83% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.spec.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.spec.ts index a2446db8..6c537055 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.spec.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.spec.ts @@ -1,15 +1,14 @@ import { jest, beforeAll, afterAll, describe, expect, it } from '@jest/globals'; import { QueryBus, CommandBus } from '@nestjs/cqrs'; -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatDeleteCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindOneQueryFixtures, CatDeleteCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { EntityNotFoundException } from '@nestjs-api-example/core-common/exception'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { DeleteOneCatResolver } from './DeleteOneCatResolver'; -import { EntityNotFoundException } from '../../../../common/domain/exception/EntityNotFoundException'; -import { CatDeleteCommandFixtures } from '../../../fixtures/domain/command/CatDeleteCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatFindOneQueryFixtures } from '../../../fixtures/domain/query/CatFindOneQueryFixtures'; describe(DeleteOneCatResolver.name, () => { let deleteOneCatResolver: DeleteOneCatResolver; diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.ts similarity index 72% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.ts index 13016698..13d69ed4 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/DeleteOneCatResolver.ts @@ -1,10 +1,9 @@ import { CommandBus, QueryBus } from '@nestjs/cqrs'; import { Args, Resolver } from '@nestjs/graphql'; -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; - -import { EntityNotFoundException } from '../../../../common/domain/exception/EntityNotFoundException'; +import { CatDeleteCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { EntityNotFoundException } from '@nestjs-api-example/core-common/exception'; +import { Cat } from '@nestjs-api-example/core-entity/model'; @Resolver('Cat') export class DeleteOneCatResolver { diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.spec.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.spec.ts similarity index 86% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.spec.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.spec.ts index 28849c00..a43932d9 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.spec.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.spec.ts @@ -1,13 +1,13 @@ import { jest, beforeAll, afterAll, describe, expect, it } from '@jest/globals'; import { QueryBus } from '@nestjs/cqrs'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatFindOneQueryFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { EntityNotFoundException } from '@nestjs-api-example/core-common/exception'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { FindOneCatResolver } from './FindOneCatResolver'; -import { EntityNotFoundException } from '../../../../common/domain/exception/EntityNotFoundException'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatFindOneQueryFixtures } from '../../../fixtures/domain/query/CatFindOneQueryFixtures'; describe(FindOneCatResolver.name, () => { let findOneCatResolver: FindOneCatResolver; diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.ts similarity index 71% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.ts index ec0474c0..7e622839 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/FindOneCatResolver.ts @@ -1,9 +1,8 @@ import { QueryBus } from '@nestjs/cqrs'; import { Args, Resolver } from '@nestjs/graphql'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; - -import { EntityNotFoundException } from '../../../../common/domain/exception/EntityNotFoundException'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { EntityNotFoundException } from '@nestjs-api-example/core-common/exception'; +import { Cat } from '@nestjs-api-example/core-entity/model'; @Resolver('Cat') export class FindOneCatResolver { diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.spec.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.spec.ts similarity index 85% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.spec.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.spec.ts index 46c5ecdb..3ec45989 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.spec.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.spec.ts @@ -1,12 +1,12 @@ import { jest, beforeAll, afterAll, describe, expect, it } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatInsertOneCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { InsertOneCatResolver } from './InsertOneCatResolver'; -import { CatInsertOneCommandFixtures } from '../../../fixtures/domain/command/CatInsertOneCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; import { InsertOneCatGraphQlInputFixtures } from '../../../fixtures/infrastructure/graphql/model/InsertOneCatGraphQlInputFixtures'; import { InsertOneCatGraphQlInput } from '../model/InsertOneCatGraphQlInput'; diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.ts similarity index 84% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.ts index 8724b577..c87c0599 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/InsertOneCatResolver.ts @@ -1,7 +1,7 @@ import { CommandBus } from '@nestjs/cqrs'; import { Args, Mutation, Resolver } from '@nestjs/graphql'; -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand } from '@nestjs-api-example/core-cat/command'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { InsertOneCatGraphQlInput } from '../model/InsertOneCatGraphQlInput'; diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.spec.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.spec.ts similarity index 89% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.spec.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.spec.ts index 0b914e0e..3db6f58b 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.spec.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.spec.ts @@ -1,11 +1,11 @@ import { jest, beforeAll, afterAll, describe, expect, it } from '@jest/globals'; import { QueryBus } from '@nestjs/cqrs'; -import { Pagination, Cat } from '@nestjs-api-example/core/models'; -import { CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; +import { CatPaginateFindQueryFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatPaginateFindQuery } from '@nestjs-api-example/core-cat/query'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; import { PaginateFindCatResolver } from './PaginateFindCatResolver'; -import { CatPaginateFindQueryFixtures } from '../../../fixtures/domain/query/CatPaginateFindQueryFixtures'; import { PaginateFindCatGraphQlInputFixtures } from '../../../fixtures/infrastructure/graphql/model/PaginateFindCatGraphQlInputFixtures'; import { PaginateFindCatGraphQlInput } from '../model/PaginateFindCatGraphQlInput'; diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.ts similarity index 90% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.ts index b5741ad7..de89b4a5 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/PaginateFindCatResolver.ts @@ -1,7 +1,7 @@ import { QueryBus } from '@nestjs/cqrs'; import { Args, Query, Resolver } from '@nestjs/graphql'; -import { Pagination, Cat } from '@nestjs-api-example/core/models'; -import { CatFindQuery, CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; +import { CatFindQuery, CatPaginateFindQuery } from '@nestjs-api-example/core-cat/query'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; import { PaginateFindCatGraphQlInput } from '../model/PaginateFindCatGraphQlInput'; diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.spec.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.spec.ts similarity index 86% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.spec.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.spec.ts index a2e963bd..7d62eeeb 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.spec.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.spec.ts @@ -1,11 +1,11 @@ import { jest, describe, beforeAll, afterAll, expect, it } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; +import { CatUpdateOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatUpdateOneCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; import { UpdateOneCatResolver } from './UpdateOneCatResolver'; -import { CatUpdateOneCommandFixtures } from '../../../fixtures/domain/command/CatUpdateOneCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; import { UpdateOneCatGraphQlInputFixtures } from '../../../fixtures/infrastructure/graphql/model/UpdateOneCatGraphQlInputFixtures'; import { UpdateOneCatGraphQlInput } from '../model/UpdateOneCatGraphQlInput'; diff --git a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.ts b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.ts similarity index 90% rename from packages/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.ts rename to packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.ts index fae979f3..f5103013 100644 --- a/packages/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/graphql/resolver/UpdateOneCatResolver.ts @@ -1,7 +1,7 @@ import { CommandBus } from '@nestjs/cqrs'; import { Resolver, Mutation, Args } from '@nestjs/graphql'; -import { CatSetCommand, CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; -import { CatFindQuery } from '@nestjs-api-example/core/queries'; +import { CatSetCommand, CatUpdateOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindQuery } from '@nestjs-api-example/core-cat/query'; import { UpdateOneCatGraphQlInput } from '../model/UpdateOneCatGraphQlInput'; diff --git a/packages/api-graphql/src/cat/infrastructure/injection/CatModule.ts b/packages/service/api-graphql/src/cat/infrastructure/injection/CatModule.ts similarity index 81% rename from packages/api-graphql/src/cat/infrastructure/injection/CatModule.ts rename to packages/service/api-graphql/src/cat/infrastructure/injection/CatModule.ts index be1112e3..bdab1ba0 100644 --- a/packages/api-graphql/src/cat/infrastructure/injection/CatModule.ts +++ b/packages/service/api-graphql/src/cat/infrastructure/injection/CatModule.ts @@ -1,7 +1,6 @@ import { Module, Provider } from '@nestjs/common'; import { CqrsModule } from '@nestjs/cqrs'; -import { CatUpdateCommand } from '@nestjs-api-example/core/commands'; -import { CatCoreModule } from '@nestjs-api-example/core/modules'; +import { CatCoreModule } from '@nestjs-api-example/core-cat/module'; import { DeleteOneCatResolver } from '../graphql/resolver/DeleteOneCatResolver'; import { FindOneCatResolver } from '../graphql/resolver/FindOneCatResolver'; @@ -13,7 +12,6 @@ const resolvers: Provider[] = [ FindOneCatResolver, InsertOneCatResolver, PaginateFindCatResolver, - CatUpdateCommand, ]; @Module({ imports: [CqrsModule, CatCoreModule], diff --git a/packages/api-graphql/src/common/infrastructure/graphql/model/PaginateFindGraphQlInput.ts b/packages/service/api-graphql/src/common/infrastructure/graphql/model/PaginateFindGraphQlInput.ts similarity index 83% rename from packages/api-graphql/src/common/infrastructure/graphql/model/PaginateFindGraphQlInput.ts rename to packages/service/api-graphql/src/common/infrastructure/graphql/model/PaginateFindGraphQlInput.ts index 9ba2fa79..e642018d 100644 --- a/packages/api-graphql/src/common/infrastructure/graphql/model/PaginateFindGraphQlInput.ts +++ b/packages/service/api-graphql/src/common/infrastructure/graphql/model/PaginateFindGraphQlInput.ts @@ -1,7 +1,6 @@ +import { CommonConstants } from '@nestjs-api-example/core-entity/model'; import { IsOptional, IsInt, Min, Max } from 'class-validator'; -import { CommonConstants } from '../../../domain/model/CommonConstants'; - export class PaginateFindGraphQlInput { @IsOptional() @IsInt() diff --git a/packages/api-graphql/src/main.ts b/packages/service/api-graphql/src/main.ts similarity index 91% rename from packages/api-graphql/src/main.ts rename to packages/service/api-graphql/src/main.ts index 1593c661..cc0c4c5f 100644 --- a/packages/api-graphql/src/main.ts +++ b/packages/service/api-graphql/src/main.ts @@ -1,7 +1,7 @@ import { ValidationPipe } from '@nestjs/common'; import { NestFactory } from '@nestjs/core'; import { FastifyAdapter, NestFastifyApplication } from '@nestjs/platform-fastify'; -import { AppConfig } from '@nestjs-api-example/core/models'; +import { AppConfig } from '@nestjs-api-example/core-config/model'; import { AppModule } from './AppModule'; diff --git a/packages/api-graphql/tsconfig.json b/packages/service/api-graphql/tsconfig.json similarity index 100% rename from packages/api-graphql/tsconfig.json rename to packages/service/api-graphql/tsconfig.json diff --git a/packages/service/api-grpc/.eslintignore b/packages/service/api-grpc/.eslintignore new file mode 100644 index 00000000..e8e77702 --- /dev/null +++ b/packages/service/api-grpc/.eslintignore @@ -0,0 +1,2 @@ +**/*.js +**/*.mjs diff --git a/packages/service/api-grpc/.eslintrc.js b/packages/service/api-grpc/.eslintrc.js new file mode 100644 index 00000000..49fe91d1 --- /dev/null +++ b/packages/service/api-grpc/.eslintrc.js @@ -0,0 +1,8 @@ +/** @type { import("eslint").ESLint.ConfigData } */ +module.exports = { + extends: '@nestjs-api-example/eslint-config', + parserOptions: { + project: ['./tsconfig.json'], + tsconfigRootDir: __dirname, + }, +}; diff --git a/packages/service/api-grpc/.gitignore b/packages/service/api-grpc/.gitignore new file mode 100644 index 00000000..1bfe5ecc --- /dev/null +++ b/packages/service/api-grpc/.gitignore @@ -0,0 +1,14 @@ +# Typescript compiled files +/lib/** + +# node modules +/node_modules/ + +# test coverage reports +/coverage + +# Turborepo files +.turbo/ + +# env file +.env diff --git a/packages/service/api-grpc/.lintstagedrc.json b/packages/service/api-grpc/.lintstagedrc.json new file mode 100644 index 00000000..0061dfc2 --- /dev/null +++ b/packages/service/api-grpc/.lintstagedrc.json @@ -0,0 +1,9 @@ +{ + "*.js": [ + "prettier --write" + ], + "*.ts": [ + "prettier --write", + "eslint" + ] +} diff --git a/packages/service/api-grpc/.npmignore b/packages/service/api-grpc/.npmignore new file mode 100644 index 00000000..126a35b5 --- /dev/null +++ b/packages/service/api-grpc/.npmignore @@ -0,0 +1,15 @@ +# Typescript compiled files +/src/** +/lib/**.spec.* + +# node modules +/node_modules/ + +# test coverage reports +/coverage + +# Turborepo files +.turbo/ + +# env file +.env \ No newline at end of file diff --git a/packages/service/api-grpc/jest.config.mjs b/packages/service/api-grpc/jest.config.mjs new file mode 100644 index 00000000..496a0af2 --- /dev/null +++ b/packages/service/api-grpc/jest.config.mjs @@ -0,0 +1,3 @@ +import { tsGlobalConfig } from '@nestjs-api-example/jest-config'; + +export default tsGlobalConfig; diff --git a/packages/service/api-grpc/jest.js.config.mjs b/packages/service/api-grpc/jest.js.config.mjs new file mode 100644 index 00000000..94ac18cd --- /dev/null +++ b/packages/service/api-grpc/jest.js.config.mjs @@ -0,0 +1,3 @@ +import { jsGlobalConfig } from '@nestjs-api-example/jest-config'; + +export default jsGlobalConfig; diff --git a/packages/api-grpc/package.json b/packages/service/api-grpc/package.json similarity index 95% rename from packages/api-grpc/package.json rename to packages/service/api-grpc/package.json index 8c422ec3..41ed41d2 100644 --- a/packages/api-grpc/package.json +++ b/packages/service/api-grpc/package.json @@ -16,7 +16,8 @@ "dependencies": { "@grpc/grpc-js": "1.9.12", "@grpc/proto-loader": "0.7.10", - "@nestjs-api-example/core": "workspace:*", + "@nestjs-api-example/core-cat": "workspace:*", + "@nestjs-api-example/core-entity": "workspace:*", "@nestjs/common": "10.2.10", "@nestjs/core": "10.2.10", "@nestjs/cqrs": "10.2.6", diff --git a/packages/service/api-grpc/prettier.config.js b/packages/service/api-grpc/prettier.config.js new file mode 100644 index 00000000..56b4980c --- /dev/null +++ b/packages/service/api-grpc/prettier.config.js @@ -0,0 +1,3 @@ +module.exports = { + ...require('@nestjs-api-example/prettier-config'), +}; diff --git a/packages/api-grpc/proto/api.proto b/packages/service/api-grpc/proto/api.proto similarity index 100% rename from packages/api-grpc/proto/api.proto rename to packages/service/api-grpc/proto/api.proto diff --git a/packages/api-grpc/proto/app/model/status.proto b/packages/service/api-grpc/proto/app/model/status.proto similarity index 100% rename from packages/api-grpc/proto/app/model/status.proto rename to packages/service/api-grpc/proto/app/model/status.proto diff --git a/packages/api-grpc/proto/app/service/app_service.proto b/packages/service/api-grpc/proto/app/service/app_service.proto similarity index 100% rename from packages/api-grpc/proto/app/service/app_service.proto rename to packages/service/api-grpc/proto/app/service/app_service.proto diff --git a/packages/api-grpc/proto/cat/model/cat.proto b/packages/service/api-grpc/proto/cat/model/cat.proto similarity index 100% rename from packages/api-grpc/proto/cat/model/cat.proto rename to packages/service/api-grpc/proto/cat/model/cat.proto diff --git a/packages/api-grpc/proto/cat/model/cat_list.proto b/packages/service/api-grpc/proto/cat/model/cat_list.proto similarity index 100% rename from packages/api-grpc/proto/cat/model/cat_list.proto rename to packages/service/api-grpc/proto/cat/model/cat_list.proto diff --git a/packages/api-grpc/proto/cat/model/cat_pagination.proto b/packages/service/api-grpc/proto/cat/model/cat_pagination.proto similarity index 100% rename from packages/api-grpc/proto/cat/model/cat_pagination.proto rename to packages/service/api-grpc/proto/cat/model/cat_pagination.proto diff --git a/packages/api-grpc/proto/cat/model/delete_one_cat.proto b/packages/service/api-grpc/proto/cat/model/delete_one_cat.proto similarity index 100% rename from packages/api-grpc/proto/cat/model/delete_one_cat.proto rename to packages/service/api-grpc/proto/cat/model/delete_one_cat.proto diff --git a/packages/api-grpc/proto/cat/model/find_one_cat.proto b/packages/service/api-grpc/proto/cat/model/find_one_cat.proto similarity index 100% rename from packages/api-grpc/proto/cat/model/find_one_cat.proto rename to packages/service/api-grpc/proto/cat/model/find_one_cat.proto diff --git a/packages/api-grpc/proto/cat/model/insert_one_cat.proto b/packages/service/api-grpc/proto/cat/model/insert_one_cat.proto similarity index 100% rename from packages/api-grpc/proto/cat/model/insert_one_cat.proto rename to packages/service/api-grpc/proto/cat/model/insert_one_cat.proto diff --git a/packages/api-grpc/proto/cat/model/paginate_find_cat.proto b/packages/service/api-grpc/proto/cat/model/paginate_find_cat.proto similarity index 100% rename from packages/api-grpc/proto/cat/model/paginate_find_cat.proto rename to packages/service/api-grpc/proto/cat/model/paginate_find_cat.proto diff --git a/packages/api-grpc/proto/cat/model/update_one_cat.proto b/packages/service/api-grpc/proto/cat/model/update_one_cat.proto similarity index 100% rename from packages/api-grpc/proto/cat/model/update_one_cat.proto rename to packages/service/api-grpc/proto/cat/model/update_one_cat.proto diff --git a/packages/api-grpc/proto/cat/service/cat_service.proto b/packages/service/api-grpc/proto/cat/service/cat_service.proto similarity index 100% rename from packages/api-grpc/proto/cat/service/cat_service.proto rename to packages/service/api-grpc/proto/cat/service/cat_service.proto diff --git a/packages/api-grpc/proto/common/model/pagination_meta.proto b/packages/service/api-grpc/proto/common/model/pagination_meta.proto similarity index 100% rename from packages/api-grpc/proto/common/model/pagination_meta.proto rename to packages/service/api-grpc/proto/common/model/pagination_meta.proto diff --git a/packages/api-grpc/src/AppController.spec.ts b/packages/service/api-grpc/src/AppController.spec.ts similarity index 100% rename from packages/api-grpc/src/AppController.spec.ts rename to packages/service/api-grpc/src/AppController.spec.ts diff --git a/packages/api-grpc/src/AppController.ts b/packages/service/api-grpc/src/AppController.ts similarity index 100% rename from packages/api-grpc/src/AppController.ts rename to packages/service/api-grpc/src/AppController.ts diff --git a/packages/api-grpc/src/AppModule.ts b/packages/service/api-grpc/src/AppModule.ts similarity index 100% rename from packages/api-grpc/src/AppModule.ts rename to packages/service/api-grpc/src/AppModule.ts diff --git a/packages/api-grpc/src/HttpExceptionToGrpcExceptionFilter.ts b/packages/service/api-grpc/src/HttpExceptionToGrpcExceptionFilter.ts similarity index 100% rename from packages/api-grpc/src/HttpExceptionToGrpcExceptionFilter.ts rename to packages/service/api-grpc/src/HttpExceptionToGrpcExceptionFilter.ts diff --git a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/DeleteOneCatGrpcFixtures.ts b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/DeleteOneCatGrpcFixtures.ts similarity index 82% rename from packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/DeleteOneCatGrpcFixtures.ts rename to packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/DeleteOneCatGrpcFixtures.ts index aafd9549..d10b5cb5 100644 --- a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/DeleteOneCatGrpcFixtures.ts +++ b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/DeleteOneCatGrpcFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { DeleteOneCatGrpc } from '../../../../infrastructure/grpc/model/DeleteOneCatGrpc'; -import { CatFixtures } from '../../../domain/model/CatFixtures'; export class DeleteOneCatGrpcFixtures { public static get any(): DeleteOneCatGrpc { diff --git a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/FindOneCatGrpcFixtures.ts b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/FindOneCatGrpcFixtures.ts similarity index 81% rename from packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/FindOneCatGrpcFixtures.ts rename to packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/FindOneCatGrpcFixtures.ts index 08af7b39..39f74008 100644 --- a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/FindOneCatGrpcFixtures.ts +++ b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/FindOneCatGrpcFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { FindOneCatGrpc } from '../../../../infrastructure/grpc/model/FindOneCatGrpc'; -import { CatFixtures } from '../../../domain/model/CatFixtures'; export class FindOneCatGrpcFixtures { public static get any(): FindOneCatGrpc { diff --git a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures.ts b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures.ts similarity index 86% rename from packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures.ts rename to packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures.ts index 54119709..971f81a2 100644 --- a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures.ts +++ b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { InsertOneCatGrpc } from '../../../../infrastructure/grpc/model/InsertOneCatGrpc'; -import { CatFixtures } from '../../../domain/model/CatFixtures'; export class InsertOneCatGrpcFixture { public static get any(): InsertOneCatGrpc { diff --git a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/PaginateFindCatGrpcFixtures.ts b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/PaginateFindCatGrpcFixtures.ts similarity index 100% rename from packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/PaginateFindCatGrpcFixtures.ts rename to packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/PaginateFindCatGrpcFixtures.ts diff --git a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/UpdateOneCatGrpcFixtures.ts b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/UpdateOneCatGrpcFixtures.ts similarity index 82% rename from packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/UpdateOneCatGrpcFixtures.ts rename to packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/UpdateOneCatGrpcFixtures.ts index a5900ece..758cd5e0 100644 --- a/packages/api-grpc/src/cat/fixtures/infrastructure/grpc/model/UpdateOneCatGrpcFixtures.ts +++ b/packages/service/api-grpc/src/cat/fixtures/infrastructure/grpc/model/UpdateOneCatGrpcFixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { UpdateOneCatGrpc } from '../../../../infrastructure/grpc/model/UpdateOneCatGrpc'; -import { CatFixtures } from '../../../domain/model/CatFixtures'; export class UpdateOneCatGrpcFixtures { public static get any(): UpdateOneCatGrpc { diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.spec.ts similarity index 87% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.spec.ts index bfb963d9..79a443e4 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.spec.ts @@ -3,14 +3,13 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { status } from '@grpc/grpc-js'; import { CommandBus, QueryBus } from '@nestjs/cqrs'; import { RpcException } from '@nestjs/microservices'; -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatDeleteCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindOneQueryFixtures, CatDeleteCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { DeleteOneCatGrpcController } from './DeleteOneCatGrpcController'; -import { CatDeleteCommandFixtures } from '../../../fixtures/domain/command/CatDeleteCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatFindOneQueryFixtures } from '../../../fixtures/domain/query/CatFindOneQueryFixtures'; import { DeleteOneCatGrpcFixtures } from '../../../fixtures/infrastructure/grpc/model/DeleteOneCatGrpcFixtures'; import { DeleteOneCatGrpc } from '../model/DeleteOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.ts similarity index 84% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.ts index 70ad44f2..39978bd8 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/DeleteOneCatGrpcController.ts @@ -2,9 +2,9 @@ import { status } from '@grpc/grpc-js'; import { Controller, UsePipes, ValidationPipe } from '@nestjs/common'; import { CommandBus, QueryBus } from '@nestjs/cqrs'; import { GrpcMethod, RpcException } from '@nestjs/microservices'; -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatDeleteCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { DeleteOneCatGrpc } from '../model/DeleteOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.spec.ts similarity index 90% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.spec.ts index f05946cc..693bcf41 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.spec.ts @@ -3,12 +3,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { status } from '@grpc/grpc-js'; import { QueryBus } from '@nestjs/cqrs'; import { RpcException } from '@nestjs/microservices'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatFindOneQueryFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { FindOneCatGrpcController } from './FindOneCatGrpcController'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatFindOneQueryFixtures } from '../../../fixtures/domain/query/CatFindOneQueryFixtures'; import { FindOneCatGrpcFixtures } from '../../../fixtures/infrastructure/grpc/model/FindOneCatGrpcFixtures'; import { FindOneCatGrpc } from '../model/FindOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.ts similarity index 87% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.ts index 66a348a0..cb364294 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/FindOneCatGrpcController.ts @@ -2,8 +2,8 @@ import { status } from '@grpc/grpc-js'; import { Controller, UsePipes, ValidationPipe } from '@nestjs/common'; import { QueryBus } from '@nestjs/cqrs'; import { GrpcMethod, RpcException } from '@nestjs/microservices'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { FindOneCatGrpc } from '../model/FindOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.spec.ts similarity index 85% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.spec.ts index 0d2ea064..f66242ab 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.spec.ts @@ -1,13 +1,13 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatInsertCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertCommand } from '@nestjs-api-example/core-cat/command'; +import { CatInsertCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { firstValueFrom, from } from 'rxjs'; import { InsertCatGrpcController } from './InsertCatGrpcController'; -import { CatInsertCommandFixtures } from '../../../fixtures/domain/command/CatInsertCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; import { InsertOneCatGrpcFixture } from '../../../fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures'; import { InsertOneCatGrpc } from '../model/InsertOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.ts similarity index 92% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.ts index 1ea74c7b..4e5be03b 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertCatGrpcController.ts @@ -1,8 +1,8 @@ import { Controller } from '@nestjs/common'; import { CommandBus } from '@nestjs/cqrs'; import { GrpcStreamMethod } from '@nestjs/microservices'; -import { CatInsertOneCommand, CatInsertCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand, CatInsertCommand } from '@nestjs-api-example/core-cat/command'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { Observable, map, mergeMap, toArray } from 'rxjs'; import { InsertOneCatGrpc } from '../model/InsertOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.spec.ts similarity index 85% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.spec.ts index 2b964e24..9c107707 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.spec.ts @@ -1,12 +1,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatInsertOneCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { InsertOneCatGrpcController } from './InsertOneCatGrpcController'; -import { CatInsertOneCommandFixtures } from '../../../fixtures/domain/command/CatInsertOneCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; import { InsertOneCatGrpcFixture } from '../../../fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures'; import { InsertOneCatGrpc } from '../model/InsertOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.ts similarity index 86% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.ts index 735a5dd6..67d3df46 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneCatGrpcController.ts @@ -1,8 +1,8 @@ import { Controller, UsePipes, ValidationPipe } from '@nestjs/common'; import { CommandBus } from '@nestjs/cqrs'; import { GrpcMethod } from '@nestjs/microservices'; -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand } from '@nestjs-api-example/core-cat/command'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { InsertOneCatGrpc } from '../model/InsertOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.spec.ts similarity index 86% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.spec.ts index f256fe16..c6995ae8 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.spec.ts @@ -1,13 +1,13 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatInsertOneCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { firstValueFrom, from } from 'rxjs'; import { InsertOneStreamCatGrpcController } from './InsertOneStreamCatGrpcController'; -import { CatInsertOneCommandFixtures } from '../../../fixtures/domain/command/CatInsertOneCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; import { InsertOneCatGrpcFixture } from '../../../fixtures/infrastructure/grpc/model/InsertOneCatGrpcFixtures'; import { InsertOneCatGrpc } from '../model/InsertOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.ts similarity index 87% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.ts index 46d80fd5..a4d85a0c 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/InsertOneStreamCatGrpcController.ts @@ -1,8 +1,8 @@ import { Controller } from '@nestjs/common'; import { CommandBus } from '@nestjs/cqrs'; import { GrpcStreamMethod } from '@nestjs/microservices'; -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand } from '@nestjs-api-example/core-cat/command'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { Observable, map, mergeMap } from 'rxjs'; import { InsertOneCatGrpc } from '../model/InsertOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.spec.ts similarity index 86% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.spec.ts index 0f54c19c..721eb1cb 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.spec.ts @@ -1,12 +1,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { QueryBus } from '@nestjs/cqrs'; -import { Cat, Pagination } from '@nestjs-api-example/core/models'; -import { CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; +import { CatPaginateFindQueryFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatPaginateFindQuery } from '@nestjs-api-example/core-cat/query'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; import { PaginateFindCatGrpcController } from './PaginateFindCatGrpcController'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatPaginateFindQueryFixtures } from '../../../fixtures/domain/query/CatPaginateFindQueryFixtures'; import { PaginateFindCatGrpcFixtures } from '../../../fixtures/infrastructure/grpc/model/PaginateFindCatGrpcFixtures'; import { PaginateFindCatGrpc } from '../model/PaginateFindCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.ts similarity index 90% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.ts index 8f291e9c..a2029489 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindCatGrpcController.ts @@ -1,8 +1,8 @@ import { Controller, UsePipes, ValidationPipe } from '@nestjs/common'; import { QueryBus } from '@nestjs/cqrs'; import { GrpcMethod } from '@nestjs/microservices'; -import { Pagination, Cat } from '@nestjs-api-example/core/models'; -import { CatPaginateFindQuery, CatFindQuery } from '@nestjs-api-example/core/queries'; +import { CatPaginateFindQuery, CatFindQuery } from '@nestjs-api-example/core-cat/query'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; import { PaginateFindCatGrpc } from '../model/PaginateFindCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.spec.ts similarity index 87% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.spec.ts index 7f1a04e3..97c128de 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.spec.ts @@ -1,13 +1,13 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { QueryBus } from '@nestjs/cqrs'; -import { Pagination, Cat } from '@nestjs-api-example/core/models'; -import { CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; +import { CatPaginateFindQueryFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatPaginateFindQuery } from '@nestjs-api-example/core-cat/query'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; import { firstValueFrom, from } from 'rxjs'; import { PaginateFindStreamCatGrpcController } from './PaginateFindStreamCatGrpcController'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatPaginateFindQueryFixtures } from '../../../fixtures/domain/query/CatPaginateFindQueryFixtures'; import { PaginateFindCatGrpcFixtures } from '../../../fixtures/infrastructure/grpc/model/PaginateFindCatGrpcFixtures'; import { PaginateFindCatGrpc } from '../model/PaginateFindCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.ts similarity index 91% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.ts index 6a0592cf..0ba184bb 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/PaginateFindStreamCatGrpcController.ts @@ -1,8 +1,8 @@ import { Controller } from '@nestjs/common'; import { QueryBus } from '@nestjs/cqrs'; import { GrpcStreamMethod } from '@nestjs/microservices'; -import { Pagination, Cat } from '@nestjs-api-example/core/models'; -import { CatPaginateFindQuery, CatFindQuery } from '@nestjs-api-example/core/queries'; +import { CatPaginateFindQuery, CatFindQuery } from '@nestjs-api-example/core-cat/query'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; import { Observable, map, mergeMap } from 'rxjs'; import { PaginateFindCatGrpc } from '../model/PaginateFindCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.spec.ts similarity index 89% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.spec.ts index 72b02e98..c8c84628 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.spec.ts @@ -1,11 +1,11 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatUpdateCommand } from '@nestjs-api-example/core/commands'; +import { CatUpdateCommand } from '@nestjs-api-example/core-cat/command'; +import { CatUpdateCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; import { firstValueFrom, from } from 'rxjs'; import { UpdateCatGrpcController } from './UpdateCatGrpcController'; -import { CatUpdateCommandFixtures } from '../../../fixtures/domain/command/CatUpdateCommandFixtures'; import { UpdateOneCatGrpcFixtures } from '../../../fixtures/infrastructure/grpc/model/UpdateOneCatGrpcFixtures'; import { UpdateOneCatGrpc } from '../model/UpdateOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.ts similarity index 91% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.ts index b9f45ab9..105a15f5 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateCatGrpcController.ts @@ -1,8 +1,8 @@ import { Controller } from '@nestjs/common'; import { CommandBus } from '@nestjs/cqrs'; import { GrpcMethod } from '@nestjs/microservices'; -import { CatUpdateOneCommand, CatSetCommand, CatUpdateCommand } from '@nestjs-api-example/core/commands'; -import { CatFindQuery } from '@nestjs-api-example/core/queries'; +import { CatUpdateOneCommand, CatSetCommand, CatUpdateCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindQuery } from '@nestjs-api-example/core-cat/query'; import { Observable, map, mergeMap, toArray } from 'rxjs'; import { UpdateOneCatGrpc } from '../model/UpdateOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.spec.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.spec.ts similarity index 89% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.spec.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.spec.ts index 47b54ea9..51122d2d 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.spec.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.spec.ts @@ -1,10 +1,10 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; +import { CatUpdateOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatUpdateOneCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; import { UpdateOneCatGrpcController } from './UpdateOneCatGrpcController'; -import { CatUpdateOneCommandFixtures } from '../../../fixtures/domain/command/CatUpdateOneCommandFixtures'; import { UpdateOneCatGrpcFixtures } from '../../../fixtures/infrastructure/grpc/model/UpdateOneCatGrpcFixtures'; import { UpdateOneCatGrpc } from '../model/UpdateOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.ts similarity index 90% rename from packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.ts index cf969227..a17655a9 100644 --- a/packages/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/grpc/controller/UpdateOneCatGrpcController.ts @@ -1,8 +1,8 @@ import { Controller, UsePipes, ValidationPipe } from '@nestjs/common'; import { CommandBus } from '@nestjs/cqrs'; import { GrpcMethod } from '@nestjs/microservices'; -import { CatSetCommand, CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; -import { CatFindQuery } from '@nestjs-api-example/core/queries'; +import { CatSetCommand, CatUpdateOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindQuery } from '@nestjs-api-example/core-cat/query'; import { UpdateOneCatGrpc } from '../model/UpdateOneCatGrpc'; diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/model/DeleteOneCatGrpc.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/model/DeleteOneCatGrpc.ts similarity index 100% rename from packages/api-grpc/src/cat/infrastructure/grpc/model/DeleteOneCatGrpc.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/model/DeleteOneCatGrpc.ts diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/model/FindOneCatGrpc.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/model/FindOneCatGrpc.ts similarity index 100% rename from packages/api-grpc/src/cat/infrastructure/grpc/model/FindOneCatGrpc.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/model/FindOneCatGrpc.ts diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/model/InsertOneCatGrpc.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/model/InsertOneCatGrpc.ts similarity index 100% rename from packages/api-grpc/src/cat/infrastructure/grpc/model/InsertOneCatGrpc.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/model/InsertOneCatGrpc.ts diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/model/PaginateFindCatGrpc.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/model/PaginateFindCatGrpc.ts similarity index 100% rename from packages/api-grpc/src/cat/infrastructure/grpc/model/PaginateFindCatGrpc.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/model/PaginateFindCatGrpc.ts diff --git a/packages/api-grpc/src/cat/infrastructure/grpc/model/UpdateOneCatGrpc.ts b/packages/service/api-grpc/src/cat/infrastructure/grpc/model/UpdateOneCatGrpc.ts similarity index 100% rename from packages/api-grpc/src/cat/infrastructure/grpc/model/UpdateOneCatGrpc.ts rename to packages/service/api-grpc/src/cat/infrastructure/grpc/model/UpdateOneCatGrpc.ts diff --git a/packages/api-grpc/src/cat/infrastructure/injection/CatModule.ts b/packages/service/api-grpc/src/cat/infrastructure/injection/CatModule.ts similarity index 95% rename from packages/api-grpc/src/cat/infrastructure/injection/CatModule.ts rename to packages/service/api-grpc/src/cat/infrastructure/injection/CatModule.ts index 4269d577..1eb11c7a 100644 --- a/packages/api-grpc/src/cat/infrastructure/injection/CatModule.ts +++ b/packages/service/api-grpc/src/cat/infrastructure/injection/CatModule.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { CqrsModule } from '@nestjs/cqrs'; -import { CatCoreModule } from '@nestjs-api-example/core/modules'; +import { CatCoreModule } from '@nestjs-api-example/core-cat/module'; import { DeleteOneCatGrpcController } from '../grpc/controller/DeleteOneCatGrpcController'; import { FindOneCatGrpcController } from '../grpc/controller/FindOneCatGrpcController'; diff --git a/packages/api-grpc/src/common/infrastructure/grpc/model/PaginateFindGrpc.ts b/packages/service/api-grpc/src/common/infrastructure/grpc/model/PaginateFindGrpc.ts similarity index 83% rename from packages/api-grpc/src/common/infrastructure/grpc/model/PaginateFindGrpc.ts rename to packages/service/api-grpc/src/common/infrastructure/grpc/model/PaginateFindGrpc.ts index d37fee8b..53b81973 100644 --- a/packages/api-grpc/src/common/infrastructure/grpc/model/PaginateFindGrpc.ts +++ b/packages/service/api-grpc/src/common/infrastructure/grpc/model/PaginateFindGrpc.ts @@ -1,7 +1,6 @@ +import { CommonConstants } from '@nestjs-api-example/core-entity/model'; import { IsInt, IsOptional, Max, Min } from 'class-validator'; -import { CommonConstants } from '../../../domain/model/CommonConstants'; - export class PaginateFindGrpc { @IsOptional() @IsInt() diff --git a/packages/api-grpc/src/grpcConfig.ts b/packages/service/api-grpc/src/grpcConfig.ts similarity index 100% rename from packages/api-grpc/src/grpcConfig.ts rename to packages/service/api-grpc/src/grpcConfig.ts diff --git a/packages/api-grpc/src/main.ts b/packages/service/api-grpc/src/main.ts similarity index 100% rename from packages/api-grpc/src/main.ts rename to packages/service/api-grpc/src/main.ts diff --git a/packages/api-grpc/tsconfig.json b/packages/service/api-grpc/tsconfig.json similarity index 100% rename from packages/api-grpc/tsconfig.json rename to packages/service/api-grpc/tsconfig.json diff --git a/packages/service/api-rest/.eslintignore b/packages/service/api-rest/.eslintignore new file mode 100644 index 00000000..e8e77702 --- /dev/null +++ b/packages/service/api-rest/.eslintignore @@ -0,0 +1,2 @@ +**/*.js +**/*.mjs diff --git a/packages/service/api-rest/.eslintrc.js b/packages/service/api-rest/.eslintrc.js new file mode 100644 index 00000000..49fe91d1 --- /dev/null +++ b/packages/service/api-rest/.eslintrc.js @@ -0,0 +1,8 @@ +/** @type { import("eslint").ESLint.ConfigData } */ +module.exports = { + extends: '@nestjs-api-example/eslint-config', + parserOptions: { + project: ['./tsconfig.json'], + tsconfigRootDir: __dirname, + }, +}; diff --git a/packages/service/api-rest/.gitignore b/packages/service/api-rest/.gitignore new file mode 100644 index 00000000..1bfe5ecc --- /dev/null +++ b/packages/service/api-rest/.gitignore @@ -0,0 +1,14 @@ +# Typescript compiled files +/lib/** + +# node modules +/node_modules/ + +# test coverage reports +/coverage + +# Turborepo files +.turbo/ + +# env file +.env diff --git a/packages/service/api-rest/.lintstagedrc.json b/packages/service/api-rest/.lintstagedrc.json new file mode 100644 index 00000000..0061dfc2 --- /dev/null +++ b/packages/service/api-rest/.lintstagedrc.json @@ -0,0 +1,9 @@ +{ + "*.js": [ + "prettier --write" + ], + "*.ts": [ + "prettier --write", + "eslint" + ] +} diff --git a/packages/service/api-rest/.npmignore b/packages/service/api-rest/.npmignore new file mode 100644 index 00000000..126a35b5 --- /dev/null +++ b/packages/service/api-rest/.npmignore @@ -0,0 +1,15 @@ +# Typescript compiled files +/src/** +/lib/**.spec.* + +# node modules +/node_modules/ + +# test coverage reports +/coverage + +# Turborepo files +.turbo/ + +# env file +.env \ No newline at end of file diff --git a/packages/service/api-rest/jest.config.mjs b/packages/service/api-rest/jest.config.mjs new file mode 100644 index 00000000..496a0af2 --- /dev/null +++ b/packages/service/api-rest/jest.config.mjs @@ -0,0 +1,3 @@ +import { tsGlobalConfig } from '@nestjs-api-example/jest-config'; + +export default tsGlobalConfig; diff --git a/packages/service/api-rest/jest.js.config.mjs b/packages/service/api-rest/jest.js.config.mjs new file mode 100644 index 00000000..94ac18cd --- /dev/null +++ b/packages/service/api-rest/jest.js.config.mjs @@ -0,0 +1,3 @@ +import { jsGlobalConfig } from '@nestjs-api-example/jest-config'; + +export default jsGlobalConfig; diff --git a/packages/api-rest/package.json b/packages/service/api-rest/package.json similarity index 90% rename from packages/api-rest/package.json rename to packages/service/api-rest/package.json index 0604ade8..7b896d6d 100644 --- a/packages/api-rest/package.json +++ b/packages/service/api-rest/package.json @@ -15,7 +15,10 @@ }, "dependencies": { "@fastify/static": "6.12.0", - "@nestjs-api-example/core": "workspace:*", + "@nestjs-api-example/core-cat": "workspace:*", + "@nestjs-api-example/core-config": "workspace:*", + "@nestjs-api-example/core-common": "workspace:*", + "@nestjs-api-example/core-entity": "workspace:*", "@nestjs/common": "10.2.10", "@nestjs/core": "10.2.10", "@nestjs/cqrs": "10.2.6", diff --git a/packages/service/api-rest/prettier.config.js b/packages/service/api-rest/prettier.config.js new file mode 100644 index 00000000..56b4980c --- /dev/null +++ b/packages/service/api-rest/prettier.config.js @@ -0,0 +1,3 @@ +module.exports = { + ...require('@nestjs-api-example/prettier-config'), +}; diff --git a/packages/api-rest/src/AppController.spec.ts b/packages/service/api-rest/src/AppController.spec.ts similarity index 100% rename from packages/api-rest/src/AppController.spec.ts rename to packages/service/api-rest/src/AppController.spec.ts diff --git a/packages/api-rest/src/AppController.ts b/packages/service/api-rest/src/AppController.ts similarity index 100% rename from packages/api-rest/src/AppController.ts rename to packages/service/api-rest/src/AppController.ts diff --git a/packages/api-rest/src/AppModule.ts b/packages/service/api-rest/src/AppModule.ts similarity index 78% rename from packages/api-rest/src/AppModule.ts rename to packages/service/api-rest/src/AppModule.ts index 2fb2b3d5..bb986861 100644 --- a/packages/api-rest/src/AppModule.ts +++ b/packages/service/api-rest/src/AppModule.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { AppConfigModule } from '@nestjs-api-example/core/modules'; +import { AppConfigModule } from '@nestjs-api-example/core-config/module'; import { AppController } from './AppController'; import { CatModule } from './cat/infrastructure/injection/CatModule'; diff --git a/packages/api-rest/src/cat/fixtures/infrastructure/model/InsertOneCatHttpV1Fixtures.ts b/packages/service/api-rest/src/cat/fixtures/infrastructure/model/InsertOneCatHttpV1Fixtures.ts similarity index 86% rename from packages/api-rest/src/cat/fixtures/infrastructure/model/InsertOneCatHttpV1Fixtures.ts rename to packages/service/api-rest/src/cat/fixtures/infrastructure/model/InsertOneCatHttpV1Fixtures.ts index 4964f4fa..8173ebb9 100644 --- a/packages/api-rest/src/cat/fixtures/infrastructure/model/InsertOneCatHttpV1Fixtures.ts +++ b/packages/service/api-rest/src/cat/fixtures/infrastructure/model/InsertOneCatHttpV1Fixtures.ts @@ -1,5 +1,6 @@ +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; + import { InsertOneCatHttpV1 } from '../../../infrastructure/http/model/InsertOneCatHttpV1'; -import { CatFixtures } from '../../domain/model/CatFixtures'; export class InsertOneCatHttpV1Fixtures { public static get any(): InsertOneCatHttpV1 { diff --git a/packages/api-rest/src/cat/fixtures/infrastructure/model/PaginateFindCatHttpV1Fixtures.ts b/packages/service/api-rest/src/cat/fixtures/infrastructure/model/PaginateFindCatHttpV1Fixtures.ts similarity index 100% rename from packages/api-rest/src/cat/fixtures/infrastructure/model/PaginateFindCatHttpV1Fixtures.ts rename to packages/service/api-rest/src/cat/fixtures/infrastructure/model/PaginateFindCatHttpV1Fixtures.ts diff --git a/packages/api-rest/src/cat/fixtures/infrastructure/model/UpdateOneCatHttpV1Fixtures.ts b/packages/service/api-rest/src/cat/fixtures/infrastructure/model/UpdateOneCatHttpV1Fixtures.ts similarity index 100% rename from packages/api-rest/src/cat/fixtures/infrastructure/model/UpdateOneCatHttpV1Fixtures.ts rename to packages/service/api-rest/src/cat/fixtures/infrastructure/model/UpdateOneCatHttpV1Fixtures.ts diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.spec.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.spec.ts similarity index 84% rename from packages/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.spec.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.spec.ts index 97e6a654..43df3550 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.spec.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.spec.ts @@ -1,15 +1,14 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { CommandBus, QueryBus } from '@nestjs/cqrs'; -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatDeleteCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindOneQueryFixtures, CatDeleteCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { EntityNotFoundException } from '@nestjs-api-example/core-common/exception'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { DeleteOneCatControllerV1 } from './DeleteOneCatControllerV1'; -import { EntityNotFoundException } from '../../../../common/domain/exception/EntityNotFoundException'; -import { CatDeleteCommandFixtures } from '../../../fixtures/domain/command/CatDeleteCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatFindOneQueryFixtures } from '../../../fixtures/domain/query/CatFindOneQueryFixtures'; describe(DeleteOneCatControllerV1.name, () => { let deleteOneCatControllerV1: DeleteOneCatControllerV1; diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.ts similarity index 83% rename from packages/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.ts index 18ff5a55..483770bd 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/DeleteOneCatControllerV1.ts @@ -9,11 +9,10 @@ import { ApiParam, ApiTags, } from '@nestjs/swagger'; -import { CatDeleteCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; - -import { EntityNotFoundException } from '../../../../common/domain/exception/EntityNotFoundException'; +import { CatDeleteCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { EntityNotFoundException } from '@nestjs-api-example/core-common/exception'; +import { Cat } from '@nestjs-api-example/core-entity/model'; @ApiTags('Cats') @Controller({ path: 'cats', version: '1' }) diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.spec.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.spec.ts similarity index 86% rename from packages/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.spec.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.spec.ts index 52af4114..181e4ae6 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.spec.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.spec.ts @@ -1,13 +1,13 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { QueryBus } from '@nestjs/cqrs'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatFindOneQueryFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { EntityNotFoundException } from '@nestjs-api-example/core-common/exception'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { FindOneCatControllerV1 } from './FindOneCatControllerV1'; -import { EntityNotFoundException } from '../../../../common/domain/exception/EntityNotFoundException'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; -import { CatFindOneQueryFixtures } from '../../../fixtures/domain/query/CatFindOneQueryFixtures'; describe(FindOneCatControllerV1.name, () => { let findOneCatControllerV1: FindOneCatControllerV1; diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.ts similarity index 83% rename from packages/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.ts index 4340a4e3..95c1b8a4 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/FindOneCatControllerV1.ts @@ -8,10 +8,10 @@ import { ApiParam, ApiTags, } from '@nestjs/swagger'; -import { Cat } from '@nestjs-api-example/core/models'; -import { CatFindOneQuery } from '@nestjs-api-example/core/queries'; +import { CatFindOneQuery } from '@nestjs-api-example/core-cat/query'; +import { EntityNotFoundException } from '@nestjs-api-example/core-common/exception'; +import { Cat } from '@nestjs-api-example/core-entity/model'; -import { EntityNotFoundException } from '../../../../common/domain/exception/EntityNotFoundException'; import { CatHttpV1 } from '../model/CatHttpV1'; @ApiTags('Cats') diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.spec.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.spec.ts similarity index 85% rename from packages/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.spec.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.spec.ts index fadc3fd9..cbeb5eb4 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.spec.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.spec.ts @@ -1,12 +1,12 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatInsertOneCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { InsertOneCatControllerV1 } from './InsertOneCatControllerV1'; -import { CatInsertOneCommandFixtures } from '../../../fixtures/domain/command/CatInsertOneCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; import { InsertOneCatHttpV1Fixtures } from '../../../fixtures/infrastructure/model/InsertOneCatHttpV1Fixtures'; import { InsertOneCatHttpV1 } from '../model/InsertOneCatHttpV1'; diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.ts similarity index 88% rename from packages/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.ts index ca4d7ab7..9bb1f91e 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/InsertOneCatControllerV1.ts @@ -1,8 +1,8 @@ import { Body, Controller, Post } from '@nestjs/common'; import { CommandBus } from '@nestjs/cqrs'; import { ApiBadRequestResponse, ApiCreatedResponse, ApiOperation, ApiTags } from '@nestjs/swagger'; -import { CatInsertOneCommand } from '@nestjs-api-example/core/commands'; -import { Cat } from '@nestjs-api-example/core/models'; +import { CatInsertOneCommand } from '@nestjs-api-example/core-cat/command'; +import { Cat } from '@nestjs-api-example/core-entity/model'; import { CatHttpV1 } from '../model/CatHttpV1'; import { InsertOneCatHttpV1 } from '../model/InsertOneCatHttpV1'; diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.spec.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.spec.ts similarity index 89% rename from packages/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.spec.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.spec.ts index 4c092939..1546cdf2 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.spec.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.spec.ts @@ -1,11 +1,11 @@ import { jest, beforeAll, afterAll, describe, expect, it } from '@jest/globals'; import { QueryBus } from '@nestjs/cqrs'; -import { Cat, Pagination } from '@nestjs-api-example/core/models'; -import { CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; +import { CatPaginateFindQueryFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatPaginateFindQuery } from '@nestjs-api-example/core-cat/query'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; import { PaginateFindCatControllerV1 } from './PaginateFindCatControllerV1'; -import { CatPaginateFindQueryFixtures } from '../../../fixtures/domain/query/CatPaginateFindQueryFixtures'; import { PaginateFindCatHttpV1Fixtures } from '../../../fixtures/infrastructure/model/PaginateFindCatHttpV1Fixtures'; import { PaginateFindCatHttpV1 } from '../model/PaginateFindCatHttpV1'; diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.ts similarity index 93% rename from packages/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.ts index 22398fac..ffebca7b 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/PaginateFindCatControllerV1.ts @@ -1,8 +1,8 @@ import { Controller, Get, Query } from '@nestjs/common'; import { QueryBus } from '@nestjs/cqrs'; import { ApiBadRequestResponse, ApiOperation, ApiTags } from '@nestjs/swagger'; -import { Pagination, Cat } from '@nestjs-api-example/core/models'; -import { CatFindQuery, CatPaginateFindQuery } from '@nestjs-api-example/core/queries'; +import { CatFindQuery, CatPaginateFindQuery } from '@nestjs-api-example/core-cat/query'; +import { Pagination, Cat } from '@nestjs-api-example/core-entity/model'; import { ApiOkPaginationResponse } from '../../../../common/infrastructure/http/decorator/ApiOkPaginationResponse'; import { CatHttpV1 } from '../model/CatHttpV1'; diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.spec.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.spec.ts similarity index 86% rename from packages/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.spec.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.spec.ts index 4ddd3e93..ff276d76 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.spec.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.spec.ts @@ -1,11 +1,11 @@ import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'; import { CommandBus } from '@nestjs/cqrs'; -import { CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; +import { CatUpdateOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatUpdateOneCommandFixtures } from '@nestjs-api-example/core-cat/fixture'; +import { CatFixtures } from '@nestjs-api-example/core-entity/fixture'; import { UpdateOneCatControllerV1 } from './UpdateOneCatControllerV1'; -import { CatUpdateOneCommandFixtures } from '../../../fixtures/domain/command/CatUpdateOneCommandFixtures'; -import { CatFixtures } from '../../../fixtures/domain/model/CatFixtures'; import { UpdateOneCatHttpV1Fixtures } from '../../../fixtures/infrastructure/model/UpdateOneCatHttpV1Fixtures'; import { UpdateOneCatHttpV1 } from '../model/UpdateOneCatHttpV1'; diff --git a/packages/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.ts similarity index 93% rename from packages/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.ts index c99f7ea0..3d2e8fff 100644 --- a/packages/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.ts +++ b/packages/service/api-rest/src/cat/infrastructure/http/controller/UpdateOneCatControllerV1.ts @@ -8,8 +8,8 @@ import { ApiParam, ApiTags, } from '@nestjs/swagger'; -import { CatSetCommand, CatUpdateOneCommand } from '@nestjs-api-example/core/commands'; -import { CatFindQuery } from '@nestjs-api-example/core/queries'; +import { CatSetCommand, CatUpdateOneCommand } from '@nestjs-api-example/core-cat/command'; +import { CatFindQuery } from '@nestjs-api-example/core-cat/query'; import { UpdateOneCatHttpV1 } from '../model/UpdateOneCatHttpV1'; diff --git a/packages/api-rest/src/cat/infrastructure/http/model/CatHttpV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/model/CatHttpV1.ts similarity index 100% rename from packages/api-rest/src/cat/infrastructure/http/model/CatHttpV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/model/CatHttpV1.ts diff --git a/packages/api-rest/src/cat/infrastructure/http/model/InsertOneCatHttpV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/model/InsertOneCatHttpV1.ts similarity index 100% rename from packages/api-rest/src/cat/infrastructure/http/model/InsertOneCatHttpV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/model/InsertOneCatHttpV1.ts diff --git a/packages/api-rest/src/cat/infrastructure/http/model/PaginateFindCatHttpV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/model/PaginateFindCatHttpV1.ts similarity index 100% rename from packages/api-rest/src/cat/infrastructure/http/model/PaginateFindCatHttpV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/model/PaginateFindCatHttpV1.ts diff --git a/packages/api-rest/src/cat/infrastructure/http/model/UpdateOneCatHttpV1.ts b/packages/service/api-rest/src/cat/infrastructure/http/model/UpdateOneCatHttpV1.ts similarity index 100% rename from packages/api-rest/src/cat/infrastructure/http/model/UpdateOneCatHttpV1.ts rename to packages/service/api-rest/src/cat/infrastructure/http/model/UpdateOneCatHttpV1.ts diff --git a/packages/api-rest/src/cat/infrastructure/injection/CatModule.ts b/packages/service/api-rest/src/cat/infrastructure/injection/CatModule.ts similarity index 91% rename from packages/api-rest/src/cat/infrastructure/injection/CatModule.ts rename to packages/service/api-rest/src/cat/infrastructure/injection/CatModule.ts index 2ebfd314..1f22506b 100644 --- a/packages/api-rest/src/cat/infrastructure/injection/CatModule.ts +++ b/packages/service/api-rest/src/cat/infrastructure/injection/CatModule.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { CqrsModule } from '@nestjs/cqrs'; -import { CatCoreModule } from '@nestjs-api-example/core/modules'; +import { CatCoreModule } from '@nestjs-api-example/core-cat/module'; import { DeleteOneCatControllerV1 } from '../http/controller/DeleteOneCatControllerV1'; import { FindOneCatControllerV1 } from '../http/controller/FindOneCatControllerV1'; diff --git a/packages/api-rest/src/common/infrastructure/http/decorator/ApiOkPaginationResponse.ts b/packages/service/api-rest/src/common/infrastructure/http/decorator/ApiOkPaginationResponse.ts similarity index 100% rename from packages/api-rest/src/common/infrastructure/http/decorator/ApiOkPaginationResponse.ts rename to packages/service/api-rest/src/common/infrastructure/http/decorator/ApiOkPaginationResponse.ts diff --git a/packages/api-rest/src/common/infrastructure/http/model/BaseEntityHttpV1.ts b/packages/service/api-rest/src/common/infrastructure/http/model/BaseEntityHttpV1.ts similarity index 100% rename from packages/api-rest/src/common/infrastructure/http/model/BaseEntityHttpV1.ts rename to packages/service/api-rest/src/common/infrastructure/http/model/BaseEntityHttpV1.ts diff --git a/packages/api-rest/src/common/infrastructure/http/model/PaginateFindHttpV1.ts b/packages/service/api-rest/src/common/infrastructure/http/model/PaginateFindHttpV1.ts similarity index 86% rename from packages/api-rest/src/common/infrastructure/http/model/PaginateFindHttpV1.ts rename to packages/service/api-rest/src/common/infrastructure/http/model/PaginateFindHttpV1.ts index 6515939a..65b9f8e9 100644 --- a/packages/api-rest/src/common/infrastructure/http/model/PaginateFindHttpV1.ts +++ b/packages/service/api-rest/src/common/infrastructure/http/model/PaginateFindHttpV1.ts @@ -1,8 +1,7 @@ import { ApiPropertyOptional } from '@nestjs/swagger'; +import { CommonConstants } from '@nestjs-api-example/core-entity/model'; import { IsInt, IsOptional, Max, Min } from 'class-validator'; -import { CommonConstants } from '../../../domain/model/CommonConstants'; - export class PaginateFindHttpV1 { @ApiPropertyOptional() @IsOptional() diff --git a/packages/api-rest/src/common/infrastructure/http/model/PaginationHttp.ts b/packages/service/api-rest/src/common/infrastructure/http/model/PaginationHttp.ts similarity index 100% rename from packages/api-rest/src/common/infrastructure/http/model/PaginationHttp.ts rename to packages/service/api-rest/src/common/infrastructure/http/model/PaginationHttp.ts diff --git a/packages/api-rest/src/common/infrastructure/http/model/PaginationMetaHttp.ts b/packages/service/api-rest/src/common/infrastructure/http/model/PaginationMetaHttp.ts similarity index 100% rename from packages/api-rest/src/common/infrastructure/http/model/PaginationMetaHttp.ts rename to packages/service/api-rest/src/common/infrastructure/http/model/PaginationMetaHttp.ts diff --git a/packages/api-rest/src/main.ts b/packages/service/api-rest/src/main.ts similarity index 94% rename from packages/api-rest/src/main.ts rename to packages/service/api-rest/src/main.ts index bfc4bcd5..7e9ac9a6 100644 --- a/packages/api-rest/src/main.ts +++ b/packages/service/api-rest/src/main.ts @@ -2,7 +2,7 @@ import { ValidationPipe, VersioningType } from '@nestjs/common'; import { NestFactory } from '@nestjs/core'; import { FastifyAdapter, NestFastifyApplication } from '@nestjs/platform-fastify'; import { DocumentBuilder, OpenAPIObject, SwaggerModule } from '@nestjs/swagger'; -import { AppConfig } from '@nestjs-api-example/core/models'; +import { AppConfig } from '@nestjs-api-example/core-config/model'; import { AppModule } from './AppModule'; diff --git a/packages/api-rest/tsconfig.json b/packages/service/api-rest/tsconfig.json similarity index 100% rename from packages/api-rest/tsconfig.json rename to packages/service/api-rest/tsconfig.json diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index dee51e92..ba9daf27 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,4 @@ packages: - - "packages/*" + - "packages/core/*" + - "packages/project-config/*" + - "packages/service/*"