diff --git a/apps/server/src/console/console.module.ts b/apps/server/src/console/console.module.ts index 9d30db8fedb..55520d2fe34 100644 --- a/apps/server/src/console/console.module.ts +++ b/apps/server/src/console/console.module.ts @@ -1,17 +1,17 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; -import { Dictionary, IPrimaryKey } from '@mikro-orm/core'; -import { MikroOrmModule } from '@mikro-orm/nestjs'; -import { Module, NotFoundException } from '@nestjs/common'; -import { ConfigModule } from '@nestjs/config'; -import { ALL_ENTITIES } from '@shared/domain'; import { ConsoleWriterModule } from '@infra/console/console-writer/console-writer.module'; import { KeycloakModule } from '@infra/identity-management/keycloak/keycloak.module'; -import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config'; +import { Dictionary, IPrimaryKey } from '@mikro-orm/core'; +import { MikroOrmModule } from '@mikro-orm/nestjs'; import { FilesModule } from '@modules/files'; -import { FileEntity } from '@modules/files/entity'; import { FileRecord } from '@modules/files-storage/entity'; +import { FileEntity } from '@modules/files/entity'; import { ManagementModule } from '@modules/management/management.module'; import { serverConfig } from '@modules/server'; +import { Module, NotFoundException } from '@nestjs/common'; +import { ConfigModule } from '@nestjs/config'; +import { ALL_ENTITIES } from '@shared/domain/entity'; +import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config'; import { ConsoleModule } from 'nestjs-console'; import { ServerConsole } from './server.console'; diff --git a/apps/server/src/infra/calendar/service/calendar.service.ts b/apps/server/src/infra/calendar/service/calendar.service.ts index 7f39c21ae58..654da665b1b 100644 --- a/apps/server/src/infra/calendar/service/calendar.service.ts +++ b/apps/server/src/infra/calendar/service/calendar.service.ts @@ -1,7 +1,7 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { HttpService } from '@nestjs/axios'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorUtils } from '@src/core/error/utils'; import { AxiosRequestConfig, AxiosResponse } from 'axios'; import { firstValueFrom, Observable } from 'rxjs'; diff --git a/apps/server/src/infra/collaborative-storage/collaborative-storage.adapter.spec.ts b/apps/server/src/infra/collaborative-storage/collaborative-storage.adapter.spec.ts index 3742c3ff408..7ab965a7676 100644 --- a/apps/server/src/infra/collaborative-storage/collaborative-storage.adapter.spec.ts +++ b/apps/server/src/infra/collaborative-storage/collaborative-storage.adapter.spec.ts @@ -2,7 +2,7 @@ import { createMock } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; import { TeamDto } from '@modules/collaborative-storage/services/dto/team.dto'; // invalid import please fix import { Test, TestingModule } from '@nestjs/testing'; -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; import { LegacyLogger } from '@src/core/logger'; import { CollaborativeStorageAdapter } from './collaborative-storage.adapter'; import { CollaborativeStorageAdapterMapper } from './mapper/collaborative-storage-adapter.mapper'; diff --git a/apps/server/src/infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper.spec.ts b/apps/server/src/infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper.spec.ts index bea98c50ebe..2191c9c5caa 100644 --- a/apps/server/src/infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper.spec.ts +++ b/apps/server/src/infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper.spec.ts @@ -1,6 +1,6 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { RoleName } from '@shared/domain'; import { CollaborativeStorageAdapterMapper } from '@infra/collaborative-storage/mapper/collaborative-storage-adapter.mapper'; +import { Test, TestingModule } from '@nestjs/testing'; +import { RoleName } from '@shared/domain/interface'; describe('TeamStorage Mapper', () => { let module: TestingModule; diff --git a/apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.spec.ts b/apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.spec.ts index 706e360b700..ec68c9a3968 100644 --- a/apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.spec.ts +++ b/apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.spec.ts @@ -1,18 +1,20 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { TeamDto, TeamUserDto } from '@modules/collaborative-storage/services/dto/team.dto'; +import { PseudonymService } from '@modules/pseudonym'; +import { ExternalToolService } from '@modules/tool/external-tool/service'; +import { UserService } from '@modules/user'; import { UnprocessableEntityException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { LtiPrivacyPermission, LtiRoleType, Pseudonym, RoleName, User, UserDO } from '@shared/domain'; +import { Pseudonym, UserDO } from '@shared/domain/domainobject'; import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; +import { LtiPrivacyPermission, LtiRoleType, User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { LtiToolRepo } from '@shared/repo'; import { ltiToolDOFactory, pseudonymFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; -import { TeamDto, TeamUserDto } from '@modules/collaborative-storage/services/dto/team.dto'; -import { PseudonymService } from '@modules/pseudonym'; -import { ExternalToolService } from '@modules/tool/external-tool/service'; -import { UserService } from '@modules/user'; -import { NextcloudStrategy } from './nextcloud.strategy'; -import { NextcloudClient } from './nextcloud.client'; import { TeamRolePermissionsDto } from '../../dto/team-role-permissions.dto'; +import { NextcloudClient } from './nextcloud.client'; +import { NextcloudStrategy } from './nextcloud.strategy'; class NextcloudStrategySpec extends NextcloudStrategy { static specGenerateGroupId(dto: TeamRolePermissionsDto): string { diff --git a/apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.ts b/apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.ts index b7312f9158e..7dd1b73873b 100644 --- a/apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.ts +++ b/apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.ts @@ -4,7 +4,7 @@ import { ExternalTool } from '@modules/tool/external-tool/domain'; import { ExternalToolService } from '@modules/tool/external-tool/service'; import { UserService } from '@modules/user'; import { Injectable, UnprocessableEntityException } from '@nestjs/common'; -import { Pseudonym, UserDO } from '@shared/domain/'; +import { Pseudonym, UserDO } from '@shared/domain/domainobject'; import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; import { LtiToolRepo } from '@shared/repo/ltitool/'; import { LegacyLogger } from '@src/core/logger'; diff --git a/apps/server/src/infra/database/management/database-management.service.ts b/apps/server/src/infra/database/management/database-management.service.ts index 34941886629..d7e0aa22e56 100644 --- a/apps/server/src/infra/database/management/database-management.service.ts +++ b/apps/server/src/infra/database/management/database-management.service.ts @@ -1,8 +1,8 @@ -import { BaseEntity } from '@shared/domain'; +import { MikroORM } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; +import { BaseEntity } from '@shared/domain/entity'; import { Collection, Db } from 'mongodb'; -import { MikroORM } from '@mikro-orm/core'; @Injectable() export class DatabaseManagementService { diff --git a/apps/server/src/infra/database/mongo-memory-database/mongo-memory-database.module.ts b/apps/server/src/infra/database/mongo-memory-database/mongo-memory-database.module.ts index a7d7c399c5f..68f09bd2ea5 100644 --- a/apps/server/src/infra/database/mongo-memory-database/mongo-memory-database.module.ts +++ b/apps/server/src/infra/database/mongo-memory-database/mongo-memory-database.module.ts @@ -1,7 +1,7 @@ import { MikroORM } from '@mikro-orm/core'; import { MikroOrmModule, MikroOrmModuleAsyncOptions } from '@mikro-orm/nestjs'; import { DynamicModule, Inject, Module, OnModuleDestroy } from '@nestjs/common'; -import { ALL_ENTITIES } from '@shared/domain'; +import { ALL_ENTITIES } from '@shared/domain/entity'; import _ from 'lodash'; import { MongoDatabaseModuleOptions } from './types'; diff --git a/apps/server/src/infra/identity-management/identity-management.service.ts b/apps/server/src/infra/identity-management/identity-management.service.ts index 882557196e6..2a502135b70 100644 --- a/apps/server/src/infra/identity-management/identity-management.service.ts +++ b/apps/server/src/infra/identity-management/identity-management.service.ts @@ -1,4 +1,5 @@ -import { Counted, IdmAccount, IdmAccountUpdate } from '@shared/domain'; +import { IdmAccount, IdmAccountUpdate } from '@shared/domain/interface'; +import { Counted } from '@shared/domain/types'; export type SearchOptions = { exact?: boolean; diff --git a/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.spec.ts b/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.spec.ts index 76bcbceebf2..11bf59c9d8c 100644 --- a/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.spec.ts +++ b/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.spec.ts @@ -12,7 +12,9 @@ import { SystemOidcService } from '@modules/system/service/system-oidc.service'; import { HttpService } from '@nestjs/axios'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { SystemEntity, SystemTypeEnum } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; +import { SystemTypeEnum } from '@shared/domain/types'; + import { systemEntityFactory } from '@shared/testing'; import { AxiosResponse } from 'axios'; import { of } from 'rxjs'; diff --git a/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-migration.service.integration.spec.ts b/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-migration.service.integration.spec.ts index eba5e20fcd0..fc9f592f428 100644 --- a/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-migration.service.integration.spec.ts +++ b/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-migration.service.integration.spec.ts @@ -1,9 +1,9 @@ -import { EntityManager } from '@mikro-orm/mongodb'; +import { MongoMemoryDatabaseModule } from '@infra/database'; import KeycloakAdminClient from '@keycloak/keycloak-admin-client'; +import { EntityManager } from '@mikro-orm/mongodb'; import { ConfigModule } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { Account } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { Account } from '@shared/domain/entity'; import { accountFactory, cleanupCollections } from '@shared/testing'; import { LoggerModule } from '@src/core/logger'; import { v1 } from 'uuid'; diff --git a/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.integration.spec.ts b/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.integration.spec.ts index c5f83c35f17..bb368321f82 100644 --- a/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.integration.spec.ts +++ b/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.integration.spec.ts @@ -1,12 +1,12 @@ +import { KeycloakAdministrationService } from '@infra/identity-management/keycloak-administration/service/keycloak-administration.service'; +import { KeycloakModule } from '@infra/identity-management/keycloak/keycloak.module'; import KeycloakAdminClient from '@keycloak/keycloak-admin-client-cjs/keycloak-admin-client-cjs-index'; import UserRepresentation from '@keycloak/keycloak-admin-client/lib/defs/userRepresentation'; import { ObjectId } from '@mikro-orm/mongodb'; +import { ServerModule } from '@modules/server'; import { HttpModule } from '@nestjs/axios'; import { Test, TestingModule } from '@nestjs/testing'; -import { IdmAccount, IdmAccountUpdate } from '@shared/domain'; -import { KeycloakAdministrationService } from '@infra/identity-management/keycloak-administration/service/keycloak-administration.service'; -import { KeycloakModule } from '@infra/identity-management/keycloak/keycloak.module'; -import { ServerModule } from '@modules/server'; +import { IdmAccount, IdmAccountUpdate } from '@shared/domain/interface'; import { v1 } from 'uuid'; import { IdentityManagementService } from '../../identity-management.service'; import { KeycloakIdentityManagementService } from './keycloak-identity-management.service'; diff --git a/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.ts b/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.ts index f4ea727ffe4..616adf90b00 100644 --- a/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.ts +++ b/apps/server/src/infra/identity-management/keycloak/service/keycloak-identity-management.service.ts @@ -1,7 +1,8 @@ import UserRepresentation from '@keycloak/keycloak-admin-client/lib/defs/userRepresentation'; import { Injectable } from '@nestjs/common'; import { EntityNotFoundError } from '@shared/common'; -import { Counted, IdmAccount, IdmAccountUpdate } from '@shared/domain'; +import { IdmAccount, IdmAccountUpdate } from '@shared/domain/interface'; +import { Counted } from '@shared/domain/types'; import { IdentityManagementService, SearchOptions } from '../../identity-management.service'; import { KeycloakAdministrationService } from '../../keycloak-administration/service/keycloak-administration.service'; diff --git a/apps/server/src/infra/rabbitmq/exchange/files-storage.ts b/apps/server/src/infra/rabbitmq/exchange/files-storage.ts index 86d2f710a57..6731df5dbc4 100644 --- a/apps/server/src/infra/rabbitmq/exchange/files-storage.ts +++ b/apps/server/src/infra/rabbitmq/exchange/files-storage.ts @@ -1,5 +1,5 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; export const FilesStorageExchange = Configuration.get('FILES_STORAGE__EXCHANGE') as string; diff --git a/apps/server/src/modules/account/account-api.module.ts b/apps/server/src/modules/account/account-api.module.ts index 744c421ff53..d06a9dabebd 100644 --- a/apps/server/src/modules/account/account-api.module.ts +++ b/apps/server/src/modules/account/account-api.module.ts @@ -1,10 +1,10 @@ import { Module } from '@nestjs/common'; -import { PermissionService } from '@shared/domain'; +import { PermissionService } from '@shared/domain/service'; import { UserRepo } from '@shared/repo'; +import { LoggerModule } from '../../core/logger/logger.module'; import { AccountModule } from './account.module'; import { AccountController } from './controller/account.controller'; import { AccountUc } from './uc/account.uc'; -import { LoggerModule } from '../../core/logger/logger.module'; @Module({ imports: [AccountModule, LoggerModule], diff --git a/apps/server/src/modules/account/account.module.ts b/apps/server/src/modules/account/account.module.ts index 2a60d4c453a..7f5cf04cd0e 100644 --- a/apps/server/src/modules/account/account.module.ts +++ b/apps/server/src/modules/account/account.module.ts @@ -1,8 +1,9 @@ import { IdentityManagementModule } from '@infra/identity-management'; import { Module } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { PermissionService } from '@shared/domain'; +import { PermissionService } from '@shared/domain/service'; import { LegacySystemRepo, UserRepo } from '@shared/repo'; + import { LoggerModule } from '@src/core/logger/logger.module'; import { ServerConfig } from '../server/server.config'; import { AccountIdmToDtoMapper, AccountIdmToDtoMapperDb, AccountIdmToDtoMapperIdm } from './mapper'; diff --git a/apps/server/src/modules/account/controller/api-test/account.api.spec.ts b/apps/server/src/modules/account/controller/api-test/account.api.spec.ts index 7a920a40a97..14d68ae5668 100644 --- a/apps/server/src/modules/account/controller/api-test/account.api.spec.ts +++ b/apps/server/src/modules/account/controller/api-test/account.api.spec.ts @@ -1,7 +1,8 @@ import { EntityManager } from '@mikro-orm/core'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Account, Permission, RoleName, User } from '@shared/domain'; +import { Account, User } from '@shared/domain/entity'; +import { Permission, RoleName } from '@shared/domain/interface'; import { accountFactory, mapUserToCurrentUser, roleFactory, schoolFactory, userFactory } from '@shared/testing'; import { AccountByIdBodyParams, diff --git a/apps/server/src/modules/account/mapper/account-entity-to-dto.mapper.spec.ts b/apps/server/src/modules/account/mapper/account-entity-to-dto.mapper.spec.ts index 8e9522434eb..e5e828d3b87 100644 --- a/apps/server/src/modules/account/mapper/account-entity-to-dto.mapper.spec.ts +++ b/apps/server/src/modules/account/mapper/account-entity-to-dto.mapper.spec.ts @@ -1,4 +1,4 @@ -import { Account } from '@shared/domain'; +import { Account } from '@shared/domain/entity'; import { ObjectId } from 'bson'; import { AccountEntityToDtoMapper } from './account-entity-to-dto.mapper'; diff --git a/apps/server/src/modules/account/mapper/account-entity-to-dto.mapper.ts b/apps/server/src/modules/account/mapper/account-entity-to-dto.mapper.ts index 417497b3218..4ce38116477 100644 --- a/apps/server/src/modules/account/mapper/account-entity-to-dto.mapper.ts +++ b/apps/server/src/modules/account/mapper/account-entity-to-dto.mapper.ts @@ -1,4 +1,5 @@ -import { Account, Counted } from '@shared/domain'; +import { Account } from '@shared/domain/entity'; +import { Counted } from '@shared/domain/types'; import { AccountDto } from '../services/dto/account.dto'; export class AccountEntityToDtoMapper { diff --git a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.abstract.ts b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.abstract.ts index 6fb7e64ac09..9e3f0b83501 100644 --- a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.abstract.ts +++ b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.abstract.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { IdmAccount } from '@shared/domain'; +import { IdmAccount } from '@shared/domain/interface'; import { AccountDto } from '../services/dto/account.dto'; @Injectable() diff --git a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.db.spec.ts b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.db.spec.ts index 0774457472a..bd6284383db 100644 --- a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.db.spec.ts +++ b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.db.spec.ts @@ -1,5 +1,5 @@ import { Test, TestingModule } from '@nestjs/testing'; -import { IdmAccount } from '@shared/domain'; +import { IdmAccount } from '@shared/domain/interface'; import { AccountDto } from '../services/dto'; import { AccountIdmToDtoMapper } from './account-idm-to-dto.mapper.abstract'; import { AccountIdmToDtoMapperDb } from './account-idm-to-dto.mapper.db'; diff --git a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.db.ts b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.db.ts index 0dd4877d59d..16cc41f5170 100644 --- a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.db.ts +++ b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.db.ts @@ -1,4 +1,4 @@ -import { IdmAccount } from '@shared/domain'; +import { IdmAccount } from '@shared/domain/interface'; import { AccountDto } from '../services/dto/account.dto'; import { AccountIdmToDtoMapper } from './account-idm-to-dto.mapper.abstract'; diff --git a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.idm.spec.ts b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.idm.spec.ts index 0d60a2cc57f..7ef8508c0c2 100644 --- a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.idm.spec.ts +++ b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.idm.spec.ts @@ -1,5 +1,5 @@ import { Test, TestingModule } from '@nestjs/testing'; -import { IdmAccount } from '@shared/domain'; +import { IdmAccount } from '@shared/domain/interface'; import { AccountDto } from '../services/dto'; import { AccountIdmToDtoMapper } from './account-idm-to-dto.mapper.abstract'; import { AccountIdmToDtoMapperIdm } from './account-idm-to-dto.mapper.idm'; diff --git a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.idm.ts b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.idm.ts index 4f30fac7158..0f57a63dee4 100644 --- a/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.idm.ts +++ b/apps/server/src/modules/account/mapper/account-idm-to-dto.mapper.idm.ts @@ -1,4 +1,4 @@ -import { IdmAccount } from '@shared/domain'; +import { IdmAccount } from '@shared/domain/interface'; import { AccountDto } from '../services/dto/account.dto'; import { AccountIdmToDtoMapper } from './account-idm-to-dto.mapper.abstract'; diff --git a/apps/server/src/modules/account/mapper/account-response.mapper.spec.ts b/apps/server/src/modules/account/mapper/account-response.mapper.spec.ts index c4bd892faa0..ef9b64e8257 100644 --- a/apps/server/src/modules/account/mapper/account-response.mapper.spec.ts +++ b/apps/server/src/modules/account/mapper/account-response.mapper.spec.ts @@ -1,6 +1,6 @@ -import { Account } from '@shared/domain'; -import { AccountDto } from '@modules/account/services/dto/account.dto'; import { ObjectId } from '@mikro-orm/mongodb'; +import { AccountDto } from '@modules/account/services/dto/account.dto'; +import { Account } from '@shared/domain/entity'; import { AccountResponseMapper } from '.'; describe('AccountResponseMapper', () => { diff --git a/apps/server/src/modules/account/mapper/account-response.mapper.ts b/apps/server/src/modules/account/mapper/account-response.mapper.ts index dac10f98255..04e2f7c9ac8 100644 --- a/apps/server/src/modules/account/mapper/account-response.mapper.ts +++ b/apps/server/src/modules/account/mapper/account-response.mapper.ts @@ -1,5 +1,5 @@ -import { Account } from '@shared/domain'; import { AccountDto } from '@modules/account/services/dto/account.dto'; +import { Account } from '@shared/domain/entity'; import { AccountResponse } from '../controller/dto'; export class AccountResponseMapper { diff --git a/apps/server/src/modules/account/repo/account.repo.integration.spec.ts b/apps/server/src/modules/account/repo/account.repo.integration.spec.ts index 77acc53a3b1..70778e590a3 100644 --- a/apps/server/src/modules/account/repo/account.repo.integration.spec.ts +++ b/apps/server/src/modules/account/repo/account.repo.integration.spec.ts @@ -1,8 +1,8 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { Account, User } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { Account, User } from '@shared/domain/entity'; import { accountFactory, cleanupCollections, userFactory } from '@shared/testing'; import { AccountRepo } from './account.repo'; diff --git a/apps/server/src/modules/account/repo/account.repo.ts b/apps/server/src/modules/account/repo/account.repo.ts index f8c1f5677ec..d9c07297e8d 100644 --- a/apps/server/src/modules/account/repo/account.repo.ts +++ b/apps/server/src/modules/account/repo/account.repo.ts @@ -1,8 +1,9 @@ import { AnyEntity, EntityName, Primary } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId, SortOrder } from '@shared/domain'; import { Account } from '@shared/domain/entity/account.entity'; +import { SortOrder } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo/base.repo'; @Injectable() diff --git a/apps/server/src/modules/account/services/account-db.service.spec.ts b/apps/server/src/modules/account/services/account-db.service.spec.ts index e847cdf9eb7..21b8c890245 100644 --- a/apps/server/src/modules/account/services/account-db.service.spec.ts +++ b/apps/server/src/modules/account/services/account-db.service.spec.ts @@ -7,7 +7,10 @@ import { ServerConfig } from '@modules/server'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; import { EntityNotFoundError } from '@shared/common'; -import { Account, EntityId, Permission, Role, RoleName, SchoolEntity, User } from '@shared/domain'; +import { Account, Role, SchoolEntity, User } from '@shared/domain/entity'; + +import { Permission, RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { accountFactory, schoolFactory, setupEntities, userFactory } from '@shared/testing'; import bcrypt from 'bcryptjs'; import { LegacyLogger } from '../../../core/logger'; diff --git a/apps/server/src/modules/account/services/account-db.service.ts b/apps/server/src/modules/account/services/account-db.service.ts index 1209ed86744..7ace1cd0655 100644 --- a/apps/server/src/modules/account/services/account-db.service.ts +++ b/apps/server/src/modules/account/services/account-db.service.ts @@ -1,13 +1,14 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import bcrypt from 'bcryptjs'; import { EntityNotFoundError } from '@shared/common'; -import { Account, Counted, EntityId } from '@shared/domain'; -import { AccountRepo } from '../repo/account.repo'; +import { Account } from '@shared/domain/entity'; +import { Counted, EntityId } from '@shared/domain/types'; +import bcrypt from 'bcryptjs'; import { AccountEntityToDtoMapper } from '../mapper'; -import { AccountDto, AccountSaveDto } from './dto'; -import { AbstractAccountService } from './account.service.abstract'; +import { AccountRepo } from '../repo/account.repo'; import { AccountLookupService } from './account-lookup.service'; +import { AbstractAccountService } from './account.service.abstract'; +import { AccountDto, AccountSaveDto } from './dto'; @Injectable() export class AccountServiceDb extends AbstractAccountService { diff --git a/apps/server/src/modules/account/services/account-idm.service.integration.spec.ts b/apps/server/src/modules/account/services/account-idm.service.integration.spec.ts index 06ad0943c22..59be9d3265c 100644 --- a/apps/server/src/modules/account/services/account-idm.service.integration.spec.ts +++ b/apps/server/src/modules/account/services/account-idm.service.integration.spec.ts @@ -1,17 +1,17 @@ -import { v1 } from 'uuid'; +import { IdentityManagementModule, IdentityManagementService } from '@infra/identity-management'; +import { KeycloakAdministrationService } from '@infra/identity-management/keycloak-administration/service/keycloak-administration.service'; import KeycloakAdminClient from '@keycloak/keycloak-admin-client-cjs/keycloak-admin-client-cjs-index'; import { ObjectId } from '@mikro-orm/mongodb'; +import { AccountSaveDto } from '@modules/account/services/dto'; import { ConfigModule } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { IdmAccount } from '@shared/domain'; -import { KeycloakAdministrationService } from '@infra/identity-management/keycloak-administration/service/keycloak-administration.service'; -import { AccountSaveDto } from '@modules/account/services/dto'; +import { IdmAccount } from '@shared/domain/interface'; import { LoggerModule } from '@src/core/logger'; -import { IdentityManagementModule, IdentityManagementService } from '@infra/identity-management'; +import { v1 } from 'uuid'; import { AccountIdmToDtoMapper, AccountIdmToDtoMapperDb } from '../mapper'; import { AccountServiceIdm } from './account-idm.service'; -import { AbstractAccountService } from './account.service.abstract'; import { AccountLookupService } from './account-lookup.service'; +import { AbstractAccountService } from './account.service.abstract'; describe('AccountIdmService Integration', () => { let module: TestingModule; diff --git a/apps/server/src/modules/account/services/account-idm.service.spec.ts b/apps/server/src/modules/account/services/account-idm.service.spec.ts index 9b8705089b3..6a32f588f83 100644 --- a/apps/server/src/modules/account/services/account-idm.service.spec.ts +++ b/apps/server/src/modules/account/services/account-idm.service.spec.ts @@ -1,12 +1,12 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { Test, TestingModule } from '@nestjs/testing'; -import { EntityNotFoundError } from '@shared/common'; -import { IdmAccount } from '@shared/domain'; import { MongoMemoryDatabaseModule } from '@infra/database'; import { IdentityManagementOauthService, IdentityManagementService } from '@infra/identity-management'; import { NotImplementedException } from '@nestjs/common'; -import { LoggerModule } from '@src/core/logger'; import { ConfigModule } from '@nestjs/config'; +import { Test, TestingModule } from '@nestjs/testing'; +import { EntityNotFoundError } from '@shared/common'; +import { IdmAccount } from '@shared/domain/interface'; +import { LoggerModule } from '@src/core/logger'; import { AccountIdmToDtoMapper, AccountIdmToDtoMapperDb } from '../mapper'; import { AccountServiceIdm } from './account-idm.service'; import { AccountLookupService } from './account-lookup.service'; diff --git a/apps/server/src/modules/account/services/account-idm.service.ts b/apps/server/src/modules/account/services/account-idm.service.ts index 2136326e038..65368599019 100644 --- a/apps/server/src/modules/account/services/account-idm.service.ts +++ b/apps/server/src/modules/account/services/account-idm.service.ts @@ -1,13 +1,14 @@ +import { IdentityManagementOauthService, IdentityManagementService } from '@infra/identity-management'; import { ObjectId } from '@mikro-orm/mongodb'; import { Injectable, NotImplementedException } from '@nestjs/common'; import { EntityNotFoundError } from '@shared/common'; -import { Counted, EntityId, IdmAccount, IdmAccountUpdate } from '@shared/domain'; -import { IdentityManagementService, IdentityManagementOauthService } from '@infra/identity-management'; +import { IdmAccount, IdmAccountUpdate } from '@shared/domain/interface'; +import { Counted, EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { AccountIdmToDtoMapper } from '../mapper'; +import { AccountLookupService } from './account-lookup.service'; import { AbstractAccountService } from './account.service.abstract'; import { AccountDto, AccountSaveDto } from './dto'; -import { AccountLookupService } from './account-lookup.service'; @Injectable() export class AccountServiceIdm extends AbstractAccountService { diff --git a/apps/server/src/modules/account/services/account-lookup.service.spec.ts b/apps/server/src/modules/account/services/account-lookup.service.spec.ts index c3351a6b0c3..351a076396f 100644 --- a/apps/server/src/modules/account/services/account-lookup.service.spec.ts +++ b/apps/server/src/modules/account/services/account-lookup.service.spec.ts @@ -1,10 +1,10 @@ -import { ObjectId } from 'bson'; -import { v1 } from 'uuid'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { IdentityManagementService } from '@infra/identity-management'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { IdmAccount } from '@shared/domain'; -import { IdentityManagementService } from '@infra/identity-management'; +import { IdmAccount } from '@shared/domain/interface'; +import { ObjectId } from 'bson'; +import { v1 } from 'uuid'; import { AccountLookupService } from './account-lookup.service'; describe('AccountLookupService', () => { diff --git a/apps/server/src/modules/account/services/account-lookup.service.ts b/apps/server/src/modules/account/services/account-lookup.service.ts index 41064d077e9..8a752d2472d 100644 --- a/apps/server/src/modules/account/services/account-lookup.service.ts +++ b/apps/server/src/modules/account/services/account-lookup.service.ts @@ -2,7 +2,7 @@ import { IdentityManagementService } from '@infra/identity-management'; import { ServerConfig } from '@modules/server/server.config'; import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; /** diff --git a/apps/server/src/modules/account/services/account.service.abstract.ts b/apps/server/src/modules/account/services/account.service.abstract.ts index b2e198f6a86..d027c30e3da 100644 --- a/apps/server/src/modules/account/services/account.service.abstract.ts +++ b/apps/server/src/modules/account/services/account.service.abstract.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { Counted, EntityId } from '@shared/domain'; +import { Counted, EntityId } from '@shared/domain/types'; import { AccountDto, AccountSaveDto } from './dto'; export abstract class AbstractAccountService { diff --git a/apps/server/src/modules/account/services/account.service.integration.spec.ts b/apps/server/src/modules/account/services/account.service.integration.spec.ts index ccaf450ffed..6c7e0b810d8 100644 --- a/apps/server/src/modules/account/services/account.service.integration.spec.ts +++ b/apps/server/src/modules/account/services/account.service.integration.spec.ts @@ -1,13 +1,14 @@ import { createMock } from '@golevelup/ts-jest'; -import KeycloakAdminClient from '@keycloak/keycloak-admin-client-cjs/keycloak-admin-client-cjs-index'; -import { EntityManager } from '@mikro-orm/mongodb'; -import { ConfigModule } from '@nestjs/config'; -import { Test, TestingModule } from '@nestjs/testing'; -import { Account, IdmAccount } from '@shared/domain'; import { MongoMemoryDatabaseModule } from '@infra/database'; import { IdentityManagementModule } from '@infra/identity-management'; import { IdentityManagementService } from '@infra/identity-management/identity-management.service'; import { KeycloakAdministrationService } from '@infra/identity-management/keycloak-administration/service/keycloak-administration.service'; +import KeycloakAdminClient from '@keycloak/keycloak-admin-client-cjs/keycloak-admin-client-cjs-index'; +import { EntityManager } from '@mikro-orm/mongodb'; +import { ConfigModule } from '@nestjs/config'; +import { Test, TestingModule } from '@nestjs/testing'; +import { Account } from '@shared/domain/entity'; +import { IdmAccount } from '@shared/domain/interface'; import { UserRepo } from '@shared/repo'; import { accountFactory, cleanupCollections } from '@shared/testing'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/account/services/account.service.ts b/apps/server/src/modules/account/services/account.service.ts index 6e6107954ce..2a461c32540 100644 --- a/apps/server/src/modules/account/services/account.service.ts +++ b/apps/server/src/modules/account/services/account.service.ts @@ -2,7 +2,7 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import { ValidationError } from '@shared/common'; -import { Counted } from '@shared/domain'; +import { Counted } from '@shared/domain/types'; import { isEmail, validateOrReject } from 'class-validator'; import { LegacyLogger } from '../../../core/logger'; import { ServerConfig } from '../../server/server.config'; diff --git a/apps/server/src/modules/account/services/account.validation.service.spec.ts b/apps/server/src/modules/account/services/account.validation.service.spec.ts index 9b4e54c6d48..835a2055bcc 100644 --- a/apps/server/src/modules/account/services/account.validation.service.spec.ts +++ b/apps/server/src/modules/account/services/account.validation.service.spec.ts @@ -1,6 +1,8 @@ import { Test, TestingModule } from '@nestjs/testing'; import { EntityNotFoundError } from '@shared/common'; -import { Account, EntityId, Permission, Role, RoleName, User } from '@shared/domain'; +import { Account, Role, User } from '@shared/domain/entity'; +import { Permission, RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { UserRepo } from '@shared/repo'; import { accountFactory, setupEntities, systemEntityFactory, userFactory } from '@shared/testing'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/account/services/account.validation.service.ts b/apps/server/src/modules/account/services/account.validation.service.ts index fc47569ed71..2dff4f8b10e 100644 --- a/apps/server/src/modules/account/services/account.validation.service.ts +++ b/apps/server/src/modules/account/services/account.validation.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { UserRepo } from '@shared/repo'; import { AccountEntityToDtoMapper } from '../mapper/account-entity-to-dto.mapper'; import { AccountRepo } from '../repo/account.repo'; diff --git a/apps/server/src/modules/account/services/dto/account-save.dto.ts b/apps/server/src/modules/account/services/dto/account-save.dto.ts index 10262dd9478..5b2cfb5fe31 100644 --- a/apps/server/src/modules/account/services/dto/account-save.dto.ts +++ b/apps/server/src/modules/account/services/dto/account-save.dto.ts @@ -1,5 +1,5 @@ import { PrivacyProtect } from '@shared/controller'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { IsBoolean, IsDate, IsMongoId, IsNotEmpty, IsOptional, IsString, Matches } from 'class-validator'; import { passwordPattern } from '../../controller/dto/password-pattern'; diff --git a/apps/server/src/modules/account/services/dto/account.dto.ts b/apps/server/src/modules/account/services/dto/account.dto.ts index 760be1f2453..70bcbeca203 100644 --- a/apps/server/src/modules/account/services/dto/account.dto.ts +++ b/apps/server/src/modules/account/services/dto/account.dto.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { AccountSaveDto } from './account-save.dto'; export class AccountDto extends AccountSaveDto { diff --git a/apps/server/src/modules/account/uc/account.uc.spec.ts b/apps/server/src/modules/account/uc/account.uc.spec.ts index 2552469b8cf..b2f6e3356d1 100644 --- a/apps/server/src/modules/account/uc/account.uc.spec.ts +++ b/apps/server/src/modules/account/uc/account.uc.spec.ts @@ -6,19 +6,10 @@ import { ICurrentUser } from '@modules/authentication'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; import { AuthorizationError, EntityNotFoundError, ForbiddenOperationError, ValidationError } from '@shared/common'; -import { - Account, - Counted, - EntityId, - Permission, - PermissionService, - Role, - RoleName, - SchoolEntity, - SchoolRolePermission, - SchoolRoles, - User, -} from '@shared/domain'; +import { Account, Role, SchoolEntity, SchoolRolePermission, SchoolRoles, User } from '@shared/domain/entity'; +import { Permission, RoleName } from '@shared/domain/interface'; +import { PermissionService } from '@shared/domain/service'; +import { Counted, EntityId } from '@shared/domain/types'; import { UserRepo } from '@shared/repo'; import { accountFactory, schoolFactory, setupEntities, systemEntityFactory, userFactory } from '@shared/testing'; import { BruteForcePrevention } from '@src/imports-from-feathers'; diff --git a/apps/server/src/modules/account/uc/account.uc.ts b/apps/server/src/modules/account/uc/account.uc.ts index dac0b936ba5..3dda5f67f2c 100644 --- a/apps/server/src/modules/account/uc/account.uc.ts +++ b/apps/server/src/modules/account/uc/account.uc.ts @@ -8,7 +8,10 @@ import { ForbiddenOperationError, ValidationError, } from '@shared/common/error'; -import { Account, EntityId, Permission, PermissionService, Role, RoleName, SchoolEntity, User } from '@shared/domain'; +import { Account, Role, SchoolEntity, User } from '@shared/domain/entity'; +import { Permission, RoleName } from '@shared/domain/interface'; +import { PermissionService } from '@shared/domain/service'; +import { EntityId } from '@shared/domain/types'; import { UserRepo } from '@shared/repo'; import { ICurrentUser } from '@modules/authentication'; diff --git a/apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts b/apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts index 6541da27b08..3c34d4fb303 100644 --- a/apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts +++ b/apps/server/src/modules/authentication/controllers/api-test/login.api.spec.ts @@ -4,7 +4,8 @@ import { OauthTokenResponse } from '@modules/oauth/service/dto'; import { ServerTestModule } from '@modules/server/server.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Account, RoleName, SchoolEntity, SystemEntity, User } from '@shared/domain'; +import { Account, SchoolEntity, SystemEntity, User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { accountFactory, roleFactory, schoolFactory, systemEntityFactory, userFactory } from '@shared/testing'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; diff --git a/apps/server/src/modules/authentication/interface/user.ts b/apps/server/src/modules/authentication/interface/user.ts index 82b6d292d50..b4d43e138c8 100644 --- a/apps/server/src/modules/authentication/interface/user.ts +++ b/apps/server/src/modules/authentication/interface/user.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; export interface ICurrentUser { /** authenticated users id */ diff --git a/apps/server/src/modules/authentication/mapper/current-user.mapper.spec.ts b/apps/server/src/modules/authentication/mapper/current-user.mapper.spec.ts index 104ca1219a4..312bfeb3800 100644 --- a/apps/server/src/modules/authentication/mapper/current-user.mapper.spec.ts +++ b/apps/server/src/modules/authentication/mapper/current-user.mapper.spec.ts @@ -1,6 +1,6 @@ import { ValidationError } from '@shared/common'; -import { Permission, RoleName } from '@shared/domain'; import { UserDO } from '@shared/domain/domainobject/user.do'; +import { Permission, RoleName } from '@shared/domain/interface'; import { roleFactory, schoolFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing'; import { ICurrentUser, OauthCurrentUser } from '../interface'; import { CreateJwtPayload, JwtPayload } from '../interface/jwt-payload'; diff --git a/apps/server/src/modules/authentication/mapper/current-user.mapper.ts b/apps/server/src/modules/authentication/mapper/current-user.mapper.ts index 35dd6c5fe7c..1c189877dce 100644 --- a/apps/server/src/modules/authentication/mapper/current-user.mapper.ts +++ b/apps/server/src/modules/authentication/mapper/current-user.mapper.ts @@ -1,7 +1,7 @@ import { ValidationError } from '@shared/common'; -import { Role, User } from '@shared/domain'; import { RoleReference } from '@shared/domain/domainobject'; import { UserDO } from '@shared/domain/domainobject/user.do'; +import { Role, User } from '@shared/domain/entity'; import { ICurrentUser, OauthCurrentUser } from '../interface'; import { CreateJwtPayload, JwtPayload } from '../interface/jwt-payload'; diff --git a/apps/server/src/modules/authentication/services/ldap.service.spec.ts b/apps/server/src/modules/authentication/services/ldap.service.spec.ts index ec0b8c05bb3..22f27573d3d 100644 --- a/apps/server/src/modules/authentication/services/ldap.service.spec.ts +++ b/apps/server/src/modules/authentication/services/ldap.service.spec.ts @@ -1,7 +1,7 @@ import { createMock } from '@golevelup/ts-jest'; import { UnauthorizedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { SystemEntity } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; import { systemEntityFactory } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; import { LdapService } from './ldap.service'; diff --git a/apps/server/src/modules/authentication/services/ldap.service.ts b/apps/server/src/modules/authentication/services/ldap.service.ts index d47ee31c200..4a5609985fc 100644 --- a/apps/server/src/modules/authentication/services/ldap.service.ts +++ b/apps/server/src/modules/authentication/services/ldap.service.ts @@ -1,5 +1,5 @@ import { Injectable, UnauthorizedException } from '@nestjs/common'; -import { SystemEntity } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; import { ErrorUtils } from '@src/core/error/utils'; import { LegacyLogger } from '@src/core/logger'; import { Client, createClient } from 'ldapjs'; diff --git a/apps/server/src/modules/authentication/strategy/ldap.strategy.spec.ts b/apps/server/src/modules/authentication/strategy/ldap.strategy.spec.ts index c45a25cc310..7740b56b44e 100644 --- a/apps/server/src/modules/authentication/strategy/ldap.strategy.spec.ts +++ b/apps/server/src/modules/authentication/strategy/ldap.strategy.spec.ts @@ -3,8 +3,11 @@ import { AccountDto } from '@modules/account/services/dto'; import { UnauthorizedException } from '@nestjs/common'; import { PassportModule } from '@nestjs/passport'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, RoleName, SystemEntity, User } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; +import { SystemEntity, User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { LegacySchoolRepo, LegacySystemRepo, UserRepo } from '@shared/repo'; + import { accountDtoFactory, defaultTestPassword, diff --git a/apps/server/src/modules/authentication/strategy/ldap.strategy.ts b/apps/server/src/modules/authentication/strategy/ldap.strategy.ts index 8ffd1aa0bb6..c11ea3818be 100644 --- a/apps/server/src/modules/authentication/strategy/ldap.strategy.ts +++ b/apps/server/src/modules/authentication/strategy/ldap.strategy.ts @@ -1,7 +1,8 @@ import { AccountDto } from '@modules/account/services/dto'; import { Injectable, UnauthorizedException } from '@nestjs/common'; import { PassportStrategy } from '@nestjs/passport'; -import { LegacySchoolDo, SystemEntity, User } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; +import { SystemEntity, User } from '@shared/domain/entity'; import { LegacySchoolRepo, LegacySystemRepo, UserRepo } from '@shared/repo'; import { ErrorLoggable } from '@src/core/error/loggable/error.loggable'; import { Logger } from '@src/core/logger'; diff --git a/apps/server/src/modules/authentication/strategy/local.strategy.spec.ts b/apps/server/src/modules/authentication/strategy/local.strategy.spec.ts index 44db3ea4b21..427b1adea39 100644 --- a/apps/server/src/modules/authentication/strategy/local.strategy.spec.ts +++ b/apps/server/src/modules/authentication/strategy/local.strategy.spec.ts @@ -5,7 +5,8 @@ import { AccountDto } from '@modules/account/services/dto'; import { ServerConfig } from '@modules/server'; import { UnauthorizedException } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { RoleName, User } from '@shared/domain'; +import { User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { UserRepo } from '@shared/repo'; import { accountFactory, setupEntities, userFactory } from '@shared/testing'; import bcrypt from 'bcryptjs'; diff --git a/apps/server/src/modules/authentication/strategy/oauth2.strategy.spec.ts b/apps/server/src/modules/authentication/strategy/oauth2.strategy.spec.ts index 9f47f0e1d6a..4b9cf685baa 100644 --- a/apps/server/src/modules/authentication/strategy/oauth2.strategy.spec.ts +++ b/apps/server/src/modules/authentication/strategy/oauth2.strategy.spec.ts @@ -4,8 +4,9 @@ import { AccountDto } from '@modules/account/services/dto'; import { OAuthService, OAuthTokenDto } from '@modules/oauth'; import { UnauthorizedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, RoleName } from '@shared/domain'; import { UserDO } from '@shared/domain/domainobject/user.do'; +import { RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { userDoFactory } from '@shared/testing'; import { ICurrentUser, OauthCurrentUser } from '../interface'; diff --git a/apps/server/src/modules/authorization/domain/error/forbidden.loggable-exception.ts b/apps/server/src/modules/authorization/domain/error/forbidden.loggable-exception.ts index 9557ed14ede..535fc67c692 100644 --- a/apps/server/src/modules/authorization/domain/error/forbidden.loggable-exception.ts +++ b/apps/server/src/modules/authorization/domain/error/forbidden.loggable-exception.ts @@ -1,5 +1,5 @@ import { ForbiddenException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { Loggable } from '@src/core/logger/interfaces'; import { ErrorLogMessage } from '@src/core/logger/types'; import { AuthorizationContext } from '../type'; diff --git a/apps/server/src/modules/authorization/domain/mapper/authorization-context.builder.spec.ts b/apps/server/src/modules/authorization/domain/mapper/authorization-context.builder.spec.ts index 5944d7f22e0..4a882dc343e 100644 --- a/apps/server/src/modules/authorization/domain/mapper/authorization-context.builder.spec.ts +++ b/apps/server/src/modules/authorization/domain/mapper/authorization-context.builder.spec.ts @@ -1,6 +1,6 @@ -import { Permission } from '@shared/domain'; -import { AuthorizationContextBuilder } from './authorization-context.builder'; +import { Permission } from '@shared/domain/interface'; import { Action } from '../type'; +import { AuthorizationContextBuilder } from './authorization-context.builder'; describe('AuthorizationContextBuilder', () => { it('Should allow to set required permissions.', () => { diff --git a/apps/server/src/modules/authorization/domain/mapper/authorization-context.builder.ts b/apps/server/src/modules/authorization/domain/mapper/authorization-context.builder.ts index 86b16685b58..14ba6714cca 100644 --- a/apps/server/src/modules/authorization/domain/mapper/authorization-context.builder.ts +++ b/apps/server/src/modules/authorization/domain/mapper/authorization-context.builder.ts @@ -1,5 +1,5 @@ -import { Permission } from '@shared/domain'; -import { AuthorizationContext, Action } from '../type'; +import { Permission } from '@shared/domain/interface'; +import { Action, AuthorizationContext } from '../type'; export class AuthorizationContextBuilder { private static build(requiredPermissions: Permission[], action: Action): AuthorizationContext { diff --git a/apps/server/src/modules/authorization/domain/rules/group.rule.spec.ts b/apps/server/src/modules/authorization/domain/rules/group.rule.spec.ts index bb2bc2e48b3..8229e81ec10 100644 --- a/apps/server/src/modules/authorization/domain/rules/group.rule.spec.ts +++ b/apps/server/src/modules/authorization/domain/rules/group.rule.spec.ts @@ -1,6 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission, Role, SchoolEntity, User } from '@shared/domain'; +import { Role, SchoolEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { groupFactory, roleFactory, schoolFactory, setupEntities, userFactory } from '@shared/testing'; import { Action, AuthorizationContext, AuthorizationHelper } from '@src/modules/authorization'; import { Group } from '@src/modules/group'; diff --git a/apps/server/src/modules/authorization/domain/rules/legacy-school.rule.ts b/apps/server/src/modules/authorization/domain/rules/legacy-school.rule.ts index e115727091a..564577d9038 100644 --- a/apps/server/src/modules/authorization/domain/rules/legacy-school.rule.ts +++ b/apps/server/src/modules/authorization/domain/rules/legacy-school.rule.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; -import { BaseDO, LegacySchoolDo } from '@shared/domain'; -import { User } from '@shared/domain/entity'; import { AuthorizableObject } from '@shared/domain/domain-object'; -import { AuthorizationContext, Rule } from '../type'; +import { BaseDO, LegacySchoolDo } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; import { AuthorizationHelper } from '../service/authorization.helper'; +import { AuthorizationContext, Rule } from '../type'; /** * @deprecated because it uses the deprecated LegacySchoolDo. diff --git a/apps/server/src/modules/authorization/domain/rules/school-external-tool.rule.spec.ts b/apps/server/src/modules/authorization/domain/rules/school-external-tool.rule.spec.ts index 453f77fc968..2a29ef23c9f 100644 --- a/apps/server/src/modules/authorization/domain/rules/school-external-tool.rule.spec.ts +++ b/apps/server/src/modules/authorization/domain/rules/school-external-tool.rule.spec.ts @@ -1,17 +1,18 @@ +import { SchoolExternalTool } from '@modules/tool/school-external-tool/domain'; +import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/entity'; import { Test, TestingModule } from '@nestjs/testing'; +import { Role, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { roleFactory, schoolExternalToolEntityFactory, + schoolExternalToolFactory, schoolFactory, setupEntities, userFactory, - schoolExternalToolFactory, } from '@shared/testing'; -import { SchoolExternalTool } from '@modules/tool/school-external-tool/domain'; -import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/entity'; -import { Role, User, Permission } from '@shared/domain'; -import { Action } from '../type'; import { AuthorizationHelper } from '../service/authorization.helper'; +import { Action } from '../type'; import { SchoolExternalToolRule } from './school-external-tool.rule'; describe('SchoolExternalToolRule', () => { diff --git a/apps/server/src/modules/authorization/domain/rules/system.rule.spec.ts b/apps/server/src/modules/authorization/domain/rules/system.rule.spec.ts index 589e21a03d3..922ac71b20a 100644 --- a/apps/server/src/modules/authorization/domain/rules/system.rule.spec.ts +++ b/apps/server/src/modules/authorization/domain/rules/system.rule.spec.ts @@ -1,7 +1,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { System } from '@modules/system'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission, SchoolEntity, SystemEntity, User } from '@shared/domain'; +import { SchoolEntity, SystemEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { schoolFactory, setupEntities, systemEntityFactory, systemFactory, userFactory } from '@shared/testing'; import { AuthorizationContextBuilder } from '../mapper'; import { AuthorizationHelper } from '../service/authorization.helper'; diff --git a/apps/server/src/modules/authorization/domain/service/authorization-reference.service.ts b/apps/server/src/modules/authorization/domain/service/authorization-reference.service.ts index 814df9378da..742fcad58a9 100644 --- a/apps/server/src/modules/authorization/domain/service/authorization-reference.service.ts +++ b/apps/server/src/modules/authorization/domain/service/authorization-reference.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; -import { ReferenceLoader } from './reference.loader'; -import { AuthorizationContext, AuthorizableReferenceType } from '../type'; +import { EntityId } from '@shared/domain/types'; import { ForbiddenLoggableException } from '../error'; +import { AuthorizableReferenceType, AuthorizationContext } from '../type'; import { AuthorizationService } from './authorization.service'; +import { ReferenceLoader } from './reference.loader'; /** * Should by use only internal in authorization module. See ticket: BC-3990 diff --git a/apps/server/src/modules/authorization/domain/service/authorization.helper.spec.ts b/apps/server/src/modules/authorization/domain/service/authorization.helper.spec.ts index f1c166d6dd4..d2506ac8709 100644 --- a/apps/server/src/modules/authorization/domain/service/authorization.helper.spec.ts +++ b/apps/server/src/modules/authorization/domain/service/authorization.helper.spec.ts @@ -1,4 +1,4 @@ -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { courseFactory, roleFactory, setupEntities, taskFactory, userFactory } from '@shared/testing'; import { AuthorizationHelper } from './authorization.helper'; diff --git a/apps/server/src/modules/authorization/domain/service/authorization.service.spec.ts b/apps/server/src/modules/authorization/domain/service/authorization.service.spec.ts index f113c64472c..afe0fd8c5c4 100644 --- a/apps/server/src/modules/authorization/domain/service/authorization.service.spec.ts +++ b/apps/server/src/modules/authorization/domain/service/authorization.service.spec.ts @@ -1,16 +1,16 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { UnauthorizedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; -import { setupEntities, userFactory } from '@shared/testing'; +import { Permission } from '@shared/domain/interface'; import { UserRepo } from '@shared/repo'; +import { setupEntities, userFactory } from '@shared/testing'; +import { ForbiddenLoggableException } from '../error'; import { AuthorizationContextBuilder } from '../mapper'; +import { Rule } from '../type'; import { AuthorizationHelper } from './authorization.helper'; import { AuthorizationService } from './authorization.service'; -import { ForbiddenLoggableException } from '../error'; import { ReferenceLoader } from './reference.loader'; import { RuleManager } from './rule-manager'; -import { Rule } from '../type'; class TestRule implements Rule { constructor(private returnValueOfhasPermission: boolean) {} diff --git a/apps/server/src/modules/authorization/domain/service/authorization.service.ts b/apps/server/src/modules/authorization/domain/service/authorization.service.ts index 5218dffda81..d6505519f50 100644 --- a/apps/server/src/modules/authorization/domain/service/authorization.service.ts +++ b/apps/server/src/modules/authorization/domain/service/authorization.service.ts @@ -1,11 +1,13 @@ import { Injectable, UnauthorizedException } from '@nestjs/common'; -import { BaseDO, EntityId, User } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; +import { BaseDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { UserRepo } from '@shared/repo'; -import { AuthorizationHelper } from './authorization.helper'; import { ForbiddenLoggableException } from '../error'; -import { RuleManager } from './rule-manager'; import { AuthorizationContext } from '../type'; +import { AuthorizationHelper } from './authorization.helper'; +import { RuleManager } from './rule-manager'; @Injectable() export class AuthorizationService { diff --git a/apps/server/src/modules/authorization/domain/service/reference.loader.spec.ts b/apps/server/src/modules/authorization/domain/service/reference.loader.spec.ts index 11f553423b6..77e04a3c1ba 100644 --- a/apps/server/src/modules/authorization/domain/service/reference.loader.spec.ts +++ b/apps/server/src/modules/authorization/domain/service/reference.loader.spec.ts @@ -1,10 +1,11 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; import { BoardDoAuthorizableService } from '@modules/board'; +import { LessonService } from '@modules/lesson'; import { ContextExternalToolAuthorizableService } from '@modules/tool'; import { NotImplementedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { CourseGroupRepo, CourseRepo, @@ -16,7 +17,6 @@ import { UserRepo, } from '@shared/repo'; import { setupEntities, userFactory } from '@shared/testing'; -import { LessonService } from '@modules/lesson'; import { AuthorizableReferenceType } from '../type'; import { ReferenceLoader } from './reference.loader'; diff --git a/apps/server/src/modules/authorization/domain/service/reference.loader.ts b/apps/server/src/modules/authorization/domain/service/reference.loader.ts index 7fb574a4d6e..2bce4ab98ce 100644 --- a/apps/server/src/modules/authorization/domain/service/reference.loader.ts +++ b/apps/server/src/modules/authorization/domain/service/reference.loader.ts @@ -3,8 +3,9 @@ import { BoardDoAuthorizableService } from '@modules/board'; import { LessonService } from '@modules/lesson'; import { ContextExternalToolAuthorizableService } from '@modules/tool'; import { Injectable, NotImplementedException } from '@nestjs/common'; -import { BaseDO, EntityId } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; +import { BaseDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { CourseGroupRepo, CourseRepo, diff --git a/apps/server/src/modules/authorization/domain/service/rule-manager.ts b/apps/server/src/modules/authorization/domain/service/rule-manager.ts index 2f35f5e9939..a17bbc3d4b2 100644 --- a/apps/server/src/modules/authorization/domain/service/rule-manager.ts +++ b/apps/server/src/modules/authorization/domain/service/rule-manager.ts @@ -1,6 +1,7 @@ import { Injectable, InternalServerErrorException, NotImplementedException } from '@nestjs/common'; -import { BaseDO, User } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; // fix import when it is avaible +import { BaseDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; import { BoardDoRule, ContextExternalToolRule, diff --git a/apps/server/src/modules/authorization/domain/type/authorization-context.interface.ts b/apps/server/src/modules/authorization/domain/type/authorization-context.interface.ts index a79029fcf71..abe71547fc9 100644 --- a/apps/server/src/modules/authorization/domain/type/authorization-context.interface.ts +++ b/apps/server/src/modules/authorization/domain/type/authorization-context.interface.ts @@ -1,4 +1,4 @@ -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { Action } from './action.enum'; export interface AuthorizationContext { diff --git a/apps/server/src/modules/authorization/domain/type/authorization-loader-service.ts b/apps/server/src/modules/authorization/domain/type/authorization-loader-service.ts index b15f0059cac..e369fba20b8 100644 --- a/apps/server/src/modules/authorization/domain/type/authorization-loader-service.ts +++ b/apps/server/src/modules/authorization/domain/type/authorization-loader-service.ts @@ -1,5 +1,6 @@ -import { BaseDO, EntityId } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; // fix import when it is avaible +import { BaseDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; export interface AuthorizationLoaderService { findById(id: EntityId): Promise; diff --git a/apps/server/src/modules/authorization/domain/type/rule.interface.ts b/apps/server/src/modules/authorization/domain/type/rule.interface.ts index 87746f37221..b6077f83d70 100644 --- a/apps/server/src/modules/authorization/domain/type/rule.interface.ts +++ b/apps/server/src/modules/authorization/domain/type/rule.interface.ts @@ -1,5 +1,6 @@ -import { BaseDO, User } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; // fix import when it is avaible +import { BaseDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; import { AuthorizationContext } from './authorization-context.interface'; export interface Rule { diff --git a/apps/server/src/modules/authorization/feathers/feathers-auth.provider.spec.ts b/apps/server/src/modules/authorization/feathers/feathers-auth.provider.spec.ts index f035fa5a867..b3be76517ef 100644 --- a/apps/server/src/modules/authorization/feathers/feathers-auth.provider.spec.ts +++ b/apps/server/src/modules/authorization/feathers/feathers-auth.provider.spec.ts @@ -1,8 +1,9 @@ +import { FeathersServiceProvider } from '@infra/feathers'; import { ObjectId } from '@mikro-orm/mongodb'; import { NotFoundException } from '@nestjs/common/exceptions/not-found.exception'; import { Test, TestingModule } from '@nestjs/testing'; -import { NewsTargetModel } from '@shared/domain'; -import { FeathersServiceProvider } from '@infra/feathers'; + +import { NewsTargetModel } from '@shared/domain/types'; import { FeathersAuthProvider } from './feathers-auth.provider'; describe('FeathersAuthProvider', () => { diff --git a/apps/server/src/modules/authorization/feathers/feathers-auth.provider.ts b/apps/server/src/modules/authorization/feathers/feathers-auth.provider.ts index 4e4f87c56d1..9e54cf53c28 100644 --- a/apps/server/src/modules/authorization/feathers/feathers-auth.provider.ts +++ b/apps/server/src/modules/authorization/feathers/feathers-auth.provider.ts @@ -1,7 +1,8 @@ -import { Injectable, NotFoundException } from '@nestjs/common'; -import { BaseEntity, EntityId, NewsTargetModel } from '@shared/domain'; -import { ObjectId } from '@mikro-orm/mongodb'; import { FeathersServiceProvider } from '@infra/feathers'; +import { ObjectId } from '@mikro-orm/mongodb'; +import { Injectable, NotFoundException } from '@nestjs/common'; +import { BaseEntity } from '@shared/domain/entity'; +import { EntityId, NewsTargetModel } from '@shared/domain/types'; interface User { _id: ObjectId; diff --git a/apps/server/src/modules/authorization/feathers/feathers-authorization.service.spec.ts b/apps/server/src/modules/authorization/feathers/feathers-authorization.service.spec.ts index 19e46e7b3f9..9232dacc5c1 100644 --- a/apps/server/src/modules/authorization/feathers/feathers-authorization.service.spec.ts +++ b/apps/server/src/modules/authorization/feathers/feathers-authorization.service.spec.ts @@ -1,7 +1,8 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { UnauthorizedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, NewsTargetModel } from '@shared/domain'; + +import { EntityId, NewsTargetModel } from '@shared/domain/types'; import { FeathersAuthProvider } from './feathers-auth.provider'; import { FeathersAuthorizationService } from './feathers-authorization.service'; diff --git a/apps/server/src/modules/authorization/feathers/feathers-authorization.service.ts b/apps/server/src/modules/authorization/feathers/feathers-authorization.service.ts index adefba5377f..3b43a6ec9f4 100644 --- a/apps/server/src/modules/authorization/feathers/feathers-authorization.service.ts +++ b/apps/server/src/modules/authorization/feathers/feathers-authorization.service.ts @@ -1,5 +1,5 @@ import { Injectable, UnauthorizedException } from '@nestjs/common'; -import { EntityId, NewsTargetModel } from '@shared/domain'; +import { EntityId, NewsTargetModel } from '@shared/domain/types'; import { FeathersAuthProvider } from './feathers-auth.provider'; @Injectable() diff --git a/apps/server/src/modules/board/board.module.ts b/apps/server/src/modules/board/board.module.ts index 880d9607cc9..1c66d759695 100644 --- a/apps/server/src/modules/board/board.module.ts +++ b/apps/server/src/modules/board/board.module.ts @@ -1,9 +1,9 @@ +import { ConsoleWriterModule } from '@infra/console'; import { FilesStorageClientModule } from '@modules/files-storage-client'; import { ContextExternalToolModule } from '@modules/tool/context-external-tool'; import { UserModule } from '@modules/user'; import { Module } from '@nestjs/common'; -import { ContentElementFactory } from '@shared/domain'; -import { ConsoleWriterModule } from '@infra/console'; +import { ContentElementFactory } from '@shared/domain/domainobject'; import { CourseRepo } from '@shared/repo'; import { LoggerModule } from '@src/core/logger'; import { DrawingElementAdapterService } from '@modules/tldraw-client/service/drawing-element-adapter.service'; diff --git a/apps/server/src/modules/board/controller/api-test/board-context.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-context.api.spec.ts index 0cbdad3b8c2..5c14248de95 100644 --- a/apps/server/src/modules/board/controller/api-test/board-context.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-context.api.spec.ts @@ -1,15 +1,15 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, columnBoardNodeFactory, courseFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; import { BoardContextResponse } from '../dto/board/board-context.reponse'; const baseRouteName = '/boards'; diff --git a/apps/server/src/modules/board/controller/api-test/board-delete.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-delete.api.spec.ts index 5d7633e4c99..835192909f1 100644 --- a/apps/server/src/modules/board/controller/api-test/board-delete.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-delete.api.spec.ts @@ -5,7 +5,9 @@ import { ServerTestModule } from '@modules/server'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType, ColumnBoardNode, ColumnNode, EntityId } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { ColumnBoardNode, ColumnNode } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { cleanupCollections, columnBoardNodeFactory, diff --git a/apps/server/src/modules/board/controller/api-test/board-lookup.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-lookup.api.spec.ts index c4f685b9a6a..fc5b3e49ed7 100644 --- a/apps/server/src/modules/board/controller/api-test/board-lookup.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-lookup.api.spec.ts @@ -5,7 +5,7 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/controller/api-test/board-update-title.api.spec.ts b/apps/server/src/modules/board/controller/api-test/board-update-title.api.spec.ts index 9b77f2f3824..2504715dcc6 100644 --- a/apps/server/src/modules/board/controller/api-test/board-update-title.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/board-update-title.api.spec.ts @@ -1,15 +1,16 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server/server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, ColumnBoardNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { ColumnBoardNode } from '@shared/domain/entity'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, columnBoardNodeFactory, courseFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server/server.module'; const baseRouteName = '/boards'; diff --git a/apps/server/src/modules/board/controller/api-test/card-create.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-create.api.spec.ts index de006926e8f..fb1a5f0aeb9 100644 --- a/apps/server/src/modules/board/controller/api-test/card-create.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-create.api.spec.ts @@ -5,7 +5,7 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType, ContentElementType } from '@shared/domain'; +import { BoardExternalReferenceType, ContentElementType } from '@shared/domain/domainobject'; import { cleanupCollections, columnBoardNodeFactory, diff --git a/apps/server/src/modules/board/controller/api-test/card-delete.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-delete.api.spec.ts index d2b9a02efda..2380deddfed 100644 --- a/apps/server/src/modules/board/controller/api-test/card-delete.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-delete.api.spec.ts @@ -5,7 +5,8 @@ import { ServerTestModule } from '@modules/server'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType, CardNode, RichTextElementNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { CardNode, RichTextElementNode } from '@shared/domain/entity'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/controller/api-test/card-lookup.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-lookup.api.spec.ts index f43fb954e68..6f6412376ee 100644 --- a/apps/server/src/modules/board/controller/api-test/card-lookup.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-lookup.api.spec.ts @@ -5,7 +5,7 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/controller/api-test/card-move.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-move.api.spec.ts index fa67220072a..558883302bf 100644 --- a/apps/server/src/modules/board/controller/api-test/card-move.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-move.api.spec.ts @@ -5,7 +5,8 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType, CardNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { CardNode } from '@shared/domain/entity'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/controller/api-test/card-update-height.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-update-height.api.spec.ts index 2d4ab15b365..a2ca9ce993d 100644 --- a/apps/server/src/modules/board/controller/api-test/card-update-height.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-update-height.api.spec.ts @@ -1,7 +1,9 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server/server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, CardNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { CardNode } from '@shared/domain/entity'; import { TestApiClient, UserAndAccountTestFactory, @@ -11,7 +13,6 @@ import { columnNodeFactory, courseFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server/server.module'; describe(`card update height (api)`, () => { let app: INestApplication; diff --git a/apps/server/src/modules/board/controller/api-test/card-update-title.api.spec.ts b/apps/server/src/modules/board/controller/api-test/card-update-title.api.spec.ts index bc598d69051..8067b17eb3a 100644 --- a/apps/server/src/modules/board/controller/api-test/card-update-title.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/card-update-title.api.spec.ts @@ -1,17 +1,18 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server/server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, CardNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { CardNode } from '@shared/domain/entity'; import { + TestApiClient, + UserAndAccountTestFactory, cardNodeFactory, cleanupCollections, columnBoardNodeFactory, columnNodeFactory, courseFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server/server.module'; const baseRouteName = '/cards'; diff --git a/apps/server/src/modules/board/controller/api-test/column-create.api.spec.ts b/apps/server/src/modules/board/controller/api-test/column-create.api.spec.ts index dd63155d4a5..bd48042d962 100644 --- a/apps/server/src/modules/board/controller/api-test/column-create.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/column-create.api.spec.ts @@ -5,7 +5,7 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; import { cleanupCollections, columnBoardNodeFactory, diff --git a/apps/server/src/modules/board/controller/api-test/column-delete.api.spec.ts b/apps/server/src/modules/board/controller/api-test/column-delete.api.spec.ts index 8b7dc463f98..fc2af6374b1 100644 --- a/apps/server/src/modules/board/controller/api-test/column-delete.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/column-delete.api.spec.ts @@ -5,7 +5,8 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType, CardNode, ColumnNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { CardNode, ColumnNode } from '@shared/domain/entity'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/controller/api-test/column-move.api.spec.ts b/apps/server/src/modules/board/controller/api-test/column-move.api.spec.ts index f467646766a..5db11857367 100644 --- a/apps/server/src/modules/board/controller/api-test/column-move.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/column-move.api.spec.ts @@ -5,7 +5,8 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType, ColumnNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { ColumnNode } from '@shared/domain/entity'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/controller/api-test/column-update-title.api.spec.ts b/apps/server/src/modules/board/controller/api-test/column-update-title.api.spec.ts index 350406041c7..f7e37510e4b 100644 --- a/apps/server/src/modules/board/controller/api-test/column-update-title.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/column-update-title.api.spec.ts @@ -1,16 +1,17 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server/server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, ColumnNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { ColumnNode } from '@shared/domain/entity'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, columnBoardNodeFactory, columnNodeFactory, courseFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server/server.module'; const baseRouteName = '/columns'; diff --git a/apps/server/src/modules/board/controller/api-test/content-element-create.api.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-create.api.spec.ts index 50dec80777d..42a8d331ed2 100644 --- a/apps/server/src/modules/board/controller/api-test/content-element-create.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/content-element-create.api.spec.ts @@ -1,8 +1,12 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server/server.module'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, ContentElementType, RichTextElementNode } from '@shared/domain'; +import { BoardExternalReferenceType, ContentElementType } from '@shared/domain/domainobject'; +import { RichTextElementNode } from '@shared/domain/entity'; import { + TestApiClient, + UserAndAccountTestFactory, cardNodeFactory, cleanupCollections, columnBoardNodeFactory, @@ -10,10 +14,7 @@ import { courseFactory, submissionContainerElementNodeFactory, submissionItemNodeFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server/server.module'; import { AnyContentElementResponse, SubmissionContainerElementResponse } from '../dto'; const baseRouteName = '/cards'; diff --git a/apps/server/src/modules/board/controller/api-test/content-element-delete.api.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-delete.api.spec.ts index b19aa8ff11c..0507039a3ff 100644 --- a/apps/server/src/modules/board/controller/api-test/content-element-delete.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/content-element-delete.api.spec.ts @@ -5,7 +5,8 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType, RichTextElementNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { RichTextElementNode } from '@shared/domain/entity'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/controller/api-test/content-element-move.api.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-move.api.spec.ts index f913a547f59..def2d498698 100644 --- a/apps/server/src/modules/board/controller/api-test/content-element-move.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/content-element-move.api.spec.ts @@ -5,7 +5,8 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { BoardExternalReferenceType, RichTextElementNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { RichTextElementNode } from '@shared/domain/entity'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts b/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts index 3be8e7dda15..77678a3ac0c 100644 --- a/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/content-element-update-content.spec.ts @@ -1,15 +1,11 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server/server.module'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { sanitizeRichText } from '@shared/controller'; -import { - BoardExternalReferenceType, - ContentElementType, - FileElementNode, - InputFormat, - RichTextElementNode, - SubmissionContainerElementNode, -} from '@shared/domain'; +import { BoardExternalReferenceType, ContentElementType } from '@shared/domain/domainobject'; +import { FileElementNode, RichTextElementNode, SubmissionContainerElementNode } from '@shared/domain/entity'; +import { InputFormat } from '@shared/domain/types'; import { TestApiClient, UserAndAccountTestFactory, @@ -22,7 +18,6 @@ import { richTextElementNodeFactory, submissionContainerElementNodeFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server/server.module'; describe(`content element update content (api)`, () => { let app: INestApplication; diff --git a/apps/server/src/modules/board/controller/api-test/submission-item-create.api.spec.ts b/apps/server/src/modules/board/controller/api-test/submission-item-create.api.spec.ts index 9155e1faf16..33b764e67a0 100644 --- a/apps/server/src/modules/board/controller/api-test/submission-item-create.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/submission-item-create.api.spec.ts @@ -1,7 +1,9 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, SubmissionItemNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { SubmissionItemNode } from '@shared/domain/entity'; import { TestApiClient, UserAndAccountTestFactory, @@ -13,7 +15,6 @@ import { submissionContainerElementNodeFactory, userFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; import { SubmissionItemResponse } from '../dto'; const baseRouteName = '/elements'; diff --git a/apps/server/src/modules/board/controller/api-test/submission-item-lookup.api.spec.ts b/apps/server/src/modules/board/controller/api-test/submission-item-lookup.api.spec.ts index e297b164d9e..65cad7285fe 100644 --- a/apps/server/src/modules/board/controller/api-test/submission-item-lookup.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/submission-item-lookup.api.spec.ts @@ -1,8 +1,11 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, ContentElementType } from '@shared/domain'; +import { BoardExternalReferenceType, ContentElementType } from '@shared/domain/domainobject'; import { + TestApiClient, + UserAndAccountTestFactory, cardNodeFactory, cleanupCollections, columnBoardNodeFactory, @@ -12,11 +15,8 @@ import { richTextElementNodeFactory, submissionContainerElementNodeFactory, submissionItemNodeFactory, - TestApiClient, - UserAndAccountTestFactory, userFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; import { SubmissionsResponse } from '../dto'; const baseRouteName = '/board-submissions'; diff --git a/apps/server/src/modules/board/controller/api-test/submission-item-update.api.spec.ts b/apps/server/src/modules/board/controller/api-test/submission-item-update.api.spec.ts index f8058a3ee4b..698804a9925 100644 --- a/apps/server/src/modules/board/controller/api-test/submission-item-update.api.spec.ts +++ b/apps/server/src/modules/board/controller/api-test/submission-item-update.api.spec.ts @@ -1,7 +1,9 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, SubmissionItemNode } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { SubmissionItemNode } from '@shared/domain/entity'; import { TestApiClient, UserAndAccountTestFactory, @@ -13,7 +15,6 @@ import { submissionContainerElementNodeFactory, submissionItemNodeFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; import { SubmissionItemResponse } from '../dto'; const baseRouteName = '/board-submissions'; diff --git a/apps/server/src/modules/board/controller/card.controller.ts b/apps/server/src/modules/board/controller/card.controller.ts index 86320a55736..341d1e85dc9 100644 --- a/apps/server/src/modules/board/controller/card.controller.ts +++ b/apps/server/src/modules/board/controller/card.controller.ts @@ -131,8 +131,8 @@ export class CardController { { $ref: getSchemaPath(FileElementResponse) }, { $ref: getSchemaPath(LinkElementResponse) }, { $ref: getSchemaPath(RichTextElementResponse) }, - { $ref: getSchemaPath(DrawingElementResponse) }, { $ref: getSchemaPath(SubmissionContainerElementResponse) }, + { $ref: getSchemaPath(DrawingElementResponse) }, ], }, }) diff --git a/apps/server/src/modules/board/controller/dto/board/board-context.reponse.ts b/apps/server/src/modules/board/controller/dto/board/board-context.reponse.ts index 183dbbaed9d..c78a7e4c1fa 100644 --- a/apps/server/src/modules/board/controller/dto/board/board-context.reponse.ts +++ b/apps/server/src/modules/board/controller/dto/board/board-context.reponse.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { BoardExternalReferenceType } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; export class BoardContextResponse { constructor({ id, type }: BoardContextResponse) { diff --git a/apps/server/src/modules/board/controller/dto/card/create-card.body.params.ts b/apps/server/src/modules/board/controller/dto/card/create-card.body.params.ts index 1d6956d2c7d..c00e8dd9704 100644 --- a/apps/server/src/modules/board/controller/dto/card/create-card.body.params.ts +++ b/apps/server/src/modules/board/controller/dto/card/create-card.body.params.ts @@ -1,5 +1,5 @@ import { ApiPropertyOptional } from '@nestjs/swagger'; -import { ContentElementType } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; import { IsEnum, IsOptional } from 'class-validator'; export class CreateCardBodyParams { diff --git a/apps/server/src/modules/board/controller/dto/element/create-content-element.body.params.ts b/apps/server/src/modules/board/controller/dto/element/create-content-element.body.params.ts index 4eaf32d2a6d..a20de3bf6f4 100644 --- a/apps/server/src/modules/board/controller/dto/element/create-content-element.body.params.ts +++ b/apps/server/src/modules/board/controller/dto/element/create-content-element.body.params.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { ContentElementType } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; import { IsEnum, IsInt, IsOptional, Min } from 'class-validator'; export class CreateContentElementBodyParams { diff --git a/apps/server/src/modules/board/controller/dto/element/drawing-element.response.ts b/apps/server/src/modules/board/controller/dto/element/drawing-element.response.ts index 7c2b0e20852..cdf54c18a02 100644 --- a/apps/server/src/modules/board/controller/dto/element/drawing-element.response.ts +++ b/apps/server/src/modules/board/controller/dto/element/drawing-element.response.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ContentElementType } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; import { TimestampsResponse } from '../timestamps.response'; export class DrawingElementContent { diff --git a/apps/server/src/modules/board/controller/dto/element/external-tool-element.response.ts b/apps/server/src/modules/board/controller/dto/element/external-tool-element.response.ts index fc67b7631b6..68afa9d815b 100644 --- a/apps/server/src/modules/board/controller/dto/element/external-tool-element.response.ts +++ b/apps/server/src/modules/board/controller/dto/element/external-tool-element.response.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ContentElementType } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; import { TimestampsResponse } from '../timestamps.response'; export class ExternalToolElementContent { diff --git a/apps/server/src/modules/board/controller/dto/element/file-element.response.ts b/apps/server/src/modules/board/controller/dto/element/file-element.response.ts index d6c5122358f..9713891f7be 100644 --- a/apps/server/src/modules/board/controller/dto/element/file-element.response.ts +++ b/apps/server/src/modules/board/controller/dto/element/file-element.response.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; import { DecodeHtmlEntities } from '@shared/controller'; -import { ContentElementType } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; import { TimestampsResponse } from '../timestamps.response'; export class FileElementContent { diff --git a/apps/server/src/modules/board/controller/dto/element/link-element.response.ts b/apps/server/src/modules/board/controller/dto/element/link-element.response.ts index d6c4a7e7080..5ec02920642 100644 --- a/apps/server/src/modules/board/controller/dto/element/link-element.response.ts +++ b/apps/server/src/modules/board/controller/dto/element/link-element.response.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { ContentElementType } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; import { TimestampsResponse } from '../timestamps.response'; export class LinkElementContent { diff --git a/apps/server/src/modules/board/controller/dto/element/rich-text-element.response.ts b/apps/server/src/modules/board/controller/dto/element/rich-text-element.response.ts index 5de20e7689c..1b6dcbc7313 100644 --- a/apps/server/src/modules/board/controller/dto/element/rich-text-element.response.ts +++ b/apps/server/src/modules/board/controller/dto/element/rich-text-element.response.ts @@ -1,5 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ContentElementType, InputFormat } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; +import { InputFormat } from '@shared/domain/types'; import { TimestampsResponse } from '../timestamps.response'; export class RichTextElementContent { diff --git a/apps/server/src/modules/board/controller/dto/element/submission-container-element.response.ts b/apps/server/src/modules/board/controller/dto/element/submission-container-element.response.ts index e6f0d1364ef..2b0ced78a79 100644 --- a/apps/server/src/modules/board/controller/dto/element/submission-container-element.response.ts +++ b/apps/server/src/modules/board/controller/dto/element/submission-container-element.response.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ContentElementType } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; import { TimestampsResponse } from '../timestamps.response'; export class SubmissionContainerElementContent { diff --git a/apps/server/src/modules/board/controller/dto/element/update-element-content.body.params.ts b/apps/server/src/modules/board/controller/dto/element/update-element-content.body.params.ts index c7dc06fd668..3c4f5857917 100644 --- a/apps/server/src/modules/board/controller/dto/element/update-element-content.body.params.ts +++ b/apps/server/src/modules/board/controller/dto/element/update-element-content.body.params.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional, getSchemaPath } from '@nestjs/swagger'; -import { ContentElementType } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; import { InputFormat } from '@shared/domain/types'; import { Type } from 'class-transformer'; import { IsDate, IsEnum, IsMongoId, IsOptional, IsString, ValidateNested } from 'class-validator'; diff --git a/apps/server/src/modules/board/controller/mapper/base-mapper.interface.ts b/apps/server/src/modules/board/controller/mapper/base-mapper.interface.ts index 0cc0cd742ba..99f5186b286 100644 --- a/apps/server/src/modules/board/controller/mapper/base-mapper.interface.ts +++ b/apps/server/src/modules/board/controller/mapper/base-mapper.interface.ts @@ -1,4 +1,4 @@ -import type { AnyBoardDo } from '@shared/domain'; +import type { AnyBoardDo } from '@shared/domain/domainobject'; import type { AnyContentElementResponse } from '../dto'; export interface BaseResponseMapper { diff --git a/apps/server/src/modules/board/controller/mapper/board-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/board-response.mapper.ts index b6f7b2a86d0..8d87144c2f9 100644 --- a/apps/server/src/modules/board/controller/mapper/board-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/board-response.mapper.ts @@ -1,5 +1,5 @@ import { HttpException, HttpStatus } from '@nestjs/common'; -import { Column, ColumnBoard } from '@shared/domain'; +import { Column, ColumnBoard } from '@shared/domain/domainobject'; import { BoardResponse, TimestampsResponse } from '../dto'; import { ColumnResponseMapper } from './column-response.mapper'; diff --git a/apps/server/src/modules/board/controller/mapper/card-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/card-response.mapper.ts index e33b83f1dfc..935fe120ba4 100644 --- a/apps/server/src/modules/board/controller/mapper/card-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/card-response.mapper.ts @@ -1,4 +1,4 @@ -import { Card } from '@shared/domain'; +import { Card } from '@shared/domain/domainobject'; import { CardResponse, TimestampsResponse, VisibilitySettingsResponse } from '../dto'; import { ContentElementResponseFactory } from './content-element-response.factory'; diff --git a/apps/server/src/modules/board/controller/mapper/column-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/column-response.mapper.ts index c4e0629903f..8938f029316 100644 --- a/apps/server/src/modules/board/controller/mapper/column-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/column-response.mapper.ts @@ -1,5 +1,5 @@ import { HttpException, HttpStatus } from '@nestjs/common'; -import { Card, Column } from '@shared/domain'; +import { Card, Column } from '@shared/domain/domainobject'; import { CardSkeletonResponse, ColumnResponse, TimestampsResponse } from '../dto'; export class ColumnResponseMapper { diff --git a/apps/server/src/modules/board/controller/mapper/content-element-response.factory.ts b/apps/server/src/modules/board/controller/mapper/content-element-response.factory.ts index 72311882bb8..9300890d684 100644 --- a/apps/server/src/modules/board/controller/mapper/content-element-response.factory.ts +++ b/apps/server/src/modules/board/controller/mapper/content-element-response.factory.ts @@ -1,11 +1,11 @@ import { NotImplementedException, UnprocessableEntityException } from '@nestjs/common'; -import { AnyBoardDo, FileElement, RichTextElement } from '@shared/domain'; +import { AnyBoardDo, FileElement, RichTextElement } from '@shared/domain/domainobject'; import { AnyContentElementResponse, FileElementResponse, - RichTextElementResponse, isFileElementResponse, isRichTextElementResponse, + RichTextElementResponse, } from '../dto'; import { BaseResponseMapper } from './base-mapper.interface'; import { DrawingElementResponseMapper } from './drawing-element-response.mapper'; diff --git a/apps/server/src/modules/board/controller/mapper/drawing-element-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/drawing-element-response.mapper.ts index 1ab07081f07..90b4656617f 100644 --- a/apps/server/src/modules/board/controller/mapper/drawing-element-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/drawing-element-response.mapper.ts @@ -1,5 +1,5 @@ -import { ContentElementType } from '@shared/domain'; import { DrawingElement } from '@shared/domain/domainobject/board/drawing-element.do'; +import { ContentElementType } from '@shared/domain/domainobject'; import { DrawingElementContent, DrawingElementResponse } from '../dto/element/drawing-element.response'; import { TimestampsResponse } from '../dto'; import { BaseResponseMapper } from './base-mapper.interface'; diff --git a/apps/server/src/modules/board/controller/mapper/external-tool-element-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/external-tool-element-response.mapper.ts index a27cab41d63..30a46e0d326 100644 --- a/apps/server/src/modules/board/controller/mapper/external-tool-element-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/external-tool-element-response.mapper.ts @@ -1,4 +1,4 @@ -import { ContentElementType, ExternalToolElement } from '@shared/domain'; +import { ContentElementType, ExternalToolElement } from '@shared/domain/domainobject'; import { ExternalToolElementContent, ExternalToolElementResponse, TimestampsResponse } from '../dto'; import { BaseResponseMapper } from './base-mapper.interface'; diff --git a/apps/server/src/modules/board/controller/mapper/file-element-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/file-element-response.mapper.ts index 769eafb74f8..e0b78a069a2 100644 --- a/apps/server/src/modules/board/controller/mapper/file-element-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/file-element-response.mapper.ts @@ -1,4 +1,4 @@ -import { ContentElementType, FileElement } from '@shared/domain'; +import { ContentElementType, FileElement } from '@shared/domain/domainobject'; import { FileElementContent, FileElementResponse, TimestampsResponse } from '../dto'; import { BaseResponseMapper } from './base-mapper.interface'; diff --git a/apps/server/src/modules/board/controller/mapper/link-element-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/link-element-response.mapper.ts index e6a31b2c07a..5abf9f3fe8b 100644 --- a/apps/server/src/modules/board/controller/mapper/link-element-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/link-element-response.mapper.ts @@ -1,4 +1,4 @@ -import { ContentElementType, LinkElement } from '@shared/domain'; +import { ContentElementType, LinkElement } from '@shared/domain/domainobject'; import { LinkElementContent, LinkElementResponse, TimestampsResponse } from '../dto'; import { BaseResponseMapper } from './base-mapper.interface'; diff --git a/apps/server/src/modules/board/controller/mapper/rich-text-element-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/rich-text-element-response.mapper.ts index 89d4842a753..1e513adb0a6 100644 --- a/apps/server/src/modules/board/controller/mapper/rich-text-element-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/rich-text-element-response.mapper.ts @@ -1,4 +1,4 @@ -import { ContentElementType, RichTextElement } from '@shared/domain'; +import { ContentElementType, RichTextElement } from '@shared/domain/domainobject'; import { TimestampsResponse } from '../dto'; import { RichTextElementContent, RichTextElementResponse } from '../dto/element/rich-text-element.response'; import { BaseResponseMapper } from './base-mapper.interface'; diff --git a/apps/server/src/modules/board/controller/mapper/submission-container-element-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/submission-container-element-response.mapper.ts index fc68da31d13..df58f12f73c 100644 --- a/apps/server/src/modules/board/controller/mapper/submission-container-element-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/submission-container-element-response.mapper.ts @@ -1,4 +1,4 @@ -import { ContentElementType, SubmissionContainerElement } from '@shared/domain'; +import { ContentElementType, SubmissionContainerElement } from '@shared/domain/domainobject'; import { SubmissionContainerElementContent, SubmissionContainerElementResponse, TimestampsResponse } from '../dto'; import { BaseResponseMapper } from './base-mapper.interface'; diff --git a/apps/server/src/modules/board/controller/mapper/submission-item-response.mapper.ts b/apps/server/src/modules/board/controller/mapper/submission-item-response.mapper.ts index 6cbf0348109..abb91cb00ea 100644 --- a/apps/server/src/modules/board/controller/mapper/submission-item-response.mapper.ts +++ b/apps/server/src/modules/board/controller/mapper/submission-item-response.mapper.ts @@ -1,4 +1,10 @@ -import { FileElement, isSubmissionItemContent, RichTextElement, SubmissionItem, UserBoardRoles } from '@shared/domain'; +import { + FileElement, + isSubmissionItemContent, + RichTextElement, + SubmissionItem, + UserBoardRoles, +} from '@shared/domain/domainobject'; import { SubmissionItemResponse, SubmissionsResponse, TimestampsResponse, UserDataResponse } from '../dto'; import { ContentElementResponseFactory } from './content-element-response.factory'; diff --git a/apps/server/src/modules/board/repo/board-do.builder-impl.spec.ts b/apps/server/src/modules/board/repo/board-do.builder-impl.spec.ts index 43bdc325623..5d9c0a0e7d2 100644 --- a/apps/server/src/modules/board/repo/board-do.builder-impl.spec.ts +++ b/apps/server/src/modules/board/repo/board-do.builder-impl.spec.ts @@ -1,4 +1,5 @@ -import { BoardNodeType, ExternalToolElement, LinkElement } from '@shared/domain'; +import { ExternalToolElement, LinkElement } from '@shared/domain/domainobject'; +import { BoardNodeType } from '@shared/domain/entity'; import { cardNodeFactory, columnBoardNodeFactory, diff --git a/apps/server/src/modules/board/repo/board-do.builder-impl.ts b/apps/server/src/modules/board/repo/board-do.builder-impl.ts index 2154264fd20..1e052f39d3c 100644 --- a/apps/server/src/modules/board/repo/board-do.builder-impl.ts +++ b/apps/server/src/modules/board/repo/board-do.builder-impl.ts @@ -1,20 +1,6 @@ import { NotImplementedException } from '@nestjs/common'; -import type { - BoardDoBuilder, - BoardNode, - CardNode, - ColumnBoardNode, - ColumnNode, - ExternalToolElementNodeEntity, - FileElementNode, - LinkElementNode, - RichTextElementNode, - SubmissionContainerElementNode, - SubmissionItemNode, -} from '@shared/domain'; import { AnyBoardDo, - BoardNodeType, Card, Column, ColumnBoard, @@ -24,9 +10,23 @@ import { RichTextElement, SubmissionContainerElement, SubmissionItem, -} from '@shared/domain'; -import { DrawingElementNode } from '@shared/domain/entity/boardnode/drawing-element-node.entity'; +} from '@shared/domain/domainobject'; import { DrawingElement } from '@shared/domain/domainobject/board/drawing-element.do'; +import { + BoardNodeType, + type BoardDoBuilder, + type BoardNode, + type CardNode, + type ColumnBoardNode, + type ColumnNode, + type ExternalToolElementNodeEntity, + type FileElementNode, + type LinkElementNode, + type RichTextElementNode, + type SubmissionContainerElementNode, + type SubmissionItemNode, +} from '@shared/domain/entity'; +import { DrawingElementNode } from '@shared/domain/entity/boardnode/drawing-element-node.entity'; export class BoardDoBuilderImpl implements BoardDoBuilder { private childrenMap: Record = {}; diff --git a/apps/server/src/modules/board/repo/board-do.repo.spec.ts b/apps/server/src/modules/board/repo/board-do.repo.spec.ts index 2bf3037973d..1d79f961ae8 100644 --- a/apps/server/src/modules/board/repo/board-do.repo.spec.ts +++ b/apps/server/src/modules/board/repo/board-do.repo.spec.ts @@ -1,20 +1,13 @@ import { createMock } from '@golevelup/ts-jest'; +import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { ContextExternalToolService } from '@modules/tool/context-external-tool/service'; import { NotFoundException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { - AnyBoardDo, - BoardExternalReferenceType, - Card, - CardNode, - Column, - ColumnBoard, - RichTextElementNode, -} from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { AnyBoardDo, BoardExternalReferenceType, Card, Column, ColumnBoard } from '@shared/domain/domainobject'; +import { CardNode, RichTextElementNode } from '@shared/domain/entity'; import { cardFactory, cardNodeFactory, diff --git a/apps/server/src/modules/board/repo/board-do.repo.ts b/apps/server/src/modules/board/repo/board-do.repo.ts index a9358bc1177..79ab3dc3c48 100644 --- a/apps/server/src/modules/board/repo/board-do.repo.ts +++ b/apps/server/src/modules/board/repo/board-do.repo.ts @@ -1,7 +1,9 @@ import { Utils } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable, NotFoundException } from '@nestjs/common'; -import { AnyBoardDo, BoardExternalReference, BoardNode, ColumnBoardNode, EntityId } from '@shared/domain'; +import { AnyBoardDo, BoardExternalReference } from '@shared/domain/domainobject'; +import { BoardNode, ColumnBoardNode } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { BoardDoBuilderImpl } from './board-do.builder-impl'; import { BoardNodeRepo } from './board-node.repo'; import { RecursiveDeleteVisitor } from './recursive-delete.vistor'; diff --git a/apps/server/src/modules/board/repo/board-node.repo.spec.ts b/apps/server/src/modules/board/repo/board-node.repo.spec.ts index 2ebed80d0af..35d8d0f78ea 100644 --- a/apps/server/src/modules/board/repo/board-node.repo.spec.ts +++ b/apps/server/src/modules/board/repo/board-node.repo.spec.ts @@ -1,7 +1,7 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { ColumnBoardNode } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { ColumnBoardNode } from '@shared/domain/entity'; import { cardNodeFactory, cleanupCollections, diff --git a/apps/server/src/modules/board/repo/board-node.repo.ts b/apps/server/src/modules/board/repo/board-node.repo.ts index 65e57624dc9..5c3f3b5ebb3 100644 --- a/apps/server/src/modules/board/repo/board-node.repo.ts +++ b/apps/server/src/modules/board/repo/board-node.repo.ts @@ -1,6 +1,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { BoardNode, EntityId } from '@shared/domain'; +import { BoardNode } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; @Injectable() export class BoardNodeRepo { diff --git a/apps/server/src/modules/board/repo/recursive-delete.vistor.ts b/apps/server/src/modules/board/repo/recursive-delete.vistor.ts index c7acaa1c81d..3993d9da87c 100644 --- a/apps/server/src/modules/board/repo/recursive-delete.vistor.ts +++ b/apps/server/src/modules/board/repo/recursive-delete.vistor.ts @@ -7,7 +7,6 @@ import { Injectable } from '@nestjs/common'; import { AnyBoardDo, BoardCompositeVisitorAsync, - BoardNode, Card, Column, ColumnBoard, @@ -16,9 +15,10 @@ import { RichTextElement, SubmissionContainerElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; import { DrawingElement } from '@shared/domain/domainobject/board/drawing-element.do'; import { LinkElement } from '@shared/domain/domainobject/board/link-element.do'; +import { BoardNode } from '@shared/domain/entity'; @Injectable() export class RecursiveDeleteVisitor implements BoardCompositeVisitorAsync { diff --git a/apps/server/src/modules/board/repo/recursive-save.visitor.spec.ts b/apps/server/src/modules/board/repo/recursive-save.visitor.spec.ts index 55be7d41d75..23129cd2288 100644 --- a/apps/server/src/modules/board/repo/recursive-save.visitor.spec.ts +++ b/apps/server/src/modules/board/repo/recursive-save.visitor.spec.ts @@ -12,7 +12,7 @@ import { DrawingElementNode, SubmissionContainerElementNode, SubmissionItemNode, -} from '@shared/domain'; +} from '@shared/domain/entity'; import { cardFactory, columnBoardFactory, diff --git a/apps/server/src/modules/board/repo/recursive-save.visitor.ts b/apps/server/src/modules/board/repo/recursive-save.visitor.ts index 32abcfb0747..f08e87fd620 100644 --- a/apps/server/src/modules/board/repo/recursive-save.visitor.ts +++ b/apps/server/src/modules/board/repo/recursive-save.visitor.ts @@ -1,32 +1,35 @@ import { Utils } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; +import { ContextExternalToolEntity } from '@modules/tool/context-external-tool/entity'; import { AnyBoardDo, BoardCompositeVisitor, - BoardNode, Card, - CardNode, Column, ColumnBoard, + ExternalToolElement, + FileElement, + RichTextElement, + SubmissionContainerElement, + SubmissionItem, +} from '@shared/domain/domainobject'; +import { DrawingElement } from '@shared/domain/domainobject/board/drawing-element.do'; +import { LinkElement } from '@shared/domain/domainobject/board/link-element.do'; +import { + BoardNode, + CardNode, ColumnBoardNode, ColumnNode, - EntityId, - ExternalToolElement, ExternalToolElementNodeEntity, - FileElement, FileElementNode, - RichTextElement, RichTextElementNode, - SubmissionContainerElement, SubmissionContainerElementNode, - SubmissionItem, SubmissionItemNode, -} from '@shared/domain'; -import { LinkElement } from '@shared/domain/domainobject/board/link-element.do'; -import { LinkElementNode } from '@shared/domain/entity/boardnode/link-element-node.entity'; -import { ContextExternalToolEntity } from '@modules/tool/context-external-tool/entity'; -import { DrawingElement } from '@shared/domain/domainobject/board/drawing-element.do'; +} from '@shared/domain/entity'; import { DrawingElementNode } from '@shared/domain/entity/boardnode/drawing-element-node.entity'; +import { LinkElementNode } from '@shared/domain/entity/boardnode/link-element-node.entity'; +import { EntityId } from '@shared/domain/types'; + import { BoardNodeRepo } from './board-node.repo'; type ParentData = { diff --git a/apps/server/src/modules/board/service/board-do-authorizable.service.spec.ts b/apps/server/src/modules/board/service/board-do-authorizable.service.spec.ts index 752d075b06b..25bfb26a25d 100644 --- a/apps/server/src/modules/board/service/board-do-authorizable.service.spec.ts +++ b/apps/server/src/modules/board/service/board-do-authorizable.service.spec.ts @@ -1,6 +1,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, BoardRoles, UserRoleEnum } from '@shared/domain'; +import { BoardExternalReferenceType, BoardRoles, UserRoleEnum } from '@shared/domain/domainobject'; import { CourseRepo } from '@shared/repo'; import { courseFactory, roleFactory, setupEntities, userFactory } from '@shared/testing'; import { columnBoardFactory, columnFactory } from '@shared/testing/factory/domainobject'; diff --git a/apps/server/src/modules/board/service/board-do-authorizable.service.ts b/apps/server/src/modules/board/service/board-do-authorizable.service.ts index 46ef7d3d45b..bcdc08adfee 100644 --- a/apps/server/src/modules/board/service/board-do-authorizable.service.ts +++ b/apps/server/src/modules/board/service/board-do-authorizable.service.ts @@ -1,3 +1,4 @@ +import { AuthorizationLoaderService } from '@modules/authorization'; import { forwardRef, Inject, Injectable } from '@nestjs/common'; import { AnyBoardDo, @@ -5,13 +6,12 @@ import { BoardExternalReferenceType, BoardRoles, ColumnBoard, - Course, - EntityId, UserBoardRoles, UserRoleEnum, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; +import { Course } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { CourseRepo } from '@shared/repo'; -import { AuthorizationLoaderService } from '@modules/authorization'; import { BoardDoRepo } from '../repo'; @Injectable() diff --git a/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.spec.ts b/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.spec.ts index 04a3e8dce3c..ecebe7ac65a 100644 --- a/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.spec.ts +++ b/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.spec.ts @@ -1,4 +1,6 @@ import { createMock } from '@golevelup/ts-jest'; +import { FileRecordParentType } from '@infra/rabbitmq'; +import { CopyElementType, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; import { Test, TestingModule } from '@nestjs/testing'; import { Card, @@ -7,6 +9,9 @@ import { DrawingElement, ExternalToolElement, FileElement, + LinkElement, + RichTextElement, + SubmissionContainerElement, isCard, isColumn, isColumnBoard, @@ -16,11 +21,7 @@ import { isLinkElement, isRichTextElement, isSubmissionContainerElement, - LinkElement, - RichTextElement, - SubmissionContainerElement, -} from '@shared/domain'; -import { FileRecordParentType } from '@infra/rabbitmq'; +} from '@shared/domain/domainobject'; import { cardFactory, columnBoardFactory, @@ -34,7 +35,6 @@ import { submissionContainerElementFactory, submissionItemFactory, } from '@shared/testing'; -import { CopyElementType, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; import { ObjectId } from 'bson'; import { BoardDoCopyService } from './board-do-copy.service'; import { SchoolSpecificFileCopyService } from './school-specific-file-copy.interface'; diff --git a/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.ts b/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.ts index b2458dd6cfb..a398a807de9 100644 --- a/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.ts +++ b/apps/server/src/modules/board/service/board-do-copy-service/board-do-copy.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@nestjs/common'; -import { AnyBoardDo } from '@shared/domain'; import { CopyStatus } from '@modules/copy-helper'; +import { Injectable } from '@nestjs/common'; +import { AnyBoardDo } from '@shared/domain/domainobject'; import { RecursiveCopyVisitor } from './recursive-copy.visitor'; import { SchoolSpecificFileCopyService } from './school-specific-file-copy.interface'; diff --git a/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.spec.ts b/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.spec.ts index bb0a7fda403..3fe6c7b6cbe 100644 --- a/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.spec.ts +++ b/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.spec.ts @@ -1,6 +1,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { LinkElement } from '@shared/domain'; +import { LinkElement } from '@shared/domain/domainobject'; import { linkElementFactory, setupEntities } from '@shared/testing'; import { CopyFileDto } from '@src/modules/files-storage-client/dto'; diff --git a/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.ts b/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.ts index a70d133d324..a7a0d3b6d1b 100644 --- a/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.ts +++ b/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.ts @@ -7,14 +7,14 @@ import { Column, ColumnBoard, DrawingElement, - EntityId, ExternalToolElement, FileElement, RichTextElement, SubmissionContainerElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; import { LinkElement } from '@shared/domain/domainobject/board/link-element.do'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { SchoolSpecificFileCopyService } from './school-specific-file-copy.interface'; diff --git a/apps/server/src/modules/board/service/board-do-copy-service/school-specific-file-copy.interface.ts b/apps/server/src/modules/board/service/board-do-copy-service/school-specific-file-copy.interface.ts index ce7870f6c86..2a3b769f580 100644 --- a/apps/server/src/modules/board/service/board-do-copy-service/school-specific-file-copy.interface.ts +++ b/apps/server/src/modules/board/service/board-do-copy-service/school-specific-file-copy.interface.ts @@ -1,6 +1,6 @@ -import { EntityId } from '@shared/domain'; import { CopyFileDto } from '@modules/files-storage-client/dto'; import { FileRecordParentType } from '@modules/files-storage/entity'; +import { EntityId } from '@shared/domain/types'; export type SchoolSpecificFileCopyServiceCopyParams = { sourceParentId: EntityId; diff --git a/apps/server/src/modules/board/service/board-do.service.ts b/apps/server/src/modules/board/service/board-do.service.ts index 721872b75ee..4ac578069e6 100644 --- a/apps/server/src/modules/board/service/board-do.service.ts +++ b/apps/server/src/modules/board/service/board-do.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { AnyBoardDo } from '@shared/domain'; +import { AnyBoardDo } from '@shared/domain/domainobject'; import { BoardDoRepo } from '../repo'; @Injectable() diff --git a/apps/server/src/modules/board/service/card.service.spec.ts b/apps/server/src/modules/board/service/card.service.spec.ts index eb155793412..ffef98c53ad 100644 --- a/apps/server/src/modules/board/service/card.service.spec.ts +++ b/apps/server/src/modules/board/service/card.service.spec.ts @@ -1,6 +1,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { Card, ContentElementType } from '@shared/domain'; +import { Card, ContentElementType } from '@shared/domain/domainobject'; import { setupEntities } from '@shared/testing'; import { cardFactory, diff --git a/apps/server/src/modules/board/service/card.service.ts b/apps/server/src/modules/board/service/card.service.ts index b7fee25c94f..a9d49982ad2 100644 --- a/apps/server/src/modules/board/service/card.service.ts +++ b/apps/server/src/modules/board/service/card.service.ts @@ -1,5 +1,6 @@ import { Injectable, NotFoundException } from '@nestjs/common'; -import { Card, Column, ContentElementType, EntityId } from '@shared/domain'; +import { Card, Column, ContentElementType } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { BoardDoRepo } from '../repo'; import { BoardDoService } from './board-do.service'; diff --git a/apps/server/src/modules/board/service/column-board-copy.service.spec.ts b/apps/server/src/modules/board/service/column-board-copy.service.spec.ts index bbfeb27a1f3..ef37775138f 100644 --- a/apps/server/src/modules/board/service/column-board-copy.service.spec.ts +++ b/apps/server/src/modules/board/service/column-board-copy.service.spec.ts @@ -1,10 +1,10 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { CopyElementType, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; +import { UserService } from '@modules/user'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, ColumnBoard, UserDO } from '@shared/domain'; +import { BoardExternalReferenceType, ColumnBoard, UserDO } from '@shared/domain/domainobject'; import { CourseRepo } from '@shared/repo'; import { columnBoardFactory, courseFactory, schoolFactory, setupEntities, userFactory } from '@shared/testing'; -import { CopyElementType, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; -import { UserService } from '@modules/user'; import { BoardDoRepo } from '../repo'; import { BoardDoCopyService, diff --git a/apps/server/src/modules/board/service/column-board-copy.service.ts b/apps/server/src/modules/board/service/column-board-copy.service.ts index 79ef29f4752..b68ae9d1a90 100644 --- a/apps/server/src/modules/board/service/column-board-copy.service.ts +++ b/apps/server/src/modules/board/service/column-board-copy.service.ts @@ -1,14 +1,14 @@ +import { CopyStatus } from '@modules/copy-helper'; +import { UserService } from '@modules/user'; import { Injectable, InternalServerErrorException, NotImplementedException } from '@nestjs/common'; import { BoardExternalReference, BoardExternalReferenceType, ColumnBoard, - EntityId, isColumnBoard, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { CourseRepo } from '@shared/repo'; -import { CopyStatus } from '@modules/copy-helper'; -import { UserService } from '@modules/user'; import { BoardDoRepo } from '../repo'; import { BoardDoCopyService, SchoolSpecificFileCopyServiceFactory } from './board-do-copy-service'; diff --git a/apps/server/src/modules/board/service/column-board.service.spec.ts b/apps/server/src/modules/board/service/column-board.service.spec.ts index 97b4a3d2578..0c308afc4ef 100644 --- a/apps/server/src/modules/board/service/column-board.service.spec.ts +++ b/apps/server/src/modules/board/service/column-board.service.spec.ts @@ -9,9 +9,9 @@ import { Card, ColumnBoard, ContentElementFactory, - InputFormat, RichTextElement, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; +import { InputFormat } from '@shared/domain/types'; import { columnBoardNodeFactory, setupEntities } from '@shared/testing'; import { columnBoardFactory, columnFactory, richTextElementFactory } from '@shared/testing/factory/domainobject'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/board/service/column-board.service.ts b/apps/server/src/modules/board/service/column-board.service.ts index 7a455e0fcfa..3a24f58cdf1 100644 --- a/apps/server/src/modules/board/service/column-board.service.ts +++ b/apps/server/src/modules/board/service/column-board.service.ts @@ -9,9 +9,9 @@ import { ColumnBoard, ContentElementFactory, ContentElementType, - EntityId, RichTextElement, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { BoardDoRepo } from '../repo'; import { BoardDoService } from './board-do.service'; diff --git a/apps/server/src/modules/board/service/column.service.spec.ts b/apps/server/src/modules/board/service/column.service.spec.ts index d5cd50a0658..1ff2e1cc328 100644 --- a/apps/server/src/modules/board/service/column.service.spec.ts +++ b/apps/server/src/modules/board/service/column.service.spec.ts @@ -1,6 +1,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { Column } from '@shared/domain'; +import { Column } from '@shared/domain/domainobject'; import { setupEntities } from '@shared/testing'; import { columnBoardFactory, columnFactory } from '@shared/testing/factory/domainobject'; import { BoardDoRepo } from '../repo'; diff --git a/apps/server/src/modules/board/service/column.service.ts b/apps/server/src/modules/board/service/column.service.ts index 6da6dfa4c95..bc5ef9fd1b0 100644 --- a/apps/server/src/modules/board/service/column.service.ts +++ b/apps/server/src/modules/board/service/column.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { Column, ColumnBoard, EntityId } from '@shared/domain'; +import { Column, ColumnBoard } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { BoardDoRepo } from '../repo'; import { BoardDoService } from './board-do.service'; diff --git a/apps/server/src/modules/board/service/content-element-update.visitor.spec.ts b/apps/server/src/modules/board/service/content-element-update.visitor.spec.ts index 6061c05eb42..e29397c6c7b 100644 --- a/apps/server/src/modules/board/service/content-element-update.visitor.spec.ts +++ b/apps/server/src/modules/board/service/content-element-update.visitor.spec.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { InputFormat } from '@shared/domain'; +import { InputFormat } from '@shared/domain/types'; import { cardFactory, columnBoardFactory, diff --git a/apps/server/src/modules/board/service/content-element-update.visitor.ts b/apps/server/src/modules/board/service/content-element-update.visitor.ts index 77d9581dec4..18b38903ed3 100644 --- a/apps/server/src/modules/board/service/content-element-update.visitor.ts +++ b/apps/server/src/modules/board/service/content-element-update.visitor.ts @@ -8,13 +8,13 @@ import { ColumnBoard, ExternalToolElement, FileElement, - InputFormat, RichTextElement, SubmissionContainerElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; import { DrawingElement } from '@shared/domain/domainobject/board/drawing-element.do'; import { LinkElement } from '@shared/domain/domainobject/board/link-element.do'; +import { InputFormat } from '@shared/domain/types'; import { AnyElementContentBody, DrawingContentBody, diff --git a/apps/server/src/modules/board/service/content-element.service.spec.ts b/apps/server/src/modules/board/service/content-element.service.spec.ts index 73bbf150f80..5c638270218 100644 --- a/apps/server/src/modules/board/service/content-element.service.spec.ts +++ b/apps/server/src/modules/board/service/content-element.service.spec.ts @@ -5,10 +5,10 @@ import { ContentElementFactory, ContentElementType, FileElement, - InputFormat, RichTextElement, SubmissionContainerElement, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; +import { InputFormat } from '@shared/domain/types'; import { drawingElementFactory, setupEntities } from '@shared/testing'; import { cardFactory, diff --git a/apps/server/src/modules/board/service/content-element.service.ts b/apps/server/src/modules/board/service/content-element.service.ts index 20f225e665b..b6ac32434f3 100644 --- a/apps/server/src/modules/board/service/content-element.service.ts +++ b/apps/server/src/modules/board/service/content-element.service.ts @@ -5,10 +5,10 @@ import { Card, ContentElementFactory, ContentElementType, - EntityId, isAnyContentElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { AnyElementContentBody } from '../controller/dto'; import { BoardDoRepo } from '../repo'; import { BoardDoService } from './board-do.service'; diff --git a/apps/server/src/modules/board/service/submission-item.service.spec.ts b/apps/server/src/modules/board/service/submission-item.service.spec.ts index fef2bf00ae6..77926d1b4f3 100644 --- a/apps/server/src/modules/board/service/submission-item.service.spec.ts +++ b/apps/server/src/modules/board/service/submission-item.service.spec.ts @@ -1,8 +1,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { NotFoundException, UnprocessableEntityException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { SubmissionItem } from '@shared/domain'; import { ValidationError } from '@shared/common'; +import { SubmissionItem } from '@shared/domain/domainobject'; import { richTextElementFactory, setupEntities, userFactory } from '@shared/testing'; import { cardFactory, diff --git a/apps/server/src/modules/board/service/submission-item.service.ts b/apps/server/src/modules/board/service/submission-item.service.ts index 0fc67ba694f..7e372b0d962 100644 --- a/apps/server/src/modules/board/service/submission-item.service.ts +++ b/apps/server/src/modules/board/service/submission-item.service.ts @@ -1,8 +1,9 @@ -import { ObjectId } from 'bson'; import { Injectable, NotFoundException, UnprocessableEntityException } from '@nestjs/common'; +import { ObjectId } from 'bson'; -import { EntityId, isSubmissionContainerElement, SubmissionContainerElement, SubmissionItem } from '@shared/domain'; import { ValidationError } from '@shared/common'; +import { isSubmissionContainerElement, SubmissionContainerElement, SubmissionItem } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BoardDoRepo } from '../repo'; import { BoardDoService } from './board-do.service'; diff --git a/apps/server/src/modules/board/uc/base.uc.ts b/apps/server/src/modules/board/uc/base.uc.ts index e5d88e7b13d..8cf43e9745f 100644 --- a/apps/server/src/modules/board/uc/base.uc.ts +++ b/apps/server/src/modules/board/uc/base.uc.ts @@ -1,6 +1,7 @@ -import { AnyBoardDo, EntityId, SubmissionItem, UserRoleEnum } from '@shared/domain'; +import { Action, AuthorizationService } from '@modules/authorization'; import { ForbiddenException } from '@nestjs/common'; -import { AuthorizationService, Action } from '@modules/authorization'; +import { AnyBoardDo, SubmissionItem, UserRoleEnum } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BoardDoAuthorizableService } from '../service'; export abstract class BaseUc { diff --git a/apps/server/src/modules/board/uc/board.uc.spec.ts b/apps/server/src/modules/board/uc/board.uc.spec.ts index 947370bbf75..f769f61574b 100644 --- a/apps/server/src/modules/board/uc/board.uc.spec.ts +++ b/apps/server/src/modules/board/uc/board.uc.spec.ts @@ -1,18 +1,18 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AuthorizationService } from '@modules/authorization'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardDoAuthorizable, BoardRoles, ContentElementType, UserRoleEnum } from '@shared/domain'; +import { BoardDoAuthorizable, BoardRoles, ContentElementType, UserRoleEnum } from '@shared/domain/domainobject'; import { setupEntities, userFactory } from '@shared/testing'; import { columnBoardFactory, columnFactory } from '@shared/testing/factory/domainobject'; import { LegacyLogger } from '@src/core/logger'; -import { AuthorizationService } from '@modules/authorization'; import { ObjectId } from 'bson'; import { BoardDoAuthorizableService, - ContentElementService, CardService, ColumnBoardService, ColumnService, + ContentElementService, } from '../service'; import { BoardUc } from './board.uc'; diff --git a/apps/server/src/modules/board/uc/board.uc.ts b/apps/server/src/modules/board/uc/board.uc.ts index 62559bd966f..e6a01ed93f5 100644 --- a/apps/server/src/modules/board/uc/board.uc.ts +++ b/apps/server/src/modules/board/uc/board.uc.ts @@ -1,8 +1,9 @@ +import { Action } from '@modules/authorization'; +import { AuthorizationService } from '@modules/authorization/domain'; import { forwardRef, Inject, Injectable } from '@nestjs/common'; -import { BoardExternalReference, Column, ColumnBoard, EntityId } from '@shared/domain'; +import { BoardExternalReference, Column, ColumnBoard } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; -import { AuthorizationService } from '@modules/authorization/domain'; -import { Action } from '@modules/authorization'; import { CardService, ColumnBoardService, ColumnService } from '../service'; import { BoardDoAuthorizableService } from '../service/board-do-authorizable.service'; import { BaseUc } from './base.uc'; diff --git a/apps/server/src/modules/board/uc/card.uc.spec.ts b/apps/server/src/modules/board/uc/card.uc.spec.ts index 004944f6dd5..ec5daacd197 100644 --- a/apps/server/src/modules/board/uc/card.uc.spec.ts +++ b/apps/server/src/modules/board/uc/card.uc.spec.ts @@ -1,13 +1,13 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AuthorizationService } from '@modules/authorization'; +import { HttpService } from '@nestjs/axios'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardDoAuthorizable, BoardRoles, ContentElementType, UserRoleEnum } from '@shared/domain'; +import { BoardDoAuthorizable, BoardRoles, ContentElementType, UserRoleEnum } from '@shared/domain/domainobject'; import { columnBoardFactory, columnFactory, setupEntities, userFactory } from '@shared/testing'; import { cardFactory, richTextElementFactory } from '@shared/testing/factory/domainobject'; import { LegacyLogger } from '@src/core/logger'; -import { AuthorizationService } from '@modules/authorization'; import { ObjectId } from 'bson'; -import { HttpService } from '@nestjs/axios'; -import { BoardDoAuthorizableService, ContentElementService, CardService } from '../service'; +import { BoardDoAuthorizableService, CardService, ContentElementService } from '../service'; import { CardUc } from './card.uc'; describe(CardUc.name, () => { diff --git a/apps/server/src/modules/board/uc/card.uc.ts b/apps/server/src/modules/board/uc/card.uc.ts index 97289984922..eac4498c096 100644 --- a/apps/server/src/modules/board/uc/card.uc.ts +++ b/apps/server/src/modules/board/uc/card.uc.ts @@ -1,7 +1,8 @@ +import { Action, AuthorizationService } from '@modules/authorization'; import { forwardRef, Inject, Injectable } from '@nestjs/common'; -import { AnyBoardDo, AnyContentElementDo, Card, ContentElementType, EntityId } from '@shared/domain'; +import { AnyBoardDo, AnyContentElementDo, Card, ContentElementType } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; -import { AuthorizationService, Action } from '@modules/authorization'; import { BoardDoAuthorizableService, CardService, ContentElementService } from '../service'; import { BaseUc } from './base.uc'; diff --git a/apps/server/src/modules/board/uc/column.uc.spec.ts b/apps/server/src/modules/board/uc/column.uc.spec.ts index 4708a52f793..53345319b22 100644 --- a/apps/server/src/modules/board/uc/column.uc.spec.ts +++ b/apps/server/src/modules/board/uc/column.uc.spec.ts @@ -1,11 +1,11 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AuthorizationService } from '@modules/authorization'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardDoAuthorizable, BoardRoles, ContentElementType, UserRoleEnum } from '@shared/domain'; +import { BoardDoAuthorizable, BoardRoles, ContentElementType, UserRoleEnum } from '@shared/domain/domainobject'; import { setupEntities, userFactory } from '@shared/testing'; import { cardFactory, columnBoardFactory, columnFactory } from '@shared/testing/factory/domainobject'; import { LegacyLogger } from '@src/core/logger'; -import { AuthorizationService } from '@modules/authorization'; -import { ContentElementService, BoardDoAuthorizableService, CardService, ColumnService } from '../service'; +import { BoardDoAuthorizableService, CardService, ColumnService, ContentElementService } from '../service'; import { ColumnUc } from './column.uc'; describe(ColumnUc.name, () => { diff --git a/apps/server/src/modules/board/uc/column.uc.ts b/apps/server/src/modules/board/uc/column.uc.ts index da8eceedbe3..b42f99e2d79 100644 --- a/apps/server/src/modules/board/uc/column.uc.ts +++ b/apps/server/src/modules/board/uc/column.uc.ts @@ -1,8 +1,9 @@ +import { Action, AuthorizationService } from '@modules/authorization'; import { forwardRef, Inject, Injectable } from '@nestjs/common'; -import { Card, ContentElementType, EntityId } from '@shared/domain'; +import { Card, ContentElementType } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; -import { AuthorizationService, Action } from '@modules/authorization'; -import { CardService, ColumnService, BoardDoAuthorizableService } from '../service'; +import { BoardDoAuthorizableService, CardService, ColumnService } from '../service'; import { BaseUc } from './base.uc'; @Injectable() diff --git a/apps/server/src/modules/board/uc/element.uc.spec.ts b/apps/server/src/modules/board/uc/element.uc.spec.ts index e28fb7638ec..cb2e7846118 100644 --- a/apps/server/src/modules/board/uc/element.uc.spec.ts +++ b/apps/server/src/modules/board/uc/element.uc.spec.ts @@ -1,9 +1,13 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Action, AuthorizationService } from '@modules/authorization'; +import { HttpService } from '@nestjs/axios'; +import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardDoAuthorizable, InputFormat } from '@shared/domain'; +import { BoardDoAuthorizable } from '@shared/domain/domainobject'; +import { InputFormat } from '@shared/domain/types'; import { - fileElementFactory, drawingElementFactory, + fileElementFactory, richTextElementFactory, setupEntities, submissionContainerElementFactory, @@ -11,10 +15,7 @@ import { userFactory, } from '@shared/testing'; import { Logger } from '@src/core/logger'; -import { AuthorizationService, Action } from '@modules/authorization'; import { ObjectId } from 'bson'; -import { ForbiddenException } from '@nestjs/common'; -import { HttpService } from '@nestjs/axios'; import { BoardDoAuthorizableService, ContentElementService, SubmissionItemService } from '../service'; import { ElementUc } from './element.uc'; diff --git a/apps/server/src/modules/board/uc/element.uc.ts b/apps/server/src/modules/board/uc/element.uc.ts index d094e758fd5..b9043cd71f0 100644 --- a/apps/server/src/modules/board/uc/element.uc.ts +++ b/apps/server/src/modules/board/uc/element.uc.ts @@ -1,15 +1,15 @@ +import { Action, AuthorizationService } from '@modules/authorization'; import { ForbiddenException, forwardRef, Inject, Injectable, UnprocessableEntityException } from '@nestjs/common'; import { AnyBoardDo, AnyContentElementDo, - EntityId, isSubmissionContainerElement, isSubmissionItem, SubmissionItem, UserRoleEnum, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { Logger } from '@src/core/logger'; -import { AuthorizationService, Action } from '@modules/authorization'; import { AnyElementContentBody } from '../controller/dto'; import { BoardDoAuthorizableService, ContentElementService } from '../service'; import { SubmissionItemService } from '../service/submission-item.service'; diff --git a/apps/server/src/modules/board/uc/submission-item.uc.spec.ts b/apps/server/src/modules/board/uc/submission-item.uc.spec.ts index e6b96d83394..5a9e66b7b1d 100644 --- a/apps/server/src/modules/board/uc/submission-item.uc.spec.ts +++ b/apps/server/src/modules/board/uc/submission-item.uc.spec.ts @@ -1,6 +1,13 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Action, AuthorizationService } from '@modules/authorization'; +import { + BadRequestException, + ForbiddenException, + NotFoundException, + UnprocessableEntityException, +} from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardDoAuthorizable, BoardRoles, ContentElementType, UserRoleEnum } from '@shared/domain'; +import { BoardDoAuthorizable, BoardRoles, ContentElementType, UserRoleEnum } from '@shared/domain/domainobject'; import { fileElementFactory, richTextElementFactory, @@ -10,13 +17,6 @@ import { userFactory, } from '@shared/testing'; import { Logger } from '@src/core/logger'; -import { Action, AuthorizationService } from '@modules/authorization'; -import { - BadRequestException, - ForbiddenException, - NotFoundException, - UnprocessableEntityException, -} from '@nestjs/common'; import { BoardDoAuthorizableService, ContentElementService, SubmissionItemService } from '../service'; import { SubmissionItemUc } from './submission-item.uc'; diff --git a/apps/server/src/modules/board/uc/submission-item.uc.ts b/apps/server/src/modules/board/uc/submission-item.uc.ts index 3fb87f2b5dc..2256376a5a6 100644 --- a/apps/server/src/modules/board/uc/submission-item.uc.ts +++ b/apps/server/src/modules/board/uc/submission-item.uc.ts @@ -1,3 +1,4 @@ +import { Action, AuthorizationService } from '@modules/authorization'; import { BadRequestException, forwardRef, @@ -8,7 +9,6 @@ import { } from '@nestjs/common'; import { ContentElementType, - EntityId, FileElement, isFileElement, isRichTextElement, @@ -18,8 +18,8 @@ import { SubmissionItem, UserBoardRoles, UserRoleEnum, -} from '@shared/domain'; -import { AuthorizationService, Action } from '@modules/authorization'; +} from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BoardDoAuthorizableService, ContentElementService, SubmissionItemService } from '../service'; import { BaseUc } from './base.uc'; diff --git a/apps/server/src/modules/class/entity/class.entity.ts b/apps/server/src/modules/class/entity/class.entity.ts index e5b2dce908e..1d847cd065d 100644 --- a/apps/server/src/modules/class/entity/class.entity.ts +++ b/apps/server/src/modules/class/entity/class.entity.ts @@ -1,7 +1,7 @@ import { Embedded, Entity, Index, Property } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; -import { EntityId } from '@shared/domain'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; +import { EntityId } from '@shared/domain/types'; import { ClassSourceOptionsEntity } from './class-source-options.entity'; export interface ClassEntityProps { diff --git a/apps/server/src/modules/class/repo/classes.repo.spec.ts b/apps/server/src/modules/class/repo/classes.repo.spec.ts index df0191d24ef..df232d7878a 100644 --- a/apps/server/src/modules/class/repo/classes.repo.spec.ts +++ b/apps/server/src/modules/class/repo/classes.repo.spec.ts @@ -1,10 +1,10 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { classEntityFactory } from '@modules/class/entity/testing/factory/class.entity.factory'; import { Test } from '@nestjs/testing'; import { TestingModule } from '@nestjs/testing/testing-module'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { SchoolEntity } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { SchoolEntity } from '@shared/domain/entity'; import { cleanupCollections, schoolFactory } from '@shared/testing'; import { Class } from '../domain'; import { ClassEntity } from '../entity'; diff --git a/apps/server/src/modules/class/repo/classes.repo.ts b/apps/server/src/modules/class/repo/classes.repo.ts index 24300bbe673..636fde8abb2 100644 --- a/apps/server/src/modules/class/repo/classes.repo.ts +++ b/apps/server/src/modules/class/repo/classes.repo.ts @@ -1,7 +1,7 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { Class } from '../domain'; import { ClassEntity } from '../entity'; import { ClassMapper } from './mapper'; diff --git a/apps/server/src/modules/class/service/class.service.spec.ts b/apps/server/src/modules/class/service/class.service.spec.ts index 5ba4b367b59..08a9452445c 100644 --- a/apps/server/src/modules/class/service/class.service.spec.ts +++ b/apps/server/src/modules/class/service/class.service.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; import { InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { setupEntities } from '@shared/testing'; import { Class } from '../domain'; import { classFactory } from '../domain/testing'; diff --git a/apps/server/src/modules/class/service/class.service.ts b/apps/server/src/modules/class/service/class.service.ts index 772b9f0c4d4..6b56ea86384 100644 --- a/apps/server/src/modules/class/service/class.service.ts +++ b/apps/server/src/modules/class/service/class.service.ts @@ -1,5 +1,5 @@ import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { Class } from '../domain'; import { ClassesRepo } from '../repo'; diff --git a/apps/server/src/modules/collaborative-storage/mapper/team.mapper.ts b/apps/server/src/modules/collaborative-storage/mapper/team.mapper.ts index 28f58609bbb..7f8cf1c2da4 100644 --- a/apps/server/src/modules/collaborative-storage/mapper/team.mapper.ts +++ b/apps/server/src/modules/collaborative-storage/mapper/team.mapper.ts @@ -1,5 +1,5 @@ -import { TeamEntity, TeamUserEntity } from '@shared/domain'; import { Injectable } from '@nestjs/common'; +import { TeamEntity, TeamUserEntity } from '@shared/domain/entity'; import { TeamDto, TeamUserDto } from '../services/dto/team.dto'; @Injectable() diff --git a/apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.spec.ts b/apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.spec.ts index a1f8757f576..e934d046730 100644 --- a/apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.spec.ts +++ b/apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.spec.ts @@ -1,18 +1,19 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { CollaborativeStorageAdapter } from '@infra/collaborative-storage'; import { ObjectId } from '@mikro-orm/mongodb'; +import { AuthorizationService } from '@modules/authorization'; +import { TeamMapper } from '@modules/collaborative-storage/mapper/team.mapper'; +import { CollaborativeStorageService } from '@modules/collaborative-storage/services/collaborative-storage.service'; +import { RoleDto } from '@modules/role/service/dto/role.dto'; +import { RoleService } from '@modules/role/service/role.service'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { RoleName, TeamEntity } from '@shared/domain'; -import { CollaborativeStorageAdapter } from '@infra/collaborative-storage'; +import { TeamEntity } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { TeamsRepo } from '@shared/repo'; import { setupEntities } from '@shared/testing'; import { teamFactory } from '@shared/testing/factory/team.factory'; import { LegacyLogger } from '@src/core/logger'; -import { AuthorizationService } from '@modules/authorization'; -import { TeamMapper } from '@modules/collaborative-storage/mapper/team.mapper'; -import { CollaborativeStorageService } from '@modules/collaborative-storage/services/collaborative-storage.service'; -import { RoleDto } from '@modules/role/service/dto/role.dto'; -import { RoleService } from '@modules/role/service/role.service'; import { TeamDto } from './dto/team.dto'; describe('Collaborative Storage Service', () => { diff --git a/apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.ts b/apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.ts index 8f32f0ffc5f..b5fdf8426c3 100644 --- a/apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.ts +++ b/apps/server/src/modules/collaborative-storage/services/collaborative-storage.service.ts @@ -1,10 +1,11 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId, Permission } from '@shared/domain'; import { CollaborativeStorageAdapter } from '@infra/collaborative-storage'; -import { TeamsRepo } from '@shared/repo'; -import { LegacyLogger } from '@src/core/logger'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { RoleService } from '@modules/role/service/role.service'; +import { Injectable } from '@nestjs/common'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; +import { TeamsRepo } from '@shared/repo'; +import { LegacyLogger } from '@src/core/logger'; import { TeamMapper } from '../mapper/team.mapper'; import { TeamPermissionsDto } from './dto/team-permissions.dto'; import { TeamDto } from './dto/team.dto'; diff --git a/apps/server/src/modules/collaborative-storage/services/dto/team.dto.ts b/apps/server/src/modules/collaborative-storage/services/dto/team.dto.ts index 81891d2abf7..d8d5b520b81 100644 --- a/apps/server/src/modules/collaborative-storage/services/dto/team.dto.ts +++ b/apps/server/src/modules/collaborative-storage/services/dto/team.dto.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; /** * TODO diff --git a/apps/server/src/modules/copy-helper/mapper/copy.mapper.ts b/apps/server/src/modules/copy-helper/mapper/copy.mapper.ts index 20aae3e888b..581e33161bd 100644 --- a/apps/server/src/modules/copy-helper/mapper/copy.mapper.ts +++ b/apps/server/src/modules/copy-helper/mapper/copy.mapper.ts @@ -1,8 +1,9 @@ -import { EntityId, LessonEntity, Task } from '@shared/domain'; import { LessonCopyApiParams } from '@modules/learnroom/controller/dto/lesson/lesson-copy.params'; import { LessonCopyParentParams } from '@modules/lesson/types'; import { TaskCopyApiParams } from '@modules/task/controller/dto/task-copy.params'; import { TaskCopyParentParams } from '@modules/task/types'; +import { LessonEntity, Task } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { CopyApiResponse } from '../dto/copy.response'; import { CopyStatus, CopyStatusEnum } from '../types/copy.types'; diff --git a/apps/server/src/modules/copy-helper/types/copy.types.ts b/apps/server/src/modules/copy-helper/types/copy.types.ts index b1968ec4dee..0dff9249331 100644 --- a/apps/server/src/modules/copy-helper/types/copy.types.ts +++ b/apps/server/src/modules/copy-helper/types/copy.types.ts @@ -1,5 +1,5 @@ -import { EntityId } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; +import { EntityId } from '@shared/domain/types'; export type CopyStatus = { id?: string; diff --git a/apps/server/src/modules/deletion/builder/deletion-request-body-props.builder.ts b/apps/server/src/modules/deletion/builder/deletion-request-body-props.builder.ts index b7dcd72b441..2105f7dfc0c 100644 --- a/apps/server/src/modules/deletion/builder/deletion-request-body-props.builder.ts +++ b/apps/server/src/modules/deletion/builder/deletion-request-body-props.builder.ts @@ -1,6 +1,6 @@ -import { EntityId } from '@shared/domain'; -import { DeletionDomainModel } from '../domain/types'; +import { EntityId } from '@shared/domain/types'; import { DeletionRequestBodyProps } from '../controller/dto'; +import { DeletionDomainModel } from '../domain/types'; export class DeletionRequestBodyPropsBuilder { static build(domain: DeletionDomainModel, id: EntityId, deleteInMinutes?: number): DeletionRequestBodyProps { diff --git a/apps/server/src/modules/deletion/builder/deletion-target-ref.builder.ts b/apps/server/src/modules/deletion/builder/deletion-target-ref.builder.ts index f98271ff317..d1960a5d4a4 100644 --- a/apps/server/src/modules/deletion/builder/deletion-target-ref.builder.ts +++ b/apps/server/src/modules/deletion/builder/deletion-target-ref.builder.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { DeletionDomainModel } from '../domain/types'; import { DeletionTargetRef } from '../interface'; diff --git a/apps/server/src/modules/deletion/entity/deletion-log.entity.ts b/apps/server/src/modules/deletion/entity/deletion-log.entity.ts index 38c13aaf78d..31ec5447e56 100644 --- a/apps/server/src/modules/deletion/entity/deletion-log.entity.ts +++ b/apps/server/src/modules/deletion/entity/deletion-log.entity.ts @@ -1,6 +1,6 @@ import { Entity, Index, Property } from '@mikro-orm/core'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { DeletionDomainModel, DeletionOperationModel } from '../domain/types'; diff --git a/apps/server/src/modules/deletion/entity/deletion-request.entity.ts b/apps/server/src/modules/deletion/entity/deletion-request.entity.ts index 56567155f26..bff42fac93a 100644 --- a/apps/server/src/modules/deletion/entity/deletion-request.entity.ts +++ b/apps/server/src/modules/deletion/entity/deletion-request.entity.ts @@ -1,6 +1,6 @@ import { Entity, Index, Property, Unique } from '@mikro-orm/core'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { DeletionDomainModel, DeletionStatusModel } from '../domain/types'; const SECONDS_OF_90_DAYS = 90 * 24 * 60 * 60; diff --git a/apps/server/src/modules/deletion/interface/interfaces.ts b/apps/server/src/modules/deletion/interface/interfaces.ts index b615254e608..9d75c1c0da2 100644 --- a/apps/server/src/modules/deletion/interface/interfaces.ts +++ b/apps/server/src/modules/deletion/interface/interfaces.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { DeletionDomainModel } from '../domain/types'; export interface DeletionTargetRef { diff --git a/apps/server/src/modules/deletion/repo/deletion-log.repo.ts b/apps/server/src/modules/deletion/repo/deletion-log.repo.ts index d71032eb124..ad7b17436f3 100644 --- a/apps/server/src/modules/deletion/repo/deletion-log.repo.ts +++ b/apps/server/src/modules/deletion/repo/deletion-log.repo.ts @@ -1,6 +1,6 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { DeletionLog } from '../domain/deletion-log.do'; import { DeletionLogEntity } from '../entity/deletion-log.entity'; import { DeletionLogMapper } from './mapper/deletion-log.mapper'; diff --git a/apps/server/src/modules/deletion/repo/deletion-request.repo.ts b/apps/server/src/modules/deletion/repo/deletion-request.repo.ts index b24cf792f01..9bd7c303d1d 100644 --- a/apps/server/src/modules/deletion/repo/deletion-request.repo.ts +++ b/apps/server/src/modules/deletion/repo/deletion-request.repo.ts @@ -1,10 +1,11 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId, SortOrder } from '@shared/domain'; +import { SortOrder } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { DeletionRequest } from '../domain/deletion-request.do'; import { DeletionRequestEntity } from '../entity'; -import { DeletionRequestMapper } from './mapper/deletion-request.mapper'; import { DeletionRequestScope } from './deletion-request-scope'; +import { DeletionRequestMapper } from './mapper/deletion-request.mapper'; @Injectable() export class DeletionRequestRepo { diff --git a/apps/server/src/modules/deletion/services/deletion-log.service.ts b/apps/server/src/modules/deletion/services/deletion-log.service.ts index 1fce142decb..a06458fe748 100644 --- a/apps/server/src/modules/deletion/services/deletion-log.service.ts +++ b/apps/server/src/modules/deletion/services/deletion-log.service.ts @@ -1,9 +1,9 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; import { ObjectId } from '@mikro-orm/mongodb'; -import { DeletionLogRepo } from '../repo'; +import { Injectable } from '@nestjs/common'; +import { EntityId } from '@shared/domain/types'; import { DeletionLog } from '../domain/deletion-log.do'; import { DeletionDomainModel, DeletionOperationModel } from '../domain/types'; +import { DeletionLogRepo } from '../repo'; @Injectable() export class DeletionLogService { diff --git a/apps/server/src/modules/deletion/services/deletion-request.service.ts b/apps/server/src/modules/deletion/services/deletion-request.service.ts index 206cb01a7a1..d3a41e03c12 100644 --- a/apps/server/src/modules/deletion/services/deletion-request.service.ts +++ b/apps/server/src/modules/deletion/services/deletion-request.service.ts @@ -1,9 +1,9 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; import { ObjectId } from '@mikro-orm/mongodb'; -import { DeletionRequestRepo } from '../repo/deletion-request.repo'; +import { Injectable } from '@nestjs/common'; +import { EntityId } from '@shared/domain/types'; import { DeletionRequest } from '../domain/deletion-request.do'; import { DeletionDomainModel, DeletionStatusModel } from '../domain/types'; +import { DeletionRequestRepo } from '../repo/deletion-request.repo'; @Injectable() export class DeletionRequestService { diff --git a/apps/server/src/modules/deletion/uc/builder/deletion-target-ref.builder.spec.ts b/apps/server/src/modules/deletion/uc/builder/deletion-target-ref.builder.spec.ts new file mode 100644 index 00000000000..c40582d2de7 --- /dev/null +++ b/apps/server/src/modules/deletion/uc/builder/deletion-target-ref.builder.spec.ts @@ -0,0 +1,16 @@ +import { EntityId } from '@shared/domain/types'; +import { DeletionDomainModel } from '../../domain/types/deletion-domain-model.enum'; +import { DeletionTargetRefBuilder } from './deletion-target-ref.builder'; + +describe('DeletionTargetRefBuilder', () => { + describe('build', () => { + it('should return a DeletionTargetRef', () => { + const targetRefDomain = DeletionDomainModel.USER; + const targetRefId: EntityId = 'targetRefId'; + + const deletionTargetRef = DeletionTargetRefBuilder.build(targetRefDomain, targetRefId); + + expect(deletionTargetRef).toEqual({ targetRefDomain, targetRefId }); + }); + }); +}); diff --git a/apps/server/src/modules/deletion/uc/builder/deletion-target-ref.builder.ts b/apps/server/src/modules/deletion/uc/builder/deletion-target-ref.builder.ts new file mode 100644 index 00000000000..6d551f8365f --- /dev/null +++ b/apps/server/src/modules/deletion/uc/builder/deletion-target-ref.builder.ts @@ -0,0 +1,11 @@ +import { EntityId } from '@shared/domain/types'; +import { DeletionDomainModel } from '../../domain/types/deletion-domain-model.enum'; +import { DeletionTargetRef } from '../interface/interfaces'; + +export class DeletionTargetRefBuilder { + static build(targetRefDomain: DeletionDomainModel, targetRefId: EntityId): DeletionTargetRef { + const deletionTargetRef = { targetRefDomain, targetRefId }; + + return deletionTargetRef; + } +} diff --git a/apps/server/src/modules/deletion/uc/deletion-request.uc.ts b/apps/server/src/modules/deletion/uc/deletion-request.uc.ts index 0e5c3c10c85..3babb3318e5 100644 --- a/apps/server/src/modules/deletion/uc/deletion-request.uc.ts +++ b/apps/server/src/modules/deletion/uc/deletion-request.uc.ts @@ -1,25 +1,25 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; -import { PseudonymService } from '@modules/pseudonym'; -import { UserService } from '@modules/user'; -import { TeamService } from '@modules/teams'; +import { AccountService } from '@modules/account/services'; import { ClassService } from '@modules/class'; -import { LessonService } from '@modules/lesson/service'; -import { CourseGroupService, CourseService } from '@modules/learnroom/service'; import { FilesService } from '@modules/files/service'; -import { AccountService } from '@modules/account/services'; -import { RocketChatUserService } from '@modules/rocketchat-user'; +import { CourseGroupService, CourseService } from '@modules/learnroom/service'; +import { LessonService } from '@modules/lesson/service'; +import { PseudonymService } from '@modules/pseudonym'; +import { RegistrationPinService } from '@modules/registration-pin'; import { RocketChatService } from '@modules/rocketchat'; +import { RocketChatUserService } from '@modules/rocketchat-user'; +import { TeamService } from '@modules/teams'; +import { UserService } from '@modules/user'; +import { Injectable } from '@nestjs/common'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; -import { RegistrationPinService } from '@modules/registration-pin'; -import { DeletionRequestService } from '../services/deletion-request.service'; -import { DeletionDomainModel, DeletionOperationModel, DeletionStatusModel } from '../domain/types'; -import { DeletionLogService } from '../services/deletion-log.service'; -import { DeletionRequest } from '../domain/deletion-request.do'; -import { DeletionLog } from '../domain/deletion-log.do'; -import { DeletionLogStatistic } from '../interface/interfaces'; import { DeletionLogStatisticBuilder, DeletionRequestLogResponseBuilder, DeletionTargetRefBuilder } from '../builder'; import { DeletionRequestBodyProps, DeletionRequestLogResponse, DeletionRequestResponse } from '../controller/dto'; +import { DeletionLog } from '../domain/deletion-log.do'; +import { DeletionRequest } from '../domain/deletion-request.do'; +import { DeletionDomainModel, DeletionOperationModel, DeletionStatusModel } from '../domain/types'; +import { DeletionLogStatistic } from '../interface/interfaces'; +import { DeletionLogService } from '../services/deletion-log.service'; +import { DeletionRequestService } from '../services/deletion-request.service'; @Injectable() export class DeletionRequestUc { diff --git a/apps/server/src/modules/deletion/uc/interface/interfaces.ts b/apps/server/src/modules/deletion/uc/interface/interfaces.ts new file mode 100644 index 00000000000..57275b5b530 --- /dev/null +++ b/apps/server/src/modules/deletion/uc/interface/interfaces.ts @@ -0,0 +1,29 @@ +import { EntityId } from '@shared/domain/types'; +import { DeletionDomainModel } from '../../domain/types/deletion-domain-model.enum'; + +export interface DeletionTargetRef { + targetRefDomain: DeletionDomainModel; + targetRefId: EntityId; +} + +export interface DeletionRequestLog { + targetRef: DeletionTargetRef; + deletionPlannedAt: Date; + statistics?: DeletionLogStatistic[]; +} + +export interface DeletionLogStatistic { + domain: DeletionDomainModel; + modifiedCount?: number; + deletedCount?: number; +} + +export interface DeletionRequestProps { + targetRef: { targetRefDoamin: DeletionDomainModel; targetRefId: EntityId }; + deleteInMinutes?: number; +} + +export interface DeletionRequestCreateAnswer { + requestId: EntityId; + deletionPlannedAt: Date; +} diff --git a/apps/server/src/modules/files-storage-client/dto/copy-file.dto.ts b/apps/server/src/modules/files-storage-client/dto/copy-file.dto.ts index 8c6936f33fa..314ef2a17a9 100644 --- a/apps/server/src/modules/files-storage-client/dto/copy-file.dto.ts +++ b/apps/server/src/modules/files-storage-client/dto/copy-file.dto.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { CopyFileDomainObjectProps } from '../interfaces'; export class CopyFileDto { diff --git a/apps/server/src/modules/files-storage-client/dto/file.dto.ts b/apps/server/src/modules/files-storage-client/dto/file.dto.ts index c5a5118ceae..3770d610df5 100644 --- a/apps/server/src/modules/files-storage-client/dto/file.dto.ts +++ b/apps/server/src/modules/files-storage-client/dto/file.dto.ts @@ -1,5 +1,5 @@ import { FileRecordParentType } from '@infra/rabbitmq'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { FileDomainObjectProps } from '../interfaces'; export class FileDto { diff --git a/apps/server/src/modules/files-storage-client/interfaces/copy-file-domain-object-props.ts b/apps/server/src/modules/files-storage-client/interfaces/copy-file-domain-object-props.ts index 0dfa8455094..6b8ef88cc1f 100644 --- a/apps/server/src/modules/files-storage-client/interfaces/copy-file-domain-object-props.ts +++ b/apps/server/src/modules/files-storage-client/interfaces/copy-file-domain-object-props.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; export interface CopyFileDomainObjectProps { id?: EntityId | undefined; diff --git a/apps/server/src/modules/files-storage-client/interfaces/copy-file-request-info.ts b/apps/server/src/modules/files-storage-client/interfaces/copy-file-request-info.ts index 42c971d9a0d..e1687427882 100644 --- a/apps/server/src/modules/files-storage-client/interfaces/copy-file-request-info.ts +++ b/apps/server/src/modules/files-storage-client/interfaces/copy-file-request-info.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { FileRequestInfo } from './file-request-info'; export interface CopyFilesRequestInfo { diff --git a/apps/server/src/modules/files-storage-client/interfaces/file-domain-object-props.ts b/apps/server/src/modules/files-storage-client/interfaces/file-domain-object-props.ts index 6a0fca7ec2e..9b4b1bc749c 100644 --- a/apps/server/src/modules/files-storage-client/interfaces/file-domain-object-props.ts +++ b/apps/server/src/modules/files-storage-client/interfaces/file-domain-object-props.ts @@ -1,5 +1,5 @@ -import { EntityId } from '@shared/domain'; import { FileRecordParentType } from '@infra/rabbitmq'; +import { EntityId } from '@shared/domain/types'; export interface FileDomainObjectProps { id: EntityId; diff --git a/apps/server/src/modules/files-storage-client/interfaces/file-request-info.ts b/apps/server/src/modules/files-storage-client/interfaces/file-request-info.ts index 4d00caf356b..76b41b396b5 100644 --- a/apps/server/src/modules/files-storage-client/interfaces/file-request-info.ts +++ b/apps/server/src/modules/files-storage-client/interfaces/file-request-info.ts @@ -1,5 +1,5 @@ -import { EntityId } from '@shared/domain'; import { FileRecordParentType } from '@infra/rabbitmq'; +import { EntityId } from '@shared/domain/types'; export interface FileRequestInfo { schoolId: EntityId; diff --git a/apps/server/src/modules/files-storage-client/interfaces/types.ts b/apps/server/src/modules/files-storage-client/interfaces/types.ts index 28ccce1d7ed..29185da451a 100644 --- a/apps/server/src/modules/files-storage-client/interfaces/types.ts +++ b/apps/server/src/modules/files-storage-client/interfaces/types.ts @@ -1,4 +1,4 @@ -import { LessonEntity, Submission, Task } from '@shared/domain'; +import { LessonEntity, Submission, Task } from '@shared/domain/entity'; export type EntitiesWithFiles = Task | LessonEntity | Submission; export type EntityWithEmbeddedFiles = Task | LessonEntity; diff --git a/apps/server/src/modules/files-storage-client/mapper/copy-files-of-parent-param.builder.ts b/apps/server/src/modules/files-storage-client/mapper/copy-files-of-parent-param.builder.ts index fe1bbf09c08..d41195dda11 100644 --- a/apps/server/src/modules/files-storage-client/mapper/copy-files-of-parent-param.builder.ts +++ b/apps/server/src/modules/files-storage-client/mapper/copy-files-of-parent-param.builder.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { FileRequestInfo } from '../interfaces'; import { CopyFilesRequestInfo } from '../interfaces/copy-file-request-info'; diff --git a/apps/server/src/modules/files-storage-client/mapper/files-storage-client.mapper.ts b/apps/server/src/modules/files-storage-client/mapper/files-storage-client.mapper.ts index dcc2f927b5f..d60977aa62e 100644 --- a/apps/server/src/modules/files-storage-client/mapper/files-storage-client.mapper.ts +++ b/apps/server/src/modules/files-storage-client/mapper/files-storage-client.mapper.ts @@ -1,5 +1,5 @@ -import { LessonEntity, Submission, Task } from '@shared/domain'; import { FileRecordParentType } from '@infra/rabbitmq'; +import { LessonEntity, Submission, Task } from '@shared/domain/entity'; import { CopyFileDto, FileDto } from '../dto'; import { CopyFileDomainObjectProps, EntitiesWithFiles, FileDomainObjectProps } from '../interfaces'; diff --git a/apps/server/src/modules/files-storage-client/mapper/files-storage-param.builder.ts b/apps/server/src/modules/files-storage-client/mapper/files-storage-param.builder.ts index 08ae8552bf0..d3e2286ec14 100644 --- a/apps/server/src/modules/files-storage-client/mapper/files-storage-param.builder.ts +++ b/apps/server/src/modules/files-storage-client/mapper/files-storage-param.builder.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { EntitiesWithFiles, FileRequestInfo } from '../interfaces'; import { FilesStorageClientMapper } from './files-storage-client.mapper'; diff --git a/apps/server/src/modules/files-storage-client/service/copy-files.service.spec.ts b/apps/server/src/modules/files-storage-client/service/copy-files.service.spec.ts index 24de3426bc9..fbc54e3cf0f 100644 --- a/apps/server/src/modules/files-storage-client/service/copy-files.service.spec.ts +++ b/apps/server/src/modules/files-storage-client/service/copy-files.service.spec.ts @@ -1,7 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { CopyElementType, CopyHelperService } from '@modules/copy-helper'; import { Test, TestingModule } from '@nestjs/testing'; -import { ComponentProperties, ComponentType } from '@shared/domain'; +import { ComponentProperties, ComponentType } from '@shared/domain/entity'; import { courseFactory, legacyFileEntityMockFactory, diff --git a/apps/server/src/modules/files-storage-client/service/copy-files.service.ts b/apps/server/src/modules/files-storage-client/service/copy-files.service.ts index 1dc5904eb9b..5283088ae84 100644 --- a/apps/server/src/modules/files-storage-client/service/copy-files.service.ts +++ b/apps/server/src/modules/files-storage-client/service/copy-files.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; +import { Injectable } from '@nestjs/common'; +import { EntityId } from '@shared/domain/types'; import { CopyFileDto } from '../dto'; import { EntityWithEmbeddedFiles } from '../interfaces'; import { CopyFilesOfParentParamBuilder, FileParamBuilder } from '../mapper'; diff --git a/apps/server/src/modules/files-storage-client/service/files-storage-client.service.ts b/apps/server/src/modules/files-storage-client/service/files-storage-client.service.ts index 6cb47305248..809b1dcfef5 100644 --- a/apps/server/src/modules/files-storage-client/service/files-storage-client.service.ts +++ b/apps/server/src/modules/files-storage-client/service/files-storage-client.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { CopyFileDto, FileDto } from '../dto'; import { FileRequestInfo } from '../interfaces'; diff --git a/apps/server/src/modules/files-storage-client/service/files-storage.producer.ts b/apps/server/src/modules/files-storage-client/service/files-storage.producer.ts index 5f122263a14..91b68a7cd81 100644 --- a/apps/server/src/modules/files-storage-client/service/files-storage.producer.ts +++ b/apps/server/src/modules/files-storage-client/service/files-storage.producer.ts @@ -10,7 +10,7 @@ import { } from '@infra/rabbitmq'; import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { FilesStorageClientConfig } from '../interfaces'; diff --git a/apps/server/src/modules/files-storage/controller/api-test/files-security.api.spec.ts b/apps/server/src/modules/files-storage/controller/api-test/files-security.api.spec.ts index 4694b1817ac..38d33bb4168 100644 --- a/apps/server/src/modules/files-storage/controller/api-test/files-security.api.spec.ts +++ b/apps/server/src/modules/files-storage/controller/api-test/files-security.api.spec.ts @@ -5,7 +5,7 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, fileRecordFactory, diff --git a/apps/server/src/modules/files-storage/controller/api-test/files-storage-copy-files.api.spec.ts b/apps/server/src/modules/files-storage/controller/api-test/files-storage-copy-files.api.spec.ts index 1711acba050..6f57f89d27e 100644 --- a/apps/server/src/modules/files-storage/controller/api-test/files-storage-copy-files.api.spec.ts +++ b/apps/server/src/modules/files-storage/controller/api-test/files-storage-copy-files.api.spec.ts @@ -7,7 +7,8 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { EntityId, Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { cleanupCollections, courseFactory, diff --git a/apps/server/src/modules/files-storage/controller/api-test/files-storage-delete-files.api.spec.ts b/apps/server/src/modules/files-storage/controller/api-test/files-storage-delete-files.api.spec.ts index ea85d9b656b..97fed8c660e 100644 --- a/apps/server/src/modules/files-storage/controller/api-test/files-storage-delete-files.api.spec.ts +++ b/apps/server/src/modules/files-storage/controller/api-test/files-storage-delete-files.api.spec.ts @@ -7,7 +7,9 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { EntityId, Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; + +import { EntityId } from '@shared/domain/types'; import { cleanupCollections, fileRecordFactory, diff --git a/apps/server/src/modules/files-storage/controller/api-test/files-storage-download-upload.api.spec.ts b/apps/server/src/modules/files-storage/controller/api-test/files-storage-download-upload.api.spec.ts index 8d8e7dbf912..14843ad75e0 100644 --- a/apps/server/src/modules/files-storage/controller/api-test/files-storage-download-upload.api.spec.ts +++ b/apps/server/src/modules/files-storage/controller/api-test/files-storage-download-upload.api.spec.ts @@ -7,7 +7,8 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { EntityId, Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { cleanupCollections, mapUserToCurrentUser, roleFactory, schoolFactory, userFactory } from '@shared/testing'; import NodeClam from 'clamscan'; import { Request } from 'express'; diff --git a/apps/server/src/modules/files-storage/controller/api-test/files-storage-list-files.api.spec.ts b/apps/server/src/modules/files-storage/controller/api-test/files-storage-list-files.api.spec.ts index 35410d712c8..df220828567 100644 --- a/apps/server/src/modules/files-storage/controller/api-test/files-storage-list-files.api.spec.ts +++ b/apps/server/src/modules/files-storage/controller/api-test/files-storage-list-files.api.spec.ts @@ -5,7 +5,9 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { EntityId, Permission } from '@shared/domain'; + +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { cleanupCollections, fileRecordFactory, diff --git a/apps/server/src/modules/files-storage/controller/api-test/files-storage-preview.api.spec.ts b/apps/server/src/modules/files-storage/controller/api-test/files-storage-preview.api.spec.ts index 6ccc6d0d5ea..f218cf3e6e8 100644 --- a/apps/server/src/modules/files-storage/controller/api-test/files-storage-preview.api.spec.ts +++ b/apps/server/src/modules/files-storage/controller/api-test/files-storage-preview.api.spec.ts @@ -8,7 +8,8 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ExecutionContext, INestApplication, NotFoundException, StreamableFile } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { EntityId, Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { cleanupCollections, mapUserToCurrentUser, roleFactory, schoolFactory, userFactory } from '@shared/testing'; import NodeClam from 'clamscan'; import { Request } from 'express'; diff --git a/apps/server/src/modules/files-storage/controller/api-test/files-storage-rename-file.api.spec.ts b/apps/server/src/modules/files-storage/controller/api-test/files-storage-rename-file.api.spec.ts index fb1dfa866eb..d1d814437cf 100644 --- a/apps/server/src/modules/files-storage/controller/api-test/files-storage-rename-file.api.spec.ts +++ b/apps/server/src/modules/files-storage/controller/api-test/files-storage-rename-file.api.spec.ts @@ -5,7 +5,7 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, fileRecordFactory, diff --git a/apps/server/src/modules/files-storage/controller/api-test/files-storage-restore-files.api.spec.ts b/apps/server/src/modules/files-storage/controller/api-test/files-storage-restore-files.api.spec.ts index 7f56152f7da..04241fdb4a5 100644 --- a/apps/server/src/modules/files-storage/controller/api-test/files-storage-restore-files.api.spec.ts +++ b/apps/server/src/modules/files-storage/controller/api-test/files-storage-restore-files.api.spec.ts @@ -7,7 +7,9 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { EntityId, Permission } from '@shared/domain'; + +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { cleanupCollections, fileRecordFactory, diff --git a/apps/server/src/modules/files-storage/controller/dto/file-storage.params.ts b/apps/server/src/modules/files-storage/controller/dto/file-storage.params.ts index 913a259e9c3..a294a37d180 100644 --- a/apps/server/src/modules/files-storage/controller/dto/file-storage.params.ts +++ b/apps/server/src/modules/files-storage/controller/dto/file-storage.params.ts @@ -1,7 +1,7 @@ +import { ScanResult } from '@infra/antivirus'; import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { StringToBoolean } from '@shared/controller'; -import { EntityId } from '@shared/domain'; -import { ScanResult } from '@infra/antivirus'; +import { EntityId } from '@shared/domain/types'; import { Allow, IsBoolean, IsEnum, IsMongoId, IsNotEmpty, IsOptional, IsString, ValidateNested } from 'class-validator'; import { FileRecordParentType } from '../../entity'; import { PreviewOutputMimeTypes, PreviewWidth } from '../../interface'; diff --git a/apps/server/src/modules/files-storage/controller/files-storage.consumer.spec.ts b/apps/server/src/modules/files-storage/controller/files-storage.consumer.spec.ts index 81fd2884347..4c577e553fc 100644 --- a/apps/server/src/modules/files-storage/controller/files-storage.consumer.spec.ts +++ b/apps/server/src/modules/files-storage/controller/files-storage.consumer.spec.ts @@ -2,7 +2,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { MikroORM } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { ALL_ENTITIES, EntityId } from '@shared/domain'; +import { ALL_ENTITIES } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { courseFactory, fileRecordFactory, setupEntities } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; import { FileRecord, FileRecordParentType } from '../entity'; diff --git a/apps/server/src/modules/files-storage/controller/files-storage.consumer.ts b/apps/server/src/modules/files-storage/controller/files-storage.consumer.ts index 3b6b5654c4c..38073e709ac 100644 --- a/apps/server/src/modules/files-storage/controller/files-storage.consumer.ts +++ b/apps/server/src/modules/files-storage/controller/files-storage.consumer.ts @@ -3,7 +3,7 @@ import { CopyFileDO, FileDO, FilesStorageEvents, FilesStorageExchange } from '@i import { RpcMessage } from '@infra/rabbitmq/rpc-message'; import { MikroORM, UseRequestContext } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { FilesStorageMapper } from '../mapper'; import { FilesStorageService } from '../service/files-storage.service'; diff --git a/apps/server/src/modules/files-storage/entity/filerecord.entity.ts b/apps/server/src/modules/files-storage/entity/filerecord.entity.ts index e0957b355bb..15281f5f52d 100644 --- a/apps/server/src/modules/files-storage/entity/filerecord.entity.ts +++ b/apps/server/src/modules/files-storage/entity/filerecord.entity.ts @@ -2,7 +2,8 @@ import { PreviewInputMimeTypes } from '@infra/preview-generator'; import { Embeddable, Embedded, Entity, Enum, Index, Property } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; import { BadRequestException } from '@nestjs/common'; -import { BaseEntityWithTimestamps, EntityId } from '@shared/domain'; +import { BaseEntityWithTimestamps } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import path from 'path'; import { v4 as uuid } from 'uuid'; import { ErrorType } from '../error'; diff --git a/apps/server/src/modules/files-storage/files-storage-test.module.ts b/apps/server/src/modules/files-storage/files-storage-test.module.ts index f219c8bccac..3cc524c18d1 100644 --- a/apps/server/src/modules/files-storage/files-storage-test.module.ts +++ b/apps/server/src/modules/files-storage/files-storage-test.module.ts @@ -1,11 +1,12 @@ import { DynamicModule, Module } from '@nestjs/common'; -import { ALL_ENTITIES } from '@shared/domain'; -import { MongoMemoryDatabaseModule, MongoDatabaseModuleOptions } from '@infra/database'; + +import { MongoDatabaseModuleOptions, MongoMemoryDatabaseModule } from '@infra/database'; import { RabbitMQWrapperTestModule } from '@infra/rabbitmq'; -import { CoreModule } from '@src/core'; -import { LoggerModule } from '@src/core/logger'; import { AuthenticationModule } from '@modules/authentication'; import { AuthorizationModule } from '@modules/authorization'; +import { ALL_ENTITIES } from '@shared/domain/entity'; +import { CoreModule } from '@src/core'; +import { LoggerModule } from '@src/core/logger'; import { FileRecord } from './entity'; import { FilesStorageApiModule } from './files-storage-api.module'; diff --git a/apps/server/src/modules/files-storage/files-storage.const.ts b/apps/server/src/modules/files-storage/files-storage.const.ts index 565e486135b..87240256afe 100644 --- a/apps/server/src/modules/files-storage/files-storage.const.ts +++ b/apps/server/src/modules/files-storage/files-storage.const.ts @@ -1,4 +1,4 @@ -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { AuthorizationContextBuilder } from '../authorization'; export enum FilesStorageInternalActions { diff --git a/apps/server/src/modules/files-storage/files-storage.module.ts b/apps/server/src/modules/files-storage/files-storage.module.ts index a7432172a21..0b049951767 100644 --- a/apps/server/src/modules/files-storage/files-storage.module.ts +++ b/apps/server/src/modules/files-storage/files-storage.module.ts @@ -1,13 +1,13 @@ import { Configuration } from '@hpi-schul-cloud/commons'; -import { Dictionary, IPrimaryKey } from '@mikro-orm/core'; -import { MikroOrmModule, MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs'; -import { Module, NotFoundException } from '@nestjs/common'; -import { ConfigModule } from '@nestjs/config'; -import { ALL_ENTITIES } from '@shared/domain'; import { AntivirusModule } from '@infra/antivirus'; import { PreviewGeneratorProducerModule } from '@infra/preview-generator'; import { RabbitMQWrapperModule } from '@infra/rabbitmq'; import { S3ClientModule } from '@infra/s3-client'; +import { Dictionary, IPrimaryKey } from '@mikro-orm/core'; +import { MikroOrmModule, MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs'; +import { Module, NotFoundException } from '@nestjs/common'; +import { ConfigModule } from '@nestjs/config'; +import { ALL_ENTITIES } from '@shared/domain/entity'; import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config'; import { LoggerModule } from '@src/core/logger'; import { FileRecord, FileRecordSecurityCheck } from './entity'; diff --git a/apps/server/src/modules/files-storage/helper/file-name.spec.ts b/apps/server/src/modules/files-storage/helper/file-name.spec.ts index eb47fd9413e..427a5bdefd3 100644 --- a/apps/server/src/modules/files-storage/helper/file-name.spec.ts +++ b/apps/server/src/modules/files-storage/helper/file-name.spec.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { fileRecordFactory, setupEntities } from '@shared/testing'; import { ObjectId } from 'bson'; import crypto from 'crypto'; diff --git a/apps/server/src/modules/files-storage/helper/file-name.ts b/apps/server/src/modules/files-storage/helper/file-name.ts index 91e84b82c18..3f9d20c0897 100644 --- a/apps/server/src/modules/files-storage/helper/file-name.ts +++ b/apps/server/src/modules/files-storage/helper/file-name.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import crypto from 'crypto'; import path from 'path'; import { PreviewParams } from '../controller/dto'; diff --git a/apps/server/src/modules/files-storage/helper/file-record.spec.ts b/apps/server/src/modules/files-storage/helper/file-record.spec.ts index a999b599936..41eab6b6be0 100644 --- a/apps/server/src/modules/files-storage/helper/file-record.spec.ts +++ b/apps/server/src/modules/files-storage/helper/file-record.spec.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { fileRecordFactory, setupEntities } from '@shared/testing'; import { ObjectId } from 'bson'; import { createFileRecord, getFormat, getPreviewName, markForDelete, unmarkForDelete } from '.'; diff --git a/apps/server/src/modules/files-storage/helper/path.spec.ts b/apps/server/src/modules/files-storage/helper/path.spec.ts index 1e413a80158..fe12ccf3e8d 100644 --- a/apps/server/src/modules/files-storage/helper/path.spec.ts +++ b/apps/server/src/modules/files-storage/helper/path.spec.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { fileRecordFactory, setupEntities } from '@shared/testing'; import { ObjectId } from 'bson'; import { createCopyFiles, createPath, createPreviewDirectoryPath, createPreviewFilePath, getPaths } from '.'; diff --git a/apps/server/src/modules/files-storage/helper/path.ts b/apps/server/src/modules/files-storage/helper/path.ts index f11a3ce7b2a..e1909ff4966 100644 --- a/apps/server/src/modules/files-storage/helper/path.ts +++ b/apps/server/src/modules/files-storage/helper/path.ts @@ -1,5 +1,5 @@ -import { EntityId } from '@shared/domain'; import { CopyFiles } from '@infra/s3-client'; +import { EntityId } from '@shared/domain/types'; import { FileRecord } from '../entity'; import { ErrorType } from '../error'; diff --git a/apps/server/src/modules/files-storage/repo/filerecord-scope.ts b/apps/server/src/modules/files-storage/repo/filerecord-scope.ts index e335e99a300..626e896ef1a 100644 --- a/apps/server/src/modules/files-storage/repo/filerecord-scope.ts +++ b/apps/server/src/modules/files-storage/repo/filerecord-scope.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { Scope } from '@shared/repo'; import { FileRecord } from '../entity'; diff --git a/apps/server/src/modules/files-storage/repo/filerecord.repo.ts b/apps/server/src/modules/files-storage/repo/filerecord.repo.ts index 2b87fe61707..d0423e604f8 100644 --- a/apps/server/src/modules/files-storage/repo/filerecord.repo.ts +++ b/apps/server/src/modules/files-storage/repo/filerecord.repo.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { Counted, EntityId, IFindOptions, SortOrder } from '@shared/domain'; +import { IFindOptions, SortOrder } from '@shared/domain/interface'; +import { Counted, EntityId } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo'; import { FileRecord } from '../entity'; import { FileRecordScope } from './filerecord-scope'; diff --git a/apps/server/src/modules/files-storage/service/files-storage.service.ts b/apps/server/src/modules/files-storage/service/files-storage.service.ts index c3c186d3db9..3c36bb6a987 100644 --- a/apps/server/src/modules/files-storage/service/files-storage.service.ts +++ b/apps/server/src/modules/files-storage/service/files-storage.service.ts @@ -9,7 +9,7 @@ import { NotFoundException, } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { Counted, EntityId } from '@shared/domain'; +import { Counted, EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import FileType from 'file-type-cjs/file-type-cjs-index'; import { PassThrough, Readable } from 'stream'; diff --git a/apps/server/src/modules/files-storage/uc/files-storage-copy.uc.spec.ts b/apps/server/src/modules/files-storage/uc/files-storage-copy.uc.spec.ts index cefaba3ac24..0f72cd326e6 100644 --- a/apps/server/src/modules/files-storage/uc/files-storage-copy.uc.spec.ts +++ b/apps/server/src/modules/files-storage/uc/files-storage-copy.uc.spec.ts @@ -1,15 +1,16 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AntivirusService } from '@infra/antivirus'; +import { S3ClientAdapter } from '@infra/s3-client'; import { ObjectId } from '@mikro-orm/mongodb'; +import { Action } from '@modules/authorization'; +import { AuthorizationReferenceService } from '@modules/authorization/domain'; import { HttpService } from '@nestjs/axios'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, Permission } from '@shared/domain'; -import { AntivirusService } from '@infra/antivirus'; -import { S3ClientAdapter } from '@infra/s3-client'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { fileRecordFactory, setupEntities } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; -import { Action } from '@modules/authorization'; -import { AuthorizationReferenceService } from '@modules/authorization/domain'; import { FileRecordParams } from '../controller/dto'; import { FileRecord, FileRecordParentType } from '../entity'; import { CopyFileResponseBuilder } from '../mapper'; diff --git a/apps/server/src/modules/files-storage/uc/files-storage-delete.uc.spec.ts b/apps/server/src/modules/files-storage/uc/files-storage-delete.uc.spec.ts index ef0dc16c1b6..b4ea26c20b1 100644 --- a/apps/server/src/modules/files-storage/uc/files-storage-delete.uc.spec.ts +++ b/apps/server/src/modules/files-storage/uc/files-storage-delete.uc.spec.ts @@ -1,12 +1,12 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AntivirusService } from '@infra/antivirus'; +import { S3ClientAdapter } from '@infra/s3-client'; import { ObjectId } from '@mikro-orm/mongodb'; import { AuthorizationReferenceService } from '@modules/authorization/domain'; import { HttpService } from '@nestjs/axios'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Counted, EntityId } from '@shared/domain'; -import { AntivirusService } from '@infra/antivirus'; -import { S3ClientAdapter } from '@infra/s3-client'; +import { Counted, EntityId } from '@shared/domain/types'; import { fileRecordFactory, setupEntities } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; import { FileRecordParams } from '../controller/dto'; diff --git a/apps/server/src/modules/files-storage/uc/files-storage-upload.uc.spec.ts b/apps/server/src/modules/files-storage/uc/files-storage-upload.uc.spec.ts index 1125e7644bb..5b9e9b410f3 100644 --- a/apps/server/src/modules/files-storage/uc/files-storage-upload.uc.spec.ts +++ b/apps/server/src/modules/files-storage/uc/files-storage-upload.uc.spec.ts @@ -1,15 +1,15 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AntivirusService } from '@infra/antivirus'; +import { S3ClientAdapter } from '@infra/s3-client'; import { ObjectId } from '@mikro-orm/mongodb'; +import { Action } from '@modules/authorization'; +import { AuthorizationReferenceService } from '@modules/authorization/domain'; import { HttpService } from '@nestjs/axios'; import { ForbiddenException, NotFoundException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; -import { AntivirusService } from '@infra/antivirus'; -import { S3ClientAdapter } from '@infra/s3-client'; +import { Permission } from '@shared/domain/interface'; import { AxiosHeadersKeyValue, axiosResponseFactory, fileRecordFactory, setupEntities } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; -import { Action } from '@modules/authorization'; -import { AuthorizationReferenceService } from '@modules/authorization/domain'; import { AxiosRequestConfig, AxiosResponse } from 'axios'; import { Request } from 'express'; import { of } from 'rxjs'; diff --git a/apps/server/src/modules/files-storage/uc/files-storage.uc.ts b/apps/server/src/modules/files-storage/uc/files-storage.uc.ts index 47eb7c79104..a9fae9db118 100644 --- a/apps/server/src/modules/files-storage/uc/files-storage.uc.ts +++ b/apps/server/src/modules/files-storage/uc/files-storage.uc.ts @@ -2,7 +2,7 @@ import { AuthorizationContext } from '@modules/authorization'; import { AuthorizationReferenceService } from '@modules/authorization/domain'; import { HttpService } from '@nestjs/axios'; import { Injectable, NotFoundException } from '@nestjs/common'; -import { Counted, EntityId } from '@shared/domain'; +import { Counted, EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { AxiosRequestConfig, AxiosResponse } from 'axios'; import busboy from 'busboy'; diff --git a/apps/server/src/modules/files/entity/file-permission.entity.ts b/apps/server/src/modules/files/entity/file-permission.entity.ts index 3bd7ed40ced..a9d94efb747 100644 --- a/apps/server/src/modules/files/entity/file-permission.entity.ts +++ b/apps/server/src/modules/files/entity/file-permission.entity.ts @@ -1,6 +1,6 @@ import { Embeddable, Enum, Property } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { FilePermissionReferenceModel } from '../domain'; export interface FilePermissionEntityProps { diff --git a/apps/server/src/modules/files/entity/file.entity.ts b/apps/server/src/modules/files/entity/file.entity.ts index ea702ffc968..68b667fe7c3 100644 --- a/apps/server/src/modules/files/entity/file.entity.ts +++ b/apps/server/src/modules/files/entity/file.entity.ts @@ -1,11 +1,12 @@ import { Embedded, Entity, Enum, Index, ManyToOne, Property } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; -import { v4 as uuid } from 'uuid'; -import { EntityId, StorageProviderEntity } from '@shared/domain'; +import { StorageProviderEntity } from '@shared/domain/entity'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; +import { EntityId } from '@shared/domain/types'; +import { v4 as uuid } from 'uuid'; import { FileOwnerModel } from '../domain'; -import { FileSecurityCheckEntity } from './file-security-check.entity'; import { FilePermissionEntity } from './file-permission.entity'; +import { FileSecurityCheckEntity } from './file-security-check.entity'; export interface FileEntityProps { createdAt?: Date; diff --git a/apps/server/src/modules/files/repo/files.repo.spec.ts b/apps/server/src/modules/files/repo/files.repo.spec.ts index 0ef8136918d..d96fb27cf04 100644 --- a/apps/server/src/modules/files/repo/files.repo.spec.ts +++ b/apps/server/src/modules/files/repo/files.repo.spec.ts @@ -1,7 +1,7 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { MongoMemoryDatabaseModule } from '@infra/database'; -import { StorageProviderEntity } from '@shared/domain'; +import { StorageProviderEntity } from '@shared/domain/entity'; import { FileEntity } from '../entity'; import { fileEntityFactory, filePermissionEntityFactory } from '../entity/testing'; import { FilesRepo } from './files.repo'; diff --git a/apps/server/src/modules/files/repo/files.repo.ts b/apps/server/src/modules/files/repo/files.repo.ts index 0fe05662e34..4b30386d6d4 100644 --- a/apps/server/src/modules/files/repo/files.repo.ts +++ b/apps/server/src/modules/files/repo/files.repo.ts @@ -1,7 +1,7 @@ -import { Injectable } from '@nestjs/common'; import { EntityDictionary } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { EntityId } from '@shared/domain'; +import { Injectable } from '@nestjs/common'; +import { EntityId } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo/base.repo'; import { FileOwnerModel } from '../domain'; import { FileEntity } from '../entity'; diff --git a/apps/server/src/modules/files/service/files.service.ts b/apps/server/src/modules/files/service/files.service.ts index b2faef58fd1..7f7666edbc3 100644 --- a/apps/server/src/modules/files/service/files.service.ts +++ b/apps/server/src/modules/files/service/files.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; -import { FilesRepo } from '../repo'; +import { EntityId } from '@shared/domain/types'; import { FileEntity } from '../entity'; +import { FilesRepo } from '../repo'; @Injectable() export class FilesService { diff --git a/apps/server/src/modules/files/uc/delete-files.uc.ts b/apps/server/src/modules/files/uc/delete-files.uc.ts index 7c349dc1d22..d4aef7048db 100644 --- a/apps/server/src/modules/files/uc/delete-files.uc.ts +++ b/apps/server/src/modules/files/uc/delete-files.uc.ts @@ -1,11 +1,11 @@ /* eslint-disable no-await-in-loop */ import { DeleteObjectCommand, S3Client } from '@aws-sdk/client-s3'; import { Injectable } from '@nestjs/common'; -import { StorageProviderEntity } from '@shared/domain'; +import { StorageProviderEntity } from '@shared/domain/entity'; import { StorageProviderRepo } from '@shared/repo/storageprovider'; import { LegacyLogger } from '@src/core/logger'; -import { FilesRepo } from '../repo'; import { FileEntity } from '../entity'; +import { FilesRepo } from '../repo'; @Injectable() export class DeleteFilesUc { diff --git a/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents-test.module.ts b/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents-test.module.ts index d644ca2a57c..6866d51c134 100644 --- a/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents-test.module.ts +++ b/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents-test.module.ts @@ -1,16 +1,16 @@ -import { HttpModule } from '@nestjs/axios'; -import { DynamicModule, Module } from '@nestjs/common'; -import { ConfigModule } from '@nestjs/config'; -import { Account, Role, SchoolEntity, SchoolYearEntity, SystemEntity, User } from '@shared/domain'; import { MongoMemoryDatabaseModule } from '@infra/database'; import { MongoDatabaseModuleOptions } from '@infra/database/mongo-memory-database/types'; import { RabbitMQWrapperTestModule } from '@infra/rabbitmq'; import { S3ClientModule } from '@infra/s3-client'; +import { AuthenticationModule } from '@modules/authentication/authentication.module'; +import { AuthorizationModule } from '@modules/authorization'; +import { HttpModule } from '@nestjs/axios'; +import { DynamicModule, Module } from '@nestjs/common'; +import { ConfigModule } from '@nestjs/config'; +import { Account, Role, SchoolEntity, SchoolYearEntity, SystemEntity, User } from '@shared/domain/entity'; import { createConfigModuleOptions } from '@src/config'; import { CoreModule } from '@src/core'; import { LoggerModule } from '@src/core/logger'; -import { AuthenticationModule } from '@modules/authentication/authentication.module'; -import { AuthorizationModule } from '@modules/authorization'; import { FwuLearningContentsController } from './controller/fwu-learning-contents.controller'; import { config, s3Config } from './fwu-learning-contents.config'; import { FwuLearningContentsUc } from './uc/fwu-learning-contents.uc'; diff --git a/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents.module.ts b/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents.module.ts index a991ca56503..8ff4c2c403f 100644 --- a/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents.module.ts +++ b/apps/server/src/modules/fwu-learning-contents/fwu-learning-contents.module.ts @@ -1,15 +1,15 @@ +import { RabbitMQWrapperModule } from '@infra/rabbitmq'; +import { S3ClientModule } from '@infra/s3-client'; import { Dictionary, IPrimaryKey } from '@mikro-orm/core'; import { MikroOrmModule, MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs'; +import { AuthorizationModule } from '@modules/authorization'; import { HttpModule } from '@nestjs/axios'; import { Module, NotFoundException } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; -import { Account, Role, SchoolEntity, SchoolYearEntity, SystemEntity, User } from '@shared/domain'; -import { RabbitMQWrapperModule } from '@infra/rabbitmq'; -import { S3ClientModule } from '@infra/s3-client'; +import { Account, Role, SchoolEntity, SchoolYearEntity, SystemEntity, User } from '@shared/domain/entity'; import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config'; import { CoreModule } from '@src/core'; import { LoggerModule } from '@src/core/logger'; -import { AuthorizationModule } from '@modules/authorization'; import { AuthenticationModule } from '../authentication/authentication.module'; import { FwuLearningContentsController } from './controller/fwu-learning-contents.controller'; import { config, s3Config } from './fwu-learning-contents.config'; diff --git a/apps/server/src/modules/group/controller/api-test/group.api.spec.ts b/apps/server/src/modules/group/controller/api-test/group.api.spec.ts index f5ab532f9b7..7d08a0fd2fa 100644 --- a/apps/server/src/modules/group/controller/api-test/group.api.spec.ts +++ b/apps/server/src/modules/group/controller/api-test/group.api.spec.ts @@ -4,15 +4,16 @@ import { classEntityFactory } from '@modules/class/entity/testing'; import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Role, RoleName, SchoolEntity, SchoolYearEntity, SortOrder, SystemEntity, User } from '@shared/domain'; +import { Role, SchoolEntity, SchoolYearEntity, SystemEntity, User } from '@shared/domain/entity'; +import { RoleName, SortOrder } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, groupEntityFactory, roleFactory, schoolFactory, schoolYearFactory, systemEntityFactory, - TestApiClient, - UserAndAccountTestFactory, userFactory, } from '@shared/testing'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/group/controller/dto/response/group-user.response.ts b/apps/server/src/modules/group/controller/dto/response/group-user.response.ts index 000958c96cf..e398369c10d 100644 --- a/apps/server/src/modules/group/controller/dto/response/group-user.response.ts +++ b/apps/server/src/modules/group/controller/dto/response/group-user.response.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; export class GroupUserResponse { @ApiProperty() diff --git a/apps/server/src/modules/group/controller/group.controller.ts b/apps/server/src/modules/group/controller/group.controller.ts index 2ae47b54552..2a0e94893a7 100644 --- a/apps/server/src/modules/group/controller/group.controller.ts +++ b/apps/server/src/modules/group/controller/group.controller.ts @@ -2,7 +2,7 @@ import { Authenticate, CurrentUser, ICurrentUser } from '@modules/authentication import { Controller, Get, HttpStatus, Param, Query } from '@nestjs/common'; import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger'; import { PaginationParams } from '@shared/controller'; -import { Page } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; import { ErrorResponse } from '@src/core/error/dto'; import { GroupUc } from '../uc'; import { ClassInfoDto, ResolvedGroupDto } from '../uc/dto'; diff --git a/apps/server/src/modules/group/controller/mapper/group-response.mapper.ts b/apps/server/src/modules/group/controller/mapper/group-response.mapper.ts index 668253de1ec..a61ee57c1a4 100644 --- a/apps/server/src/modules/group/controller/mapper/group-response.mapper.ts +++ b/apps/server/src/modules/group/controller/mapper/group-response.mapper.ts @@ -1,4 +1,4 @@ -import { Page } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; import { GroupTypes } from '../../domain'; import { ClassInfoDto, ResolvedGroupDto } from '../../uc/dto'; import { diff --git a/apps/server/src/modules/group/domain/group-user.ts b/apps/server/src/modules/group/domain/group-user.ts index 8f098ebc660..61ef07e4be6 100644 --- a/apps/server/src/modules/group/domain/group-user.ts +++ b/apps/server/src/modules/group/domain/group-user.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; export class GroupUser { userId: EntityId; diff --git a/apps/server/src/modules/group/domain/group.spec.ts b/apps/server/src/modules/group/domain/group.spec.ts index f2a22e1dc37..d11549e71c8 100644 --- a/apps/server/src/modules/group/domain/group.spec.ts +++ b/apps/server/src/modules/group/domain/group.spec.ts @@ -1,4 +1,4 @@ -import { RoleReference, UserDO } from '@shared/domain'; +import { RoleReference, UserDO } from '@shared/domain/domainobject'; import { groupFactory, roleFactory, userDoFactory } from '@shared/testing'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/group/domain/group.ts b/apps/server/src/modules/group/domain/group.ts index 3d1f19bc312..27225804515 100644 --- a/apps/server/src/modules/group/domain/group.ts +++ b/apps/server/src/modules/group/domain/group.ts @@ -1,5 +1,6 @@ -import { EntityId, ExternalSource, type UserDO } from '@shared/domain'; import { AuthorizableObject, DomainObject } from '@shared/domain/domain-object'; +import { ExternalSource, type UserDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { GroupTypes } from './group-types'; import { GroupUser } from './group-user'; diff --git a/apps/server/src/modules/group/repo/group-domain.mapper.ts b/apps/server/src/modules/group/repo/group-domain.mapper.ts index 33cb26ab9ae..44fcd006bb1 100644 --- a/apps/server/src/modules/group/repo/group-domain.mapper.ts +++ b/apps/server/src/modules/group/repo/group-domain.mapper.ts @@ -1,5 +1,6 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { ExternalSource, ExternalSourceEntity, Role, SchoolEntity, SystemEntity, User } from '@shared/domain'; +import { ExternalSource } from '@shared/domain/domainobject'; +import { ExternalSourceEntity, Role, SchoolEntity, SystemEntity, User } from '@shared/domain/entity'; import { Group, GroupProps, GroupTypes, GroupUser } from '../domain'; import { GroupEntity, GroupEntityProps, GroupEntityTypes, GroupUserEntity, GroupValidPeriodEntity } from '../entity'; diff --git a/apps/server/src/modules/group/repo/group.repo.spec.ts b/apps/server/src/modules/group/repo/group.repo.spec.ts index 1bcc024514a..4fde48b0e63 100644 --- a/apps/server/src/modules/group/repo/group.repo.spec.ts +++ b/apps/server/src/modules/group/repo/group.repo.spec.ts @@ -1,7 +1,8 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { ExternalSource, SchoolEntity, UserDO, User } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { ExternalSource, UserDO } from '@shared/domain/domainobject'; +import { SchoolEntity, User } from '@shared/domain/entity'; import { cleanupCollections, groupEntityFactory, diff --git a/apps/server/src/modules/group/repo/group.repo.ts b/apps/server/src/modules/group/repo/group.repo.ts index 920647ee7e8..c52ab7487d8 100644 --- a/apps/server/src/modules/group/repo/group.repo.ts +++ b/apps/server/src/modules/group/repo/group.repo.ts @@ -1,7 +1,7 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; +import { type UserDO } from '@shared/domain/domainobject'; import { EntityId } from '@shared/domain/types'; -import { type UserDO } from '@shared/domain'; import { Group, GroupProps } from '../domain'; import { GroupEntity, GroupEntityProps, GroupEntityTypes } from '../entity'; import { GroupDomainMapper } from './group-domain.mapper'; diff --git a/apps/server/src/modules/group/service/group.service.spec.ts b/apps/server/src/modules/group/service/group.service.spec.ts index 19c66f266ee..8724a8723ce 100644 --- a/apps/server/src/modules/group/service/group.service.spec.ts +++ b/apps/server/src/modules/group/service/group.service.spec.ts @@ -2,8 +2,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; +import { UserDO } from '@shared/domain/domainobject'; import { groupFactory, userDoFactory } from '@shared/testing'; -import { UserDO } from '@shared/domain'; import { Group } from '../domain'; import { GroupRepo } from '../repo'; import { GroupService } from './group.service'; diff --git a/apps/server/src/modules/group/service/group.service.ts b/apps/server/src/modules/group/service/group.service.ts index 0ccded2442b..62ec2ece9c8 100644 --- a/apps/server/src/modules/group/service/group.service.ts +++ b/apps/server/src/modules/group/service/group.service.ts @@ -1,7 +1,8 @@ +import { AuthorizationLoaderServiceGeneric } from '@modules/authorization'; import { Injectable } from '@nestjs/common'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { EntityId, type UserDO } from '@shared/domain'; -import { AuthorizationLoaderServiceGeneric } from '@modules/authorization'; +import { type UserDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { Group } from '../domain'; import { GroupRepo } from '../repo'; diff --git a/apps/server/src/modules/group/uc/dto/resolved-group-user.ts b/apps/server/src/modules/group/uc/dto/resolved-group-user.ts index 80db4973ef2..c33714904ff 100644 --- a/apps/server/src/modules/group/uc/dto/resolved-group-user.ts +++ b/apps/server/src/modules/group/uc/dto/resolved-group-user.ts @@ -1,5 +1,5 @@ -import { UserDO } from '@shared/domain'; import { RoleDto } from '@modules/role/service/dto/role.dto'; +import { UserDO } from '@shared/domain/domainobject'; export class ResolvedGroupUser { user: UserDO; diff --git a/apps/server/src/modules/group/uc/dto/resolved-group.dto.ts b/apps/server/src/modules/group/uc/dto/resolved-group.dto.ts index 4d288f936a0..b8b2b8ecec8 100644 --- a/apps/server/src/modules/group/uc/dto/resolved-group.dto.ts +++ b/apps/server/src/modules/group/uc/dto/resolved-group.dto.ts @@ -1,4 +1,4 @@ -import { ExternalSource } from '@shared/domain'; +import { ExternalSource } from '@shared/domain/domainobject'; import { GroupTypes } from '../../domain'; import { ResolvedGroupUser } from './resolved-group-user'; diff --git a/apps/server/src/modules/group/uc/group.uc.spec.ts b/apps/server/src/modules/group/uc/group.uc.spec.ts index 10cfc03821f..0a00d74a15c 100644 --- a/apps/server/src/modules/group/uc/group.uc.spec.ts +++ b/apps/server/src/modules/group/uc/group.uc.spec.ts @@ -12,7 +12,9 @@ import { UserService } from '@modules/user'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { LegacySchoolDo, Page, Permission, SchoolYearEntity, SortOrder, User, UserDO } from '@shared/domain'; +import { LegacySchoolDo, Page, UserDO } from '@shared/domain/domainobject'; +import { SchoolYearEntity, User } from '@shared/domain/entity'; +import { Permission, SortOrder } from '@shared/domain/interface'; import { groupFactory, legacySchoolDoFactory, diff --git a/apps/server/src/modules/group/uc/group.uc.ts b/apps/server/src/modules/group/uc/group.uc.ts index 2de4d9d5a2c..150e951b129 100644 --- a/apps/server/src/modules/group/uc/group.uc.ts +++ b/apps/server/src/modules/group/uc/group.uc.ts @@ -7,7 +7,10 @@ import { RoleDto } from '@modules/role/service/dto/role.dto'; import { LegacySystemService, SystemDto } from '@modules/system'; import { UserService } from '@modules/user'; import { Injectable } from '@nestjs/common'; -import { EntityId, LegacySchoolDo, Page, Permission, SchoolYearEntity, SortOrder, User, UserDO } from '@shared/domain'; +import { LegacySchoolDo, Page, UserDO } from '@shared/domain/domainobject'; +import { SchoolYearEntity, User } from '@shared/domain/entity'; +import { Permission, SortOrder } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { SchoolYearQueryType } from '../controller/dto/interface'; import { Group, GroupUser } from '../domain'; import { UnknownQueryTypeLoggableException } from '../loggable'; diff --git a/apps/server/src/modules/group/uc/mapper/group-uc.mapper.ts b/apps/server/src/modules/group/uc/mapper/group-uc.mapper.ts index 52ff160921f..9ba04682fe0 100644 --- a/apps/server/src/modules/group/uc/mapper/group-uc.mapper.ts +++ b/apps/server/src/modules/group/uc/mapper/group-uc.mapper.ts @@ -1,6 +1,9 @@ import { Class } from '@modules/class/domain'; import { SystemDto } from '@modules/system'; -import { RoleName, SchoolYearEntity, UserDO } from '@shared/domain'; + +import { UserDO } from '@shared/domain/domainobject'; +import { SchoolYearEntity } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { Group } from '../../domain'; import { ClassInfoDto, ResolvedGroupDto, ResolvedGroupUser } from '../dto'; import { ClassRootType } from '../dto/class-root-type'; diff --git a/apps/server/src/modules/group/util/sort-helper.spec.ts b/apps/server/src/modules/group/util/sort-helper.spec.ts index f4c738a3c65..986f32f4f43 100644 --- a/apps/server/src/modules/group/util/sort-helper.spec.ts +++ b/apps/server/src/modules/group/util/sort-helper.spec.ts @@ -1,4 +1,4 @@ -import { SortOrder } from '@shared/domain'; +import { SortOrder } from '@shared/domain/interface'; import { SortHelper } from './sort-helper'; describe('SortHelper', () => { diff --git a/apps/server/src/modules/group/util/sort-helper.ts b/apps/server/src/modules/group/util/sort-helper.ts index 099c726403e..bb2d7008d53 100644 --- a/apps/server/src/modules/group/util/sort-helper.ts +++ b/apps/server/src/modules/group/util/sort-helper.ts @@ -1,4 +1,4 @@ -import { SortOrder } from '@shared/domain'; +import { SortOrder } from '@shared/domain/interface'; export class SortHelper { public static genericSortFunction(a: T, b: T, sortOrder: SortOrder): number { diff --git a/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-delete.api.spec.ts b/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-delete.api.spec.ts index ff093b2c712..276e86236ec 100644 --- a/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-delete.api.spec.ts +++ b/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-delete.api.spec.ts @@ -3,7 +3,7 @@ import { S3ClientAdapter } from '@infra/s3-client'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, mapUserToCurrentUser, roleFactory, schoolFactory, userFactory } from '@shared/testing'; import { ICurrentUser } from '@src/modules/authentication'; import { JwtAuthGuard } from '@src/modules/authentication/guard/jwt-auth.guard'; diff --git a/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-get-editor.api.spec.ts b/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-get-editor.api.spec.ts index c22c7394fab..a2144cc37ba 100644 --- a/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-get-editor.api.spec.ts +++ b/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-get-editor.api.spec.ts @@ -3,7 +3,7 @@ import { S3ClientAdapter } from '@infra/s3-client'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, mapUserToCurrentUser, roleFactory, schoolFactory, userFactory } from '@shared/testing'; import { ICurrentUser } from '@src/modules/authentication'; import { JwtAuthGuard } from '@src/modules/authentication/guard/jwt-auth.guard'; diff --git a/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-get-player.api.spec.ts b/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-get-player.api.spec.ts index cb5a3d487eb..bf728d2dd90 100644 --- a/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-get-player.api.spec.ts +++ b/apps/server/src/modules/h5p-editor/controller/api-test/h5p-editor-get-player.api.spec.ts @@ -4,7 +4,7 @@ import { IPlayerModel } from '@lumieducation/h5p-server'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, mapUserToCurrentUser, roleFactory, schoolFactory, userFactory } from '@shared/testing'; import { ICurrentUser } from '@src/modules/authentication'; import { JwtAuthGuard } from '@src/modules/authentication/guard/jwt-auth.guard'; diff --git a/apps/server/src/modules/h5p-editor/controller/dto/h5p-editor.params.ts b/apps/server/src/modules/h5p-editor/controller/dto/h5p-editor.params.ts index a8c6d8c466d..91c67645854 100644 --- a/apps/server/src/modules/h5p-editor/controller/dto/h5p-editor.params.ts +++ b/apps/server/src/modules/h5p-editor/controller/dto/h5p-editor.params.ts @@ -1,7 +1,9 @@ import { IContentMetadata } from '@lumieducation/h5p-server'; import { ApiProperty } from '@nestjs/swagger'; import { SanitizeHtml } from '@shared/controller'; -import { EntityId, LanguageType } from '@shared/domain'; + +import { LanguageType } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { IsEnum, IsMongoId, IsNotEmpty, IsObject, IsOptional, IsString } from 'class-validator'; import { H5PContentParentType } from '../../entity'; diff --git a/apps/server/src/modules/h5p-editor/entity/h5p-content.entity.ts b/apps/server/src/modules/h5p-editor/entity/h5p-content.entity.ts index 7b96978294f..ce2748761aa 100644 --- a/apps/server/src/modules/h5p-editor/entity/h5p-content.entity.ts +++ b/apps/server/src/modules/h5p-editor/entity/h5p-content.entity.ts @@ -2,7 +2,8 @@ import { IContentMetadata, ILibraryName } from '@lumieducation/h5p-server'; import { IContentAuthor, IContentChange } from '@lumieducation/h5p-server/build/src/types'; import { Embeddable, Embedded, Entity, Enum, Index, JsonType, Property } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; -import { BaseEntityWithTimestamps, EntityId } from '@shared/domain'; +import { BaseEntityWithTimestamps } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; @Embeddable() export class ContentMetadata implements IContentMetadata { diff --git a/apps/server/src/modules/h5p-editor/entity/h5p-editor-tempfile.entity.ts b/apps/server/src/modules/h5p-editor/entity/h5p-editor-tempfile.entity.ts index f7a6913eef7..00374718c00 100644 --- a/apps/server/src/modules/h5p-editor/entity/h5p-editor-tempfile.entity.ts +++ b/apps/server/src/modules/h5p-editor/entity/h5p-editor-tempfile.entity.ts @@ -1,6 +1,6 @@ import { IFileStats, ITemporaryFile } from '@lumieducation/h5p-server'; import { Entity, Property } from '@mikro-orm/core'; -import { BaseEntityWithTimestamps } from '@shared/domain'; +import { BaseEntityWithTimestamps } from '@shared/domain/entity'; export interface TemporaryFileProperties { filename: string; diff --git a/apps/server/src/modules/h5p-editor/entity/library.entity.ts b/apps/server/src/modules/h5p-editor/entity/library.entity.ts index 868397f7266..2e7e07788b6 100644 --- a/apps/server/src/modules/h5p-editor/entity/library.entity.ts +++ b/apps/server/src/modules/h5p-editor/entity/library.entity.ts @@ -1,7 +1,7 @@ import { IInstalledLibrary, ILibraryName } from '@lumieducation/h5p-server'; import { IFileStats, ILibraryMetadata, IPath } from '@lumieducation/h5p-server/build/src/types'; import { Entity, Property } from '@mikro-orm/core'; -import { BaseEntityWithTimestamps } from '@shared/domain'; +import { BaseEntityWithTimestamps } from '@shared/domain/entity'; export class Path implements IPath { @Property() diff --git a/apps/server/src/modules/h5p-editor/h5p-editor-test.module.ts b/apps/server/src/modules/h5p-editor/h5p-editor-test.module.ts index 49d53c57726..9d0d46b2d28 100644 --- a/apps/server/src/modules/h5p-editor/h5p-editor-test.module.ts +++ b/apps/server/src/modules/h5p-editor/h5p-editor-test.module.ts @@ -1,22 +1,22 @@ -import { DynamicModule, Module } from '@nestjs/common'; -import { ALL_ENTITIES } from '@shared/domain'; import { MongoDatabaseModuleOptions, MongoMemoryDatabaseModule } from '@infra/database'; import { RabbitMQWrapperTestModule } from '@infra/rabbitmq'; import { S3ClientModule } from '@infra/s3-client'; -import { CoreModule } from '@src/core'; -import { LoggerModule } from '@src/core/logger'; import { AuthenticationModule } from '@modules/authentication'; +import { AuthenticationApiModule } from '@modules/authentication/authentication-api.module'; import { AuthorizationReferenceModule } from '@modules/authorization/authorization-reference.module'; import { UserModule } from '@modules/user'; -import { AuthenticationApiModule } from '@modules/authentication/authentication-api.module'; +import { DynamicModule, Module } from '@nestjs/common'; +import { ALL_ENTITIES } from '@shared/domain/entity'; +import { CoreModule } from '@src/core'; +import { LoggerModule } from '@src/core/logger'; +import { H5PEditorController } from './controller'; +import { H5PContent } from './entity'; +import { s3ConfigContent, s3ConfigLibraries } from './h5p-editor.config'; import { H5PEditorModule } from './h5p-editor.module'; +import { H5PAjaxEndpointProvider, H5PEditorProvider, H5PPlayerProvider } from './provider'; import { H5PContentRepo, LibraryRepo, TemporaryFileRepo } from './repo'; import { ContentStorage, LibraryStorage, TemporaryFileStorage } from './service'; import { H5PEditorUc } from './uc/h5p.uc'; -import { s3ConfigContent, s3ConfigLibraries } from './h5p-editor.config'; -import { H5PEditorController } from './controller'; -import { H5PEditorProvider, H5PAjaxEndpointProvider, H5PPlayerProvider } from './provider'; -import { H5PContent } from './entity'; const imports = [ H5PEditorModule, diff --git a/apps/server/src/modules/h5p-editor/h5p-editor.module.ts b/apps/server/src/modules/h5p-editor/h5p-editor.module.ts index b614622610c..a321bbc4e58 100644 --- a/apps/server/src/modules/h5p-editor/h5p-editor.module.ts +++ b/apps/server/src/modules/h5p-editor/h5p-editor.module.ts @@ -1,22 +1,22 @@ +import { RabbitMQWrapperModule } from '@infra/rabbitmq'; +import { S3ClientModule } from '@infra/s3-client'; import { Dictionary, IPrimaryKey } from '@mikro-orm/core'; import { MikroOrmModule, MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs'; +import { AuthenticationModule } from '@modules/authentication'; +import { AuthorizationReferenceModule } from '@modules/authorization/authorization-reference.module'; +import { UserModule } from '@modules/user'; import { Module, NotFoundException } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; -import { ALL_ENTITIES } from '@shared/domain'; -import { RabbitMQWrapperModule } from '@infra/rabbitmq'; +import { ALL_ENTITIES } from '@shared/domain/entity'; import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config'; import { CoreModule } from '@src/core'; import { Logger } from '@src/core/logger'; -import { AuthorizationReferenceModule } from '@modules/authorization/authorization-reference.module'; -import { UserModule } from '@modules/user'; -import { S3ClientModule } from '@infra/s3-client'; -import { AuthenticationModule } from '@modules/authentication'; import { H5PEditorController } from './controller/h5p-editor.controller'; -import { H5PContent, InstalledLibrary, H5pEditorTempFile } from './entity'; +import { H5PContent, H5pEditorTempFile, InstalledLibrary } from './entity'; import { config, s3ConfigContent, s3ConfigLibraries } from './h5p-editor.config'; +import { H5PAjaxEndpointProvider, H5PEditorProvider, H5PPlayerProvider } from './provider'; import { H5PContentRepo, LibraryRepo, TemporaryFileRepo } from './repo'; import { ContentStorage, LibraryStorage, TemporaryFileStorage } from './service'; -import { H5PEditorProvider, H5PAjaxEndpointProvider, H5PPlayerProvider } from './provider'; import { H5PEditorUc } from './uc/h5p.uc'; const defaultMikroOrmOptions: MikroOrmModuleSyncOptions = { diff --git a/apps/server/src/modules/h5p-editor/repo/h5p-content.repo.ts b/apps/server/src/modules/h5p-editor/repo/h5p-content.repo.ts index 6713aad5d3a..23425536c50 100644 --- a/apps/server/src/modules/h5p-editor/repo/h5p-content.repo.ts +++ b/apps/server/src/modules/h5p-editor/repo/h5p-content.repo.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo/base.repo'; import { H5PContent } from '../entity'; diff --git a/apps/server/src/modules/h5p-editor/repo/temporary-file.repo.ts b/apps/server/src/modules/h5p-editor/repo/temporary-file.repo.ts index ae6966345d9..0d6e4572c37 100644 --- a/apps/server/src/modules/h5p-editor/repo/temporary-file.repo.ts +++ b/apps/server/src/modules/h5p-editor/repo/temporary-file.repo.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo/base.repo'; import { H5pEditorTempFile } from '../entity'; diff --git a/apps/server/src/modules/h5p-editor/service/contentStorage.service.spec.ts b/apps/server/src/modules/h5p-editor/service/contentStorage.service.spec.ts index 4fb094e8e5b..9642d0a849c 100644 --- a/apps/server/src/modules/h5p-editor/service/contentStorage.service.spec.ts +++ b/apps/server/src/modules/h5p-editor/service/contentStorage.service.spec.ts @@ -4,7 +4,7 @@ import { S3ClientAdapter } from '@infra/s3-client'; import { IContentMetadata, ILibraryName, IUser, LibraryName } from '@lumieducation/h5p-server'; import { HttpException, InternalServerErrorException, NotFoundException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { IEntity } from '@shared/domain'; +import { IEntity } from '@shared/domain/interface'; import { ObjectID } from 'bson'; import { Readable } from 'stream'; import { GetH5PFileResponse } from '../controller/dto'; diff --git a/apps/server/src/modules/h5p-editor/types/lumi-types.ts b/apps/server/src/modules/h5p-editor/types/lumi-types.ts index ed1aa36a21d..2d9ec1db8a2 100644 --- a/apps/server/src/modules/h5p-editor/types/lumi-types.ts +++ b/apps/server/src/modules/h5p-editor/types/lumi-types.ts @@ -1,5 +1,5 @@ import { IUser } from '@lumieducation/h5p-server'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { H5PContentParentType } from '../entity'; export interface H5PContentParentParams { diff --git a/apps/server/src/modules/h5p-editor/uc/h5p-ajax.uc.spec.ts b/apps/server/src/modules/h5p-editor/uc/h5p-ajax.uc.spec.ts index c42b959b9e8..5918cde42a4 100644 --- a/apps/server/src/modules/h5p-editor/uc/h5p-ajax.uc.spec.ts +++ b/apps/server/src/modules/h5p-editor/uc/h5p-ajax.uc.spec.ts @@ -1,7 +1,8 @@ import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { H5PAjaxEndpoint, H5PEditor, H5PPlayer, H5pError } from '@lumieducation/h5p-server'; import { Test, TestingModule } from '@nestjs/testing'; -import { LanguageType, UserDO } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; +import { LanguageType } from '@shared/domain/entity'; import { setupEntities } from '@shared/testing'; import { AuthorizationReferenceService } from '@src/modules/authorization/domain'; import { UserService } from '@src/modules/user'; diff --git a/apps/server/src/modules/h5p-editor/uc/h5p-get-editor.uc.spec.ts b/apps/server/src/modules/h5p-editor/uc/h5p-get-editor.uc.spec.ts index 824b1f7de8a..e593b29b821 100644 --- a/apps/server/src/modules/h5p-editor/uc/h5p-get-editor.uc.spec.ts +++ b/apps/server/src/modules/h5p-editor/uc/h5p-get-editor.uc.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { H5PEditor, H5PPlayer, IEditorModel } from '@lumieducation/h5p-server'; import { ForbiddenException, NotFoundException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { LanguageType } from '@shared/domain'; +import { LanguageType } from '@shared/domain/entity'; import { UserRepo } from '@shared/repo'; import { h5pContentFactory, setupEntities } from '@shared/testing'; import { ICurrentUser } from '@src/modules/authentication'; diff --git a/apps/server/src/modules/h5p-editor/uc/h5p.uc.ts b/apps/server/src/modules/h5p-editor/uc/h5p.uc.ts index 89d4ba4da2a..41803917bbe 100644 --- a/apps/server/src/modules/h5p-editor/uc/h5p.uc.ts +++ b/apps/server/src/modules/h5p-editor/uc/h5p.uc.ts @@ -21,7 +21,8 @@ import { NotAcceptableException, NotFoundException, } from '@nestjs/common'; -import { EntityId, LanguageType } from '@shared/domain'; +import { LanguageType } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { ICurrentUser } from '@src/modules/authentication'; import { AuthorizationContext, AuthorizationContextBuilder } from '@src/modules/authorization'; import { AuthorizationReferenceService } from '@src/modules/authorization/domain'; diff --git a/apps/server/src/modules/learnroom/controller/api-test/course.api.spec.ts b/apps/server/src/modules/learnroom/controller/api-test/course.api.spec.ts index 964df864abb..8ef38761c19 100644 --- a/apps/server/src/modules/learnroom/controller/api-test/course.api.spec.ts +++ b/apps/server/src/modules/learnroom/controller/api-test/course.api.spec.ts @@ -1,10 +1,10 @@ import { EntityManager } from '@mikro-orm/mongodb'; -import { INestApplication, StreamableFile } from '@nestjs/common'; -import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; -import { cleanupCollections, courseFactory, UserAndAccountTestFactory, TestApiClient } from '@shared/testing'; import { CourseMetadataListResponse } from '@modules/learnroom/controller/dto'; import { ServerTestModule } from '@modules/server/server.module'; +import { INestApplication, StreamableFile } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { Permission } from '@shared/domain/interface'; +import { TestApiClient, UserAndAccountTestFactory, cleanupCollections, courseFactory } from '@shared/testing'; const createStudent = () => { const { studentUser, studentAccount } = UserAndAccountTestFactory.buildStudent({}, [Permission.COURSE_VIEW]); diff --git a/apps/server/src/modules/learnroom/controller/api-test/dashboard.api.spec.ts b/apps/server/src/modules/learnroom/controller/api-test/dashboard.api.spec.ts index be9b9fad583..ace1c8d68c1 100644 --- a/apps/server/src/modules/learnroom/controller/api-test/dashboard.api.spec.ts +++ b/apps/server/src/modules/learnroom/controller/api-test/dashboard.api.spec.ts @@ -5,7 +5,8 @@ import { DashboardResponse } from '@modules/learnroom/controller/dto'; import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { DashboardEntity, GridElement, Permission, RoleName, User } from '@shared/domain'; +import { DashboardEntity, GridElement, User } from '@shared/domain/entity'; +import { Permission, RoleName } from '@shared/domain/interface'; import { IDashboardRepo } from '@shared/repo'; import { courseFactory, mapUserToCurrentUser, roleFactory, userFactory } from '@shared/testing'; import { Request } from 'express'; diff --git a/apps/server/src/modules/learnroom/controller/api-test/rooms-copy-timeout.api.spec.ts b/apps/server/src/modules/learnroom/controller/api-test/rooms-copy-timeout.api.spec.ts index c73b9861c1f..17be0a523dd 100644 --- a/apps/server/src/modules/learnroom/controller/api-test/rooms-copy-timeout.api.spec.ts +++ b/apps/server/src/modules/learnroom/controller/api-test/rooms-copy-timeout.api.spec.ts @@ -6,7 +6,7 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, courseFactory, diff --git a/apps/server/src/modules/learnroom/controller/api-test/rooms.api.spec.ts b/apps/server/src/modules/learnroom/controller/api-test/rooms.api.spec.ts index ec6114f8f60..9b2126a7005 100644 --- a/apps/server/src/modules/learnroom/controller/api-test/rooms.api.spec.ts +++ b/apps/server/src/modules/learnroom/controller/api-test/rooms.api.spec.ts @@ -9,7 +9,8 @@ import { SingleColumnBoardResponse } from '@modules/learnroom/controller/dto'; import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Board, Course, Permission, Task } from '@shared/domain'; +import { Board, Course, Task } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { boardFactory, cleanupCollections, diff --git a/apps/server/src/modules/learnroom/controller/dashboard.controller.spec.ts b/apps/server/src/modules/learnroom/controller/dashboard.controller.spec.ts index 76ebe449829..50c851d024a 100644 --- a/apps/server/src/modules/learnroom/controller/dashboard.controller.spec.ts +++ b/apps/server/src/modules/learnroom/controller/dashboard.controller.spec.ts @@ -1,13 +1,7 @@ import { ICurrentUser } from '@modules/authentication'; import { Test, TestingModule } from '@nestjs/testing'; -import { - DashboardEntity, - EntityId, - GridElement, - GridPosition, - LearnroomMetadata, - LearnroomTypes, -} from '@shared/domain'; +import { DashboardEntity, GridElement, GridPosition } from '@shared/domain/entity'; +import { EntityId, LearnroomMetadata, LearnroomTypes } from '@shared/domain/types'; import { DashboardUc } from '../uc/dashboard.uc'; import { DashboardController } from './dashboard.controller'; import { DashboardResponse } from './dto'; diff --git a/apps/server/src/modules/learnroom/controller/dto/course-metadata.response.ts b/apps/server/src/modules/learnroom/controller/dto/course-metadata.response.ts index fd6f41414a8..b3615bcaf95 100644 --- a/apps/server/src/modules/learnroom/controller/dto/course-metadata.response.ts +++ b/apps/server/src/modules/learnroom/controller/dto/course-metadata.response.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { PaginationResponse } from '@shared/controller'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; export class CourseMetadataResponse { constructor( diff --git a/apps/server/src/modules/learnroom/controller/rooms.controller.spec.ts b/apps/server/src/modules/learnroom/controller/rooms.controller.spec.ts index 4e10bd706a3..9f28c85dc10 100644 --- a/apps/server/src/modules/learnroom/controller/rooms.controller.spec.ts +++ b/apps/server/src/modules/learnroom/controller/rooms.controller.spec.ts @@ -2,7 +2,7 @@ import { createMock } from '@golevelup/ts-jest'; import { ICurrentUser } from '@modules/authentication'; import { CopyApiResponse, CopyElementType, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { RoomBoardResponseMapper } from '../mapper/room-board-response.mapper'; import { RoomBoardDTO } from '../types'; import { CourseCopyUC } from '../uc/course-copy.uc'; diff --git a/apps/server/src/modules/learnroom/mapper/board-taskStatus.mapper.ts b/apps/server/src/modules/learnroom/mapper/board-taskStatus.mapper.ts index b493f0de91e..7a90f5f9d59 100644 --- a/apps/server/src/modules/learnroom/mapper/board-taskStatus.mapper.ts +++ b/apps/server/src/modules/learnroom/mapper/board-taskStatus.mapper.ts @@ -1,4 +1,4 @@ -import { TaskStatus } from '@shared/domain'; +import { TaskStatus } from '@shared/domain/types'; import { BoardTaskStatusResponse } from '../controller/dto'; export class BoardTaskStatusMapper { diff --git a/apps/server/src/modules/learnroom/mapper/course.mapper.ts b/apps/server/src/modules/learnroom/mapper/course.mapper.ts index 22ebaf45d23..498922cc633 100644 --- a/apps/server/src/modules/learnroom/mapper/course.mapper.ts +++ b/apps/server/src/modules/learnroom/mapper/course.mapper.ts @@ -1,4 +1,4 @@ -import { Course } from '@shared/domain'; +import { Course } from '@shared/domain/entity'; import { CourseMetadataResponse } from '../controller/dto'; export class CourseMapper { diff --git a/apps/server/src/modules/learnroom/mapper/dashboard.mapper.spec.ts b/apps/server/src/modules/learnroom/mapper/dashboard.mapper.spec.ts index 34ded87a94c..7633ae2ef39 100644 --- a/apps/server/src/modules/learnroom/mapper/dashboard.mapper.spec.ts +++ b/apps/server/src/modules/learnroom/mapper/dashboard.mapper.spec.ts @@ -1,10 +1,5 @@ -import { - DashboardEntity, - GridElement, - GridElementWithPosition, - LearnroomMetadata, - LearnroomTypes, -} from '@shared/domain'; +import { DashboardEntity, GridElement, GridElementWithPosition } from '@shared/domain/entity'; +import { LearnroomMetadata, LearnroomTypes } from '@shared/domain/types'; import { DashboardResponse } from '../controller/dto'; import { DashboardMapper } from './dashboard.mapper'; diff --git a/apps/server/src/modules/learnroom/mapper/dashboard.mapper.ts b/apps/server/src/modules/learnroom/mapper/dashboard.mapper.ts index ac67cc7fa44..537015f02b2 100644 --- a/apps/server/src/modules/learnroom/mapper/dashboard.mapper.ts +++ b/apps/server/src/modules/learnroom/mapper/dashboard.mapper.ts @@ -1,5 +1,6 @@ -import { DashboardEntity, GridElementWithPosition, LearnroomMetadata } from '@shared/domain'; -import { DashboardResponse, DashboardGridElementResponse, DashboardGridSubElementResponse } from '../controller/dto'; +import { DashboardEntity, GridElementWithPosition } from '@shared/domain/entity'; +import { LearnroomMetadata } from '@shared/domain/types'; +import { DashboardGridElementResponse, DashboardGridSubElementResponse, DashboardResponse } from '../controller/dto'; export class DashboardMapper { static mapToResponse(dashboard: DashboardEntity): DashboardResponse { diff --git a/apps/server/src/modules/learnroom/mapper/room-board-response.mapper.ts b/apps/server/src/modules/learnroom/mapper/room-board-response.mapper.ts index beadf1b0e3b..d5fb38e1657 100644 --- a/apps/server/src/modules/learnroom/mapper/room-board-response.mapper.ts +++ b/apps/server/src/modules/learnroom/mapper/room-board-response.mapper.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { Course, TaskWithStatusVo } from '@shared/domain'; +import { Course, TaskWithStatusVo } from '@shared/domain/entity'; import { BoardElementResponse, BoardLessonResponse, diff --git a/apps/server/src/modules/learnroom/service/board-copy.service.spec.ts b/apps/server/src/modules/learnroom/service/board-copy.service.spec.ts index 51ebc404d83..58b42b656e1 100644 --- a/apps/server/src/modules/learnroom/service/board-copy.service.spec.ts +++ b/apps/server/src/modules/learnroom/service/board-copy.service.spec.ts @@ -1,7 +1,11 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { ColumnBoardCopyService } from '@modules/board/service/column-board-copy.service'; +import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; +import { LessonCopyService } from '@modules/lesson/service'; +import { TaskCopyService } from '@modules/task/service'; import { Test, TestingModule } from '@nestjs/testing'; -import { Board } from '@shared/domain'; import { BoardExternalReferenceType } from '@shared/domain/domainobject/board/types'; +import { Board } from '@shared/domain/entity'; import { BoardRepo } from '@shared/repo'; import { boardFactory, @@ -17,10 +21,6 @@ import { userFactory, } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; -import { ColumnBoardCopyService } from '@modules/board/service/column-board-copy.service'; -import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; -import { LessonCopyService } from '@modules/lesson/service'; -import { TaskCopyService } from '@modules/task/service'; import { BoardCopyService } from './board-copy.service'; describe('board copy service', () => { diff --git a/apps/server/src/modules/learnroom/service/board-copy.service.ts b/apps/server/src/modules/learnroom/service/board-copy.service.ts index e9c1734f574..9b6582c92cd 100644 --- a/apps/server/src/modules/learnroom/service/board-copy.service.ts +++ b/apps/server/src/modules/learnroom/service/board-copy.service.ts @@ -1,29 +1,29 @@ +import { ColumnBoardCopyService } from '@modules/board/service/column-board-copy.service'; +import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; +import { getResolvedValues } from '@modules/files-storage/helper'; +import { LessonCopyService } from '@modules/lesson/service'; +import { TaskCopyService } from '@modules/task/service'; import { Injectable } from '@nestjs/common'; +import { ColumnBoard } from '@shared/domain/domainobject'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject/board/types'; import { Board, BoardElement, BoardElementType, - ColumnBoard, - ColumnboardBoardElement, ColumnBoardTarget, + ColumnboardBoardElement, Course, - isColumnBoardTarget, - isLesson, - isTask, - LessonEntity, LessonBoardElement, + LessonEntity, Task, TaskBoardElement, User, -} from '@shared/domain'; -import { BoardExternalReferenceType } from '@shared/domain/domainobject/board/types'; + isColumnBoardTarget, + isLesson, + isTask, +} from '@shared/domain/entity'; import { BoardRepo } from '@shared/repo'; import { LegacyLogger } from '@src/core/logger'; -import { ColumnBoardCopyService } from '@modules/board/service/column-board-copy.service'; -import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; -import { getResolvedValues } from '@modules/files-storage/helper'; -import { LessonCopyService } from '@modules/lesson/service'; -import { TaskCopyService } from '@modules/task/service'; import { sortBy } from 'lodash'; type BoardCopyParams = { diff --git a/apps/server/src/modules/learnroom/service/column-board-target.service.spec.ts b/apps/server/src/modules/learnroom/service/column-board-target.service.spec.ts index 8a586c39eb6..5463ac2eb65 100644 --- a/apps/server/src/modules/learnroom/service/column-board-target.service.spec.ts +++ b/apps/server/src/modules/learnroom/service/column-board-target.service.spec.ts @@ -1,10 +1,10 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; +import { ColumnBoardService } from '@modules/board'; import { Test, TestingModule } from '@nestjs/testing'; -import { ColumnBoardTarget } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { ColumnBoardTarget } from '@shared/domain/entity'; import { cleanupCollections, columnBoardTargetFactory } from '@shared/testing'; -import { ColumnBoardService } from '@modules/board'; import { ColumnBoardTargetService } from './column-board-target.service'; describe(ColumnBoardTargetService.name, () => { diff --git a/apps/server/src/modules/learnroom/service/column-board-target.service.ts b/apps/server/src/modules/learnroom/service/column-board-target.service.ts index 79b476c4fe6..ba45415186e 100644 --- a/apps/server/src/modules/learnroom/service/column-board-target.service.ts +++ b/apps/server/src/modules/learnroom/service/column-board-target.service.ts @@ -1,8 +1,9 @@ import { FilterQuery } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; -import { Injectable } from '@nestjs/common'; -import { ColumnBoardTarget, EntityId } from '@shared/domain'; import { ColumnBoardService } from '@modules/board'; +import { Injectable } from '@nestjs/common'; +import { ColumnBoardTarget } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; @Injectable() export class ColumnBoardTargetService { diff --git a/apps/server/src/modules/learnroom/service/common-cartridge-export.service.spec.ts b/apps/server/src/modules/learnroom/service/common-cartridge-export.service.spec.ts index 6630c242d34..9f964682836 100644 --- a/apps/server/src/modules/learnroom/service/common-cartridge-export.service.spec.ts +++ b/apps/server/src/modules/learnroom/service/common-cartridge-export.service.spec.ts @@ -11,7 +11,7 @@ import { Course, LessonEntity, Task, -} from '@shared/domain'; +} from '@shared/domain/entity'; import { courseFactory, lessonFactory, setupEntities, taskFactory } from '@shared/testing'; import AdmZip from 'adm-zip'; import { CommonCartridgeVersion } from '../common-cartridge'; diff --git a/apps/server/src/modules/learnroom/service/common-cartridge-export.service.ts b/apps/server/src/modules/learnroom/service/common-cartridge-export.service.ts index 1ba81d7e221..7f9e253da16 100644 --- a/apps/server/src/modules/learnroom/service/common-cartridge-export.service.ts +++ b/apps/server/src/modules/learnroom/service/common-cartridge-export.service.ts @@ -1,7 +1,8 @@ import { LessonService } from '@modules/lesson/service'; import { TaskService } from '@modules/task/service'; import { Injectable } from '@nestjs/common'; -import { ComponentProperties, Course, EntityId, Task } from '@shared/domain'; +import { ComponentProperties, Course, Task } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { ComponentType } from '@src/shared/domain/entity/lesson.entity'; import { CommonCartridgeFileBuilder, diff --git a/apps/server/src/modules/learnroom/service/course-copy.service.spec.ts b/apps/server/src/modules/learnroom/service/course-copy.service.spec.ts index 969360dcc2e..f1f09ced790 100644 --- a/apps/server/src/modules/learnroom/service/course-copy.service.spec.ts +++ b/apps/server/src/modules/learnroom/service/course-copy.service.spec.ts @@ -1,6 +1,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { CopyElementType, CopyHelperService, CopyStatusEnum } from '@modules/copy-helper'; +import { LessonCopyService } from '@modules/lesson/service'; import { Test, TestingModule } from '@nestjs/testing'; -import { Course } from '@shared/domain'; +import { Course } from '@shared/domain/entity'; import { BoardRepo, CourseRepo, UserRepo } from '@shared/repo'; import { boardFactory, @@ -10,8 +12,6 @@ import { setupEntities, userFactory, } from '@shared/testing'; -import { CopyElementType, CopyHelperService, CopyStatusEnum } from '@modules/copy-helper'; -import { LessonCopyService } from '@modules/lesson/service'; import { BoardCopyService } from './board-copy.service'; import { CourseCopyService } from './course-copy.service'; import { RoomsService } from './rooms.service'; diff --git a/apps/server/src/modules/learnroom/service/course-copy.service.ts b/apps/server/src/modules/learnroom/service/course-copy.service.ts index 51f98bb436b..65dc598d237 100644 --- a/apps/server/src/modules/learnroom/service/course-copy.service.ts +++ b/apps/server/src/modules/learnroom/service/course-copy.service.ts @@ -1,7 +1,8 @@ +import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; import { Injectable } from '@nestjs/common'; -import { Course, EntityId, User } from '@shared/domain'; +import { Course, User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { BoardRepo, CourseRepo, UserRepo } from '@shared/repo'; -import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; import { BoardCopyService } from './board-copy.service'; import { RoomsService } from './rooms.service'; diff --git a/apps/server/src/modules/learnroom/service/course.service.spec.ts b/apps/server/src/modules/learnroom/service/course.service.spec.ts index fbf2f09b698..41732f8a11d 100644 --- a/apps/server/src/modules/learnroom/service/course.service.spec.ts +++ b/apps/server/src/modules/learnroom/service/course.service.spec.ts @@ -1,6 +1,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { Course } from '@shared/domain'; +import { Course } from '@shared/domain/entity'; import { CourseRepo, UserRepo } from '@shared/repo'; import { courseFactory, setupEntities, userFactory } from '@shared/testing'; import { CourseService } from './course.service'; diff --git a/apps/server/src/modules/learnroom/service/course.service.ts b/apps/server/src/modules/learnroom/service/course.service.ts index 76b441b42d8..82ff1153655 100644 --- a/apps/server/src/modules/learnroom/service/course.service.ts +++ b/apps/server/src/modules/learnroom/service/course.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@nestjs/common'; +import { Course } from '@shared/domain/entity'; +import { Counted, EntityId } from '@shared/domain/types'; import { CourseRepo } from '@shared/repo'; -import { Counted, Course, EntityId } from '@shared/domain'; @Injectable() export class CourseService { diff --git a/apps/server/src/modules/learnroom/service/coursegroup.service.ts b/apps/server/src/modules/learnroom/service/coursegroup.service.ts index 622cdbc5e9e..f1da14c8728 100644 --- a/apps/server/src/modules/learnroom/service/coursegroup.service.ts +++ b/apps/server/src/modules/learnroom/service/coursegroup.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { Counted, CourseGroup, EntityId } from '@shared/domain'; +import { CourseGroup } from '@shared/domain/entity'; +import { Counted, EntityId } from '@shared/domain/types'; import { CourseGroupRepo } from '@shared/repo'; @Injectable() diff --git a/apps/server/src/modules/learnroom/service/rooms.service.spec.ts b/apps/server/src/modules/learnroom/service/rooms.service.spec.ts index ef161ce179a..a720c83a1ba 100644 --- a/apps/server/src/modules/learnroom/service/rooms.service.spec.ts +++ b/apps/server/src/modules/learnroom/service/rooms.service.spec.ts @@ -6,7 +6,8 @@ import { CardService, ColumnBoardService, ColumnService, ContentElementService } import { LessonService } from '@modules/lesson'; import { TaskService } from '@modules/task'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReference, BoardExternalReferenceType, EntityId } from '@shared/domain'; +import { BoardExternalReference, BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BoardRepo } from '@shared/repo'; import { boardFactory, courseFactory, lessonFactory, setupEntities, taskFactory, userFactory } from '@shared/testing'; import { ColumnBoardTargetService } from './column-board-target.service'; diff --git a/apps/server/src/modules/learnroom/service/rooms.service.ts b/apps/server/src/modules/learnroom/service/rooms.service.ts index 19ddfd57be8..28671d0e526 100644 --- a/apps/server/src/modules/learnroom/service/rooms.service.ts +++ b/apps/server/src/modules/learnroom/service/rooms.service.ts @@ -3,7 +3,9 @@ import { ColumnBoardService } from '@modules/board'; import { LessonService } from '@modules/lesson'; import { TaskService } from '@modules/task'; import { Injectable } from '@nestjs/common'; -import { Board, BoardExternalReferenceType, ColumnBoardTarget, EntityId } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { Board, ColumnBoardTarget } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { BoardRepo } from '@shared/repo'; import { ColumnBoardTargetService } from './column-board-target.service'; diff --git a/apps/server/src/modules/learnroom/types/room-board.types.ts b/apps/server/src/modules/learnroom/types/room-board.types.ts index bcb5baab097..6ec8632c294 100644 --- a/apps/server/src/modules/learnroom/types/room-board.types.ts +++ b/apps/server/src/modules/learnroom/types/room-board.types.ts @@ -1,4 +1,5 @@ -import { EntityId, TaskWithStatusVo } from '@shared/domain'; +import { TaskWithStatusVo } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; export type RoomBoardDTO = { roomId: string; diff --git a/apps/server/src/modules/learnroom/uc/course-copy.uc.spec.ts b/apps/server/src/modules/learnroom/uc/course-copy.uc.spec.ts index 9e051dae6da..087104ac7af 100644 --- a/apps/server/src/modules/learnroom/uc/course-copy.uc.spec.ts +++ b/apps/server/src/modules/learnroom/uc/course-copy.uc.spec.ts @@ -1,12 +1,12 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Configuration } from '@hpi-schul-cloud/commons'; +import { AuthorizationContextBuilder } from '@modules/authorization'; +import { AuthorizableReferenceType, AuthorizationReferenceService } from '@modules/authorization/domain'; +import { CopyElementType, CopyStatusEnum } from '@modules/copy-helper'; import { ForbiddenException, InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { courseFactory, setupEntities, userFactory } from '@shared/testing'; -import { AuthorizationContextBuilder } from '@modules/authorization'; -import { AuthorizationReferenceService, AuthorizableReferenceType } from '@modules/authorization/domain'; -import { CopyElementType, CopyStatusEnum } from '@modules/copy-helper'; import { CourseCopyService } from '../service'; import { CourseCopyUC } from './course-copy.uc'; diff --git a/apps/server/src/modules/learnroom/uc/course-copy.uc.ts b/apps/server/src/modules/learnroom/uc/course-copy.uc.ts index 19b94a9c238..995298fa666 100644 --- a/apps/server/src/modules/learnroom/uc/course-copy.uc.ts +++ b/apps/server/src/modules/learnroom/uc/course-copy.uc.ts @@ -1,9 +1,10 @@ import { Configuration } from '@hpi-schul-cloud/commons'; -import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { EntityId, Permission } from '@shared/domain'; import { AuthorizationContextBuilder } from '@modules/authorization'; -import { AuthorizationReferenceService, AuthorizableReferenceType } from '@modules/authorization/domain'; +import { AuthorizableReferenceType, AuthorizationReferenceService } from '@modules/authorization/domain'; import { CopyStatus } from '@modules/copy-helper'; +import { Injectable, InternalServerErrorException } from '@nestjs/common'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { CourseCopyService } from '../service'; @Injectable() diff --git a/apps/server/src/modules/learnroom/uc/course-export.uc.ts b/apps/server/src/modules/learnroom/uc/course-export.uc.ts index 758b1b550d7..bbb4a388157 100644 --- a/apps/server/src/modules/learnroom/uc/course-export.uc.ts +++ b/apps/server/src/modules/learnroom/uc/course-export.uc.ts @@ -1,7 +1,8 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId, Permission } from '@shared/domain'; import { AuthorizationContextBuilder } from '@modules/authorization'; -import { AuthorizationReferenceService, AuthorizableReferenceType } from '@modules/authorization/domain'; +import { AuthorizableReferenceType, AuthorizationReferenceService } from '@modules/authorization/domain'; +import { Injectable } from '@nestjs/common'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { CommonCartridgeVersion } from '../common-cartridge'; import { CommonCartridgeExportService } from '../service/common-cartridge-export.service'; diff --git a/apps/server/src/modules/learnroom/uc/course.uc.spec.ts b/apps/server/src/modules/learnroom/uc/course.uc.spec.ts index 3ab86b82c65..c12c148a3f6 100644 --- a/apps/server/src/modules/learnroom/uc/course.uc.spec.ts +++ b/apps/server/src/modules/learnroom/uc/course.uc.spec.ts @@ -1,6 +1,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { SortOrder } from '@shared/domain'; +import { SortOrder } from '@shared/domain/interface'; import { CourseRepo } from '@shared/repo'; import { courseFactory, setupEntities } from '@shared/testing'; import { CourseUc } from './course.uc'; diff --git a/apps/server/src/modules/learnroom/uc/course.uc.ts b/apps/server/src/modules/learnroom/uc/course.uc.ts index 852bf14a3e0..fb901bb8c10 100644 --- a/apps/server/src/modules/learnroom/uc/course.uc.ts +++ b/apps/server/src/modules/learnroom/uc/course.uc.ts @@ -1,6 +1,8 @@ import { Injectable } from '@nestjs/common'; import { PaginationParams } from '@shared/controller/'; -import { Counted, Course, EntityId, SortOrder } from '@shared/domain'; +import { Course } from '@shared/domain/entity'; +import { SortOrder } from '@shared/domain/interface'; +import { Counted, EntityId } from '@shared/domain/types'; import { CourseRepo } from '@shared/repo'; @Injectable() diff --git a/apps/server/src/modules/learnroom/uc/dashboard.uc.spec.ts b/apps/server/src/modules/learnroom/uc/dashboard.uc.spec.ts index 309e139b7cd..deca332c1f0 100644 --- a/apps/server/src/modules/learnroom/uc/dashboard.uc.spec.ts +++ b/apps/server/src/modules/learnroom/uc/dashboard.uc.spec.ts @@ -1,15 +1,9 @@ import { createMock } from '@golevelup/ts-jest'; import { NotFoundException } from '@nestjs/common/'; import { Test, TestingModule } from '@nestjs/testing'; -import { - Course, - DashboardEntity, - EntityId, - GridElement, - LearnroomMetadata, - LearnroomTypes, - SortOrder, -} from '@shared/domain'; +import { Course, DashboardEntity, GridElement } from '@shared/domain/entity'; +import { SortOrder } from '@shared/domain/interface'; +import { EntityId, LearnroomMetadata, LearnroomTypes } from '@shared/domain/types'; import { CourseRepo, IDashboardRepo } from '@shared/repo'; import { setupEntities } from '@shared/testing'; import { DashboardUc } from './dashboard.uc'; diff --git a/apps/server/src/modules/learnroom/uc/dashboard.uc.ts b/apps/server/src/modules/learnroom/uc/dashboard.uc.ts index 1e1df78fcba..da4824791bf 100644 --- a/apps/server/src/modules/learnroom/uc/dashboard.uc.ts +++ b/apps/server/src/modules/learnroom/uc/dashboard.uc.ts @@ -1,5 +1,7 @@ import { Inject, Injectable, NotFoundException } from '@nestjs/common'; -import { DashboardEntity, EntityId, GridPosition, GridPositionWithGroupIndex, SortOrder } from '@shared/domain'; +import { DashboardEntity, GridPosition, GridPositionWithGroupIndex } from '@shared/domain/entity'; +import { SortOrder } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { CourseRepo, IDashboardRepo } from '@shared/repo'; // import { NotFound } from '@feathersjs/errors'; // wrong import? see NotFoundException diff --git a/apps/server/src/modules/learnroom/uc/lesson-copy.uc.spec.ts b/apps/server/src/modules/learnroom/uc/lesson-copy.uc.spec.ts index 6f148abc94f..a24643a8183 100644 --- a/apps/server/src/modules/learnroom/uc/lesson-copy.uc.spec.ts +++ b/apps/server/src/modules/learnroom/uc/lesson-copy.uc.spec.ts @@ -6,7 +6,7 @@ import { CopyElementType, CopyHelperService, CopyStatusEnum } from '@modules/cop import { LessonCopyService, LessonService } from '@modules/lesson'; import { ForbiddenException, InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { CourseRepo, UserRepo } from '@shared/repo'; import { courseFactory, lessonFactory, setupEntities, userFactory } from '@shared/testing'; import { LessonCopyUC } from './lesson-copy.uc'; diff --git a/apps/server/src/modules/learnroom/uc/lesson-copy.uc.ts b/apps/server/src/modules/learnroom/uc/lesson-copy.uc.ts index c5c75a6e011..09d7dd41260 100644 --- a/apps/server/src/modules/learnroom/uc/lesson-copy.uc.ts +++ b/apps/server/src/modules/learnroom/uc/lesson-copy.uc.ts @@ -3,8 +3,9 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/auth import { CopyHelperService, CopyStatus } from '@modules/copy-helper'; import { LessonCopyParentParams, LessonCopyService, LessonService } from '@modules/lesson'; import { ForbiddenException, Injectable, InternalServerErrorException } from '@nestjs/common'; -import { Course, EntityId, LessonEntity, User } from '@shared/domain'; +import { Course, LessonEntity, User } from '@shared/domain/entity'; import { Permission } from '@shared/domain/interface/permission.enum'; +import { EntityId } from '@shared/domain/types'; import { CourseRepo } from '@shared/repo'; @Injectable() diff --git a/apps/server/src/modules/learnroom/uc/room-board-dto.factory.spec.ts b/apps/server/src/modules/learnroom/uc/room-board-dto.factory.spec.ts index f983342f4f8..c63826163cb 100644 --- a/apps/server/src/modules/learnroom/uc/room-board-dto.factory.spec.ts +++ b/apps/server/src/modules/learnroom/uc/room-board-dto.factory.spec.ts @@ -1,8 +1,9 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { IConfig } from '@hpi-schul-cloud/commons/lib/interfaces/IConfig'; +import { AuthorizationService } from '@modules/authorization'; import { Test, TestingModule } from '@nestjs/testing'; -import { Board, Course, LessonEntity, Task, TaskWithStatusVo, User } from '@shared/domain'; +import { Board, Course, LessonEntity, Task, TaskWithStatusVo, User } from '@shared/domain/entity'; import { boardFactory, columnboardBoardElementFactory, @@ -13,7 +14,6 @@ import { taskFactory, userFactory, } from '@shared/testing'; -import { AuthorizationService } from '@modules/authorization'; import { LessonMetaData } from '../types'; import { RoomBoardDTOFactory } from './room-board-dto.factory'; import { RoomsAuthorisationService } from './rooms.authorisation.service'; diff --git a/apps/server/src/modules/learnroom/uc/room-board-dto.factory.ts b/apps/server/src/modules/learnroom/uc/room-board-dto.factory.ts index 0a74a5a34e8..785f513ba25 100644 --- a/apps/server/src/modules/learnroom/uc/room-board-dto.factory.ts +++ b/apps/server/src/modules/learnroom/uc/room-board-dto.factory.ts @@ -5,16 +5,16 @@ import { Board, BoardElement, BoardElementType, - ColumnboardBoardElement, ColumnBoardTarget, + ColumnboardBoardElement, Course, LessonEntity, - Permission, Task, - TaskStatus, TaskWithStatusVo, User, -} from '@shared/domain'; +} from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { TaskStatus } from '@shared/domain/types'; import { ColumnBoardMetaData, LessonMetaData, diff --git a/apps/server/src/modules/learnroom/uc/rooms.authorisation.service.ts b/apps/server/src/modules/learnroom/uc/rooms.authorisation.service.ts index bb64fba3f3f..8be1e72c1d8 100644 --- a/apps/server/src/modules/learnroom/uc/rooms.authorisation.service.ts +++ b/apps/server/src/modules/learnroom/uc/rooms.authorisation.service.ts @@ -1,5 +1,5 @@ import { Injectable, NotImplementedException } from '@nestjs/common'; -import { Course, LessonEntity, Task, User } from '@shared/domain'; +import { Course, LessonEntity, Task, User } from '@shared/domain/entity'; export enum TaskParentPermission { read, diff --git a/apps/server/src/modules/learnroom/uc/rooms.uc.ts b/apps/server/src/modules/learnroom/uc/rooms.uc.ts index 8d3e31c15f7..cc513f3b6f7 100644 --- a/apps/server/src/modules/learnroom/uc/rooms.uc.ts +++ b/apps/server/src/modules/learnroom/uc/rooms.uc.ts @@ -1,5 +1,5 @@ import { ForbiddenException, Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { BoardRepo, CourseRepo, UserRepo } from '@shared/repo'; import { RoomsService } from '../service/rooms.service'; import { RoomBoardDTO } from '../types'; diff --git a/apps/server/src/modules/legacy-school/repo/schoolyear.repo.integration.spec.ts b/apps/server/src/modules/legacy-school/repo/schoolyear.repo.integration.spec.ts index 1688e9e6d97..8f6f1f45e65 100644 --- a/apps/server/src/modules/legacy-school/repo/schoolyear.repo.integration.spec.ts +++ b/apps/server/src/modules/legacy-school/repo/schoolyear.repo.integration.spec.ts @@ -1,7 +1,7 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { SchoolYearEntity } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { SchoolYearEntity } from '@shared/domain/entity'; import { cleanupCollections } from '@shared/testing'; import { schoolYearFactory } from '@shared/testing/factory/schoolyear.factory'; import { SchoolYearRepo } from './schoolyear.repo'; diff --git a/apps/server/src/modules/legacy-school/repo/schoolyear.repo.ts b/apps/server/src/modules/legacy-school/repo/schoolyear.repo.ts index b4e79cdc283..14115f36002 100644 --- a/apps/server/src/modules/legacy-school/repo/schoolyear.repo.ts +++ b/apps/server/src/modules/legacy-school/repo/schoolyear.repo.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { SchoolYearEntity } from '@shared/domain'; +import { SchoolYearEntity } from '@shared/domain/entity'; import { BaseRepo } from '@shared/repo/base.repo'; @Injectable() diff --git a/apps/server/src/modules/legacy-school/service/federal-state.service.spec.ts b/apps/server/src/modules/legacy-school/service/federal-state.service.spec.ts index 1ca06d22d59..96ca86ce3a5 100644 --- a/apps/server/src/modules/legacy-school/service/federal-state.service.spec.ts +++ b/apps/server/src/modules/legacy-school/service/federal-state.service.spec.ts @@ -1,10 +1,10 @@ +import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; +import { FederalStateEntity } from '@shared/domain/entity'; import { FederalStateRepo } from '@shared/repo'; import { federalStateFactory, setupEntities } from '@shared/testing'; -import { FederalStateEntity } from '@shared/domain'; -import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { FederalStateService } from './federal-state.service'; import { FederalStateNames } from '../types/federal-state-names.enum'; +import { FederalStateService } from './federal-state.service'; describe('FederalStateService', () => { let module: TestingModule; diff --git a/apps/server/src/modules/legacy-school/service/federal-state.service.ts b/apps/server/src/modules/legacy-school/service/federal-state.service.ts index 480fcabe988..941771b3178 100644 --- a/apps/server/src/modules/legacy-school/service/federal-state.service.ts +++ b/apps/server/src/modules/legacy-school/service/federal-state.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; +import { FederalStateEntity } from '@shared/domain/entity'; import { FederalStateRepo } from '@shared/repo'; -import { FederalStateEntity } from '@shared/domain'; @Injectable() export class FederalStateService { diff --git a/apps/server/src/modules/legacy-school/service/legacy-school.service.spec.ts b/apps/server/src/modules/legacy-school/service/legacy-school.service.spec.ts index 57cc3c6f1ee..cda4d6777fa 100644 --- a/apps/server/src/modules/legacy-school/service/legacy-school.service.spec.ts +++ b/apps/server/src/modules/legacy-school/service/legacy-school.service.spec.ts @@ -1,6 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, SchoolFeatures } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; +import { SchoolFeatures } from '@shared/domain/entity'; import { LegacySchoolRepo } from '@shared/repo'; import { legacySchoolDoFactory, setupEntities } from '@shared/testing'; import { LegacySchoolService } from './legacy-school.service'; diff --git a/apps/server/src/modules/legacy-school/service/legacy-school.service.ts b/apps/server/src/modules/legacy-school/service/legacy-school.service.ts index 1ed43fd5f07..98c29cc0118 100644 --- a/apps/server/src/modules/legacy-school/service/legacy-school.service.ts +++ b/apps/server/src/modules/legacy-school/service/legacy-school.service.ts @@ -1,5 +1,7 @@ import { Injectable } from '@nestjs/common'; -import { EntityId, LegacySchoolDo, SchoolFeatures } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; +import { SchoolFeatures } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { LegacySchoolRepo } from '@shared/repo'; import { SchoolValidationService } from './validation'; diff --git a/apps/server/src/modules/legacy-school/service/school-year.service.spec.ts b/apps/server/src/modules/legacy-school/service/school-year.service.spec.ts index 4aded660643..4a580159a79 100644 --- a/apps/server/src/modules/legacy-school/service/school-year.service.spec.ts +++ b/apps/server/src/modules/legacy-school/service/school-year.service.spec.ts @@ -1,6 +1,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { SchoolYearEntity } from '@shared/domain'; +import { SchoolYearEntity } from '@shared/domain/entity'; import { setupEntities } from '@shared/testing'; import { schoolYearFactory } from '@shared/testing/factory/schoolyear.factory'; import { SchoolYearRepo } from '../repo'; diff --git a/apps/server/src/modules/legacy-school/service/school-year.service.ts b/apps/server/src/modules/legacy-school/service/school-year.service.ts index c153122e5d1..d9a70b7a841 100644 --- a/apps/server/src/modules/legacy-school/service/school-year.service.ts +++ b/apps/server/src/modules/legacy-school/service/school-year.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { EntityId, SchoolYearEntity } from '@shared/domain'; +import { SchoolYearEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { SchoolYearRepo } from '../repo'; @Injectable() diff --git a/apps/server/src/modules/legacy-school/service/validation/school-validation.service.spec.ts b/apps/server/src/modules/legacy-school/service/validation/school-validation.service.spec.ts index 065a65fe446..e6d56b75c6e 100644 --- a/apps/server/src/modules/legacy-school/service/validation/school-validation.service.spec.ts +++ b/apps/server/src/modules/legacy-school/service/validation/school-validation.service.spec.ts @@ -1,6 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo } from '@shared/domain'; + +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { LegacySchoolRepo } from '@shared/repo'; import { legacySchoolDoFactory } from '@shared/testing'; import { SchoolNumberDuplicateLoggableException } from '../../loggable'; diff --git a/apps/server/src/modules/legacy-school/service/validation/school-validation.service.ts b/apps/server/src/modules/legacy-school/service/validation/school-validation.service.ts index e934b770407..3a7814e0a7b 100644 --- a/apps/server/src/modules/legacy-school/service/validation/school-validation.service.ts +++ b/apps/server/src/modules/legacy-school/service/validation/school-validation.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { LegacySchoolDo } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { LegacySchoolRepo } from '@shared/repo'; import { SchoolNumberDuplicateLoggableException } from '../../loggable'; diff --git a/apps/server/src/modules/lesson/controller/api-test/lesson-delete.api.spec.ts b/apps/server/src/modules/lesson/controller/api-test/lesson-delete.api.spec.ts index d4a707420de..01480d90a62 100644 --- a/apps/server/src/modules/lesson/controller/api-test/lesson-delete.api.spec.ts +++ b/apps/server/src/modules/lesson/controller/api-test/lesson-delete.api.spec.ts @@ -1,17 +1,17 @@ import { createMock } from '@golevelup/ts-jest'; import { EntityManager } from '@mikro-orm/core'; +import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; +import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test } from '@nestjs/testing'; -import { LessonEntity } from '@shared/domain'; +import { LessonEntity } from '@shared/domain/entity'; import { + TestApiClient, + UserAndAccountTestFactory, courseFactory, courseGroupFactory, lessonFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; -import { ServerTestModule } from '@modules/server'; import { ObjectId } from 'bson'; describe('Lesson Controller (API) - delete', () => { diff --git a/apps/server/src/modules/lesson/repository/lesson-scope.ts b/apps/server/src/modules/lesson/repository/lesson-scope.ts index 81529b03f88..ecc6f15352b 100644 --- a/apps/server/src/modules/lesson/repository/lesson-scope.ts +++ b/apps/server/src/modules/lesson/repository/lesson-scope.ts @@ -1,4 +1,5 @@ -import { EntityId, LessonEntity } from '@shared/domain'; +import { LessonEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { Scope } from '@shared/repo'; export class LessonScope extends Scope { diff --git a/apps/server/src/modules/lesson/repository/lesson.repo.integration.spec.ts b/apps/server/src/modules/lesson/repository/lesson.repo.integration.spec.ts index 3eb94f6fc5b..3a5d979aa95 100644 --- a/apps/server/src/modules/lesson/repository/lesson.repo.integration.spec.ts +++ b/apps/server/src/modules/lesson/repository/lesson.repo.integration.spec.ts @@ -1,6 +1,6 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { ComponentProperties, ComponentType, LessonEntity } from '@shared/domain'; +import { ComponentProperties, ComponentType, LessonEntity } from '@shared/domain/entity'; import { cleanupCollections, courseFactory, lessonFactory, materialFactory, taskFactory } from '@shared/testing'; import { MongoMemoryDatabaseModule } from '@infra/database'; diff --git a/apps/server/src/modules/lesson/repository/lesson.repo.ts b/apps/server/src/modules/lesson/repository/lesson.repo.ts index 76332a7cab5..bad3db0ca2e 100644 --- a/apps/server/src/modules/lesson/repository/lesson.repo.ts +++ b/apps/server/src/modules/lesson/repository/lesson.repo.ts @@ -1,7 +1,9 @@ import { EntityDictionary } from '@mikro-orm/core'; -import { Injectable } from '@nestjs/common'; -import { Counted, EntityId, LessonEntity, SortOrder } from '@shared/domain'; import { ObjectId } from '@mikro-orm/mongodb'; +import { Injectable } from '@nestjs/common'; +import { LessonEntity } from '@shared/domain/entity'; +import { SortOrder } from '@shared/domain/interface'; +import { Counted, EntityId } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo'; import { LessonScope } from './lesson-scope'; diff --git a/apps/server/src/modules/lesson/service/etherpad.service.spec.ts b/apps/server/src/modules/lesson/service/etherpad.service.spec.ts index 02bc68e67bf..001ebf5b526 100644 --- a/apps/server/src/modules/lesson/service/etherpad.service.spec.ts +++ b/apps/server/src/modules/lesson/service/etherpad.service.spec.ts @@ -1,8 +1,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { FeathersServiceProvider } from '@infra/feathers/feathers-service.provider'; import { ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId } from '@shared/domain'; -import { FeathersServiceProvider } from '@infra/feathers/feathers-service.provider'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { EtherpadService } from './etherpad.service'; diff --git a/apps/server/src/modules/lesson/service/lesson-copy.service.spec.ts b/apps/server/src/modules/lesson/service/lesson-copy.service.spec.ts index 05f9e452aa5..3d7a5b14e62 100644 --- a/apps/server/src/modules/lesson/service/lesson-copy.service.spec.ts +++ b/apps/server/src/modules/lesson/service/lesson-copy.service.spec.ts @@ -4,6 +4,7 @@ import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from ' import { CopyFilesService } from '@modules/files-storage-client'; import { TaskCopyService } from '@modules/task'; import { Test, TestingModule } from '@nestjs/testing'; +import { AuthorizableObject } from '@shared/domain/domain-object'; import { BaseEntity, ComponentEtherpadProperties, @@ -13,11 +14,10 @@ import { ComponentProperties, ComponentTextProperties, ComponentType, - EntityId, LessonEntity, Material, -} from '@shared/domain'; -import { AuthorizableObject } from '@shared/domain/domain-object'; +} from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { courseFactory, lessonFactory, diff --git a/apps/server/src/modules/lesson/service/lesson-copy.service.ts b/apps/server/src/modules/lesson/service/lesson-copy.service.ts index 00cf3cee8b9..9e9be810e0a 100644 --- a/apps/server/src/modules/lesson/service/lesson-copy.service.ts +++ b/apps/server/src/modules/lesson/service/lesson-copy.service.ts @@ -13,7 +13,7 @@ import { ComponentType, LessonEntity, Material, -} from '@shared/domain'; +} from '@shared/domain/entity'; import { randomBytes } from 'crypto'; import { LessonRepo } from '../repository'; import { LessonCopyParams } from '../types'; diff --git a/apps/server/src/modules/lesson/service/lesson.service.spec.ts b/apps/server/src/modules/lesson/service/lesson.service.spec.ts index 958677a3e26..dc1b320e426 100644 --- a/apps/server/src/modules/lesson/service/lesson.service.spec.ts +++ b/apps/server/src/modules/lesson/service/lesson.service.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { Test, TestingModule } from '@nestjs/testing'; -import { ComponentProperties, ComponentType } from '@shared/domain'; +import { ComponentProperties, ComponentType } from '@shared/domain/entity'; import { lessonFactory, setupEntities } from '@shared/testing'; import { LessonRepo } from '../repository'; import { LessonService } from './lesson.service'; diff --git a/apps/server/src/modules/lesson/service/lesson.service.ts b/apps/server/src/modules/lesson/service/lesson.service.ts index 7359d041f51..75cd3e459cb 100644 --- a/apps/server/src/modules/lesson/service/lesson.service.ts +++ b/apps/server/src/modules/lesson/service/lesson.service.ts @@ -1,6 +1,7 @@ import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { Injectable } from '@nestjs/common'; -import { ComponentProperties, Counted, EntityId, LessonEntity } from '@shared/domain'; +import { ComponentProperties, LessonEntity } from '@shared/domain/entity'; +import { Counted, EntityId } from '@shared/domain/types'; import { AuthorizationLoaderService } from '@src/modules/authorization'; import { LessonRepo } from '../repository'; diff --git a/apps/server/src/modules/lesson/service/nexboard.service.spec.ts b/apps/server/src/modules/lesson/service/nexboard.service.spec.ts index 8085a5fdd89..6f53e361d84 100644 --- a/apps/server/src/modules/lesson/service/nexboard.service.spec.ts +++ b/apps/server/src/modules/lesson/service/nexboard.service.spec.ts @@ -1,8 +1,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { FeathersServiceProvider } from '@infra/feathers'; import { ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId } from '@shared/domain'; -import { FeathersServiceProvider } from '@infra/feathers'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { NexboardService } from './nexboard.service'; diff --git a/apps/server/src/modules/lesson/types/lesson-copy-parent.params.ts b/apps/server/src/modules/lesson/types/lesson-copy-parent.params.ts index 983c0439cfe..8957c8b0355 100644 --- a/apps/server/src/modules/lesson/types/lesson-copy-parent.params.ts +++ b/apps/server/src/modules/lesson/types/lesson-copy-parent.params.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; export type LessonCopyParentParams = { courseId?: EntityId; diff --git a/apps/server/src/modules/lesson/types/lesson-copy.params.ts b/apps/server/src/modules/lesson/types/lesson-copy.params.ts index 95967237e65..1bd9be48eb9 100644 --- a/apps/server/src/modules/lesson/types/lesson-copy.params.ts +++ b/apps/server/src/modules/lesson/types/lesson-copy.params.ts @@ -1,4 +1,5 @@ -import { Course, EntityId, User } from '@shared/domain'; +import { Course, User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; export type LessonCopyParams = { originalLessonId: EntityId; diff --git a/apps/server/src/modules/lesson/uc/lesson.uc.spec.ts b/apps/server/src/modules/lesson/uc/lesson.uc.spec.ts index 72448f8b770..5a1da45fdd4 100644 --- a/apps/server/src/modules/lesson/uc/lesson.uc.spec.ts +++ b/apps/server/src/modules/lesson/uc/lesson.uc.spec.ts @@ -1,8 +1,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { lessonFactory, setupEntities, userFactory } from '@shared/testing'; -import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { LessonService } from '../service'; import { LessonUC } from './lesson.uc'; diff --git a/apps/server/src/modules/lesson/uc/lesson.uc.ts b/apps/server/src/modules/lesson/uc/lesson.uc.ts index 063a43ce9b9..0e670a6b342 100644 --- a/apps/server/src/modules/lesson/uc/lesson.uc.ts +++ b/apps/server/src/modules/lesson/uc/lesson.uc.ts @@ -1,6 +1,7 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId, Permission } from '@shared/domain'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; +import { Injectable } from '@nestjs/common'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { LessonService } from '../service'; @Injectable() diff --git a/apps/server/src/modules/lti-tool/service/lti-tool.service.spec.ts b/apps/server/src/modules/lti-tool/service/lti-tool.service.spec.ts index d59bbaa9f10..dc3a44e280c 100644 --- a/apps/server/src/modules/lti-tool/service/lti-tool.service.spec.ts +++ b/apps/server/src/modules/lti-tool/service/lti-tool.service.spec.ts @@ -1,6 +1,6 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; -import { LtiToolDO } from '@shared/domain'; +import { LtiToolDO } from '@shared/domain/domainobject'; import { LtiToolRepo } from '@shared/repo'; import { ltiToolDOFactory } from '@shared/testing'; import { LtiToolService } from './lti-tool.service'; diff --git a/apps/server/src/modules/management/management-server.module.ts b/apps/server/src/modules/management/management-server.module.ts index c24bf90cc09..ba2feba4dfe 100644 --- a/apps/server/src/modules/management/management-server.module.ts +++ b/apps/server/src/modules/management/management-server.module.ts @@ -1,9 +1,9 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; +import { MongoDatabaseModuleOptions } from '@infra/database/mongo-memory-database/types'; import { Dictionary, IPrimaryKey } from '@mikro-orm/core'; import { MikroOrmModule, MikroOrmModuleSyncOptions } from '@mikro-orm/nestjs'; import { DynamicModule, Module, NotFoundException } from '@nestjs/common'; -import { ALL_ENTITIES } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; -import { MongoDatabaseModuleOptions } from '@infra/database/mongo-memory-database/types'; +import { ALL_ENTITIES } from '@shared/domain/entity'; import { DB_PASSWORD, DB_URL, DB_USERNAME } from '@src/config'; import { ManagementModule } from './management.module'; diff --git a/apps/server/src/modules/management/seed-data/generateSeedData.ts b/apps/server/src/modules/management/seed-data/generateSeedData.ts index d8f1e915a21..3073d492a4d 100644 --- a/apps/server/src/modules/management/seed-data/generateSeedData.ts +++ b/apps/server/src/modules/management/seed-data/generateSeedData.ts @@ -1,4 +1,4 @@ -import { BaseEntity } from '@shared/domain'; +import { BaseEntity } from '@shared/domain/entity'; import { generateFederalStates } from './federalstates'; import { generateRole } from './roles'; import { generateSchools } from './schools'; diff --git a/apps/server/src/modules/management/seed-data/roles.spec.ts b/apps/server/src/modules/management/seed-data/roles.spec.ts index cc5408ded27..43f74d7d7e8 100644 --- a/apps/server/src/modules/management/seed-data/roles.spec.ts +++ b/apps/server/src/modules/management/seed-data/roles.spec.ts @@ -1,4 +1,4 @@ -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; import { setupEntities } from '@shared/testing'; import * as roleModule from './roles'; diff --git a/apps/server/src/modules/management/seed-data/roles.ts b/apps/server/src/modules/management/seed-data/roles.ts index 3fba9d7d8ee..b8205b6a897 100644 --- a/apps/server/src/modules/management/seed-data/roles.ts +++ b/apps/server/src/modules/management/seed-data/roles.ts @@ -1,6 +1,7 @@ // All user accounts are organized by school in a single array -import { Permission, Role, RoleName, RoleProperties } from '@shared/domain'; +import { Role, RoleProperties } from '@shared/domain/entity'; +import { Permission, RoleName } from '@shared/domain/interface'; import { roleFactory } from '@shared/testing'; import { DeepPartial } from 'fishery'; diff --git a/apps/server/src/modules/management/seed-data/schools.ts b/apps/server/src/modules/management/seed-data/schools.ts index 9c0cec78153..1d9ae47898d 100644 --- a/apps/server/src/modules/management/seed-data/schools.ts +++ b/apps/server/src/modules/management/seed-data/schools.ts @@ -6,7 +6,7 @@ import { SchoolRoles, SchoolYearEntity, SystemEntity, -} from '@shared/domain'; +} from '@shared/domain/entity'; import { federalStateFactory, schoolFactory } from '@shared/testing'; import { DeepPartial } from 'fishery'; import { EFederalState } from './federalstates'; diff --git a/apps/server/src/modules/management/seed-data/schoolyears.ts b/apps/server/src/modules/management/seed-data/schoolyears.ts index c52dee77642..0198a00a5bd 100644 --- a/apps/server/src/modules/management/seed-data/schoolyears.ts +++ b/apps/server/src/modules/management/seed-data/schoolyears.ts @@ -1,4 +1,4 @@ -import { SchoolYearProperties } from '@shared/domain'; +import { SchoolYearProperties } from '@shared/domain/entity'; import { schoolYearFactory } from '@shared/testing/factory/schoolyear.factory'; import { DeepPartial } from 'fishery'; diff --git a/apps/server/src/modules/management/seed-data/systems.ts b/apps/server/src/modules/management/seed-data/systems.ts index 7aca67d896d..15b4e6a9306 100644 --- a/apps/server/src/modules/management/seed-data/systems.ts +++ b/apps/server/src/modules/management/seed-data/systems.ts @@ -1,5 +1,5 @@ /* eslint-disable no-template-curly-in-string */ -import { SystemEntityProps } from '@shared/domain'; +import { SystemEntityProps } from '@shared/domain/entity'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { systemEntityFactory } from '@shared/testing'; import { DeepPartial } from 'fishery'; diff --git a/apps/server/src/modules/management/uc/board-management.uc.ts b/apps/server/src/modules/management/uc/board-management.uc.ts index 8fa595690e8..1068df45a0b 100644 --- a/apps/server/src/modules/management/uc/board-management.uc.ts +++ b/apps/server/src/modules/management/uc/board-management.uc.ts @@ -1,7 +1,9 @@ +import { ConsoleWriterService } from '@infra/console'; import { EntityManager } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { BoardExternalReferenceType, BoardNode, Course, EntityId, InputFormat } from '@shared/domain'; -import { ConsoleWriterService } from '@infra/console'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; +import { BoardNode, Course } from '@shared/domain/entity'; +import { EntityId, InputFormat } from '@shared/domain/types'; import { cardNodeFactory, columnBoardNodeFactory, diff --git a/apps/server/src/modules/management/uc/database-management.uc.spec.ts b/apps/server/src/modules/management/uc/database-management.uc.spec.ts index 0aa2c005a39..251c34e0dc3 100644 --- a/apps/server/src/modules/management/uc/database-management.uc.spec.ts +++ b/apps/server/src/modules/management/uc/database-management.uc.spec.ts @@ -1,12 +1,12 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Configuration } from '@hpi-schul-cloud/commons/lib'; -import { EntityManager } from '@mikro-orm/mongodb'; -import { ConfigService } from '@nestjs/config'; -import { Test, TestingModule } from '@nestjs/testing'; -import { StorageProviderEntity, SystemEntity } from '@shared/domain'; import { DatabaseManagementService } from '@infra/database'; import { DefaultEncryptionService, LdapEncryptionService, SymetricKeyEncryptionService } from '@infra/encryption'; import { FileSystemAdapter } from '@infra/file-system'; +import { EntityManager } from '@mikro-orm/mongodb'; +import { ConfigService } from '@nestjs/config'; +import { Test, TestingModule } from '@nestjs/testing'; +import { StorageProviderEntity, SystemEntity } from '@shared/domain/entity'; import { setupEntities } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; import { ObjectId } from 'mongodb'; diff --git a/apps/server/src/modules/management/uc/database-management.uc.ts b/apps/server/src/modules/management/uc/database-management.uc.ts index 370c4652aeb..57da050fa15 100644 --- a/apps/server/src/modules/management/uc/database-management.uc.ts +++ b/apps/server/src/modules/management/uc/database-management.uc.ts @@ -5,7 +5,7 @@ import { FileSystemAdapter } from '@infra/file-system'; import { EntityManager } from '@mikro-orm/mongodb'; import { Inject, Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { StorageProviderEntity, SystemEntity } from '@shared/domain'; +import { StorageProviderEntity, SystemEntity } from '@shared/domain/entity'; import { LegacyLogger } from '@src/core/logger'; import { orderBy } from 'lodash'; import { BsonConverter } from '../converter/bson.converter'; diff --git a/apps/server/src/modules/meta-tag-extractor/service/url-handler/board-url-handler.spec.ts b/apps/server/src/modules/meta-tag-extractor/service/url-handler/board-url-handler.spec.ts index f7775b58f1f..a8587b6f274 100644 --- a/apps/server/src/modules/meta-tag-extractor/service/url-handler/board-url-handler.spec.ts +++ b/apps/server/src/modules/meta-tag-extractor/service/url-handler/board-url-handler.spec.ts @@ -2,7 +2,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ColumnBoardService } from '@modules/board'; import { CourseService } from '@modules/learnroom'; import { Test, TestingModule } from '@nestjs/testing'; -import { ColumnBoard } from '@shared/domain'; + +import { ColumnBoard } from '@shared/domain/domainobject'; import { setupEntities } from '@shared/testing'; import { BoardUrlHandler } from './board-url-handler'; diff --git a/apps/server/src/modules/meta-tag-extractor/service/url-handler/board-url-handler.ts b/apps/server/src/modules/meta-tag-extractor/service/url-handler/board-url-handler.ts index 013631244dd..0fff34ae377 100644 --- a/apps/server/src/modules/meta-tag-extractor/service/url-handler/board-url-handler.ts +++ b/apps/server/src/modules/meta-tag-extractor/service/url-handler/board-url-handler.ts @@ -1,7 +1,7 @@ import { ColumnBoardService } from '@modules/board'; import { CourseService } from '@modules/learnroom'; import { Injectable } from '@nestjs/common'; -import { BoardExternalReferenceType } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; import type { UrlHandler } from '../../interface/url-handler'; import { MetaData } from '../../types'; import { AbstractUrlHandler } from './abstract-url-handler'; diff --git a/apps/server/src/modules/meta-tag-extractor/service/url-handler/course-url-handler.spec.ts b/apps/server/src/modules/meta-tag-extractor/service/url-handler/course-url-handler.spec.ts index 75a43876de4..bce18e11e64 100644 --- a/apps/server/src/modules/meta-tag-extractor/service/url-handler/course-url-handler.spec.ts +++ b/apps/server/src/modules/meta-tag-extractor/service/url-handler/course-url-handler.spec.ts @@ -1,7 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { CourseService } from '@modules/learnroom'; import { Test, TestingModule } from '@nestjs/testing'; -import { Course } from '@shared/domain'; +import { Course } from '@shared/domain/entity'; import { setupEntities } from '@shared/testing'; import { CourseUrlHandler } from './course-url-handler'; diff --git a/apps/server/src/modules/meta-tag-extractor/service/url-handler/lesson-url-handler.spec.ts b/apps/server/src/modules/meta-tag-extractor/service/url-handler/lesson-url-handler.spec.ts index 53b59d86ab7..06f639cdb43 100644 --- a/apps/server/src/modules/meta-tag-extractor/service/url-handler/lesson-url-handler.spec.ts +++ b/apps/server/src/modules/meta-tag-extractor/service/url-handler/lesson-url-handler.spec.ts @@ -1,7 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { LessonService } from '@modules/lesson'; import { Test, TestingModule } from '@nestjs/testing'; -import { LessonEntity } from '@shared/domain'; +import { LessonEntity } from '@shared/domain/entity'; import { setupEntities } from '@shared/testing'; import { LessonUrlHandler } from './lesson-url-handler'; diff --git a/apps/server/src/modules/meta-tag-extractor/service/url-handler/task-url-handler.spec.ts b/apps/server/src/modules/meta-tag-extractor/service/url-handler/task-url-handler.spec.ts index 0423382f2a8..3b67a365a43 100644 --- a/apps/server/src/modules/meta-tag-extractor/service/url-handler/task-url-handler.spec.ts +++ b/apps/server/src/modules/meta-tag-extractor/service/url-handler/task-url-handler.spec.ts @@ -1,7 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { TaskService } from '@modules/task'; import { Test, TestingModule } from '@nestjs/testing'; -import { Task } from '@shared/domain'; +import { Task } from '@shared/domain/entity'; import { setupEntities } from '@shared/testing'; import { TaskUrlHandler } from './task-url-handler'; diff --git a/apps/server/src/modules/meta-tag-extractor/uc/meta-tag-extractor.uc.ts b/apps/server/src/modules/meta-tag-extractor/uc/meta-tag-extractor.uc.ts index 47ac53d88b0..93ff352a597 100644 --- a/apps/server/src/modules/meta-tag-extractor/uc/meta-tag-extractor.uc.ts +++ b/apps/server/src/modules/meta-tag-extractor/uc/meta-tag-extractor.uc.ts @@ -1,6 +1,6 @@ import { AuthorizationService } from '@modules/authorization'; import { Injectable, UnauthorizedException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { MetaTagExtractorService } from '../service'; import { MetaData } from '../types'; diff --git a/apps/server/src/modules/news/controller/api-test/news.api.spec.ts b/apps/server/src/modules/news/controller/api-test/news.api.spec.ts index 31e4a10af9a..0a951c69038 100644 --- a/apps/server/src/modules/news/controller/api-test/news.api.spec.ts +++ b/apps/server/src/modules/news/controller/api-test/news.api.spec.ts @@ -1,12 +1,13 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { ExecutionContext, INestApplication } from '@nestjs/common'; -import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, News, NewsTargetModel } from '@shared/domain'; -import { API_VALIDATION_ERROR_TYPE } from '@src/core/error/server-error-types'; import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { FeathersAuthorizationService } from '@modules/authorization'; import { CreateNewsParams, NewsListResponse, NewsResponse, UpdateNewsParams } from '@modules/news/controller/dto'; import { ServerTestModule } from '@modules/server/server.module'; +import { ExecutionContext, INestApplication } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { News } from '@shared/domain/entity'; +import { EntityId, NewsTargetModel } from '@shared/domain/types'; +import { API_VALIDATION_ERROR_TYPE } from '@src/core/error/server-error-types'; import { Request } from 'express'; import moment from 'moment'; import request from 'supertest'; diff --git a/apps/server/src/modules/news/controller/dto/create-news.params.ts b/apps/server/src/modules/news/controller/dto/create-news.params.ts index d86fda92978..6bc1d3049e5 100644 --- a/apps/server/src/modules/news/controller/dto/create-news.params.ts +++ b/apps/server/src/modules/news/controller/dto/create-news.params.ts @@ -1,7 +1,7 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { IsDate, IsEnum, IsMongoId, IsOptional, IsString } from 'class-validator'; -import { InputFormat, NewsTargetModel } from '@shared/domain'; import { SanitizeHtml } from '@shared/controller'; +import { InputFormat, NewsTargetModel } from '@shared/domain/types'; +import { IsDate, IsEnum, IsMongoId, IsOptional, IsString } from 'class-validator'; /** * DTO for creating a news document. @@ -15,6 +15,7 @@ export class CreateNewsParams { title!: string; @IsString() + // TODO add correct validation for input format @SanitizeHtml(InputFormat.RICH_TEXT) @ApiProperty({ description: 'Content of the News entity', diff --git a/apps/server/src/modules/news/controller/dto/filter-news.params.ts b/apps/server/src/modules/news/controller/dto/filter-news.params.ts index 37de6dac9c5..949281387c8 100644 --- a/apps/server/src/modules/news/controller/dto/filter-news.params.ts +++ b/apps/server/src/modules/news/controller/dto/filter-news.params.ts @@ -1,7 +1,7 @@ import { ApiPropertyOptional } from '@nestjs/swagger'; -import { IsBoolean, IsEnum, IsMongoId, IsOptional, IsString } from 'class-validator'; import { StringToBoolean } from '@shared/controller/transformer'; -import { NewsTargetModel } from '@shared/domain'; +import { NewsTargetModel } from '@shared/domain/types'; +import { IsBoolean, IsEnum, IsMongoId, IsOptional, IsString } from 'class-validator'; export class FilterNewsParams { @IsOptional() diff --git a/apps/server/src/modules/news/controller/dto/news.response.ts b/apps/server/src/modules/news/controller/dto/news.response.ts index 18016e46e14..766f40e19c2 100644 --- a/apps/server/src/modules/news/controller/dto/news.response.ts +++ b/apps/server/src/modules/news/controller/dto/news.response.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { PaginationResponse } from '@shared/controller'; -import { NewsTargetModel } from '@shared/domain'; +import { NewsTargetModel } from '@shared/domain/types'; import { SchoolInfoResponse } from './school-info.response'; import { TargetInfoResponse } from './target-info.response'; import { UserInfoResponse } from './user-info.response'; diff --git a/apps/server/src/modules/news/controller/dto/update-news.params.ts b/apps/server/src/modules/news/controller/dto/update-news.params.ts index 97c71d74862..f91b26eb46d 100644 --- a/apps/server/src/modules/news/controller/dto/update-news.params.ts +++ b/apps/server/src/modules/news/controller/dto/update-news.params.ts @@ -1,7 +1,7 @@ import { ApiPropertyOptional } from '@nestjs/swagger'; import { SanitizeHtml } from '@shared/controller'; +import { InputFormat } from '@shared/domain/types'; import { IsDate, IsOptional, IsString } from 'class-validator'; -import { InputFormat } from '@shared/domain'; /** * DTO for Updating a news document. diff --git a/apps/server/src/modules/news/loggable/news-crud-operation.loggable.ts b/apps/server/src/modules/news/loggable/news-crud-operation.loggable.ts index 45b14fca331..1d4c35845b1 100644 --- a/apps/server/src/modules/news/loggable/news-crud-operation.loggable.ts +++ b/apps/server/src/modules/news/loggable/news-crud-operation.loggable.ts @@ -1,6 +1,7 @@ -import { EntityId, News } from '@shared/domain'; +import { News } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { CrudOperation } from '@shared/types'; -import { LogMessage, Loggable } from '@src/core/logger'; +import { Loggable, LogMessage } from '@src/core/logger'; import { NewsMapper } from '../mapper/news.mapper'; export class NewsCrudOperationLoggable implements Loggable { diff --git a/apps/server/src/modules/news/mapper/news.mapper.spec.ts b/apps/server/src/modules/news/mapper/news.mapper.spec.ts index 40bd66d8130..4ffa8228045 100644 --- a/apps/server/src/modules/news/mapper/news.mapper.spec.ts +++ b/apps/server/src/modules/news/mapper/news.mapper.spec.ts @@ -1,19 +1,15 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { CourseNews, - CreateNews, - INewsScope, - IUpdateNews, News, NewsProperties, - NewsTarget, - NewsTargetModel, SchoolEntity, SchoolNews, TeamEntity, TeamNews, User, -} from '@shared/domain'; +} from '@shared/domain/entity'; +import { CreateNews, INewsScope, IUpdateNews, NewsTarget, NewsTargetModel } from '@shared/domain/types'; import { courseFactory, schoolFactory, setupEntities, userFactory } from '@shared/testing'; import { CreateNewsParams, diff --git a/apps/server/src/modules/news/mapper/news.mapper.ts b/apps/server/src/modules/news/mapper/news.mapper.ts index 36c17f57607..30bf13e6540 100644 --- a/apps/server/src/modules/news/mapper/news.mapper.ts +++ b/apps/server/src/modules/news/mapper/news.mapper.ts @@ -1,4 +1,5 @@ -import { CreateNews, INewsScope, IUpdateNews, News, NewsTargetModel } from '@shared/domain'; +import { News } from '@shared/domain/entity'; +import { CreateNews, INewsScope, IUpdateNews, NewsTargetModel } from '@shared/domain/types'; import { LogMessageData } from '@src/core/logger'; import { CreateNewsParams, FilterNewsParams, NewsResponse, UpdateNewsParams } from '../controller/dto'; import { SchoolInfoMapper } from './school-info.mapper'; diff --git a/apps/server/src/modules/news/mapper/school-info.mapper.ts b/apps/server/src/modules/news/mapper/school-info.mapper.ts index b4a982966f7..ddc99f1bb21 100644 --- a/apps/server/src/modules/news/mapper/school-info.mapper.ts +++ b/apps/server/src/modules/news/mapper/school-info.mapper.ts @@ -1,4 +1,4 @@ -import { SchoolEntity } from '@shared/domain'; +import { SchoolEntity } from '@shared/domain/entity'; import { SchoolInfoResponse } from '../controller/dto'; export class SchoolInfoMapper { diff --git a/apps/server/src/modules/news/mapper/target-info.mapper.ts b/apps/server/src/modules/news/mapper/target-info.mapper.ts index ffc5e4e02d1..9bf3d1772b6 100644 --- a/apps/server/src/modules/news/mapper/target-info.mapper.ts +++ b/apps/server/src/modules/news/mapper/target-info.mapper.ts @@ -1,4 +1,4 @@ -import { NewsTarget } from '@shared/domain'; +import { NewsTarget } from '@shared/domain/types'; import { TargetInfoResponse } from '../controller/dto/target-info.response'; export class TargetInfoMapper { diff --git a/apps/server/src/modules/news/mapper/user-info.mapper.ts b/apps/server/src/modules/news/mapper/user-info.mapper.ts index 47533d06373..bb3e5248820 100644 --- a/apps/server/src/modules/news/mapper/user-info.mapper.ts +++ b/apps/server/src/modules/news/mapper/user-info.mapper.ts @@ -1,4 +1,4 @@ -import { User } from '@shared/domain'; +import { User } from '@shared/domain/entity'; import { UserInfoResponse } from '../controller/dto'; export class UserInfoMapper { diff --git a/apps/server/src/modules/news/uc/news.uc.spec.ts b/apps/server/src/modules/news/uc/news.uc.spec.ts index 91166132320..45250a28935 100644 --- a/apps/server/src/modules/news/uc/news.uc.spec.ts +++ b/apps/server/src/modules/news/uc/news.uc.spec.ts @@ -4,7 +4,8 @@ import { FeathersAuthorizationService } from '@modules/authorization'; import { UnauthorizedException } from '@nestjs/common'; import { NotFoundException } from '@nestjs/common/exceptions/not-found.exception'; import { Test, TestingModule } from '@nestjs/testing'; -import { CreateNews, NewsTargetModel, Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; +import { CreateNews, NewsTargetModel } from '@shared/domain/types'; import { NewsRepo } from '@shared/repo'; import { Logger } from '@src/core/logger'; import { NewsUc } from './news.uc'; diff --git a/apps/server/src/modules/news/uc/news.uc.ts b/apps/server/src/modules/news/uc/news.uc.ts index 002eaa45819..2983010fcb6 100644 --- a/apps/server/src/modules/news/uc/news.uc.ts +++ b/apps/server/src/modules/news/uc/news.uc.ts @@ -1,17 +1,8 @@ import { FeathersAuthorizationService } from '@modules/authorization'; import { Injectable } from '@nestjs/common'; -import { - Counted, - CreateNews, - EntityId, - IFindOptions, - INewsScope, - IUpdateNews, - News, - NewsTargetModel, - Permission, - SortOrder, -} from '@shared/domain'; +import { News } from '@shared/domain/entity'; +import { IFindOptions, Permission, SortOrder } from '@shared/domain/interface'; +import { Counted, CreateNews, EntityId, INewsScope, IUpdateNews, NewsTargetModel } from '@shared/domain/types'; import { NewsRepo, NewsTargetFilter } from '@shared/repo'; import { CrudOperation } from '@shared/types'; import { Logger } from '@src/core/logger'; diff --git a/apps/server/src/modules/oauth-provider/service/id-token.service.spec.ts b/apps/server/src/modules/oauth-provider/service/id-token.service.spec.ts index 4f8eff19c80..4a58a3e8336 100644 --- a/apps/server/src/modules/oauth-provider/service/id-token.service.spec.ts +++ b/apps/server/src/modules/oauth-provider/service/id-token.service.spec.ts @@ -1,15 +1,16 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { Test, TestingModule } from '@nestjs/testing'; -import { Pseudonym, TeamEntity, UserDO } from '@shared/domain'; -import { TeamsRepo } from '@shared/repo'; -import { externalToolFactory, pseudonymFactory, setupEntities, userDoFactory } from '@shared/testing'; -import { teamFactory } from '@shared/testing/factory/team.factory'; import { IdToken } from '@modules/oauth-provider/interface/id-token'; import { OauthScope } from '@modules/oauth-provider/interface/oauth-scope.enum'; import { IdTokenService } from '@modules/oauth-provider/service/id-token.service'; import { PseudonymService } from '@modules/pseudonym/service'; import { ExternalTool } from '@modules/tool/external-tool/domain'; import { UserService } from '@modules/user/service/user.service'; +import { Test, TestingModule } from '@nestjs/testing'; +import { Pseudonym, UserDO } from '@shared/domain/domainobject'; +import { TeamEntity } from '@shared/domain/entity'; +import { TeamsRepo } from '@shared/repo'; +import { externalToolFactory, pseudonymFactory, setupEntities, userDoFactory } from '@shared/testing'; +import { teamFactory } from '@shared/testing/factory/team.factory'; import { IdTokenCreationLoggableException } from '../error/id-token-creation-exception.loggable'; import { OauthProviderLoginFlowService } from './oauth-provider.login-flow.service'; import resetAllMocks = jest.resetAllMocks; diff --git a/apps/server/src/modules/oauth-provider/service/id-token.service.ts b/apps/server/src/modules/oauth-provider/service/id-token.service.ts index 998ff46f15f..57a69e7dc6e 100644 --- a/apps/server/src/modules/oauth-provider/service/id-token.service.ts +++ b/apps/server/src/modules/oauth-provider/service/id-token.service.ts @@ -1,9 +1,10 @@ -import { Injectable } from '@nestjs/common'; -import { LtiToolDO, Pseudonym, TeamEntity, UserDO } from '@shared/domain'; -import { TeamsRepo } from '@shared/repo'; import { PseudonymService } from '@modules/pseudonym'; import { ExternalTool } from '@modules/tool/external-tool/domain'; import { UserService } from '@modules/user'; +import { Injectable } from '@nestjs/common'; +import { LtiToolDO, Pseudonym, UserDO } from '@shared/domain/domainobject'; +import { TeamEntity } from '@shared/domain/entity'; +import { TeamsRepo } from '@shared/repo'; import { IdTokenCreationLoggableException } from '../error/id-token-creation-exception.loggable'; import { GroupNameIdTuple, IdToken, OauthScope } from '../interface'; import { OauthProviderLoginFlowService } from './oauth-provider.login-flow.service'; diff --git a/apps/server/src/modules/oauth-provider/service/oauth-provider.login-flow.service.spec.ts b/apps/server/src/modules/oauth-provider/service/oauth-provider.login-flow.service.spec.ts index 052f3f1c6a2..b25709dbb69 100644 --- a/apps/server/src/modules/oauth-provider/service/oauth-provider.login-flow.service.spec.ts +++ b/apps/server/src/modules/oauth-provider/service/oauth-provider.login-flow.service.spec.ts @@ -5,7 +5,7 @@ import { ExternalToolService } from '@modules/tool/external-tool/service'; import { IToolFeatures, ToolFeatures } from '@modules/tool/tool-config'; import { NotFoundException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { LtiToolDO } from '@shared/domain'; +import { LtiToolDO } from '@shared/domain/domainobject'; import { externalToolFactory, ltiToolDOFactory, setupEntities } from '@shared/testing'; import { OauthProviderLoginFlowService } from './oauth-provider.login-flow.service'; diff --git a/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.spec.ts b/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.spec.ts index 8e80da47969..99be39f54de 100644 --- a/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.spec.ts +++ b/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.spec.ts @@ -5,7 +5,8 @@ import { ICurrentUser } from '@modules/authentication'; import { AuthorizationService } from '@modules/authorization'; import { UnauthorizedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission, User } from '@shared/domain'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { setupEntities, userFactory } from '@shared/testing'; import { OauthProviderClientCrudUc } from './oauth-provider.client-crud.uc'; import resetAllMocks = jest.resetAllMocks; diff --git a/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.ts b/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.ts index 84221847796..3dc637f89c1 100644 --- a/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.ts +++ b/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.ts @@ -3,7 +3,8 @@ import { OauthProviderService } from '@infra/oauth-provider/index'; import { ICurrentUser } from '@modules/authentication'; import { AuthorizationService } from '@modules/authorization'; import { Injectable } from '@nestjs/common'; -import { Permission, User } from '@shared/domain/index'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; @Injectable() export class OauthProviderClientCrudUc { diff --git a/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.spec.ts b/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.spec.ts index 1c160b021d7..8133b73aae2 100644 --- a/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.spec.ts +++ b/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.spec.ts @@ -1,9 +1,14 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { InternalServerErrorException, UnprocessableEntityException } from '@nestjs/common'; -import { Test, TestingModule } from '@nestjs/testing'; -import { LtiToolDO, Permission, Pseudonym, UserDO } from '@shared/domain'; import { OauthProviderService } from '@infra/oauth-provider'; import { ProviderLoginResponse, ProviderRedirectResponse } from '@infra/oauth-provider/dto'; +import { AuthorizationService } from '@modules/authorization'; +import { PseudonymService } from '@modules/pseudonym'; +import { ExternalTool } from '@modules/tool/external-tool/domain'; +import { UserService } from '@modules/user'; +import { InternalServerErrorException, UnprocessableEntityException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { LtiToolDO, Pseudonym, UserDO } from '@shared/domain/domainobject'; +import { Permission } from '@shared/domain/interface'; import { externalToolFactory, ltiToolDOFactory, @@ -12,10 +17,6 @@ import { userDoFactory, userFactory, } from '@shared/testing'; -import { AuthorizationService } from '@modules/authorization'; -import { PseudonymService } from '@modules/pseudonym'; -import { ExternalTool } from '@modules/tool/external-tool/domain'; -import { UserService } from '@modules/user'; import { AcceptQuery, LoginRequestBody, OAuthRejectableBody } from '../controller/dto'; import { OauthProviderLoginFlowService } from '../service/oauth-provider.login-flow.service'; import { OauthProviderLoginFlowUc } from './oauth-provider.login-flow.uc'; diff --git a/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.ts b/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.ts index cfe208c477c..0fd72d5dff1 100644 --- a/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.ts +++ b/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.ts @@ -1,6 +1,3 @@ -import { Injectable, InternalServerErrorException, UnprocessableEntityException } from '@nestjs/common'; -import { Permission, Pseudonym, User, UserDO } from '@shared/domain'; -import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; import { OauthProviderService } from '@infra/oauth-provider'; import { AcceptLoginRequestBody, ProviderLoginResponse, ProviderRedirectResponse } from '@infra/oauth-provider/dto'; import { AuthorizationService } from '@modules/authorization'; @@ -9,6 +6,11 @@ import { OauthProviderRequestMapper } from '@modules/oauth-provider/mapper/oauth import { PseudonymService } from '@modules/pseudonym/service'; import { ExternalTool, Oauth2ToolConfig } from '@modules/tool/external-tool/domain'; import { UserService } from '@modules/user'; +import { Injectable, InternalServerErrorException, UnprocessableEntityException } from '@nestjs/common'; +import { Pseudonym, UserDO } from '@shared/domain/domainobject'; +import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { OauthProviderLoginFlowService } from '../service/oauth-provider.login-flow.service'; @Injectable() diff --git a/apps/server/src/modules/oauth-provider/uc/oauth-provider.uc.ts b/apps/server/src/modules/oauth-provider/uc/oauth-provider.uc.ts index 39ad1effd7f..f48170463d3 100644 --- a/apps/server/src/modules/oauth-provider/uc/oauth-provider.uc.ts +++ b/apps/server/src/modules/oauth-provider/uc/oauth-provider.uc.ts @@ -1,7 +1,7 @@ -import { Injectable } from '@nestjs/common'; import { OauthProviderService } from '@infra/oauth-provider'; -import { EntityId } from '@shared/domain'; import { ProviderConsentSessionResponse } from '@infra/oauth-provider/dto/'; +import { Injectable } from '@nestjs/common'; +import { EntityId } from '@shared/domain/types'; @Injectable() export class OauthProviderUc { diff --git a/apps/server/src/modules/oauth/loggable/user-not-found-after-provisioning.loggable-exception.ts b/apps/server/src/modules/oauth/loggable/user-not-found-after-provisioning.loggable-exception.ts index cff908850d9..d5cd050cded 100644 --- a/apps/server/src/modules/oauth/loggable/user-not-found-after-provisioning.loggable-exception.ts +++ b/apps/server/src/modules/oauth/loggable/user-not-found-after-provisioning.loggable-exception.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; import { OAuthSSOError } from './oauth-sso.error'; diff --git a/apps/server/src/modules/oauth/service/hydra.service.spec.ts b/apps/server/src/modules/oauth/service/hydra.service.spec.ts index 37db961eb9d..9874bbb22da 100644 --- a/apps/server/src/modules/oauth/service/hydra.service.spec.ts +++ b/apps/server/src/modules/oauth/service/hydra.service.spec.ts @@ -8,8 +8,8 @@ import { HydraSsoService } from '@modules/oauth/service/hydra.service'; import { HttpService } from '@nestjs/axios'; import { InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { LtiPrivacyPermission, LtiRoleType, OauthConfigEntity } from '@shared/domain'; import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; +import { LtiPrivacyPermission, LtiRoleType, OauthConfigEntity } from '@shared/domain/entity'; import { LtiToolRepo } from '@shared/repo'; import { axiosResponseFactory } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; diff --git a/apps/server/src/modules/oauth/service/hydra.service.ts b/apps/server/src/modules/oauth/service/hydra.service.ts index a74e1936af8..ca439858e9f 100644 --- a/apps/server/src/modules/oauth/service/hydra.service.ts +++ b/apps/server/src/modules/oauth/service/hydra.service.ts @@ -6,14 +6,14 @@ import { HydraRedirectDto } from '@modules/oauth/service/dto/hydra.redirect.dto' import { HttpService } from '@nestjs/axios'; import { Inject, InternalServerErrorException } from '@nestjs/common'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { OauthConfigEntity } from '@shared/domain'; import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; +import { OauthConfigEntity } from '@shared/domain/entity'; import { LtiToolRepo } from '@shared/repo'; import { LegacyLogger } from '@src/core/logger'; import { AxiosRequestConfig, AxiosResponse } from 'axios'; import { nanoid } from 'nanoid'; import QueryString from 'qs'; -import { firstValueFrom, Observable } from 'rxjs'; +import { Observable, firstValueFrom } from 'rxjs'; @Injectable() export class HydraSsoService { diff --git a/apps/server/src/modules/oauth/service/oauth.service.spec.ts b/apps/server/src/modules/oauth/service/oauth.service.spec.ts index 390ee95c5e5..483026b6be8 100644 --- a/apps/server/src/modules/oauth/service/oauth.service.spec.ts +++ b/apps/server/src/modules/oauth/service/oauth.service.spec.ts @@ -9,7 +9,8 @@ import { SystemDto } from '@modules/system/service/dto/system.dto'; import { UserService } from '@modules/user'; import { MigrationCheckService } from '@modules/user-login-migration'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, OauthConfigEntity, SchoolFeatures, SystemEntity, UserDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO } from '@shared/domain/domainobject'; +import { OauthConfigEntity, SchoolFeatures, SystemEntity } from '@shared/domain/entity'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { legacySchoolDoFactory, setupEntities, systemEntityFactory, userDoFactory } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; diff --git a/apps/server/src/modules/oauth/service/oauth.service.ts b/apps/server/src/modules/oauth/service/oauth.service.ts index 5f13511766c..340763341bd 100644 --- a/apps/server/src/modules/oauth/service/oauth.service.ts +++ b/apps/server/src/modules/oauth/service/oauth.service.ts @@ -7,7 +7,9 @@ import { UserService } from '@modules/user'; import { MigrationCheckService } from '@modules/user-login-migration'; import { Inject } from '@nestjs/common'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { EntityId, LegacySchoolDo, OauthConfigEntity, SchoolFeatures, UserDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO } from '@shared/domain/domainobject'; +import { OauthConfigEntity, SchoolFeatures } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import jwt, { JwtPayload } from 'jsonwebtoken'; import { OAuthTokenDto } from '../interface'; diff --git a/apps/server/src/modules/oauth/uc/hydra-oauth.uc.spec.ts b/apps/server/src/modules/oauth/uc/hydra-oauth.uc.spec.ts index e66be61ef83..8626e969cbc 100644 --- a/apps/server/src/modules/oauth/uc/hydra-oauth.uc.spec.ts +++ b/apps/server/src/modules/oauth/uc/hydra-oauth.uc.spec.ts @@ -5,7 +5,7 @@ import { HydraRedirectDto } from '@modules/oauth/service/dto/hydra.redirect.dto' import { HttpModule } from '@nestjs/axios'; import { InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { OauthConfigEntity } from '@shared/domain'; +import { OauthConfigEntity } from '@shared/domain/entity'; import { axiosResponseFactory } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; import { AxiosResponse } from 'axios'; diff --git a/apps/server/src/modules/oauth/uc/hydra-oauth.uc.ts b/apps/server/src/modules/oauth/uc/hydra-oauth.uc.ts index 258fb2fb7d5..8a0b3786f0b 100644 --- a/apps/server/src/modules/oauth/uc/hydra-oauth.uc.ts +++ b/apps/server/src/modules/oauth/uc/hydra-oauth.uc.ts @@ -1,6 +1,6 @@ import { HydraRedirectDto } from '@modules/oauth/service/dto/hydra.redirect.dto'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { OauthConfigEntity } from '@shared/domain'; +import { OauthConfigEntity } from '@shared/domain/entity'; import { LegacyLogger } from '@src/core/logger'; import { AxiosRequestConfig, AxiosResponse } from 'axios'; import { AuthorizationParams } from '../controller/dto'; diff --git a/apps/server/src/modules/provisioning/dto/external-group-user.dto.ts b/apps/server/src/modules/provisioning/dto/external-group-user.dto.ts index 16ed7440319..988224dc3b0 100644 --- a/apps/server/src/modules/provisioning/dto/external-group-user.dto.ts +++ b/apps/server/src/modules/provisioning/dto/external-group-user.dto.ts @@ -1,4 +1,4 @@ -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; export class ExternalGroupUserDto { externalUserId: string; diff --git a/apps/server/src/modules/provisioning/dto/external-user.dto.ts b/apps/server/src/modules/provisioning/dto/external-user.dto.ts index d7291504b57..bc5bcc9c80b 100644 --- a/apps/server/src/modules/provisioning/dto/external-user.dto.ts +++ b/apps/server/src/modules/provisioning/dto/external-user.dto.ts @@ -1,4 +1,4 @@ -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; export class ExternalUserDto { externalId: string; diff --git a/apps/server/src/modules/provisioning/dto/provisioning-system.dto.ts b/apps/server/src/modules/provisioning/dto/provisioning-system.dto.ts index 26ed736b394..c8738beac0b 100644 --- a/apps/server/src/modules/provisioning/dto/provisioning-system.dto.ts +++ b/apps/server/src/modules/provisioning/dto/provisioning-system.dto.ts @@ -1,5 +1,5 @@ -import { EntityId } from '@shared/domain'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; +import { EntityId } from '@shared/domain/types'; export class ProvisioningSystemDto { systemId: EntityId; diff --git a/apps/server/src/modules/provisioning/loggable/user-for-group-not-found.loggable.spec.ts b/apps/server/src/modules/provisioning/loggable/user-for-group-not-found.loggable.spec.ts index 48728a17081..9bb8ee631bc 100644 --- a/apps/server/src/modules/provisioning/loggable/user-for-group-not-found.loggable.spec.ts +++ b/apps/server/src/modules/provisioning/loggable/user-for-group-not-found.loggable.spec.ts @@ -1,6 +1,6 @@ -import { RoleName } from '@shared/domain'; -import { UserForGroupNotFoundLoggable } from './user-for-group-not-found.loggable'; +import { RoleName } from '@shared/domain/interface'; import { ExternalGroupUserDto } from '../dto'; +import { UserForGroupNotFoundLoggable } from './user-for-group-not-found.loggable'; describe('UserForGroupNotFoundLoggable', () => { describe('constructor', () => { diff --git a/apps/server/src/modules/provisioning/strategy/iserv/iserv-do.mapper.ts b/apps/server/src/modules/provisioning/strategy/iserv/iserv-do.mapper.ts index ff2373e3765..ef65bf06d08 100644 --- a/apps/server/src/modules/provisioning/strategy/iserv/iserv-do.mapper.ts +++ b/apps/server/src/modules/provisioning/strategy/iserv/iserv-do.mapper.ts @@ -1,4 +1,5 @@ -import { LegacySchoolDo, RoleName, UserDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO } from '@shared/domain/domainobject'; +import { RoleName } from '@shared/domain/interface'; import { ExternalSchoolDto, ExternalUserDto } from '../../dto'; export class IservMapper { diff --git a/apps/server/src/modules/provisioning/strategy/iserv/iserv.strategy.spec.ts b/apps/server/src/modules/provisioning/strategy/iserv/iserv.strategy.spec.ts index e91ec8ca159..6e1e909a4ba 100644 --- a/apps/server/src/modules/provisioning/strategy/iserv/iserv.strategy.spec.ts +++ b/apps/server/src/modules/provisioning/strategy/iserv/iserv.strategy.spec.ts @@ -1,13 +1,15 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; +import { LegacySchoolService } from '@modules/legacy-school'; +import { OAuthSSOError } from '@modules/oauth/loggable'; +import { UserService } from '@modules/user'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, RoleName, User, UserDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { legacySchoolDoFactory, schoolFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing'; -import { LegacySchoolService } from '@modules/legacy-school'; -import { UserService } from '@modules/user'; import jwt from 'jsonwebtoken'; -import { OAuthSSOError } from '@modules/oauth/loggable'; import { RoleDto } from '../../../role/service/dto/role.dto'; import { ExternalSchoolDto, diff --git a/apps/server/src/modules/provisioning/strategy/iserv/iserv.strategy.ts b/apps/server/src/modules/provisioning/strategy/iserv/iserv.strategy.ts index 8d5e1b5378f..4803c80e297 100644 --- a/apps/server/src/modules/provisioning/strategy/iserv/iserv.strategy.ts +++ b/apps/server/src/modules/provisioning/strategy/iserv/iserv.strategy.ts @@ -1,10 +1,12 @@ -import { Injectable } from '@nestjs/common'; -import { LegacySchoolDo, RoleName, RoleReference, User, UserDO } from '@shared/domain'; -import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { LegacySchoolService } from '@modules/legacy-school'; +import { OAuthSSOError } from '@modules/oauth/loggable'; import { UserService } from '@modules/user'; +import { Injectable } from '@nestjs/common'; +import { LegacySchoolDo, RoleReference, UserDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; +import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import jwt, { JwtPayload } from 'jsonwebtoken'; -import { OAuthSSOError } from '@modules/oauth/loggable'; import { ExternalSchoolDto, ExternalUserDto, diff --git a/apps/server/src/modules/provisioning/strategy/oidc/oidc.strategy.spec.ts b/apps/server/src/modules/provisioning/strategy/oidc/oidc.strategy.spec.ts index e4f50429d0f..bbba0ba9009 100644 --- a/apps/server/src/modules/provisioning/strategy/oidc/oidc.strategy.spec.ts +++ b/apps/server/src/modules/provisioning/strategy/oidc/oidc.strategy.spec.ts @@ -1,10 +1,11 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { NotImplementedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, RoleName, UserDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO } from '@shared/domain/domainobject'; +import { RoleName } from '@shared/domain/interface'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { legacySchoolDoFactory, userDoFactory } from '@shared/testing'; -import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { externalGroupDtoFactory } from '@shared/testing/factory/external-group-dto.factory'; import { ExternalSchoolDto, diff --git a/apps/server/src/modules/provisioning/strategy/oidc/oidc.strategy.ts b/apps/server/src/modules/provisioning/strategy/oidc/oidc.strategy.ts index 4cb3e920da6..eb54b862a2b 100644 --- a/apps/server/src/modules/provisioning/strategy/oidc/oidc.strategy.ts +++ b/apps/server/src/modules/provisioning/strategy/oidc/oidc.strategy.ts @@ -1,6 +1,6 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { Injectable } from '@nestjs/common'; -import { LegacySchoolDo, UserDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO } from '@shared/domain/domainobject'; import { OauthDataDto, ProvisioningDto } from '../../dto'; import { ProvisioningStrategy } from '../base.strategy'; import { OidcProvisioningService } from './service/oidc-provisioning.service'; diff --git a/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.spec.ts b/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.spec.ts index c313be9973d..06cedba863d 100644 --- a/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.spec.ts +++ b/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.spec.ts @@ -10,8 +10,9 @@ import { UserService } from '@modules/user'; import { UnprocessableEntityException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { ExternalSource, LegacySchoolDo, RoleName, RoleReference, SchoolFeatures } from '@shared/domain'; -import { UserDO } from '@shared/domain/domainobject/user.do'; +import { ExternalSource, LegacySchoolDo, RoleReference, UserDO } from '@shared/domain/domainobject'; +import { SchoolFeatures } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { externalGroupDtoFactory, federalStateFactory, diff --git a/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.ts b/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.ts index 52b0e7472e2..7d37199c1aa 100644 --- a/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.ts +++ b/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.ts @@ -8,8 +8,9 @@ import { RoleDto } from '@modules/role/service/dto/role.dto'; import { UserService } from '@modules/user'; import { Injectable, UnprocessableEntityException } from '@nestjs/common'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { EntityId, ExternalSource, FederalStateEntity, SchoolFeatures, SchoolYearEntity } from '@shared/domain'; -import { LegacySchoolDo, RoleReference, UserDO } from '@shared/domain/domainobject'; +import { ExternalSource, LegacySchoolDo, RoleReference, UserDO } from '@shared/domain/domainobject'; +import { FederalStateEntity, SchoolFeatures, SchoolYearEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { Logger } from '@src/core/logger'; import { ObjectId } from 'bson'; import CryptoJS from 'crypto-js'; diff --git a/apps/server/src/modules/provisioning/strategy/sanis/sanis-response.mapper.spec.ts b/apps/server/src/modules/provisioning/strategy/sanis/sanis-response.mapper.spec.ts index c560d4f7c3a..36e0b6a1d9f 100644 --- a/apps/server/src/modules/provisioning/strategy/sanis/sanis-response.mapper.spec.ts +++ b/apps/server/src/modules/provisioning/strategy/sanis/sanis-response.mapper.spec.ts @@ -1,7 +1,7 @@ import { createMock } from '@golevelup/ts-jest'; import { GroupTypes } from '@modules/group'; import { Test, TestingModule } from '@nestjs/testing'; -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; import { Logger } from '@src/core/logger'; import { UUID } from 'bson'; import { ExternalGroupDto, ExternalSchoolDto, ExternalUserDto } from '../../dto'; diff --git a/apps/server/src/modules/provisioning/strategy/sanis/sanis-response.mapper.ts b/apps/server/src/modules/provisioning/strategy/sanis/sanis-response.mapper.ts index 3ca0d06806e..6d9ee9e721c 100644 --- a/apps/server/src/modules/provisioning/strategy/sanis/sanis-response.mapper.ts +++ b/apps/server/src/modules/provisioning/strategy/sanis/sanis-response.mapper.ts @@ -1,6 +1,6 @@ import { GroupTypes } from '@modules/group'; import { Injectable } from '@nestjs/common'; -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; import { Logger } from '@src/core/logger'; import { ExternalGroupDto, ExternalGroupUserDto, ExternalSchoolDto, ExternalUserDto } from '../../dto'; import { GroupRoleUnknownLoggable } from '../../loggable'; diff --git a/apps/server/src/modules/provisioning/strategy/sanis/sanis.strategy.spec.ts b/apps/server/src/modules/provisioning/strategy/sanis/sanis.strategy.spec.ts index 0ef8173c2d2..2a491f84dde 100644 --- a/apps/server/src/modules/provisioning/strategy/sanis/sanis.strategy.spec.ts +++ b/apps/server/src/modules/provisioning/strategy/sanis/sanis.strategy.spec.ts @@ -1,12 +1,14 @@ +/* eslint-disable import/first */ +export * from '@shared/domain/entity/all-entities'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Configuration } from '@hpi-schul-cloud/commons/lib'; +import { GroupTypes } from '@modules/group'; import { HttpService } from '@nestjs/axios'; import { InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { axiosResponseFactory, setupEntities } from '@shared/testing'; -import { GroupTypes } from '@modules/group'; import { UUID } from 'bson'; import { of } from 'rxjs'; import { diff --git a/apps/server/src/modules/provisioning/strategy/sanis/sanis.strategy.ts b/apps/server/src/modules/provisioning/strategy/sanis/sanis.strategy.ts index ad48ae06d93..e57d46e937a 100644 --- a/apps/server/src/modules/provisioning/strategy/sanis/sanis.strategy.ts +++ b/apps/server/src/modules/provisioning/strategy/sanis/sanis.strategy.ts @@ -1,21 +1,21 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { HttpService } from '@nestjs/axios'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; +import { RoleName } from '@shared/domain/interface'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { AxiosRequestConfig, AxiosResponse } from 'axios'; import { firstValueFrom } from 'rxjs'; -import { RoleName } from '@shared/domain'; import { + ExternalGroupDto, ExternalSchoolDto, ExternalUserDto, OauthDataDto, OauthDataStrategyInputDto, - ExternalGroupDto, } from '../../dto'; import { OidcProvisioningStrategy } from '../oidc/oidc.strategy'; import { OidcProvisioningService } from '../oidc/service/oidc-provisioning.service'; -import { SanisResponseMapper } from './sanis-response.mapper'; import { SanisResponse } from './response'; +import { SanisResponseMapper } from './sanis-response.mapper'; @Injectable() export class SanisProvisioningStrategy extends OidcProvisioningStrategy { diff --git a/apps/server/src/modules/pseudonym/controller/api-test/pseudonym.api.spec.ts b/apps/server/src/modules/pseudonym/controller/api-test/pseudonym.api.spec.ts index fa72cf82075..f646a401885 100644 --- a/apps/server/src/modules/pseudonym/controller/api-test/pseudonym.api.spec.ts +++ b/apps/server/src/modules/pseudonym/controller/api-test/pseudonym.api.spec.ts @@ -1,19 +1,19 @@ -import { HttpStatus, INestApplication } from '@nestjs/common'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; +import { ExternalToolEntity } from '@modules/tool/external-tool/entity'; +import { HttpStatus, INestApplication } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { SchoolEntity } from '@shared/domain/entity'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, externalToolEntityFactory, externalToolPseudonymEntityFactory, schoolFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { Test, TestingModule } from '@nestjs/testing'; -import { Response } from 'supertest'; -import { SchoolEntity } from '@shared/domain'; -import { ServerTestModule } from '@modules/server'; -import { ExternalToolEntity } from '@modules/tool/external-tool/entity'; import { UUID } from 'bson'; +import { Response } from 'supertest'; import { ExternalToolPseudonymEntity } from '../../entity'; import { PseudonymResponse } from '../dto'; diff --git a/apps/server/src/modules/pseudonym/controller/pseudonym.controller.ts b/apps/server/src/modules/pseudonym/controller/pseudonym.controller.ts index 993f3ba9ded..4eab278fb89 100644 --- a/apps/server/src/modules/pseudonym/controller/pseudonym.controller.ts +++ b/apps/server/src/modules/pseudonym/controller/pseudonym.controller.ts @@ -7,7 +7,7 @@ import { ApiTags, ApiUnauthorizedResponse, } from '@nestjs/swagger'; -import { Pseudonym } from '@shared/domain'; +import { Pseudonym } from '@shared/domain/domainobject'; import { PseudonymMapper } from '../mapper/pseudonym.mapper'; import { PseudonymUc } from '../uc'; import { PseudonymResponse } from './dto'; diff --git a/apps/server/src/modules/pseudonym/entity/external-tool-pseudonym.entity.ts b/apps/server/src/modules/pseudonym/entity/external-tool-pseudonym.entity.ts index 9fabd37f91c..492a7e137ba 100644 --- a/apps/server/src/modules/pseudonym/entity/external-tool-pseudonym.entity.ts +++ b/apps/server/src/modules/pseudonym/entity/external-tool-pseudonym.entity.ts @@ -1,7 +1,7 @@ import { Entity, Property, Unique } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; -import { EntityId } from '@shared/domain'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; +import { EntityId } from '@shared/domain/types'; export interface ExternalToolPseudonymEntityProps { id?: EntityId; diff --git a/apps/server/src/modules/pseudonym/entity/pseudonym.entity.ts b/apps/server/src/modules/pseudonym/entity/pseudonym.entity.ts index c9c051fa8b3..8fba5e5a404 100644 --- a/apps/server/src/modules/pseudonym/entity/pseudonym.entity.ts +++ b/apps/server/src/modules/pseudonym/entity/pseudonym.entity.ts @@ -1,7 +1,7 @@ import { Entity, Property, Unique } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; -import { EntityId } from '@shared/domain'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; +import { EntityId } from '@shared/domain/types'; export interface PseudonymEntityProps { id?: EntityId; diff --git a/apps/server/src/modules/pseudonym/mapper/pseudonym.mapper.ts b/apps/server/src/modules/pseudonym/mapper/pseudonym.mapper.ts index a12ecdfea70..61d9a96a13c 100644 --- a/apps/server/src/modules/pseudonym/mapper/pseudonym.mapper.ts +++ b/apps/server/src/modules/pseudonym/mapper/pseudonym.mapper.ts @@ -1,4 +1,4 @@ -import { Pseudonym } from '@shared/domain'; +import { Pseudonym } from '@shared/domain/domainobject'; import { PseudonymResponse } from '../controller/dto'; export class PseudonymMapper { diff --git a/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.integration.spec.ts b/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.integration.spec.ts index 324e444afcb..1b9e8e64843 100644 --- a/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.integration.spec.ts +++ b/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.integration.spec.ts @@ -1,9 +1,10 @@ import { createMock } from '@golevelup/ts-jest'; +import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { Page, Pseudonym } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; + +import { Page, Pseudonym } from '@shared/domain/domainobject'; import { cleanupCollections, externalToolPseudonymEntityFactory, pseudonymFactory, userFactory } from '@shared/testing'; import { pseudonymEntityFactory } from '@shared/testing/factory/pseudonym.factory'; import { LegacyLogger } from '@src/core/logger'; diff --git a/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.ts b/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.ts index 65ef03cd539..77f90894e47 100644 --- a/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.ts +++ b/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.ts @@ -1,6 +1,8 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId, IFindOptions, Page, Pagination, Pseudonym } from '@shared/domain'; +import { Page, Pseudonym } from '@shared/domain/domainobject'; +import { IFindOptions, Pagination } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { Scope } from '@shared/repo'; import { PseudonymSearchQuery } from '../domain'; import { ExternalToolPseudonymEntity, ExternalToolPseudonymEntityProps } from '../entity'; diff --git a/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.spec.ts b/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.spec.ts index 8246479da4a..afa77d64935 100644 --- a/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.spec.ts +++ b/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.spec.ts @@ -1,9 +1,9 @@ import { createMock } from '@golevelup/ts-jest'; +import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { Pseudonym } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { Pseudonym } from '@shared/domain/domainobject'; import { cleanupCollections, pseudonymFactory, userFactory } from '@shared/testing'; import { pseudonymEntityFactory } from '@shared/testing/factory/pseudonym.factory'; import { LegacyLogger } from '@src/core/logger'; diff --git a/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.ts b/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.ts index c4e40535ddb..d0979e91fca 100644 --- a/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.ts +++ b/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.ts @@ -1,6 +1,7 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId, Pseudonym } from '@shared/domain'; +import { Pseudonym } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { PseudonymEntity, PseudonymEntityProps } from '../entity'; @Injectable() diff --git a/apps/server/src/modules/pseudonym/service/feathers-roster.service.spec.ts b/apps/server/src/modules/pseudonym/service/feathers-roster.service.spec.ts index 59de8663ea6..e8c56b7d950 100644 --- a/apps/server/src/modules/pseudonym/service/feathers-roster.service.spec.ts +++ b/apps/server/src/modules/pseudonym/service/feathers-roster.service.spec.ts @@ -2,7 +2,19 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { DatabaseObjectNotFoundException } from '@mikro-orm/core'; import { Test, TestingModule } from '@nestjs/testing'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { Course, LegacySchoolDo, Pseudonym, RoleName, SchoolEntity, UserDO } from '@shared/domain'; +import { Course, SchoolEntity } from '@shared/domain/entity'; + +import { CourseService } from '@modules/learnroom/service/course.service'; +import { ToolContextType } from '@modules/tool/common/enum'; +import { ContextExternalTool, ContextRef } from '@modules/tool/context-external-tool/domain'; +import { ContextExternalToolService } from '@modules/tool/context-external-tool/service'; +import { ExternalTool } from '@modules/tool/external-tool/domain'; +import { ExternalToolService } from '@modules/tool/external-tool/service'; +import { SchoolExternalTool } from '@modules/tool/school-external-tool/domain'; +import { SchoolExternalToolService } from '@modules/tool/school-external-tool/service'; +import { UserService } from '@modules/user'; +import { LegacySchoolDo, Pseudonym, UserDO } from '@shared/domain/domainobject'; +import { RoleName } from '@shared/domain/interface'; import { contextExternalToolFactory, courseFactory, @@ -15,15 +27,6 @@ import { UserAndAccountTestFactory, userDoFactory, } from '@shared/testing'; -import { CourseService } from '@modules/learnroom/service/course.service'; -import { ToolContextType } from '@modules/tool/common/enum'; -import { ContextExternalTool, ContextRef } from '@modules/tool/context-external-tool/domain'; -import { ContextExternalToolService } from '@modules/tool/context-external-tool/service'; -import { ExternalTool } from '@modules/tool/external-tool/domain'; -import { ExternalToolService } from '@modules/tool/external-tool/service'; -import { SchoolExternalTool } from '@modules/tool/school-external-tool/domain'; -import { SchoolExternalToolService } from '@modules/tool/school-external-tool/service'; -import { UserService } from '@modules/user'; import { ObjectId } from 'bson'; import { FeathersRosterService } from './feathers-roster.service'; import { PseudonymService } from './pseudonym.service'; diff --git a/apps/server/src/modules/pseudonym/service/feathers-roster.service.ts b/apps/server/src/modules/pseudonym/service/feathers-roster.service.ts index a6b512d13c2..aad41f42fd5 100644 --- a/apps/server/src/modules/pseudonym/service/feathers-roster.service.ts +++ b/apps/server/src/modules/pseudonym/service/feathers-roster.service.ts @@ -1,6 +1,3 @@ -import { Injectable } from '@nestjs/common'; -import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { Course, EntityId, Pseudonym, RoleName, RoleReference, UserDO } from '@shared/domain'; import { CourseService } from '@modules/learnroom/service'; import { ToolContextType } from '@modules/tool/common/enum'; import { ContextExternalTool, ContextRef } from '@modules/tool/context-external-tool/domain'; @@ -10,6 +7,12 @@ import { ExternalToolService } from '@modules/tool/external-tool/service'; import { SchoolExternalTool } from '@modules/tool/school-external-tool/domain'; import { SchoolExternalToolService } from '@modules/tool/school-external-tool/service'; import { UserService } from '@modules/user'; +import { Injectable } from '@nestjs/common'; +import { NotFoundLoggableException } from '@shared/common/loggable-exception'; +import { Pseudonym, RoleReference, UserDO } from '@shared/domain/domainobject'; +import { Course } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { PseudonymService } from './pseudonym.service'; interface UserMetdata { diff --git a/apps/server/src/modules/pseudonym/service/pseudonym.service.spec.ts b/apps/server/src/modules/pseudonym/service/pseudonym.service.spec.ts index 026d28d039f..b63982b03ee 100644 --- a/apps/server/src/modules/pseudonym/service/pseudonym.service.spec.ts +++ b/apps/server/src/modules/pseudonym/service/pseudonym.service.spec.ts @@ -1,10 +1,12 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Configuration } from '@hpi-schul-cloud/commons/lib'; +import { ExternalTool } from '@modules/tool/external-tool/domain'; import { InternalServerErrorException, NotFoundException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { IFindOptions, LtiToolDO, Page, Pseudonym, UserDO } from '@shared/domain'; +import { IFindOptions } from '@shared/domain/interface'; + +import { LtiToolDO, Page, Pseudonym, UserDO } from '@shared/domain/domainobject'; import { externalToolFactory, ltiToolDOFactory, pseudonymFactory, userDoFactory } from '@shared/testing/factory'; -import { ExternalTool } from '@modules/tool/external-tool/domain'; import { PseudonymSearchQuery } from '../domain'; import { ExternalToolPseudonymRepo, PseudonymsRepo } from '../repo'; import { PseudonymService } from './pseudonym.service'; diff --git a/apps/server/src/modules/pseudonym/service/pseudonym.service.ts b/apps/server/src/modules/pseudonym/service/pseudonym.service.ts index 6d15d6a1ec9..4f6580e71ce 100644 --- a/apps/server/src/modules/pseudonym/service/pseudonym.service.ts +++ b/apps/server/src/modules/pseudonym/service/pseudonym.service.ts @@ -1,8 +1,9 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { ObjectId } from '@mikro-orm/mongodb'; -import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { IFindOptions, LtiToolDO, Page, Pseudonym, UserDO } from '@shared/domain'; import { ExternalTool } from '@modules/tool/external-tool/domain'; +import { Injectable, InternalServerErrorException } from '@nestjs/common'; +import { LtiToolDO, Page, Pseudonym, UserDO } from '@shared/domain/domainobject'; +import { IFindOptions } from '@shared/domain/interface'; import { v4 as uuidv4 } from 'uuid'; import { PseudonymSearchQuery } from '../domain'; import { ExternalToolPseudonymRepo, PseudonymsRepo } from '../repo'; diff --git a/apps/server/src/modules/pseudonym/uc/pseudonym.uc.spec.ts b/apps/server/src/modules/pseudonym/uc/pseudonym.uc.spec.ts index 26140da8a28..d7b2b861c88 100644 --- a/apps/server/src/modules/pseudonym/uc/pseudonym.uc.spec.ts +++ b/apps/server/src/modules/pseudonym/uc/pseudonym.uc.spec.ts @@ -1,10 +1,11 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, Pseudonym, SchoolEntity, User } from '@shared/domain'; -import { legacySchoolDoFactory, pseudonymFactory, schoolFactory, setupEntities, userFactory } from '@shared/testing'; -import { ForbiddenException } from '@nestjs/common'; import { Action, AuthorizationService } from '@modules/authorization'; import { LegacySchoolService } from '@modules/legacy-school'; +import { ForbiddenException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { LegacySchoolDo, Pseudonym } from '@shared/domain/domainobject'; +import { SchoolEntity, User } from '@shared/domain/entity'; +import { legacySchoolDoFactory, pseudonymFactory, schoolFactory, setupEntities, userFactory } from '@shared/testing'; import { PseudonymService } from '../service'; import { PseudonymUc } from './pseudonym.uc'; diff --git a/apps/server/src/modules/pseudonym/uc/pseudonym.uc.ts b/apps/server/src/modules/pseudonym/uc/pseudonym.uc.ts index 4c0ecb19a36..41cc0327b84 100644 --- a/apps/server/src/modules/pseudonym/uc/pseudonym.uc.ts +++ b/apps/server/src/modules/pseudonym/uc/pseudonym.uc.ts @@ -1,8 +1,10 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId, LegacySchoolDo, Pseudonym, User } from '@shared/domain'; -import { NotFoundLoggableException } from '@shared/common/loggable-exception'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { LegacySchoolService } from '@modules/legacy-school'; +import { Injectable } from '@nestjs/common'; +import { NotFoundLoggableException } from '@shared/common/loggable-exception'; +import { LegacySchoolDo, Pseudonym } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { PseudonymService } from '../service'; @Injectable() diff --git a/apps/server/src/modules/registration-pin/entity/registration-pin.entity.ts b/apps/server/src/modules/registration-pin/entity/registration-pin.entity.ts index ee5ece7a421..d36f10d7165 100644 --- a/apps/server/src/modules/registration-pin/entity/registration-pin.entity.ts +++ b/apps/server/src/modules/registration-pin/entity/registration-pin.entity.ts @@ -1,6 +1,6 @@ import { Entity, Index, Property } from '@mikro-orm/core'; -import { EntityId } from '@shared/domain'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; +import { EntityId } from '@shared/domain/types'; export interface RegistrationPinEntityProps { id?: EntityId; diff --git a/apps/server/src/modules/rocketchat-user/entity/rocket-chat-user.entity.ts b/apps/server/src/modules/rocketchat-user/entity/rocket-chat-user.entity.ts index 23a30f66d5e..93841d5ddc5 100644 --- a/apps/server/src/modules/rocketchat-user/entity/rocket-chat-user.entity.ts +++ b/apps/server/src/modules/rocketchat-user/entity/rocket-chat-user.entity.ts @@ -1,7 +1,7 @@ import { Entity, Index, Property, Unique } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; export interface RocketChatUserEntityProps { id?: EntityId; diff --git a/apps/server/src/modules/rocketchat-user/repo/rocket-chat-user.repo.ts b/apps/server/src/modules/rocketchat-user/repo/rocket-chat-user.repo.ts index 741f297f804..539130cb5e3 100644 --- a/apps/server/src/modules/rocketchat-user/repo/rocket-chat-user.repo.ts +++ b/apps/server/src/modules/rocketchat-user/repo/rocket-chat-user.repo.ts @@ -1,8 +1,8 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; -import { RocketChatUserEntity } from '../entity'; +import { EntityId } from '@shared/domain/types'; import { RocketChatUser } from '../domain/rocket-chat-user.do'; +import { RocketChatUserEntity } from '../entity'; import { RocketChatUserMapper } from './mapper'; @Injectable() diff --git a/apps/server/src/modules/rocketchat-user/service/rocket-chat-user.service.ts b/apps/server/src/modules/rocketchat-user/service/rocket-chat-user.service.ts index 32a600c0f75..53eac463399 100644 --- a/apps/server/src/modules/rocketchat-user/service/rocket-chat-user.service.ts +++ b/apps/server/src/modules/rocketchat-user/service/rocket-chat-user.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; -import { RocketChatUserRepo } from '../repo'; +import { EntityId } from '@shared/domain/types'; import { RocketChatUser } from '../domain'; +import { RocketChatUserRepo } from '../repo'; @Injectable() export class RocketChatUserService { diff --git a/apps/server/src/modules/role/mapper/role.mapper.spec.ts b/apps/server/src/modules/role/mapper/role.mapper.spec.ts index c7152cfd949..55fb3476e2d 100644 --- a/apps/server/src/modules/role/mapper/role.mapper.spec.ts +++ b/apps/server/src/modules/role/mapper/role.mapper.spec.ts @@ -1,7 +1,8 @@ -import { Permission, Role } from '@shared/domain'; -import { roleFactory, setupEntities } from '@shared/testing'; import { RoleMapper } from '@modules/role/mapper/role.mapper'; import { RoleDto } from '@modules/role/service/dto/role.dto'; +import { Role } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { roleFactory, setupEntities } from '@shared/testing'; describe('RoleMapper', () => { beforeAll(async () => { diff --git a/apps/server/src/modules/role/mapper/role.mapper.ts b/apps/server/src/modules/role/mapper/role.mapper.ts index 7b427bb809d..f4b68a313d4 100644 --- a/apps/server/src/modules/role/mapper/role.mapper.ts +++ b/apps/server/src/modules/role/mapper/role.mapper.ts @@ -1,5 +1,5 @@ -import { Role } from '@shared/domain'; import { RoleDto } from '@modules/role/service/dto/role.dto'; +import { Role } from '@shared/domain/entity'; export class RoleMapper { static mapFromEntityToDto(entity: Role): RoleDto { diff --git a/apps/server/src/modules/role/service/dto/role.dto.ts b/apps/server/src/modules/role/service/dto/role.dto.ts index cdf09646035..a524b5307fc 100644 --- a/apps/server/src/modules/role/service/dto/role.dto.ts +++ b/apps/server/src/modules/role/service/dto/role.dto.ts @@ -1,4 +1,5 @@ -import { EntityId, Permission, RoleName } from '@shared/domain'; +import { Permission, RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; export class RoleDto { id?: EntityId; diff --git a/apps/server/src/modules/role/service/role.service.spec.ts b/apps/server/src/modules/role/service/role.service.spec.ts index fcda5283cf6..0ad82b3833b 100644 --- a/apps/server/src/modules/role/service/role.service.spec.ts +++ b/apps/server/src/modules/role/service/role.service.spec.ts @@ -1,7 +1,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { NotFoundError } from '@mikro-orm/core'; import { Test, TestingModule } from '@nestjs/testing'; -import { Role, RoleName } from '@shared/domain'; +import { Role } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { RoleRepo } from '@shared/repo'; import { roleFactory } from '@shared/testing'; import { RoleDto } from './dto/role.dto'; diff --git a/apps/server/src/modules/role/service/role.service.ts b/apps/server/src/modules/role/service/role.service.ts index 1ceea09802f..3c0c66c1226 100644 --- a/apps/server/src/modules/role/service/role.service.ts +++ b/apps/server/src/modules/role/service/role.service.ts @@ -1,5 +1,7 @@ import { Injectable } from '@nestjs/common'; -import { EntityId, Role, RoleName } from '@shared/domain'; +import { Role } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { RoleRepo } from '@shared/repo'; import { RoleMapper } from '../mapper/role.mapper'; import { RoleDto } from './dto/role.dto'; diff --git a/apps/server/src/modules/role/uc/role.uc.spec.ts b/apps/server/src/modules/role/uc/role.uc.spec.ts index b026687af3f..9a9b16e1d9c 100644 --- a/apps/server/src/modules/role/uc/role.uc.spec.ts +++ b/apps/server/src/modules/role/uc/role.uc.spec.ts @@ -1,9 +1,9 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { Test, TestingModule } from '@nestjs/testing'; -import { RoleName } from '@shared/domain'; import { RoleDto } from '@modules/role/service/dto/role.dto'; import { RoleService } from '@modules/role/service/role.service'; import { RoleUc } from '@modules/role/uc/role.uc'; +import { Test, TestingModule } from '@nestjs/testing'; +import { RoleName } from '@shared/domain/interface'; describe('RoleUc', () => { let module: TestingModule; diff --git a/apps/server/src/modules/role/uc/role.uc.ts b/apps/server/src/modules/role/uc/role.uc.ts index a1b5ba0b649..134c11673c1 100644 --- a/apps/server/src/modules/role/uc/role.uc.ts +++ b/apps/server/src/modules/role/uc/role.uc.ts @@ -1,7 +1,7 @@ -import { RoleService } from '@modules/role/service/role.service'; import { RoleDto } from '@modules/role/service/dto/role.dto'; +import { RoleService } from '@modules/role/service/role.service'; import { Injectable } from '@nestjs/common'; -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; @Injectable() export class RoleUc { diff --git a/apps/server/src/modules/server/admin-api.server.module.ts b/apps/server/src/modules/server/admin-api.server.module.ts index 6d5ae3f3297..f0ffa765d58 100644 --- a/apps/server/src/modules/server/admin-api.server.module.ts +++ b/apps/server/src/modules/server/admin-api.server.module.ts @@ -1,15 +1,16 @@ import { MikroOrmModule } from '@mikro-orm/nestjs'; import { DynamicModule, Module } from '@nestjs/common'; -import { ALL_ENTITIES } from '@shared/domain'; +// import { ALL_ENTITIES } from '@shared/domain'; +import { FileEntity } from '@modules/files/entity'; +import { ConfigModule } from '@nestjs/config'; +import { ALL_ENTITIES } from '@shared/domain/entity'; import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config'; import { LoggerModule } from '@src/core/logger'; -import { ConfigModule } from '@nestjs/config'; -import { RabbitMQWrapperModule, RabbitMQWrapperTestModule } from '@src/infra/rabbitmq'; import { MongoDatabaseModuleOptions, MongoMemoryDatabaseModule } from '@src/infra/database'; -import { FileEntity } from '@modules/files/entity'; -import { defaultMikroOrmOptions } from './server.module'; -import { serverConfig } from './server.config'; +import { RabbitMQWrapperModule, RabbitMQWrapperTestModule } from '@src/infra/rabbitmq'; import { DeletionApiModule } from '../deletion/deletion-api.module'; +import { serverConfig } from './server.config'; +import { defaultMikroOrmOptions } from './server.module'; const serverModules = [ConfigModule.forRoot(createConfigModuleOptions(serverConfig)), DeletionApiModule]; diff --git a/apps/server/src/modules/server/server.module.ts b/apps/server/src/modules/server/server.module.ts index c048156d08b..f67cd484545 100644 --- a/apps/server/src/modules/server/server.module.ts +++ b/apps/server/src/modules/server/server.module.ts @@ -30,8 +30,8 @@ import { UserApiModule } from '@modules/user/user-api.module'; import { VideoConferenceApiModule } from '@modules/video-conference/video-conference-api.module'; import { DynamicModule, Inject, MiddlewareConsumer, Module, NestModule, NotFoundException } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; -import { ALL_ENTITIES } from '@shared/domain'; -import { createConfigModuleOptions, DB_PASSWORD, DB_URL, DB_USERNAME } from '@src/config'; +import { ALL_ENTITIES } from '@shared/domain/entity'; +import { DB_PASSWORD, DB_URL, DB_USERNAME, createConfigModuleOptions } from '@src/config'; import { CoreModule } from '@src/core'; import { LegacyLogger, LoggerModule } from '@src/core/logger'; import connectRedis from 'connect-redis'; diff --git a/apps/server/src/modules/sharing/controller/api-test/sharing-create-token.api.spec.ts b/apps/server/src/modules/sharing/controller/api-test/sharing-create-token.api.spec.ts index a79b02046ac..f69411a7149 100644 --- a/apps/server/src/modules/sharing/controller/api-test/sharing-create-token.api.spec.ts +++ b/apps/server/src/modules/sharing/controller/api-test/sharing-create-token.api.spec.ts @@ -6,7 +6,7 @@ import { ServerTestModule } from '@modules/server/server.module'; import { ExecutionContext, HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, courseFactory, diff --git a/apps/server/src/modules/sharing/controller/api-test/sharing-import-token.api.spec.ts b/apps/server/src/modules/sharing/controller/api-test/sharing-import-token.api.spec.ts index 9d8df39e195..b679b40b1db 100644 --- a/apps/server/src/modules/sharing/controller/api-test/sharing-import-token.api.spec.ts +++ b/apps/server/src/modules/sharing/controller/api-test/sharing-import-token.api.spec.ts @@ -7,7 +7,7 @@ import { ServerTestModule } from '@modules/server'; import { ExecutionContext, HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, courseFactory, diff --git a/apps/server/src/modules/sharing/controller/api-test/sharing-lookup-token.api.spec.ts b/apps/server/src/modules/sharing/controller/api-test/sharing-lookup-token.api.spec.ts index 88f23408be4..5b7f0edc659 100644 --- a/apps/server/src/modules/sharing/controller/api-test/sharing-lookup-token.api.spec.ts +++ b/apps/server/src/modules/sharing/controller/api-test/sharing-lookup-token.api.spec.ts @@ -1,13 +1,13 @@ import { Configuration } from '@hpi-schul-cloud/commons'; import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { TestApiClient, UserAndAccountTestFactory, courseFactory, schoolFactory } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; +import { ShareTokenContextType, ShareTokenParentType } from '../../domainobject/share-token.do'; import { ShareTokenService } from '../../service'; import { ShareTokenInfoResponse } from '../dto'; -import { ShareTokenContextType, ShareTokenParentType } from '../../domainobject/share-token.do'; describe(`share token lookup (api)`, () => { let app: INestApplication; diff --git a/apps/server/src/modules/sharing/mapper/metadata-type.mapper.spec.ts b/apps/server/src/modules/sharing/mapper/metadata-type.mapper.spec.ts index ac0a413a43e..3f389250ff5 100644 --- a/apps/server/src/modules/sharing/mapper/metadata-type.mapper.spec.ts +++ b/apps/server/src/modules/sharing/mapper/metadata-type.mapper.spec.ts @@ -1,5 +1,6 @@ import { NotImplementedException } from '@nestjs/common'; -import { LearnroomTypes } from '@shared/domain'; + +import { LearnroomTypes } from '@shared/domain/types'; import { ShareTokenParentType } from '../domainobject/share-token.do'; import { MetadataTypeMapper } from './metadata-type.mapper'; diff --git a/apps/server/src/modules/sharing/mapper/metadata-type.mapper.ts b/apps/server/src/modules/sharing/mapper/metadata-type.mapper.ts index 2f8aaf589d7..3819d6d2aab 100644 --- a/apps/server/src/modules/sharing/mapper/metadata-type.mapper.ts +++ b/apps/server/src/modules/sharing/mapper/metadata-type.mapper.ts @@ -1,5 +1,5 @@ import { NotImplementedException } from '@nestjs/common'; -import { LearnroomTypes } from '@shared/domain'; +import { LearnroomTypes } from '@shared/domain/types'; import { ShareTokenParentType } from '../domainobject/share-token.do'; export class MetadataTypeMapper { diff --git a/apps/server/src/modules/sharing/uc/share-token.uc.spec.ts b/apps/server/src/modules/sharing/uc/share-token.uc.spec.ts index 9ad71462008..63c171a04e4 100644 --- a/apps/server/src/modules/sharing/uc/share-token.uc.spec.ts +++ b/apps/server/src/modules/sharing/uc/share-token.uc.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { BadRequestException, InternalServerErrorException, NotImplementedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { Action, diff --git a/apps/server/src/modules/sharing/uc/share-token.uc.ts b/apps/server/src/modules/sharing/uc/share-token.uc.ts index c2a12054cb7..3cef45063aa 100644 --- a/apps/server/src/modules/sharing/uc/share-token.uc.ts +++ b/apps/server/src/modules/sharing/uc/share-token.uc.ts @@ -1,7 +1,4 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; -import { BadRequestException, Injectable, InternalServerErrorException, NotImplementedException } from '@nestjs/common'; -import { EntityId, Permission } from '@shared/domain'; -import { LegacyLogger } from '@src/core/logger'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { AuthorizationReferenceService } from '@modules/authorization/domain'; import { CopyStatus } from '@modules/copy-helper'; @@ -9,6 +6,10 @@ import { CourseCopyService } from '@modules/learnroom'; import { CourseService } from '@modules/learnroom/service'; import { LessonCopyService } from '@modules/lesson/service'; import { TaskCopyService } from '@modules/task/service'; +import { BadRequestException, Injectable, InternalServerErrorException, NotImplementedException } from '@nestjs/common'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; +import { LegacyLogger } from '@src/core/logger'; import { ShareTokenContext, ShareTokenContextType, diff --git a/apps/server/src/modules/system/controller/api-test/system.api.spec.ts b/apps/server/src/modules/system/controller/api-test/system.api.spec.ts index a449db0ffc9..0ccc6e4a59f 100644 --- a/apps/server/src/modules/system/controller/api-test/system.api.spec.ts +++ b/apps/server/src/modules/system/controller/api-test/system.api.spec.ts @@ -2,8 +2,8 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { OauthConfigEntity, SchoolEntity, SystemEntity } from '@shared/domain'; -import { schoolFactory, systemEntityFactory, TestApiClient, UserAndAccountTestFactory } from '@shared/testing'; +import { OauthConfigEntity, SchoolEntity, SystemEntity } from '@shared/domain/entity'; +import { TestApiClient, UserAndAccountTestFactory, schoolFactory, systemEntityFactory } from '@shared/testing'; import { Response } from 'supertest'; import { PublicSystemListResponse, PublicSystemResponse } from '../dto'; diff --git a/apps/server/src/modules/system/controller/dto/system-id.params.ts b/apps/server/src/modules/system/controller/dto/system-id.params.ts index 9138e618d13..bbefe41a88b 100644 --- a/apps/server/src/modules/system/controller/dto/system-id.params.ts +++ b/apps/server/src/modules/system/controller/dto/system-id.params.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { IsMongoId } from 'class-validator'; export class SystemIdParams { diff --git a/apps/server/src/modules/system/controller/dto/system.filter.params.ts b/apps/server/src/modules/system/controller/dto/system.filter.params.ts index 7fbd8006d55..c2f49f55231 100644 --- a/apps/server/src/modules/system/controller/dto/system.filter.params.ts +++ b/apps/server/src/modules/system/controller/dto/system.filter.params.ts @@ -1,6 +1,6 @@ import { ApiPropertyOptional } from '@nestjs/swagger'; import { StringToBoolean } from '@shared/controller'; -import { SystemTypeEnum } from '@shared/domain'; +import { SystemTypeEnum } from '@shared/domain/types'; import { IsBoolean, IsEnum, IsOptional } from 'class-validator'; export class SystemFilterParams { diff --git a/apps/server/src/modules/system/mapper/system-oidc.mapper.spec.ts b/apps/server/src/modules/system/mapper/system-oidc.mapper.spec.ts index 0b230c87eed..49c78b4dc2f 100644 --- a/apps/server/src/modules/system/mapper/system-oidc.mapper.spec.ts +++ b/apps/server/src/modules/system/mapper/system-oidc.mapper.spec.ts @@ -1,5 +1,5 @@ import { Test, TestingModule } from '@nestjs/testing'; -import { SystemEntity } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; import { systemEntityFactory } from '@shared/testing'; import { SystemOidcMapper } from './system-oidc.mapper'; diff --git a/apps/server/src/modules/system/mapper/system-oidc.mapper.ts b/apps/server/src/modules/system/mapper/system-oidc.mapper.ts index e486ae458fd..e1a2477e2a6 100644 --- a/apps/server/src/modules/system/mapper/system-oidc.mapper.ts +++ b/apps/server/src/modules/system/mapper/system-oidc.mapper.ts @@ -1,5 +1,5 @@ import { OidcConfigDto } from '@modules/system/service/dto/oidc-config.dto'; -import { OidcConfigEntity, SystemEntity } from '@shared/domain'; +import { OidcConfigEntity, SystemEntity } from '@shared/domain/entity'; export class SystemOidcMapper { static mapFromEntityToDto(entity: SystemEntity): OidcConfigDto | undefined { diff --git a/apps/server/src/modules/system/mapper/system.mapper.spec.ts b/apps/server/src/modules/system/mapper/system.mapper.spec.ts index 8bbf4986d9e..02af426d04c 100644 --- a/apps/server/src/modules/system/mapper/system.mapper.spec.ts +++ b/apps/server/src/modules/system/mapper/system.mapper.spec.ts @@ -1,5 +1,5 @@ import { Test, TestingModule } from '@nestjs/testing'; -import { SystemEntity } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; import { systemEntityFactory } from '@shared/testing'; import { SystemMapper } from './system.mapper'; diff --git a/apps/server/src/modules/system/mapper/system.mapper.ts b/apps/server/src/modules/system/mapper/system.mapper.ts index 420de9f2a69..2837d8eb912 100644 --- a/apps/server/src/modules/system/mapper/system.mapper.ts +++ b/apps/server/src/modules/system/mapper/system.mapper.ts @@ -1,6 +1,6 @@ import { OauthConfigDto } from '@modules/system/service/dto/oauth-config.dto'; import { SystemDto } from '@modules/system/service/dto/system.dto'; -import { OauthConfigEntity, SystemEntity } from '@shared/domain'; +import { OauthConfigEntity, SystemEntity } from '@shared/domain/entity'; export class SystemMapper { static mapFromEntityToDto(entity: SystemEntity): SystemDto { diff --git a/apps/server/src/modules/system/repo/system-domain.mapper.ts b/apps/server/src/modules/system/repo/system-domain.mapper.ts index 422f838c0ed..86fa95c1ae5 100644 --- a/apps/server/src/modules/system/repo/system-domain.mapper.ts +++ b/apps/server/src/modules/system/repo/system-domain.mapper.ts @@ -1,4 +1,4 @@ -import { LdapConfigEntity, OauthConfigEntity, SystemEntity } from '@shared/domain'; +import { LdapConfigEntity, OauthConfigEntity, SystemEntity } from '@shared/domain/entity'; import { LdapConfig, OauthConfig, SystemProps } from '../domain'; export class SystemDomainMapper { diff --git a/apps/server/src/modules/system/repo/system.repo.spec.ts b/apps/server/src/modules/system/repo/system.repo.spec.ts index 584035c0e46..abf64049e9c 100644 --- a/apps/server/src/modules/system/repo/system.repo.spec.ts +++ b/apps/server/src/modules/system/repo/system.repo.spec.ts @@ -1,7 +1,7 @@ import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { LdapConfigEntity, OauthConfigEntity, SystemEntity } from '@shared/domain'; +import { LdapConfigEntity, OauthConfigEntity, SystemEntity } from '@shared/domain/entity'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { cleanupCollections, systemEntityFactory } from '@shared/testing'; import { System, SystemProps } from '../domain'; diff --git a/apps/server/src/modules/system/repo/system.repo.ts b/apps/server/src/modules/system/repo/system.repo.ts index 3251ec87230..7b54e45219f 100644 --- a/apps/server/src/modules/system/repo/system.repo.ts +++ b/apps/server/src/modules/system/repo/system.repo.ts @@ -1,6 +1,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId, SystemEntity } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { System, SystemProps } from '../domain'; import { SystemDomainMapper } from './system-domain.mapper'; diff --git a/apps/server/src/modules/system/service/legacy-system.service.spec.ts b/apps/server/src/modules/system/service/legacy-system.service.spec.ts index b600e4d2891..c1528da8ead 100644 --- a/apps/server/src/modules/system/service/legacy-system.service.spec.ts +++ b/apps/server/src/modules/system/service/legacy-system.service.spec.ts @@ -2,7 +2,8 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { IdentityManagementOauthService } from '@infra/identity-management'; import { Test, TestingModule } from '@nestjs/testing'; import { EntityNotFoundError } from '@shared/common'; -import { OauthConfigEntity, SystemEntity, SystemTypeEnum } from '@shared/domain'; +import { OauthConfigEntity, SystemEntity } from '@shared/domain/entity'; +import { SystemTypeEnum } from '@shared/domain/types'; import { LegacySystemRepo } from '@shared/repo'; import { systemEntityFactory } from '@shared/testing'; import { SystemMapper } from '../mapper'; diff --git a/apps/server/src/modules/system/service/legacy-system.service.ts b/apps/server/src/modules/system/service/legacy-system.service.ts index 9b59baad7f5..870219dd92c 100644 --- a/apps/server/src/modules/system/service/legacy-system.service.ts +++ b/apps/server/src/modules/system/service/legacy-system.service.ts @@ -1,7 +1,8 @@ import { IdentityManagementOauthService } from '@infra/identity-management'; import { Injectable } from '@nestjs/common'; import { EntityNotFoundError } from '@shared/common'; -import { EntityId, SystemEntity, SystemTypeEnum } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; +import { EntityId, SystemTypeEnum } from '@shared/domain/types'; import { LegacySystemRepo } from '@shared/repo'; import { SystemMapper } from '../mapper'; import { SystemDto } from './dto'; diff --git a/apps/server/src/modules/system/service/system-oidc.service.spec.ts b/apps/server/src/modules/system/service/system-oidc.service.spec.ts index 53e73d2e780..6c20f4c7958 100644 --- a/apps/server/src/modules/system/service/system-oidc.service.spec.ts +++ b/apps/server/src/modules/system/service/system-oidc.service.spec.ts @@ -1,7 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { Test, TestingModule } from '@nestjs/testing'; import { EntityNotFoundError } from '@shared/common'; -import { SystemEntity } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; import { LegacySystemRepo } from '@shared/repo'; import { systemEntityFactory } from '@shared/testing'; import { SystemOidcMapper } from '../mapper/system-oidc.mapper'; diff --git a/apps/server/src/modules/system/service/system-oidc.service.ts b/apps/server/src/modules/system/service/system-oidc.service.ts index c8703da8ff6..6a0e7651bab 100644 --- a/apps/server/src/modules/system/service/system-oidc.service.ts +++ b/apps/server/src/modules/system/service/system-oidc.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@nestjs/common'; import { EntityNotFoundError } from '@shared/common'; -import { EntityId, SystemEntity, SystemTypeEnum } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; +import { EntityId, SystemTypeEnum } from '@shared/domain/types'; import { LegacySystemRepo } from '@shared/repo'; import { SystemOidcMapper } from '../mapper'; import { OidcConfigDto } from './dto'; diff --git a/apps/server/src/modules/system/uc/system.uc.spec.ts b/apps/server/src/modules/system/uc/system.uc.spec.ts index e498718321a..96ca3518b71 100644 --- a/apps/server/src/modules/system/uc/system.uc.spec.ts +++ b/apps/server/src/modules/system/uc/system.uc.spec.ts @@ -5,7 +5,9 @@ import { SystemUc } from '@modules/system/uc/system.uc'; import { Test, TestingModule } from '@nestjs/testing'; import { EntityNotFoundError } from '@shared/common'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { EntityId, Permission, SystemEntity, SystemTypeEnum } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId, SystemTypeEnum } from '@shared/domain/types'; import { setupEntities, systemEntityFactory, systemFactory, userFactory } from '@shared/testing'; import { AuthorizationContextBuilder, AuthorizationService } from '../../authorization'; import { SystemMapper } from '../mapper'; diff --git a/apps/server/src/modules/system/uc/system.uc.ts b/apps/server/src/modules/system/uc/system.uc.ts index 4ced419519b..129faada416 100644 --- a/apps/server/src/modules/system/uc/system.uc.ts +++ b/apps/server/src/modules/system/uc/system.uc.ts @@ -2,7 +2,9 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/auth import { Injectable } from '@nestjs/common'; import { EntityNotFoundError } from '@shared/common'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { EntityId, Permission, SystemEntity, SystemType, SystemTypeEnum, User } from '@shared/domain'; +import { SystemEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId, SystemType, SystemTypeEnum } from '@shared/domain/types'; import { System } from '../domain'; import { LegacySystemService, SystemDto, SystemService } from '../service'; diff --git a/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts b/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts index aed731a86e8..5df2785c2db 100644 --- a/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts @@ -8,7 +8,8 @@ import { SubmissionStatusListResponse } from '@modules/task/controller/dto/submi import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { ApiValidationError } from '@shared/common'; -import { Permission, Submission } from '@shared/domain'; +import { Submission } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, courseGroupFactory, diff --git a/apps/server/src/modules/task/controller/api-test/task-delete.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task-delete.api.spec.ts index efdc78d53b2..f4b12cf9616 100644 --- a/apps/server/src/modules/task/controller/api-test/task-delete.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task-delete.api.spec.ts @@ -1,17 +1,17 @@ import { createMock } from '@golevelup/ts-jest'; import { EntityManager } from '@mikro-orm/mongodb'; +import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; +import { ServerTestModule } from '@modules/server'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, courseFactory, taskFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; -import { ServerTestModule } from '@modules/server'; const createStudent = () => { const { studentAccount, studentUser } = UserAndAccountTestFactory.buildStudent({}, [ diff --git a/apps/server/src/modules/task/controller/api-test/task-finish.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task-finish.api.spec.ts index acf66c36a1d..1ca1727f21d 100644 --- a/apps/server/src/modules/task/controller/api-test/task-finish.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task-finish.api.spec.ts @@ -1,15 +1,15 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, courseFactory, taskFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; const createStudent = () => { const { studentAccount, studentUser } = UserAndAccountTestFactory.buildStudent({}, [ diff --git a/apps/server/src/modules/task/controller/api-test/task-finished.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task-finished.api.spec.ts index f8261f9649b..7c6d543c3ec 100644 --- a/apps/server/src/modules/task/controller/api-test/task-finished.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task-finished.api.spec.ts @@ -5,7 +5,7 @@ import { ServerTestModule } from '@modules/server/server.module'; import { TaskListResponse } from '@modules/task/controller/dto'; import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { cleanupCollections, courseFactory, diff --git a/apps/server/src/modules/task/controller/api-test/task-restore.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task-restore.api.spec.ts index 9d8f50e0950..7a61ac1ae17 100644 --- a/apps/server/src/modules/task/controller/api-test/task-restore.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task-restore.api.spec.ts @@ -1,15 +1,15 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, courseFactory, taskFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; const createStudent = () => { const { studentAccount, studentUser } = UserAndAccountTestFactory.buildStudent({}, [ diff --git a/apps/server/src/modules/task/controller/api-test/task-revert-published.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task-revert-published.api.spec.ts index d4e6d4dee64..a958a1f0759 100644 --- a/apps/server/src/modules/task/controller/api-test/task-revert-published.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task-revert-published.api.spec.ts @@ -1,15 +1,15 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, courseFactory, taskFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; const createStudent = () => { const { studentAccount, studentUser } = UserAndAccountTestFactory.buildStudent({}, [ diff --git a/apps/server/src/modules/task/controller/api-test/task.api.spec.ts b/apps/server/src/modules/task/controller/api-test/task.api.spec.ts index b7afee9c257..566b3840ab0 100644 --- a/apps/server/src/modules/task/controller/api-test/task.api.spec.ts +++ b/apps/server/src/modules/task/controller/api-test/task.api.spec.ts @@ -1,7 +1,10 @@ import { EntityManager } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server/server.module'; +import { TaskListResponse } from '@modules/task/controller/dto'; import { INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { InputFormat, Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; +import { InputFormat } from '@shared/domain/types'; import { TestApiClient, UserAndAccountTestFactory, @@ -10,8 +13,6 @@ import { submissionFactory, taskFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server/server.module'; -import { TaskListResponse } from '@modules/task/controller/dto'; const tomorrow = new Date(Date.now() + 86400000); diff --git a/apps/server/src/modules/task/controller/dto/task-create.params.ts b/apps/server/src/modules/task/controller/dto/task-create.params.ts index 1489f208a37..97bd4af24cb 100644 --- a/apps/server/src/modules/task/controller/dto/task-create.params.ts +++ b/apps/server/src/modules/task/controller/dto/task-create.params.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { SanitizeHtml } from '@shared/controller'; -import { InputFormat, TaskCreate } from '@shared/domain'; +import { InputFormat, TaskCreate } from '@shared/domain/types'; import { IsDate, IsMongoId, IsOptional, IsString } from 'class-validator'; export class TaskCreateParams implements TaskCreate { diff --git a/apps/server/src/modules/task/controller/dto/task-update.params.ts b/apps/server/src/modules/task/controller/dto/task-update.params.ts index 7cefef35311..2462ee0e616 100644 --- a/apps/server/src/modules/task/controller/dto/task-update.params.ts +++ b/apps/server/src/modules/task/controller/dto/task-update.params.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { SanitizeHtml } from '@shared/controller'; -import { InputFormat, TaskUpdate } from '@shared/domain'; +import { InputFormat, TaskUpdate } from '@shared/domain/types'; import { IsDate, IsMongoId, IsOptional, IsString } from 'class-validator'; export class TaskUpdateParams implements TaskUpdate { diff --git a/apps/server/src/modules/task/controller/dto/task.response.ts b/apps/server/src/modules/task/controller/dto/task.response.ts index 102d7f8efbe..fc635b1c0d4 100644 --- a/apps/server/src/modules/task/controller/dto/task.response.ts +++ b/apps/server/src/modules/task/controller/dto/task.response.ts @@ -1,6 +1,6 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; import { DecodeHtmlEntities, PaginationResponse } from '@shared/controller'; -import { RichText } from '@shared/domain'; +import { RichText } from '@shared/domain/types'; import { TaskStatusResponse } from './task-status.response'; /** diff --git a/apps/server/src/modules/task/mapper/submission.mapper.ts b/apps/server/src/modules/task/mapper/submission.mapper.ts index cdf7e15457c..bbfdf5a7494 100644 --- a/apps/server/src/modules/task/mapper/submission.mapper.ts +++ b/apps/server/src/modules/task/mapper/submission.mapper.ts @@ -1,4 +1,4 @@ -import { Submission } from '@shared/domain'; +import { Submission } from '@shared/domain/entity'; import { SubmissionStatusResponse } from '../controller/dto'; export class SubmissionMapper { diff --git a/apps/server/src/modules/task/mapper/task-status.mapper.ts b/apps/server/src/modules/task/mapper/task-status.mapper.ts index 291ed270ba6..03b169f075d 100644 --- a/apps/server/src/modules/task/mapper/task-status.mapper.ts +++ b/apps/server/src/modules/task/mapper/task-status.mapper.ts @@ -1,4 +1,4 @@ -import { TaskStatus } from '@shared/domain'; +import { TaskStatus } from '@shared/domain/types'; import { TaskStatusResponse } from '../controller/dto/task-status.response'; export class TaskStatusMapper { diff --git a/apps/server/src/modules/task/mapper/task.mapper.spec.ts b/apps/server/src/modules/task/mapper/task.mapper.spec.ts index 2513101eca3..fe67dcaaaca 100644 --- a/apps/server/src/modules/task/mapper/task.mapper.spec.ts +++ b/apps/server/src/modules/task/mapper/task.mapper.spec.ts @@ -1,5 +1,6 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { InputFormat, Task, TaskParentDescriptions, TaskStatus, TaskUpdate } from '@shared/domain'; +import { Task, TaskParentDescriptions } from '@shared/domain/entity'; +import { InputFormat, TaskStatus, TaskUpdate } from '@shared/domain/types'; import { setupEntities, taskFactory } from '@shared/testing'; import { TaskCreateParams, TaskResponse, TaskStatusResponse, TaskUpdateParams } from '../controller/dto'; import { TaskMapper } from './task.mapper'; diff --git a/apps/server/src/modules/task/mapper/task.mapper.ts b/apps/server/src/modules/task/mapper/task.mapper.ts index 2e8d02ae977..e527c7bd1b3 100644 --- a/apps/server/src/modules/task/mapper/task.mapper.ts +++ b/apps/server/src/modules/task/mapper/task.mapper.ts @@ -1,4 +1,5 @@ -import { InputFormat, RichText, TaskCreate, TaskUpdate, TaskWithStatusVo } from '@shared/domain'; +import { TaskWithStatusVo } from '@shared/domain/entity'; +import { InputFormat, RichText, TaskCreate, TaskUpdate } from '@shared/domain/types'; import { TaskCreateParams, TaskResponse, TaskUpdateParams } from '../controller/dto'; import { TaskStatusMapper } from './task-status.mapper'; diff --git a/apps/server/src/modules/task/service/submission.service.spec.ts b/apps/server/src/modules/task/service/submission.service.spec.ts index abf5ed9f152..a75ba5d51ac 100644 --- a/apps/server/src/modules/task/service/submission.service.spec.ts +++ b/apps/server/src/modules/task/service/submission.service.spec.ts @@ -1,10 +1,11 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { Test, TestingModule } from '@nestjs/testing'; -import { Counted, Submission } from '@shared/domain'; import { FileRecordParentType } from '@infra/rabbitmq'; +import { FileDto, FilesStorageClientAdapterService } from '@modules/files-storage-client'; +import { Test, TestingModule } from '@nestjs/testing'; +import { Submission } from '@shared/domain/entity'; +import { Counted } from '@shared/domain/types'; import { SubmissionRepo } from '@shared/repo'; import { setupEntities, submissionFactory, taskFactory } from '@shared/testing'; -import { FileDto, FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { SubmissionService } from './submission.service'; describe('Submission Service', () => { diff --git a/apps/server/src/modules/task/service/submission.service.ts b/apps/server/src/modules/task/service/submission.service.ts index c451dc8ad95..b6a545c51c1 100644 --- a/apps/server/src/modules/task/service/submission.service.ts +++ b/apps/server/src/modules/task/service/submission.service.ts @@ -1,7 +1,8 @@ +import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { Injectable } from '@nestjs/common'; -import { Counted, EntityId, Submission } from '@shared/domain'; +import { Submission } from '@shared/domain/entity'; +import { Counted, EntityId } from '@shared/domain/types'; import { SubmissionRepo } from '@shared/repo'; -import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; @Injectable() export class SubmissionService { diff --git a/apps/server/src/modules/task/service/task-copy.service.ts b/apps/server/src/modules/task/service/task-copy.service.ts index f7faa684e8d..ee12c5925d3 100644 --- a/apps/server/src/modules/task/service/task-copy.service.ts +++ b/apps/server/src/modules/task/service/task-copy.service.ts @@ -1,10 +1,10 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; -import { Course, LessonEntity, Task, User } from '@shared/domain/entity'; -import { TaskRepo } from '@shared/repo'; import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; import { CopyFilesService } from '@modules/files-storage-client'; import { FileUrlReplacement } from '@modules/files-storage-client/service/copy-files.service'; +import { Injectable } from '@nestjs/common'; +import { Course, LessonEntity, Task, User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; +import { TaskRepo } from '@shared/repo'; type TaskCopyParams = { originalTaskId: EntityId; diff --git a/apps/server/src/modules/task/service/task.service.ts b/apps/server/src/modules/task/service/task.service.ts index 78f9dca9a51..3af74484604 100644 --- a/apps/server/src/modules/task/service/task.service.ts +++ b/apps/server/src/modules/task/service/task.service.ts @@ -1,7 +1,9 @@ +import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { Injectable } from '@nestjs/common'; -import { Counted, EntityId, IFindOptions, Task } from '@shared/domain'; +import { Task } from '@shared/domain/entity'; +import { IFindOptions } from '@shared/domain/interface'; +import { Counted, EntityId } from '@shared/domain/types'; import { TaskRepo } from '@shared/repo'; -import { FilesStorageClientAdapterService } from '@modules/files-storage-client'; import { SubmissionService } from './submission.service'; @Injectable() diff --git a/apps/server/src/modules/task/types/task-copy-parent.params.ts b/apps/server/src/modules/task/types/task-copy-parent.params.ts index 986785d8cf8..e19f839db3b 100644 --- a/apps/server/src/modules/task/types/task-copy-parent.params.ts +++ b/apps/server/src/modules/task/types/task-copy-parent.params.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; // todo: it look like it is required not optional export type TaskCopyParentParams = { diff --git a/apps/server/src/modules/task/uc/submission.uc.spec.ts b/apps/server/src/modules/task/uc/submission.uc.spec.ts index 63bac0f52f1..688ff682ab9 100644 --- a/apps/server/src/modules/task/uc/submission.uc.spec.ts +++ b/apps/server/src/modules/task/uc/submission.uc.spec.ts @@ -1,8 +1,10 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { Test, TestingModule } from '@nestjs/testing'; -import { Counted, Permission, Submission } from '@shared/domain'; +import { Submission } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { Counted } from '@shared/domain/types'; import { setupEntities, submissionFactory, taskFactory, userFactory } from '@shared/testing'; -import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { SubmissionService } from '../service/submission.service'; import { SubmissionUc } from './submission.uc'; diff --git a/apps/server/src/modules/task/uc/submission.uc.ts b/apps/server/src/modules/task/uc/submission.uc.ts index 50c2430e8de..9b2c956151b 100644 --- a/apps/server/src/modules/task/uc/submission.uc.ts +++ b/apps/server/src/modules/task/uc/submission.uc.ts @@ -1,6 +1,8 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId, Permission, Submission, User } from '@shared/domain'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; +import { Injectable } from '@nestjs/common'; +import { Submission, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { SubmissionService } from '../service'; @Injectable() diff --git a/apps/server/src/modules/task/uc/task-copy.uc.ts b/apps/server/src/modules/task/uc/task-copy.uc.ts index 58316aa1972..2df39034716 100644 --- a/apps/server/src/modules/task/uc/task-copy.uc.ts +++ b/apps/server/src/modules/task/uc/task-copy.uc.ts @@ -1,10 +1,11 @@ import { Configuration } from '@hpi-schul-cloud/commons'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { CopyHelperService, CopyStatus } from '@modules/copy-helper'; +import { LessonService } from '@modules/lesson'; import { ForbiddenException, Injectable, InternalServerErrorException, NotFoundException } from '@nestjs/common'; -import { Course, EntityId, LessonEntity, Task, User } from '@shared/domain'; +import { Course, LessonEntity, Task, User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { CourseRepo, TaskRepo } from '@shared/repo'; -import { LessonService } from '@modules/lesson'; import { TaskCopyService } from '../service'; import { TaskCopyParentParams } from '../types'; diff --git a/apps/server/src/modules/task/uc/task.uc.spec.ts b/apps/server/src/modules/task/uc/task.uc.spec.ts index cc11f214bcf..f580f66eaaf 100644 --- a/apps/server/src/modules/task/uc/task.uc.spec.ts +++ b/apps/server/src/modules/task/uc/task.uc.spec.ts @@ -4,7 +4,9 @@ import { LessonService } from '@modules/lesson'; import { ForbiddenException, UnauthorizedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { PaginationParams } from '@shared/controller'; -import { Permission, SortOrder, TaskStatus } from '@shared/domain'; + +import { Permission, SortOrder } from '@shared/domain/interface'; +import { TaskStatus } from '@shared/domain/types'; import { CourseRepo, TaskRepo } from '@shared/repo'; import { courseFactory, diff --git a/apps/server/src/modules/task/uc/task.uc.ts b/apps/server/src/modules/task/uc/task.uc.ts index e385a7f7309..107e1015784 100644 --- a/apps/server/src/modules/task/uc/task.uc.ts +++ b/apps/server/src/modules/task/uc/task.uc.ts @@ -1,18 +1,9 @@ import { Action, AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { LessonService } from '@modules/lesson'; import { Injectable, UnauthorizedException } from '@nestjs/common'; -import { - Counted, - Course, - EntityId, - LessonEntity, - Pagination, - Permission, - SortOrder, - TaskStatus, - TaskWithStatusVo, - User, -} from '@shared/domain'; +import { Course, LessonEntity, TaskWithStatusVo, User } from '@shared/domain/entity'; +import { Pagination, Permission, SortOrder } from '@shared/domain/interface'; +import { Counted, EntityId, TaskStatus } from '@shared/domain/types'; import { CourseRepo, TaskRepo } from '@shared/repo'; import { TaskService } from '../service'; diff --git a/apps/server/src/modules/teams/service/team.service.ts b/apps/server/src/modules/teams/service/team.service.ts index 364d6b73e57..09d26f2ed5c 100644 --- a/apps/server/src/modules/teams/service/team.service.ts +++ b/apps/server/src/modules/teams/service/team.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { EntityId, TeamEntity } from '@shared/domain'; +import { TeamEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { TeamsRepo } from '@shared/repo'; @Injectable() diff --git a/apps/server/src/modules/tldraw/tldraw-test.module.ts b/apps/server/src/modules/tldraw/tldraw-test.module.ts index 19c38171b88..49f8bd5c820 100644 --- a/apps/server/src/modules/tldraw/tldraw-test.module.ts +++ b/apps/server/src/modules/tldraw/tldraw-test.module.ts @@ -4,7 +4,7 @@ import { CoreModule } from '@src/core'; import { LoggerModule } from '@src/core/logger'; import { AuthenticationModule } from '@modules/authentication/authentication.module'; import { AuthorizationModule } from '@modules/authorization'; -import { Course, User } from '@shared/domain'; +import { Course, User } from '@shared/domain/entity'; import { AuthenticationApiModule } from '../authentication/authentication-api.module'; import { TldrawWsModule } from './tldraw-ws.module'; import { TldrawWs } from './controller'; diff --git a/apps/server/src/modules/tool/common/uc/tool-permission-helper.ts b/apps/server/src/modules/tool/common/uc/tool-permission-helper.ts index 525c8c5d3b6..d43de5d84f0 100644 --- a/apps/server/src/modules/tool/common/uc/tool-permission-helper.ts +++ b/apps/server/src/modules/tool/common/uc/tool-permission-helper.ts @@ -3,8 +3,10 @@ import { AuthorizableReferenceType } from '@modules/authorization/domain'; import { BoardDoAuthorizableService, ContentElementService } from '@modules/board'; import { CourseService } from '@modules/learnroom'; import { LegacySchoolService } from '@modules/legacy-school'; -import { forwardRef, Inject, Injectable } from '@nestjs/common'; -import { BoardDoAuthorizable, Course, EntityId, LegacySchoolDo, User } from '@shared/domain'; +import { Inject, Injectable, forwardRef } from '@nestjs/common'; +import { BoardDoAuthorizable, LegacySchoolDo } from '@shared/domain/domainobject'; +import { Course, User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { ContextExternalTool } from '../../context-external-tool/domain'; import { SchoolExternalTool } from '../../school-external-tool/domain'; import { ToolContextType } from '../enum'; diff --git a/apps/server/src/modules/tool/common/uc/tool-permissions-helper.spec.ts b/apps/server/src/modules/tool/common/uc/tool-permissions-helper.spec.ts index aace35579db..d0578cb2442 100644 --- a/apps/server/src/modules/tool/common/uc/tool-permissions-helper.spec.ts +++ b/apps/server/src/modules/tool/common/uc/tool-permissions-helper.spec.ts @@ -11,7 +11,9 @@ import { CourseService } from '@modules/learnroom'; import { LegacySchoolService } from '@modules/legacy-school'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardDoAuthorizable, ExternalToolElement, LegacySchoolDo, Permission } from '@shared/domain'; + +import { BoardDoAuthorizable, ExternalToolElement, LegacySchoolDo } from '@shared/domain/domainobject'; +import { Permission } from '@shared/domain/interface'; import { contextExternalToolFactory, courseFactory, diff --git a/apps/server/src/modules/tool/context-external-tool/controller/api-test/tool-context.api.spec.ts b/apps/server/src/modules/tool/context-external-tool/controller/api-test/tool-context.api.spec.ts index af14eb379f3..e40cc8dc4a3 100644 --- a/apps/server/src/modules/tool/context-external-tool/controller/api-test/tool-context.api.spec.ts +++ b/apps/server/src/modules/tool/context-external-tool/controller/api-test/tool-context.api.spec.ts @@ -2,8 +2,11 @@ import { EntityManager, MikroORM } from '@mikro-orm/core'; import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Account, Course, Permission, SchoolEntity, User } from '@shared/domain'; +import { Account, Course, SchoolEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, accountFactory, contextExternalToolEntityFactory, courseFactory, @@ -12,8 +15,6 @@ import { roleFactory, schoolExternalToolEntityFactory, schoolFactory, - TestApiClient, - UserAndAccountTestFactory, userFactory, } from '@shared/testing'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/tool/context-external-tool/controller/api-test/tool-reference.api.spec.ts b/apps/server/src/modules/tool/context-external-tool/controller/api-test/tool-reference.api.spec.ts index 9eae3c7298e..a0351af6c47 100644 --- a/apps/server/src/modules/tool/context-external-tool/controller/api-test/tool-reference.api.spec.ts +++ b/apps/server/src/modules/tool/context-external-tool/controller/api-test/tool-reference.api.spec.ts @@ -1,18 +1,19 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Course, Permission, SchoolEntity } from '@shared/domain'; +import { Course, SchoolEntity } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, contextExternalToolEntityFactory, courseFactory, externalToolEntityFactory, schoolExternalToolEntityFactory, schoolFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; import { Response } from 'supertest'; import { ToolContextType } from '../../../common/enum'; import { ExternalToolEntity } from '../../../external-tool/entity'; diff --git a/apps/server/src/modules/tool/context-external-tool/service/context-external-tool-authorizable.service.ts b/apps/server/src/modules/tool/context-external-tool/service/context-external-tool-authorizable.service.ts index 20dbc16fff8..d803a8f3648 100644 --- a/apps/server/src/modules/tool/context-external-tool/service/context-external-tool-authorizable.service.ts +++ b/apps/server/src/modules/tool/context-external-tool/service/context-external-tool-authorizable.service.ts @@ -1,7 +1,7 @@ import { AuthorizationLoaderService } from '@modules/authorization'; -import { EntityId } from '@shared/domain'; -import { ContextExternalToolRepo } from '@shared/repo'; import { Injectable } from '@nestjs/common'; +import { EntityId } from '@shared/domain/types'; +import { ContextExternalToolRepo } from '@shared/repo'; import { ContextExternalTool } from '../domain'; @Injectable() diff --git a/apps/server/src/modules/tool/context-external-tool/service/context-external-tool.service.ts b/apps/server/src/modules/tool/context-external-tool/service/context-external-tool.service.ts index b389b4b948e..4bf429c85de 100644 --- a/apps/server/src/modules/tool/context-external-tool/service/context-external-tool.service.ts +++ b/apps/server/src/modules/tool/context-external-tool/service/context-external-tool.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ContextExternalToolRepo } from '@shared/repo'; import { ContextExternalTool, ContextRef } from '../domain'; import { ContextExternalToolQuery } from '../uc/dto/context-external-tool.types'; diff --git a/apps/server/src/modules/tool/context-external-tool/service/tool-reference.service.ts b/apps/server/src/modules/tool/context-external-tool/service/tool-reference.service.ts index 7fc2966de78..4720c07df74 100644 --- a/apps/server/src/modules/tool/context-external-tool/service/tool-reference.service.ts +++ b/apps/server/src/modules/tool/context-external-tool/service/tool-reference.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ExternalTool } from '../../external-tool/domain'; import { ExternalToolLogoService, ExternalToolService } from '../../external-tool/service'; import { SchoolExternalTool } from '../../school-external-tool/domain'; diff --git a/apps/server/src/modules/tool/context-external-tool/uc/context-external-tool.uc.spec.ts b/apps/server/src/modules/tool/context-external-tool/uc/context-external-tool.uc.spec.ts index c3eb4cb0298..d6f0c440c2d 100644 --- a/apps/server/src/modules/tool/context-external-tool/uc/context-external-tool.uc.spec.ts +++ b/apps/server/src/modules/tool/context-external-tool/uc/context-external-tool.uc.spec.ts @@ -9,7 +9,9 @@ import { import { AuthorizableReferenceType } from '@modules/authorization/domain'; import { ForbiddenException, UnprocessableEntityException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, Permission, User } from '@shared/domain'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { contextExternalToolFactory, schoolExternalToolFactory, setupEntities, userFactory } from '@shared/testing'; import { ToolContextType } from '../../common/enum'; import { ToolPermissionHelper } from '../../common/uc/tool-permission-helper'; diff --git a/apps/server/src/modules/tool/context-external-tool/uc/context-external-tool.uc.ts b/apps/server/src/modules/tool/context-external-tool/uc/context-external-tool.uc.ts index d584be201a8..6e2c1712aba 100644 --- a/apps/server/src/modules/tool/context-external-tool/uc/context-external-tool.uc.ts +++ b/apps/server/src/modules/tool/context-external-tool/uc/context-external-tool.uc.ts @@ -6,7 +6,9 @@ import { } from '@modules/authorization'; import { AuthorizableReferenceType } from '@modules/authorization/domain'; import { Injectable } from '@nestjs/common'; -import { EntityId, Permission, User } from '@shared/domain'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { ToolContextType } from '../../common/enum'; import { ToolPermissionHelper } from '../../common/uc/tool-permission-helper'; import { SchoolExternalTool } from '../../school-external-tool/domain'; diff --git a/apps/server/src/modules/tool/context-external-tool/uc/tool-reference.uc.spec.ts b/apps/server/src/modules/tool/context-external-tool/uc/tool-reference.uc.spec.ts index e0b39787737..12c3ee32a1d 100644 --- a/apps/server/src/modules/tool/context-external-tool/uc/tool-reference.uc.spec.ts +++ b/apps/server/src/modules/tool/context-external-tool/uc/tool-reference.uc.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { AuthorizationContextBuilder } from '@modules/authorization'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { contextExternalToolFactory, externalToolFactory } from '@shared/testing'; import { ToolConfigurationStatus, ToolContextType } from '../../common/enum'; import { ToolPermissionHelper } from '../../common/uc/tool-permission-helper'; diff --git a/apps/server/src/modules/tool/context-external-tool/uc/tool-reference.uc.ts b/apps/server/src/modules/tool/context-external-tool/uc/tool-reference.uc.ts index dd2e8d1c49d..b0ed14c5b75 100644 --- a/apps/server/src/modules/tool/context-external-tool/uc/tool-reference.uc.ts +++ b/apps/server/src/modules/tool/context-external-tool/uc/tool-reference.uc.ts @@ -1,6 +1,7 @@ import { AuthorizationContext, AuthorizationContextBuilder } from '@modules/authorization'; import { Injectable } from '@nestjs/common'; -import { EntityId, Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { ToolContextType } from '../../common/enum'; import { ToolPermissionHelper } from '../../common/uc/tool-permission-helper'; import { ContextExternalTool, ContextRef, ToolReference } from '../domain'; diff --git a/apps/server/src/modules/tool/external-tool/controller/api-test/tool-configuration.api.spec.ts b/apps/server/src/modules/tool/external-tool/controller/api-test/tool-configuration.api.spec.ts index 68543982174..1bd9b027766 100644 --- a/apps/server/src/modules/tool/external-tool/controller/api-test/tool-configuration.api.spec.ts +++ b/apps/server/src/modules/tool/external-tool/controller/api-test/tool-configuration.api.spec.ts @@ -1,9 +1,14 @@ import { EntityManager, MikroORM } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; +import { CustomParameterTypeParams } from '@modules/tool/common/enum'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Account, Course, Permission, SchoolEntity, User } from '@shared/domain'; +import { Account, Course, SchoolEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, accountFactory, contextExternalToolEntityFactory, courseFactory, @@ -11,12 +16,8 @@ import { externalToolEntityFactory, schoolExternalToolEntityFactory, schoolFactory, - TestApiClient, - UserAndAccountTestFactory, userFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; -import { CustomParameterTypeParams } from '@modules/tool/common/enum'; import { Response } from 'supertest'; import { CustomParameterLocationParams, CustomParameterScopeTypeParams } from '../../../common/enum'; import { ContextExternalToolEntity, ContextExternalToolType } from '../../../context-external-tool/entity'; diff --git a/apps/server/src/modules/tool/external-tool/controller/api-test/tool.api.spec.ts b/apps/server/src/modules/tool/external-tool/controller/api-test/tool.api.spec.ts index 75dc1229231..27f7e7825e4 100644 --- a/apps/server/src/modules/tool/external-tool/controller/api-test/tool.api.spec.ts +++ b/apps/server/src/modules/tool/external-tool/controller/api-test/tool.api.spec.ts @@ -3,16 +3,17 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission, SchoolEntity } from '@shared/domain'; +import { SchoolEntity } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, cleanupCollections, contextExternalToolEntityFactory, externalToolEntityFactory, externalToolFactory, schoolExternalToolEntityFactory, schoolFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; @@ -29,9 +30,9 @@ import { ExternalToolMetadata } from '../../domain'; import { ExternalToolEntity } from '../../entity'; import { ExternalToolCreateParams, + ExternalToolMetadataResponse, ExternalToolResponse, ExternalToolSearchListResponse, - ExternalToolMetadataResponse, } from '../dto'; describe('ToolController (API)', () => { diff --git a/apps/server/src/modules/tool/external-tool/controller/dto/request/context-external-tool-id.params.ts b/apps/server/src/modules/tool/external-tool/controller/dto/request/context-external-tool-id.params.ts index 662383a69e7..ad52921ee01 100644 --- a/apps/server/src/modules/tool/external-tool/controller/dto/request/context-external-tool-id.params.ts +++ b/apps/server/src/modules/tool/external-tool/controller/dto/request/context-external-tool-id.params.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { IsMongoId } from 'class-validator'; export class ContextExternalToolIdParams { diff --git a/apps/server/src/modules/tool/external-tool/controller/dto/request/context-ref.params.ts b/apps/server/src/modules/tool/external-tool/controller/dto/request/context-ref.params.ts index 1360d205d7e..106ab959e03 100644 --- a/apps/server/src/modules/tool/external-tool/controller/dto/request/context-ref.params.ts +++ b/apps/server/src/modules/tool/external-tool/controller/dto/request/context-ref.params.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { IsEnum, IsMongoId } from 'class-validator'; import { ToolContextType } from '../../../../common/enum'; diff --git a/apps/server/src/modules/tool/external-tool/controller/dto/request/school-external-tool-id.params.ts b/apps/server/src/modules/tool/external-tool/controller/dto/request/school-external-tool-id.params.ts index 61ae44318ed..f9ddf21bc67 100644 --- a/apps/server/src/modules/tool/external-tool/controller/dto/request/school-external-tool-id.params.ts +++ b/apps/server/src/modules/tool/external-tool/controller/dto/request/school-external-tool-id.params.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { IsMongoId } from 'class-validator'; export class SchoolExternalToolIdParams { diff --git a/apps/server/src/modules/tool/external-tool/controller/dto/request/school-id.params.ts b/apps/server/src/modules/tool/external-tool/controller/dto/request/school-id.params.ts index a2c55bc1ab7..b934d55ad84 100644 --- a/apps/server/src/modules/tool/external-tool/controller/dto/request/school-id.params.ts +++ b/apps/server/src/modules/tool/external-tool/controller/dto/request/school-id.params.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { IsMongoId } from 'class-validator'; export class SchoolIdParams { diff --git a/apps/server/src/modules/tool/external-tool/controller/dto/response/context-external-tool-configuration-template.response.ts b/apps/server/src/modules/tool/external-tool/controller/dto/response/context-external-tool-configuration-template.response.ts index 7267751e5d5..09ebf443efc 100644 --- a/apps/server/src/modules/tool/external-tool/controller/dto/response/context-external-tool-configuration-template.response.ts +++ b/apps/server/src/modules/tool/external-tool/controller/dto/response/context-external-tool-configuration-template.response.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { CustomParameterResponse } from './custom-parameter.response'; export class ContextExternalToolConfigurationTemplateResponse { diff --git a/apps/server/src/modules/tool/external-tool/controller/dto/response/school-external-tool-configuration-template.response.ts b/apps/server/src/modules/tool/external-tool/controller/dto/response/school-external-tool-configuration-template.response.ts index 7de80cca1ae..6ce5712c7d7 100644 --- a/apps/server/src/modules/tool/external-tool/controller/dto/response/school-external-tool-configuration-template.response.ts +++ b/apps/server/src/modules/tool/external-tool/controller/dto/response/school-external-tool-configuration-template.response.ts @@ -1,5 +1,5 @@ import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { CustomParameterResponse } from './custom-parameter.response'; export class SchoolExternalToolConfigurationTemplateResponse { diff --git a/apps/server/src/modules/tool/external-tool/controller/tool.controller.ts b/apps/server/src/modules/tool/external-tool/controller/tool.controller.ts index b534b01b83b..1cf0ad54269 100644 --- a/apps/server/src/modules/tool/external-tool/controller/tool.controller.ts +++ b/apps/server/src/modules/tool/external-tool/controller/tool.controller.ts @@ -13,25 +13,26 @@ import { } from '@nestjs/swagger'; import { ValidationError } from '@shared/common'; import { PaginationParams } from '@shared/controller'; -import { IFindOptions, Page } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; +import { IFindOptions } from '@shared/domain/interface'; import { LegacyLogger } from '@src/core/logger'; import { Response } from 'express'; import { ExternalToolSearchQuery } from '../../common/interface'; import { ExternalTool, ExternalToolMetadata } from '../domain'; import { ExternalToolLogo } from '../domain/external-tool-logo'; -import { ExternalToolRequestMapper, ExternalToolResponseMapper, ExternalToolMetadataMapper } from '../mapper'; +import { ExternalToolMetadataMapper, ExternalToolRequestMapper, ExternalToolResponseMapper } from '../mapper'; import { ExternalToolLogoService } from '../service'; import { ExternalToolCreate, ExternalToolUc, ExternalToolUpdate } from '../uc'; import { ExternalToolCreateParams, ExternalToolIdParams, + ExternalToolMetadataResponse, ExternalToolResponse, ExternalToolSearchListResponse, ExternalToolSearchParams, ExternalToolUpdateParams, SortExternalToolParams, - ExternalToolMetadataResponse, } from './dto'; @ApiTags('Tool') diff --git a/apps/server/src/modules/tool/external-tool/mapper/external-tool-request.mapper.spec.ts b/apps/server/src/modules/tool/external-tool/mapper/external-tool-request.mapper.spec.ts index 26240cab6cb..72f5d35de5c 100644 --- a/apps/server/src/modules/tool/external-tool/mapper/external-tool-request.mapper.spec.ts +++ b/apps/server/src/modules/tool/external-tool/mapper/external-tool-request.mapper.spec.ts @@ -1,6 +1,6 @@ import { Test, TestingModule } from '@nestjs/testing'; -import { SortOrder, SortOrderMap } from '@shared/domain'; +import { SortOrder, SortOrderMap } from '@shared/domain/interface'; import { basicToolConfigFactory, customParameterFactory, diff --git a/apps/server/src/modules/tool/external-tool/mapper/external-tool-request.mapper.ts b/apps/server/src/modules/tool/external-tool/mapper/external-tool-request.mapper.ts index eed114902a0..4cfc3303d0a 100644 --- a/apps/server/src/modules/tool/external-tool/mapper/external-tool-request.mapper.ts +++ b/apps/server/src/modules/tool/external-tool/mapper/external-tool-request.mapper.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { SortOrderMap } from '@shared/domain'; +import { SortOrderMap } from '@shared/domain/interface'; import { CustomParameterLocation, CustomParameterLocationParams, @@ -8,6 +8,7 @@ import { CustomParameterType, CustomParameterTypeParams, } from '../../common/enum'; +import { ExternalToolSearchQuery } from '../../common/interface'; import { BasicToolConfigParams, CustomParameterPostParams, @@ -20,6 +21,7 @@ import { Oauth2ToolConfigUpdateParams, SortExternalToolParams, } from '../controller/dto'; +import { ExternalTool } from '../domain'; import { BasicToolConfigDto, CustomParameterDto, @@ -30,8 +32,6 @@ import { Oauth2ToolConfigCreate, Oauth2ToolConfigUpdate, } from '../uc'; -import { ExternalTool } from '../domain'; -import { ExternalToolSearchQuery } from '../../common/interface'; const scopeMapping: Record = { [CustomParameterScopeTypeParams.GLOBAL]: CustomParameterScope.GLOBAL, diff --git a/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.spec.ts b/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.spec.ts index 6d0064c1136..1fac35ae87c 100644 --- a/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.spec.ts +++ b/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.spec.ts @@ -1,5 +1,6 @@ import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, Page } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { contextExternalToolFactory, customParameterFactory, diff --git a/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.ts b/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.ts index 3d021c592fc..92938e2c98a 100644 --- a/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.ts +++ b/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.ts @@ -1,5 +1,6 @@ import { Inject, Injectable } from '@nestjs/common'; -import { EntityId, Page } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { CustomParameter } from '../../common/domain'; import { CustomParameterScope } from '../../common/enum'; import { ContextExternalTool } from '../../context-external-tool/domain'; diff --git a/apps/server/src/modules/tool/external-tool/service/external-tool-logo.service.ts b/apps/server/src/modules/tool/external-tool/service/external-tool-logo.service.ts index b39684fbd1b..d065b6d019e 100644 --- a/apps/server/src/modules/tool/external-tool/service/external-tool-logo.service.ts +++ b/apps/server/src/modules/tool/external-tool/service/external-tool-logo.service.ts @@ -1,6 +1,6 @@ import { HttpService } from '@nestjs/axios'; import { HttpException, Inject } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { Logger } from '@src/core/logger'; import { AxiosResponse } from 'axios'; import { lastValueFrom } from 'rxjs'; diff --git a/apps/server/src/modules/tool/external-tool/service/external-tool-metadata.service.ts b/apps/server/src/modules/tool/external-tool/service/external-tool-metadata.service.ts index ef82629e87d..5d99ca73935 100644 --- a/apps/server/src/modules/tool/external-tool/service/external-tool-metadata.service.ts +++ b/apps/server/src/modules/tool/external-tool/service/external-tool-metadata.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ContextExternalToolRepo, SchoolExternalToolRepo } from '@shared/repo'; import { ToolContextType } from '../../common/enum'; import { ToolContextMapper } from '../../common/mapper/tool-context.mapper'; diff --git a/apps/server/src/modules/tool/external-tool/service/external-tool.service.spec.ts b/apps/server/src/modules/tool/external-tool/service/external-tool.service.spec.ts index 05416f30fb6..41593d34fe4 100644 --- a/apps/server/src/modules/tool/external-tool/service/external-tool.service.spec.ts +++ b/apps/server/src/modules/tool/external-tool/service/external-tool.service.spec.ts @@ -4,7 +4,9 @@ import { OauthProviderService } from '@infra/oauth-provider'; import { ProviderOauthClient } from '@infra/oauth-provider/dto'; import { UnprocessableEntityException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { IFindOptions, Page, SortOrder } from '@shared/domain'; + +import { Page } from '@shared/domain/domainobject'; +import { IFindOptions, SortOrder } from '@shared/domain/interface'; import { ContextExternalToolRepo, ExternalToolRepo, SchoolExternalToolRepo } from '@shared/repo'; import { externalToolFactory, diff --git a/apps/server/src/modules/tool/external-tool/service/external-tool.service.ts b/apps/server/src/modules/tool/external-tool/service/external-tool.service.ts index 8fb5d8e4387..67f7edd161b 100644 --- a/apps/server/src/modules/tool/external-tool/service/external-tool.service.ts +++ b/apps/server/src/modules/tool/external-tool/service/external-tool.service.ts @@ -2,7 +2,9 @@ import { DefaultEncryptionService, EncryptionService } from '@infra/encryption'; import { OauthProviderService } from '@infra/oauth-provider'; import { ProviderOauthClient } from '@infra/oauth-provider/dto'; import { Inject, Injectable, UnprocessableEntityException } from '@nestjs/common'; -import { EntityId, IFindOptions, Page } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; +import { IFindOptions } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { ContextExternalToolRepo, ExternalToolRepo, SchoolExternalToolRepo } from '@shared/repo'; import { LegacyLogger } from '@src/core/logger'; import { TokenEndpointAuthMethod } from '../../common/enum'; diff --git a/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.spec.ts b/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.spec.ts index 90d205ad605..9551bde3572 100644 --- a/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.spec.ts +++ b/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.spec.ts @@ -3,7 +3,9 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { AuthorizationContextBuilder } from '@modules/authorization'; import { ForbiddenException, NotFoundException, UnauthorizedException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Page, Permission } from '@shared/domain'; + +import { Page } from '@shared/domain/domainobject'; +import { Permission } from '@shared/domain/interface'; import { contextExternalToolFactory, customParameterFactory, diff --git a/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.ts b/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.ts index 43a1c7b7775..e07db3213ff 100644 --- a/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.ts +++ b/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.ts @@ -1,8 +1,9 @@ import { AuthorizationContext, AuthorizationContextBuilder } from '@modules/authorization'; -import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { Inject, Injectable, forwardRef } from '@nestjs/common'; import { NotFoundException } from '@nestjs/common/exceptions/not-found.exception'; -import { EntityId, Permission } from '@shared/domain'; import { Page } from '@shared/domain/domainobject/page'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { CustomParameterScope, ToolContextType } from '../../common/enum'; import { ToolPermissionHelper } from '../../common/uc/tool-permission-helper'; import { ContextExternalTool } from '../../context-external-tool/domain'; diff --git a/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.spec.ts b/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.spec.ts index 35a20ca8997..47bebac803b 100644 --- a/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.spec.ts +++ b/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.spec.ts @@ -4,8 +4,9 @@ import { ICurrentUser } from '@modules/authentication'; import { Action, AuthorizationService } from '@modules/authorization'; import { UnauthorizedException, UnprocessableEntityException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { IFindOptions, Permission, Role, SortOrder, User } from '@shared/domain'; import { Page } from '@shared/domain/domainobject/page'; +import { Role, User } from '@shared/domain/entity'; +import { IFindOptions, Permission, SortOrder } from '@shared/domain/interface'; import { roleFactory, setupEntities, userFactory } from '@shared/testing'; import { externalToolFactory, oauth2ToolConfigFactory } from '@shared/testing/factory'; import { ExternalToolSearchQuery } from '../../common/interface'; diff --git a/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.ts b/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.ts index 9880994272a..c48454adb07 100644 --- a/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.ts +++ b/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.ts @@ -1,13 +1,16 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId, IFindOptions, Page, Permission, User } from '@shared/domain'; import { AuthorizationService } from '@modules/authorization'; +import { Injectable } from '@nestjs/common'; +import { Page } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { IFindOptions, Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { ExternalToolSearchQuery } from '../../common/interface'; import { ExternalTool, ExternalToolConfig, ExternalToolMetadata } from '../domain'; import { ExternalToolLogoService, + ExternalToolMetadataService, ExternalToolService, ExternalToolValidationService, - ExternalToolMetadataService, } from '../service'; import { ExternalToolCreate, ExternalToolUpdate } from './dto'; diff --git a/apps/server/src/modules/tool/school-external-tool/controller/api-test/tool-school.api.spec.ts b/apps/server/src/modules/tool/school-external-tool/controller/api-test/tool-school.api.spec.ts index 274bd289edf..3c68ec5c8c2 100644 --- a/apps/server/src/modules/tool/school-external-tool/controller/api-test/tool-school.api.spec.ts +++ b/apps/server/src/modules/tool/school-external-tool/controller/api-test/tool-school.api.spec.ts @@ -3,16 +3,17 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Account, Permission, SchoolEntity, User } from '@shared/domain'; +import { Account, SchoolEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, accountFactory, contextExternalToolEntityFactory, customParameterEntityFactory, externalToolEntityFactory, schoolExternalToolEntityFactory, schoolFactory, - TestApiClient, - UserAndAccountTestFactory, userFactory, } from '@shared/testing'; import { ToolConfigurationStatusResponse } from '../../../context-external-tool/controller/dto'; @@ -21,11 +22,11 @@ import { CustomParameterScope, CustomParameterType, ExternalToolEntity } from '. import { SchoolExternalToolEntity } from '../../entity'; import { CustomParameterEntryParam, + SchoolExternalToolMetadataResponse, SchoolExternalToolPostParams, SchoolExternalToolResponse, SchoolExternalToolSearchListResponse, SchoolExternalToolSearchParams, - SchoolExternalToolMetadataResponse, } from '../dto'; describe('ToolSchoolController (API)', () => { diff --git a/apps/server/src/modules/tool/school-external-tool/service/school-external-tool-metadata.service.ts b/apps/server/src/modules/tool/school-external-tool/service/school-external-tool-metadata.service.ts index 53061147aca..953e3decb26 100644 --- a/apps/server/src/modules/tool/school-external-tool/service/school-external-tool-metadata.service.ts +++ b/apps/server/src/modules/tool/school-external-tool/service/school-external-tool-metadata.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ContextExternalToolRepo } from '@shared/repo'; import { ToolContextType } from '../../common/enum'; import { ToolContextMapper } from '../../common/mapper/tool-context.mapper'; diff --git a/apps/server/src/modules/tool/school-external-tool/service/school-external-tool.service.ts b/apps/server/src/modules/tool/school-external-tool/service/school-external-tool.service.ts index 2ead0933582..a36d7544d94 100644 --- a/apps/server/src/modules/tool/school-external-tool/service/school-external-tool.service.ts +++ b/apps/server/src/modules/tool/school-external-tool/service/school-external-tool.service.ts @@ -1,5 +1,5 @@ import { Inject, Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { SchoolExternalToolRepo } from '@shared/repo'; import { ToolConfigurationStatus } from '../../common/enum'; import { ExternalTool } from '../../external-tool/domain'; diff --git a/apps/server/src/modules/tool/school-external-tool/uc/school-external-tool.uc.spec.ts b/apps/server/src/modules/tool/school-external-tool/uc/school-external-tool.uc.spec.ts index 6f3512f6a0d..d64ac866725 100644 --- a/apps/server/src/modules/tool/school-external-tool/uc/school-external-tool.uc.spec.ts +++ b/apps/server/src/modules/tool/school-external-tool/uc/school-external-tool.uc.spec.ts @@ -1,9 +1,11 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; +import { AuthorizationContextBuilder } from '@modules/authorization'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, Permission, User } from '@shared/domain'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { schoolExternalToolFactory, setupEntities, userFactory } from '@shared/testing'; -import { AuthorizationContextBuilder } from '@modules/authorization'; import { ToolPermissionHelper } from '../../common/uc/tool-permission-helper'; import { ContextExternalToolService } from '../../context-external-tool/service'; import { SchoolExternalTool } from '../domain'; diff --git a/apps/server/src/modules/tool/school-external-tool/uc/school-external-tool.uc.ts b/apps/server/src/modules/tool/school-external-tool/uc/school-external-tool.uc.ts index 0d098c8c657..54cba380286 100644 --- a/apps/server/src/modules/tool/school-external-tool/uc/school-external-tool.uc.ts +++ b/apps/server/src/modules/tool/school-external-tool/uc/school-external-tool.uc.ts @@ -1,13 +1,14 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId, Permission } from '@shared/domain'; import { AuthorizationContext, AuthorizationContextBuilder } from '@modules/authorization'; +import { Injectable } from '@nestjs/common'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { ToolPermissionHelper } from '../../common/uc/tool-permission-helper'; import { ContextExternalToolService } from '../../context-external-tool/service'; import { SchoolExternalTool, SchoolExternalToolMetadata } from '../domain'; import { + SchoolExternalToolMetadataService, SchoolExternalToolService, SchoolExternalToolValidationService, - SchoolExternalToolMetadataService, } from '../service'; import { SchoolExternalToolDto, SchoolExternalToolQueryInput } from './dto/school-external-tool.types'; diff --git a/apps/server/src/modules/tool/tool-launch/controller/api-test/tool-launch.controller.api.spec.ts b/apps/server/src/modules/tool/tool-launch/controller/api-test/tool-launch.controller.api.spec.ts index 04defeeb0dc..2ee9321f1cf 100644 --- a/apps/server/src/modules/tool/tool-launch/controller/api-test/tool-launch.controller.api.spec.ts +++ b/apps/server/src/modules/tool/tool-launch/controller/api-test/tool-launch.controller.api.spec.ts @@ -1,26 +1,27 @@ import { EntityManager, MikroORM } from '@mikro-orm/core'; +import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Course, Permission, SchoolEntity } from '@shared/domain'; +import { Course, SchoolEntity } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, basicToolConfigFactory, - contextExternalToolFactory, contextExternalToolEntityFactory, + contextExternalToolFactory, courseFactory, externalToolEntityFactory, schoolExternalToolEntityFactory, schoolFactory, - TestApiClient, - UserAndAccountTestFactory, } from '@shared/testing'; -import { ServerTestModule } from '@modules/server'; import { Response } from 'supertest'; -import { SchoolExternalToolEntity } from '../../../school-external-tool/entity'; -import { LaunchRequestMethod } from '../../types'; -import { ToolLaunchRequestResponse, ToolLaunchParams } from '../dto'; +import { ToolConfigType } from '../../../common/enum'; import { ContextExternalToolEntity, ContextExternalToolType } from '../../../context-external-tool/entity'; import { ExternalToolEntity } from '../../../external-tool/entity'; -import { ToolConfigType } from '../../../common/enum'; +import { SchoolExternalToolEntity } from '../../../school-external-tool/entity'; +import { LaunchRequestMethod } from '../../types'; +import { ToolLaunchParams, ToolLaunchRequestResponse } from '../dto'; describe('ToolLaunchController (API)', () => { let app: INestApplication; diff --git a/apps/server/src/modules/tool/tool-launch/error/tool-status-outdated.loggable-exception.ts b/apps/server/src/modules/tool/tool-launch/error/tool-status-outdated.loggable-exception.ts index 1b97042eea4..b51ebbd8dee 100644 --- a/apps/server/src/modules/tool/tool-launch/error/tool-status-outdated.loggable-exception.ts +++ b/apps/server/src/modules/tool/tool-launch/error/tool-status-outdated.loggable-exception.ts @@ -1,5 +1,5 @@ import { BadRequestException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; export class ToolStatusOutdatedLoggableException extends BadRequestException implements Loggable { diff --git a/apps/server/src/modules/tool/tool-launch/mapper/lti-role.mapper.spec.ts b/apps/server/src/modules/tool/tool-launch/mapper/lti-role.mapper.spec.ts index 04d6ee23ae0..d53ce306435 100644 --- a/apps/server/src/modules/tool/tool-launch/mapper/lti-role.mapper.spec.ts +++ b/apps/server/src/modules/tool/tool-launch/mapper/lti-role.mapper.spec.ts @@ -1,6 +1,6 @@ -import { RoleName } from '@shared/domain'; -import { LtiRoleMapper } from './lti-role.mapper'; +import { RoleName } from '@shared/domain/interface'; import { LtiRole } from '../../common/enum'; +import { LtiRoleMapper } from './lti-role.mapper'; describe('LtiRoleMapper', () => { describe('mapRolesToLtiRoles', () => { diff --git a/apps/server/src/modules/tool/tool-launch/mapper/lti-role.mapper.ts b/apps/server/src/modules/tool/tool-launch/mapper/lti-role.mapper.ts index 6f3d24c9e38..6040a740160 100644 --- a/apps/server/src/modules/tool/tool-launch/mapper/lti-role.mapper.ts +++ b/apps/server/src/modules/tool/tool-launch/mapper/lti-role.mapper.ts @@ -1,4 +1,4 @@ -import { RoleName } from '@shared/domain'; +import { RoleName } from '@shared/domain/interface'; import { LtiRole } from '../../common/enum'; const RoleMapping: Partial> = { diff --git a/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-context-name.strategy.spec.ts b/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-context-name.strategy.spec.ts index caa02d1c69b..7c7dc5fc87a 100644 --- a/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-context-name.strategy.spec.ts +++ b/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-context-name.strategy.spec.ts @@ -3,7 +3,8 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { ColumnBoardService, ContentElementService } from '@modules/board'; import { CourseService } from '@modules/learnroom'; import { Test, TestingModule } from '@nestjs/testing'; -import { BoardExternalReferenceType, ColumnBoard, Course, ExternalToolElement } from '@shared/domain'; +import { BoardExternalReferenceType, ColumnBoard, ExternalToolElement } from '@shared/domain/domainobject'; +import { Course } from '@shared/domain/entity'; import { columnBoardFactory, contextExternalToolFactory, diff --git a/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-context-name.strategy.ts b/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-context-name.strategy.ts index 14d296d8b60..e22f1f5036c 100644 --- a/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-context-name.strategy.ts +++ b/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-context-name.strategy.ts @@ -1,7 +1,10 @@ import { ColumnBoardService, ContentElementService } from '@modules/board'; import { CourseService } from '@modules/learnroom'; import { Injectable } from '@nestjs/common'; -import { AnyContentElementDo, BoardExternalReferenceType, ColumnBoard, Course, EntityId } from '@shared/domain'; +import { AnyContentElementDo, BoardExternalReferenceType, ColumnBoard } from '@shared/domain/domainobject'; +import { Course } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; + import { CustomParameterType, ToolContextType } from '../../../common/enum'; import { ContextExternalTool } from '../../../context-external-tool/domain'; import { SchoolExternalTool } from '../../../school-external-tool/domain'; diff --git a/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-school-number.strategy.spec.ts b/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-school-number.strategy.spec.ts index 91a01bbdd39..01f67d2c98e 100644 --- a/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-school-number.strategy.spec.ts +++ b/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-school-number.strategy.spec.ts @@ -1,7 +1,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { LegacySchoolService } from '@modules/legacy-school'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { contextExternalToolFactory, legacySchoolDoFactory, schoolExternalToolFactory } from '@shared/testing'; import { ContextExternalTool } from '../../../context-external-tool/domain'; import { SchoolExternalTool } from '../../../school-external-tool/domain'; diff --git a/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-school-number.strategy.ts b/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-school-number.strategy.ts index 7d9ad9dad65..c501212da18 100644 --- a/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-school-number.strategy.ts +++ b/apps/server/src/modules/tool/tool-launch/service/auto-parameter-strategy/auto-school-number.strategy.ts @@ -1,6 +1,6 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { Injectable } from '@nestjs/common'; -import { LegacySchoolDo } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { ContextExternalTool } from '../../../context-external-tool/domain'; import { SchoolExternalTool } from '../../../school-external-tool/domain'; import { AutoParameterStrategy } from './auto-parameter.strategy'; diff --git a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/abstract-launch.strategy.spec.ts b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/abstract-launch.strategy.spec.ts index 7e170eb412b..3993ad56e61 100644 --- a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/abstract-launch.strategy.spec.ts +++ b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/abstract-launch.strategy.spec.ts @@ -2,7 +2,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { contextExternalToolFactory, customParameterFactory, diff --git a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/abstract-launch.strategy.ts b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/abstract-launch.strategy.ts index d5e920bacf4..7ca974963df 100644 --- a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/abstract-launch.strategy.ts +++ b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/abstract-launch.strategy.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { URLSearchParams } from 'url'; import { CustomParameter, CustomParameterEntry } from '../../../common/domain'; import { CustomParameterLocation, CustomParameterScope, CustomParameterType } from '../../../common/enum'; diff --git a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/basic-tool-launch.strategy.ts b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/basic-tool-launch.strategy.ts index 399b428a710..1cf107eedcb 100644 --- a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/basic-tool-launch.strategy.ts +++ b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/basic-tool-launch.strategy.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { LaunchRequestMethod, PropertyData, PropertyLocation } from '../../types'; import { AbstractLaunchStrategy } from './abstract-launch.strategy'; import { ToolLaunchParams } from './tool-launch-params.interface'; diff --git a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.spec.ts b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.spec.ts index 69ebd3e4d26..ea670b8e33d 100644 --- a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.spec.ts +++ b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.spec.ts @@ -3,7 +3,8 @@ import { PseudonymService } from '@modules/pseudonym/service'; import { UserService } from '@modules/user'; import { InternalServerErrorException, UnprocessableEntityException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Pseudonym, RoleName, UserDO } from '@shared/domain'; +import { Pseudonym, UserDO } from '@shared/domain/domainobject'; +import { RoleName } from '@shared/domain/interface'; import { contextExternalToolFactory, externalToolFactory, diff --git a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.ts b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.ts index fca44aaf90b..0180cb885f5 100644 --- a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.ts +++ b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.ts @@ -1,8 +1,10 @@ import { PseudonymService } from '@modules/pseudonym/service'; import { UserService } from '@modules/user'; import { Injectable, InternalServerErrorException, UnprocessableEntityException } from '@nestjs/common'; -import { EntityId, LtiPrivacyPermission, Pseudonym, RoleName, UserDO } from '@shared/domain'; -import { RoleReference } from '@shared/domain/domainobject'; +import { Pseudonym, RoleReference, UserDO } from '@shared/domain/domainobject'; +import { LtiPrivacyPermission } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { Authorization } from 'oauth-1.0a'; import { LtiRole } from '../../../common/enum'; import { ExternalTool } from '../../../external-tool/domain'; diff --git a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/oauth2-tool-launch.strategy.ts b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/oauth2-tool-launch.strategy.ts index 833b0742a7b..bf061ad75d5 100644 --- a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/oauth2-tool-launch.strategy.ts +++ b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/oauth2-tool-launch.strategy.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { LaunchRequestMethod, PropertyData } from '../../types'; import { AbstractLaunchStrategy } from './abstract-launch.strategy'; import { ToolLaunchParams } from './tool-launch-params.interface'; diff --git a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/tool-launch-strategy.interface.ts b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/tool-launch-strategy.interface.ts index a0ba86c5648..ea6232098f9 100644 --- a/apps/server/src/modules/tool/tool-launch/service/launch-strategy/tool-launch-strategy.interface.ts +++ b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/tool-launch-strategy.interface.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ToolLaunchData, ToolLaunchRequest } from '../../types'; import { ToolLaunchParams } from './tool-launch-params.interface'; diff --git a/apps/server/src/modules/tool/tool-launch/service/tool-launch.service.ts b/apps/server/src/modules/tool/tool-launch/service/tool-launch.service.ts index 4ddbd55c3aa..2d84ec1ad7d 100644 --- a/apps/server/src/modules/tool/tool-launch/service/tool-launch.service.ts +++ b/apps/server/src/modules/tool/tool-launch/service/tool-launch.service.ts @@ -1,7 +1,8 @@ import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ToolConfigType, ToolConfigurationStatus } from '../../common/enum'; import { ContextExternalTool } from '../../context-external-tool/domain'; +import { ToolVersionService } from '../../context-external-tool/service/tool-version-service'; import { ExternalTool } from '../../external-tool/domain'; import { ExternalToolService } from '../../external-tool/service'; import { SchoolExternalTool } from '../../school-external-tool/domain'; @@ -15,7 +16,6 @@ import { OAuth2ToolLaunchStrategy, ToolLaunchStrategy, } from './launch-strategy'; -import { ToolVersionService } from '../../context-external-tool/service/tool-version-service'; @Injectable() export class ToolLaunchService { diff --git a/apps/server/src/modules/tool/tool-launch/uc/tool-launch.uc.ts b/apps/server/src/modules/tool/tool-launch/uc/tool-launch.uc.ts index cb38ecb065e..516e483ce09 100644 --- a/apps/server/src/modules/tool/tool-launch/uc/tool-launch.uc.ts +++ b/apps/server/src/modules/tool/tool-launch/uc/tool-launch.uc.ts @@ -1,6 +1,7 @@ import { AuthorizationContext, AuthorizationContextBuilder } from '@modules/authorization'; import { Injectable } from '@nestjs/common'; -import { EntityId, Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { ToolPermissionHelper } from '../../common/uc/tool-permission-helper'; import { ContextExternalTool } from '../../context-external-tool/domain'; import { ContextExternalToolService } from '../../context-external-tool/service'; diff --git a/apps/server/src/modules/user-import/controller/api-test/import-user.api.spec.ts b/apps/server/src/modules/user-import/controller/api-test/import-user.api.spec.ts index 5ee7db64ce0..c98797fd580 100644 --- a/apps/server/src/modules/user-import/controller/api-test/import-user.api.spec.ts +++ b/apps/server/src/modules/user-import/controller/api-test/import-user.api.spec.ts @@ -22,17 +22,8 @@ import { import { ExecutionContext, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { PaginationParams } from '@shared/controller'; -import { - ImportUser, - MatchCreator, - Permission, - RoleName, - SchoolEntity, - SchoolFeatures, - SortOrder, - SystemEntity, - User, -} from '@shared/domain'; +import { ImportUser, MatchCreator, SchoolEntity, SchoolFeatures, SystemEntity, User } from '@shared/domain/entity'; +import { Permission, RoleName, SortOrder } from '@shared/domain/interface'; import { cleanupCollections, importUserFactory, diff --git a/apps/server/src/modules/user-import/controller/import-user.controller.ts b/apps/server/src/modules/user-import/controller/import-user.controller.ts index bc29f09d6c9..228590f8f6d 100644 --- a/apps/server/src/modules/user-import/controller/import-user.controller.ts +++ b/apps/server/src/modules/user-import/controller/import-user.controller.ts @@ -2,7 +2,8 @@ import { Authenticate, CurrentUser, ICurrentUser } from '@modules/authentication import { Body, Controller, Delete, Get, Param, Patch, Post, Query } from '@nestjs/common'; import { ApiTags } from '@nestjs/swagger'; import { PaginationParams } from '@shared/controller'; -import { IFindOptions, ImportUser, User } from '@shared/domain'; +import { ImportUser, User } from '@shared/domain/entity'; +import { IFindOptions } from '@shared/domain/interface'; import { ImportUserMapper } from '../mapper/import-user.mapper'; import { UserMatchMapper } from '../mapper/user-match.mapper'; import { UserImportUc } from '../uc/user-import.uc'; diff --git a/apps/server/src/modules/user-import/loggable/school-id-does-not-match-with-user-school-id.loggable.ts b/apps/server/src/modules/user-import/loggable/school-id-does-not-match-with-user-school-id.loggable.ts index b72d56f92a6..71b315161d7 100644 --- a/apps/server/src/modules/user-import/loggable/school-id-does-not-match-with-user-school-id.loggable.ts +++ b/apps/server/src/modules/user-import/loggable/school-id-does-not-match-with-user-school-id.loggable.ts @@ -1,5 +1,5 @@ +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; -import { EntityId } from '@shared/domain'; export class SchoolIdDoesNotMatchWithUserSchoolId implements Loggable { constructor( diff --git a/apps/server/src/modules/user-import/loggable/school-in-user-migration-start.loggable.ts b/apps/server/src/modules/user-import/loggable/school-in-user-migration-start.loggable.ts index eda5ce944bc..20abb9af969 100644 --- a/apps/server/src/modules/user-import/loggable/school-in-user-migration-start.loggable.ts +++ b/apps/server/src/modules/user-import/loggable/school-in-user-migration-start.loggable.ts @@ -1,5 +1,5 @@ +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; -import { EntityId } from '@shared/domain'; export class SchoolInUserMigrationStartLoggable implements Loggable { constructor( diff --git a/apps/server/src/modules/user-import/mapper/import-user.mapper.spec.ts b/apps/server/src/modules/user-import/mapper/import-user.mapper.spec.ts index 4d53ba05985..ad7d2a2c3e4 100644 --- a/apps/server/src/modules/user-import/mapper/import-user.mapper.spec.ts +++ b/apps/server/src/modules/user-import/mapper/import-user.mapper.spec.ts @@ -1,5 +1,7 @@ import { BadRequestException } from '@nestjs/common'; -import { MatchCreator, MatchCreatorScope, RoleName, SortOrder } from '@shared/domain'; +import { MatchCreator } from '@shared/domain/entity'; +import { RoleName, SortOrder } from '@shared/domain/interface'; +import { MatchCreatorScope } from '@shared/domain/types'; import { importUserFactory, schoolFactory, setupEntities, userFactory } from '@shared/testing'; import { FilterImportUserParams, diff --git a/apps/server/src/modules/user-import/mapper/import-user.mapper.ts b/apps/server/src/modules/user-import/mapper/import-user.mapper.ts index e15b3f36b60..4c8bd53955c 100644 --- a/apps/server/src/modules/user-import/mapper/import-user.mapper.ts +++ b/apps/server/src/modules/user-import/mapper/import-user.mapper.ts @@ -1,6 +1,8 @@ import { BadRequestException } from '@nestjs/common'; import { StringValidator } from '@shared/common'; -import { IImportUserScope, ImportUser, SortOrderMap } from '@shared/domain'; +import { ImportUser } from '@shared/domain/entity'; +import { SortOrderMap } from '@shared/domain/interface'; +import { IImportUserScope } from '@shared/domain/types'; import { FilterImportUserParams, ImportUserResponse, diff --git a/apps/server/src/modules/user-import/mapper/match.mapper.spec.ts b/apps/server/src/modules/user-import/mapper/match.mapper.spec.ts index 7934a7e2885..a4f2deccb0b 100644 --- a/apps/server/src/modules/user-import/mapper/match.mapper.spec.ts +++ b/apps/server/src/modules/user-import/mapper/match.mapper.spec.ts @@ -1,5 +1,6 @@ -import { MatchCreator, MatchCreatorScope } from '@shared/domain'; -import { MatchType, FilterMatchType } from '../controller/dto'; +import { MatchCreator } from '@shared/domain/entity'; +import { MatchCreatorScope } from '@shared/domain/types'; +import { FilterMatchType, MatchType } from '../controller/dto'; import { ImportUserMatchMapper } from './match.mapper'; describe('[ImportUserMatchMapper]', () => { diff --git a/apps/server/src/modules/user-import/mapper/match.mapper.ts b/apps/server/src/modules/user-import/mapper/match.mapper.ts index 52cdbc3503d..e6c78717d28 100644 --- a/apps/server/src/modules/user-import/mapper/match.mapper.ts +++ b/apps/server/src/modules/user-import/mapper/match.mapper.ts @@ -1,5 +1,6 @@ -import { MatchCreator, MatchCreatorScope } from '@shared/domain'; -import { MatchType, FilterMatchType } from '../controller/dto'; +import { MatchCreator } from '@shared/domain/entity'; +import { MatchCreatorScope } from '@shared/domain/types'; +import { FilterMatchType, MatchType } from '../controller/dto'; export class ImportUserMatchMapper { static mapImportUserMatchScopeToDomain(match: FilterMatchType): MatchCreatorScope { diff --git a/apps/server/src/modules/user-import/mapper/role-name.mapper.spec.ts b/apps/server/src/modules/user-import/mapper/role-name.mapper.spec.ts index 8c68916ab16..9275072dee5 100644 --- a/apps/server/src/modules/user-import/mapper/role-name.mapper.spec.ts +++ b/apps/server/src/modules/user-import/mapper/role-name.mapper.spec.ts @@ -1,4 +1,5 @@ -import { RoleName, IImportUserRoleName } from '@shared/domain'; +import { IImportUserRoleName } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { FilterRoleType, UserRole } from '../controller/dto'; import { RoleNameMapper } from './role-name.mapper'; diff --git a/apps/server/src/modules/user-import/mapper/role-name.mapper.ts b/apps/server/src/modules/user-import/mapper/role-name.mapper.ts index 67c5d482c6d..8a38d3cb120 100644 --- a/apps/server/src/modules/user-import/mapper/role-name.mapper.ts +++ b/apps/server/src/modules/user-import/mapper/role-name.mapper.ts @@ -1,4 +1,5 @@ -import { RoleName, IImportUserRoleName } from '@shared/domain'; +import { IImportUserRoleName } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { FilterRoleType, UserRole } from '../controller/dto'; export class RoleNameMapper { diff --git a/apps/server/src/modules/user-import/mapper/user-match.mapper.spec.ts b/apps/server/src/modules/user-import/mapper/user-match.mapper.spec.ts index 98e0f1f7638..bd9fe337b19 100644 --- a/apps/server/src/modules/user-import/mapper/user-match.mapper.spec.ts +++ b/apps/server/src/modules/user-import/mapper/user-match.mapper.spec.ts @@ -1,4 +1,5 @@ -import { MatchCreator, RoleName } from '@shared/domain'; +import { MatchCreator } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { roleFactory, setupEntities, userFactory } from '@shared/testing'; import { MatchType, UserRole } from '../controller/dto'; import { FilterUserParams } from '../controller/dto/filter-user.params'; diff --git a/apps/server/src/modules/user-import/mapper/user-match.mapper.ts b/apps/server/src/modules/user-import/mapper/user-match.mapper.ts index 8a826a613af..d62dd10300f 100644 --- a/apps/server/src/modules/user-import/mapper/user-match.mapper.ts +++ b/apps/server/src/modules/user-import/mapper/user-match.mapper.ts @@ -1,5 +1,6 @@ import { StringValidator } from '@shared/common'; -import { MatchCreator, NameMatch, User } from '@shared/domain'; +import { MatchCreator, User } from '@shared/domain/entity'; +import { NameMatch } from '@shared/domain/types'; import { UserMatchResponse, UserRole } from '../controller/dto'; import { FilterUserParams } from '../controller/dto/filter-user.params'; import { ImportUserMatchMapper } from './match.mapper'; diff --git a/apps/server/src/modules/user-import/uc/user-import.uc.spec.ts b/apps/server/src/modules/user-import/uc/user-import.uc.spec.ts index b68cff8074f..2b2df545ffb 100644 --- a/apps/server/src/modules/user-import/uc/user-import.uc.spec.ts +++ b/apps/server/src/modules/user-import/uc/user-import.uc.spec.ts @@ -9,17 +9,10 @@ import { BadRequestException, ForbiddenException } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; import { UserAlreadyAssignedToImportUserError } from '@shared/common'; -import { - ImportUser, - LegacySchoolDo, - MatchCreator, - MatchCreatorScope, - Permission, - SchoolEntity, - SchoolFeatures, - SystemEntity, - User, -} from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; +import { ImportUser, MatchCreator, SchoolEntity, SchoolFeatures, SystemEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { MatchCreatorScope } from '@shared/domain/types'; import { ImportUserRepo, LegacySystemRepo, UserRepo } from '@shared/repo'; import { federalStateFactory, importUserFactory, schoolFactory, userFactory } from '@shared/testing'; import { systemEntityFactory } from '@shared/testing/factory/systemEntityFactory'; diff --git a/apps/server/src/modules/user-import/uc/user-import.uc.ts b/apps/server/src/modules/user-import/uc/user-import.uc.ts index 4e3b14b6734..440e0391934 100644 --- a/apps/server/src/modules/user-import/uc/user-import.uc.ts +++ b/apps/server/src/modules/user-import/uc/user-import.uc.ts @@ -5,22 +5,10 @@ import { AuthorizationService } from '@modules/authorization'; import { LegacySchoolService } from '@modules/legacy-school'; import { BadRequestException, ForbiddenException, Injectable, InternalServerErrorException } from '@nestjs/common'; import { UserAlreadyAssignedToImportUserError } from '@shared/common'; -import { - Account, - Counted, - EntityId, - IFindOptions, - IImportUserScope, - ImportUser, - LegacySchoolDo, - MatchCreator, - MatchCreatorScope, - NameMatch, - Permission, - SchoolFeatures, - SystemEntity, - User, -} from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; +import { Account, ImportUser, MatchCreator, SchoolFeatures, SystemEntity, User } from '@shared/domain/entity'; +import { IFindOptions, Permission } from '@shared/domain/interface'; +import { Counted, EntityId, IImportUserScope, MatchCreatorScope, NameMatch } from '@shared/domain/types'; import { ImportUserRepo, LegacySystemRepo, UserRepo } from '@shared/repo'; import { Logger } from '@src/core/logger'; import { AccountSaveDto } from '../../account/services/dto'; diff --git a/apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts b/apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts index d44280df28a..55b14ca952a 100644 --- a/apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts +++ b/apps/server/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts @@ -5,16 +5,16 @@ import { SanisResponse, SanisRole } from '@modules/provisioning'; import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { SchoolEntity, SystemEntity, User } from '@shared/domain'; +import { SchoolEntity, SystemEntity, User } from '@shared/domain/entity'; import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { - cleanupCollections, JwtTestFactory, - schoolFactory, - systemEntityFactory, TestApiClient, UserAndAccountTestFactory, + cleanupCollections, + schoolFactory, + systemEntityFactory, userFactory, userLoginMigrationFactory, } from '@shared/testing'; diff --git a/apps/server/src/modules/user-login-migration/controller/dto/request/school-id.params.ts b/apps/server/src/modules/user-login-migration/controller/dto/request/school-id.params.ts index ad2b769b4fb..296203e3b25 100644 --- a/apps/server/src/modules/user-login-migration/controller/dto/request/school-id.params.ts +++ b/apps/server/src/modules/user-login-migration/controller/dto/request/school-id.params.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { IsMongoId } from 'class-validator'; export class SchoolIdParams { diff --git a/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts b/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts index 5489e33e3a4..e2fcb0ed44c 100644 --- a/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts +++ b/apps/server/src/modules/user-login-migration/controller/user-login-migration.controller.ts @@ -11,7 +11,7 @@ import { ApiUnauthorizedResponse, ApiUnprocessableEntityResponse, } from '@nestjs/swagger'; -import { Page, UserLoginMigrationDO } from '@shared/domain'; +import { Page, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException, diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.ts b/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.ts index 2614ae24c72..50cd25751c9 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.ts +++ b/apps/server/src/modules/user-login-migration/loggable/debug/school-migration-successful.loggable.ts @@ -1,4 +1,4 @@ -import { LegacySchoolDo, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Loggable, LogMessage } from '@src/core/logger'; export class SchoolMigrationSuccessfulLoggable implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts b/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts index 49c2b8c4813..df601af8e47 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts +++ b/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-started.loggable.ts @@ -1,4 +1,5 @@ -import { EntityId, UserLoginMigrationDO } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { Loggable, LogMessage } from '@src/core/logger'; export class UserMigrationStartedLoggable implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts b/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts index d61259816c5..90aaca929e1 100644 --- a/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts +++ b/apps/server/src/modules/user-login-migration/loggable/debug/user-migration-successful.loggable.ts @@ -1,4 +1,5 @@ -import { EntityId, UserLoginMigrationDO } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { Loggable, LogMessage } from '@src/core/logger'; export class UserMigrationSuccessfulLoggable implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/invalid-user-login-migration.loggable-exception.ts b/apps/server/src/modules/user-login-migration/loggable/invalid-user-login-migration.loggable-exception.ts index 8e24483de1b..8642300aa86 100644 --- a/apps/server/src/modules/user-login-migration/loggable/invalid-user-login-migration.loggable-exception.ts +++ b/apps/server/src/modules/user-login-migration/loggable/invalid-user-login-migration.loggable-exception.ts @@ -1,5 +1,5 @@ import { UnprocessableEntityException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; export class InvalidUserLoginMigrationLoggableException extends UnprocessableEntityException implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/school-migration-database-operation-failed.loggable-exception.ts b/apps/server/src/modules/user-login-migration/loggable/school-migration-database-operation-failed.loggable-exception.ts index b31e2663701..de56cded65d 100644 --- a/apps/server/src/modules/user-login-migration/loggable/school-migration-database-operation-failed.loggable-exception.ts +++ b/apps/server/src/modules/user-login-migration/loggable/school-migration-database-operation-failed.loggable-exception.ts @@ -1,5 +1,5 @@ import { InternalServerErrorException } from '@nestjs/common'; -import { LegacySchoolDo } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { ErrorUtils } from '@src/core/error/utils'; import { ErrorLogMessage, Loggable } from '@src/core/logger'; diff --git a/apps/server/src/modules/user-login-migration/loggable/school-number-missing.loggable-exception.ts b/apps/server/src/modules/user-login-migration/loggable/school-number-missing.loggable-exception.ts index fba1eaec565..dfee216ada5 100644 --- a/apps/server/src/modules/user-login-migration/loggable/school-number-missing.loggable-exception.ts +++ b/apps/server/src/modules/user-login-migration/loggable/school-number-missing.loggable-exception.ts @@ -1,5 +1,5 @@ import { UnprocessableEntityException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; export class SchoolNumberMissingLoggableException extends UnprocessableEntityException implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.ts b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.ts index 4e5fec1c31b..ee41ece7e67 100644 --- a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.ts +++ b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-already-closed.loggable-exception.ts @@ -1,5 +1,5 @@ import { UnprocessableEntityException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; export class UserLoginMigrationAlreadyClosedLoggableException extends UnprocessableEntityException implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-grace-period-expired-loggable.exception.ts b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-grace-period-expired-loggable.exception.ts index 4f4f37f5ce7..b09e8745579 100644 --- a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-grace-period-expired-loggable.exception.ts +++ b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-grace-period-expired-loggable.exception.ts @@ -1,5 +1,5 @@ import { UnprocessableEntityException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; export class UserLoginMigrationGracePeriodExpiredLoggableException diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-mandatory.loggable.ts b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-mandatory.loggable.ts index b3bf5724aaf..5a0053e286e 100644 --- a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-mandatory.loggable.ts +++ b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-mandatory.loggable.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; export class UserLoginMigrationMandatoryLoggable implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-not-found.loggable-exception.ts b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-not-found.loggable-exception.ts index b01b578d673..f3bcbfe837b 100644 --- a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-not-found.loggable-exception.ts +++ b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-not-found.loggable-exception.ts @@ -1,5 +1,5 @@ import { NotFoundException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; export class UserLoginMigrationNotFoundLoggableException extends NotFoundException implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-start.loggable.ts b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-start.loggable.ts index 150ce3117b1..58b6a435e00 100644 --- a/apps/server/src/modules/user-login-migration/loggable/user-login-migration-start.loggable.ts +++ b/apps/server/src/modules/user-login-migration/loggable/user-login-migration-start.loggable.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger'; export class UserLoginMigrationStartLoggable implements Loggable { diff --git a/apps/server/src/modules/user-login-migration/loggable/user-migration-database-operation-failed.loggable-exception.ts b/apps/server/src/modules/user-login-migration/loggable/user-migration-database-operation-failed.loggable-exception.ts index 39e41b9830a..4fa07418eab 100644 --- a/apps/server/src/modules/user-login-migration/loggable/user-migration-database-operation-failed.loggable-exception.ts +++ b/apps/server/src/modules/user-login-migration/loggable/user-migration-database-operation-failed.loggable-exception.ts @@ -1,5 +1,5 @@ import { InternalServerErrorException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { ErrorUtils } from '@src/core/error/utils'; import { ErrorLogMessage, Loggable } from '@src/core/logger'; diff --git a/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts b/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts index 1fecfa7f7aa..96d40fdd7ae 100644 --- a/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts +++ b/apps/server/src/modules/user-login-migration/mapper/user-login-migration.mapper.ts @@ -1,4 +1,4 @@ -import { UserLoginMigrationDO } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationResponse, UserLoginMigrationSearchParams } from '../controller/dto'; import { UserLoginMigrationQuery } from '../uc'; diff --git a/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts b/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts index c3e2d1eac91..2bcef2646c6 100644 --- a/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/service/migration-check.service.spec.ts @@ -1,10 +1,10 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { LegacySchoolService } from '@modules/legacy-school'; +import { UserService } from '@modules/user'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, UserDO, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationRepo } from '@shared/repo'; import { legacySchoolDoFactory, userDoFactory } from '@shared/testing'; -import { LegacySchoolService } from '@modules/legacy-school'; -import { UserService } from '@modules/user'; import { MigrationCheckService } from './migration-check.service'; describe('MigrationCheckService', () => { diff --git a/apps/server/src/modules/user-login-migration/service/migration-check.service.ts b/apps/server/src/modules/user-login-migration/service/migration-check.service.ts index 4c30cc2f8c0..bf2b2e0abab 100644 --- a/apps/server/src/modules/user-login-migration/service/migration-check.service.ts +++ b/apps/server/src/modules/user-login-migration/service/migration-check.service.ts @@ -1,7 +1,8 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { UserService } from '@modules/user'; import { Injectable } from '@nestjs/common'; -import { EntityId, LegacySchoolDo, UserDO, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { UserLoginMigrationRepo } from '@shared/repo'; @Injectable() diff --git a/apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts b/apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts index c84339c9fbf..3d1bb7d1598 100644 --- a/apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/service/school-migration.service.spec.ts @@ -3,7 +3,7 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { LegacySchoolService } from '@modules/legacy-school'; import { UserService } from '@modules/user'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, Page, UserDO, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, Page, UserDO, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationRepo } from '@shared/repo/userloginmigration/user-login-migration.repo'; import { legacySchoolDoFactory, setupEntities, userDoFactory, userLoginMigrationDOFactory } from '@shared/testing'; import { LegacyLogger, Logger } from '@src/core/logger'; diff --git a/apps/server/src/modules/user-login-migration/service/school-migration.service.ts b/apps/server/src/modules/user-login-migration/service/school-migration.service.ts index 41cabc13d03..27289296348 100644 --- a/apps/server/src/modules/user-login-migration/service/school-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/service/school-migration.service.ts @@ -1,7 +1,7 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { UserService } from '@modules/user'; import { Injectable } from '@nestjs/common'; -import { LegacySchoolDo, Page, UserDO, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, Page, UserDO, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationRepo } from '@shared/repo'; import { LegacyLogger, Logger } from '@src/core/logger'; import { performance } from 'perf_hooks'; diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.spec.ts b/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.spec.ts index 36f2176e00f..182fb9fb5cf 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.spec.ts @@ -1,7 +1,7 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { createMock, DeepMocked } from '@golevelup/ts-jest'; -import { SchoolFeatures } from '@shared/domain'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { LegacySchoolService } from '@modules/legacy-school'; +import { Test, TestingModule } from '@nestjs/testing'; +import { SchoolFeatures } from '@shared/domain/entity'; import { setupEntities, userLoginMigrationDOFactory } from '@shared/testing'; import { UserLoginMigrationRevertService } from './user-login-migration-revert.service'; import { UserLoginMigrationService } from './user-login-migration.service'; diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts b/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts index 6d6512bc700..265f9019e34 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts +++ b/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts @@ -1,6 +1,7 @@ -import { Injectable } from '@nestjs/common'; -import { SchoolFeatures, UserLoginMigrationDO } from '@shared/domain'; import { LegacySchoolService } from '@modules/legacy-school'; +import { Injectable } from '@nestjs/common'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { SchoolFeatures } from '@shared/domain/entity'; import { UserLoginMigrationService } from './user-login-migration.service'; @Injectable() diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts b/apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts index 35e9e02b473..81f2186e6f5 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/service/user-login-migration.service.spec.ts @@ -7,7 +7,9 @@ import { SystemDto } from '@modules/system/service'; import { UserService } from '@modules/user'; import { InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, LegacySchoolDo, SchoolFeatures, UserDO, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { SchoolFeatures } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { UserLoginMigrationRepo } from '@shared/repo'; import { legacySchoolDoFactory, userDoFactory, userLoginMigrationDOFactory } from '@shared/testing'; import { diff --git a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts b/apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts index f9ee07a7fde..e2b5d7b23f0 100644 --- a/apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/service/user-login-migration.service.ts @@ -3,7 +3,9 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { LegacySystemService, SystemDto } from '@modules/system'; import { UserService } from '@modules/user'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { EntityId, LegacySchoolDo, SchoolFeatures, SystemTypeEnum, UserDO, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserDO, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { SchoolFeatures } from '@shared/domain/entity'; +import { EntityId, SystemTypeEnum } from '@shared/domain/types'; import { UserLoginMigrationRepo } from '@shared/repo'; import { UserLoginMigrationAlreadyClosedLoggableException, diff --git a/apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts b/apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts index e738a1feac3..fbe85911e59 100644 --- a/apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts +++ b/apps/server/src/modules/user-login-migration/service/user-migration.service.spec.ts @@ -4,7 +4,7 @@ import { AccountService } from '@modules/account/services/account.service'; import { AccountDto } from '@modules/account/services/dto'; import { UserService } from '@modules/user'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserDO } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; import { roleFactory, setupEntities, userDoFactory } from '@shared/testing'; import { Logger } from '@src/core/logger'; import { UserMigrationDatabaseOperationFailedLoggableException } from '../loggable'; diff --git a/apps/server/src/modules/user-login-migration/service/user-migration.service.ts b/apps/server/src/modules/user-login-migration/service/user-migration.service.ts index 38c020b43cb..27a7f25b9d6 100644 --- a/apps/server/src/modules/user-login-migration/service/user-migration.service.ts +++ b/apps/server/src/modules/user-login-migration/service/user-migration.service.ts @@ -2,8 +2,8 @@ import { AccountService } from '@modules/account/services/account.service'; import { AccountDto } from '@modules/account/services/dto'; import { UserService } from '@modules/user'; import { Injectable } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; import { UserDO } from '@shared/domain/domainobject/user.do'; +import { EntityId } from '@shared/domain/types'; import { Logger } from '@src/core/logger'; import { UserMigrationDatabaseOperationFailedLoggableException } from '../loggable'; diff --git a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.spec.ts index a3eead10096..4e99f03dc14 100644 --- a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.spec.ts @@ -2,7 +2,9 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { ObjectId } from '@mikro-orm/mongodb'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission, UserLoginMigrationDO } from '@shared/domain'; + +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { Permission } from '@shared/domain/interface'; import { setupEntities, userFactory, userLoginMigrationDOFactory } from '@shared/testing'; import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; import { SchoolMigrationService, UserLoginMigrationRevertService, UserLoginMigrationService } from '../service'; diff --git a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts index c04064f813a..5228e644733 100644 --- a/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/close-user-login-migration.uc.ts @@ -1,6 +1,9 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { EntityId, Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; import { SchoolMigrationService, UserLoginMigrationRevertService, UserLoginMigrationService } from '../service'; diff --git a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.spec.ts index 1aace730ee4..14b05604707 100644 --- a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.spec.ts @@ -2,7 +2,9 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { setupEntities, userFactory, userLoginMigrationDOFactory } from '@shared/testing'; import { Logger } from '@src/core/logger'; import { UserLoginMigrationNotFoundLoggableException } from '../loggable'; diff --git a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts index 60be2ca956b..0af6b1de250 100644 --- a/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts @@ -1,6 +1,8 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { Logger } from '@src/core/logger'; import { UserLoginMigrationNotFoundLoggableException, UserLoginMigrationStartLoggable } from '../loggable'; import { SchoolMigrationService, UserLoginMigrationService } from '../service'; diff --git a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.spec.ts index b6d3c0210f2..6ddaa59e9d4 100644 --- a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.spec.ts @@ -3,7 +3,9 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/auth import { LegacySchoolService } from '@modules/legacy-school'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { legacySchoolDoFactory, setupEntities, userFactory, userLoginMigrationDOFactory } from '@shared/testing'; import { Logger } from '@src/core/logger'; import { SchoolNumberMissingLoggableException, UserLoginMigrationAlreadyClosedLoggableException } from '../loggable'; diff --git a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts index 1bf47635d83..3ffd0785fa6 100644 --- a/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts @@ -1,7 +1,10 @@ import { AuthorizationContext, AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { LegacySchoolService } from '@modules/legacy-school'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { EntityId, LegacySchoolDo, Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { Logger } from '@src/core/logger'; import { SchoolNumberMissingLoggableException, diff --git a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.spec.ts index 3416250a67e..c11b4fa84b5 100644 --- a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.spec.ts @@ -3,7 +3,9 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/auth import { LegacySchoolService } from '@modules/legacy-school'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { LegacySchoolDo, Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { legacySchoolDoFactory, setupEntities, userFactory, userLoginMigrationDOFactory } from '@shared/testing'; import { Logger } from '@src/core/logger'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts index cb964ff7fa6..255dd824b3f 100644 --- a/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/toggle-user-login-migration.uc.ts @@ -1,7 +1,10 @@ import { AuthorizationContext, AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { LegacySchoolService } from '@modules/legacy-school'; import { Injectable } from '@nestjs/common'; -import { EntityId, LegacySchoolDo, Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { Logger } from '@src/core/logger'; import { UserLoginMigrationMandatoryLoggable, UserLoginMigrationNotFoundLoggableException } from '../loggable'; import { UserLoginMigrationService } from '../service'; diff --git a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts b/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts index 59271414f1d..3fce00aac9d 100644 --- a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts +++ b/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.spec.ts @@ -14,7 +14,9 @@ import { import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { LegacySchoolDo, Page, Permission, SystemEntity, User, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, Page, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { SystemEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { legacySchoolDoFactory, diff --git a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts b/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts index 8314cbfd455..4c326aaec85 100644 --- a/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts +++ b/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts @@ -1,10 +1,13 @@ import { AuthenticationService } from '@modules/authentication'; import { Action, AuthorizationService } from '@modules/authorization'; -import { OAuthTokenDto, OAuthService } from '@modules/oauth'; -import { ProvisioningService, OauthDataDto } from '@modules/provisioning'; +import { OAuthService, OAuthTokenDto } from '@modules/oauth'; +import { OauthDataDto, ProvisioningService } from '@modules/provisioning'; import { ForbiddenException, Injectable } from '@nestjs/common'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; -import { EntityId, LegacySchoolDo, Page, Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { LegacySchoolDo, Page, UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { Logger } from '@src/core/logger'; import { ExternalSchoolNumberMissingLoggableException, diff --git a/apps/server/src/modules/user/controller/api-test/user-language.api.spec.ts b/apps/server/src/modules/user/controller/api-test/user-language.api.spec.ts index 50b1c08f8d9..0268a3c8c29 100644 --- a/apps/server/src/modules/user/controller/api-test/user-language.api.spec.ts +++ b/apps/server/src/modules/user/controller/api-test/user-language.api.spec.ts @@ -6,7 +6,7 @@ import { ICurrentUser } from '@modules/authentication'; import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ServerTestModule } from '@modules/server/server.module'; import { ApiValidationError } from '@shared/common'; -import { LanguageType, User } from '@shared/domain'; +import { LanguageType, User } from '@shared/domain/entity'; import { cleanupCollections, mapUserToCurrentUser, roleFactory, userFactory } from '@shared/testing'; import { Request } from 'express'; import request from 'supertest'; diff --git a/apps/server/src/modules/user/controller/api-test/user-me.api.spec.ts b/apps/server/src/modules/user/controller/api-test/user-me.api.spec.ts index c77f23f2e59..df86b8ecb15 100644 --- a/apps/server/src/modules/user/controller/api-test/user-me.api.spec.ts +++ b/apps/server/src/modules/user/controller/api-test/user-me.api.spec.ts @@ -10,7 +10,7 @@ import { JwtAuthGuard } from '@modules/authentication/guard/jwt-auth.guard'; import { ServerTestModule } from '@modules/server/server.module'; import { ResolvedUserResponse } from '@modules/user/controller/dto'; import { ApiValidationError } from '@shared/common'; -import { LanguageType } from '@shared/domain'; +import { LanguageType } from '@shared/domain/entity'; import { cleanupCollections, mapUserToCurrentUser, roleFactory, userFactory } from '@shared/testing'; const baseRouteName = '/user/me'; diff --git a/apps/server/src/modules/user/controller/dto/user.params.ts b/apps/server/src/modules/user/controller/dto/user.params.ts index 84e3e8ed9a2..72a2dd85f00 100644 --- a/apps/server/src/modules/user/controller/dto/user.params.ts +++ b/apps/server/src/modules/user/controller/dto/user.params.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { LanguageType } from '@shared/domain'; +import { LanguageType } from '@shared/domain/entity'; import { IsEnum } from 'class-validator'; export class ChangeLanguageParams { diff --git a/apps/server/src/modules/user/mapper/resolved-user.mapper.ts b/apps/server/src/modules/user/mapper/resolved-user.mapper.ts index 52849ece3c2..a6518b23a72 100644 --- a/apps/server/src/modules/user/mapper/resolved-user.mapper.ts +++ b/apps/server/src/modules/user/mapper/resolved-user.mapper.ts @@ -1,4 +1,4 @@ -import { User, Role } from '@shared/domain'; +import { Role, User } from '@shared/domain/entity'; import { ResolvedUserResponse } from '../controller/dto'; export class ResolvedUserMapper { diff --git a/apps/server/src/modules/user/mapper/user.mapper.spec.ts b/apps/server/src/modules/user/mapper/user.mapper.spec.ts index dbb5d475f05..afc6ff1e655 100644 --- a/apps/server/src/modules/user/mapper/user.mapper.spec.ts +++ b/apps/server/src/modules/user/mapper/user.mapper.spec.ts @@ -1,7 +1,7 @@ -import { User } from '@shared/domain'; -import { roleFactory, setupEntities, userFactory } from '@shared/testing'; import { UserMapper } from '@modules/user/mapper/user.mapper'; import { UserDto } from '@modules/user/uc/dto/user.dto'; +import { User } from '@shared/domain/entity'; +import { roleFactory, setupEntities, userFactory } from '@shared/testing'; describe('UserMapper', () => { let userEntity: User; diff --git a/apps/server/src/modules/user/mapper/user.mapper.ts b/apps/server/src/modules/user/mapper/user.mapper.ts index 2238f0307b7..ad523ab2ed9 100644 --- a/apps/server/src/modules/user/mapper/user.mapper.ts +++ b/apps/server/src/modules/user/mapper/user.mapper.ts @@ -1,5 +1,5 @@ -import { Role, User } from '@shared/domain'; import { UserDto } from '@modules/user/uc/dto/user.dto'; +import { Role, User } from '@shared/domain/entity'; export class UserMapper { static mapFromEntityToDto(entity: User): UserDto { diff --git a/apps/server/src/modules/user/service/user.service.spec.ts b/apps/server/src/modules/user/service/user.service.spec.ts index 044d169864d..ecee10025a7 100644 --- a/apps/server/src/modules/user/service/user.service.spec.ts +++ b/apps/server/src/modules/user/service/user.service.spec.ts @@ -1,18 +1,20 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { EntityManager } from '@mikro-orm/core'; +import { AccountDto, AccountService } from '@modules/account'; +import { OauthCurrentUser } from '@modules/authentication/interface'; +import { RoleService } from '@modules/role'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, IFindOptions, LanguageType, Permission, Role, RoleName, SortOrder, User } from '@shared/domain'; import { UserDO } from '@shared/domain/domainobject/user.do'; +import { LanguageType, Role, User } from '@shared/domain/entity'; +import { IFindOptions, Permission, RoleName, SortOrder } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { UserRepo } from '@shared/repo'; import { UserDORepo } from '@shared/repo/user/user-do.repo'; import { roleFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing'; -import { AccountService, AccountDto } from '@modules/account'; -import { RoleService } from '@modules/role'; -import { OauthCurrentUser } from '@modules/authentication/interface'; import { UserDto } from '../uc/dto/user.dto'; -import { UserService } from './user.service'; import { UserQuery } from './user-query.type'; +import { UserService } from './user.service'; describe('UserService', () => { let service: UserService; diff --git a/apps/server/src/modules/user/service/user.service.ts b/apps/server/src/modules/user/service/user.service.ts index 8f6feca4750..a35de214447 100644 --- a/apps/server/src/modules/user/service/user.service.ts +++ b/apps/server/src/modules/user/service/user.service.ts @@ -7,8 +7,10 @@ import { RoleDto } from '@modules/role/service/dto/role.dto'; import { RoleService } from '@modules/role/service/role.service'; import { BadRequestException, Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { EntityId, IFindOptions, LanguageType, User } from '@shared/domain'; import { Page, RoleReference, UserDO } from '@shared/domain/domainobject'; +import { LanguageType, User } from '@shared/domain/entity'; +import { IFindOptions } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { UserRepo } from '@shared/repo'; import { UserDORepo } from '@shared/repo/user/user-do.repo'; import { UserConfig } from '../interfaces'; diff --git a/apps/server/src/modules/user/uc/dto/user.dto.ts b/apps/server/src/modules/user/uc/dto/user.dto.ts index 91c1d52d05c..246fc2d5efa 100644 --- a/apps/server/src/modules/user/uc/dto/user.dto.ts +++ b/apps/server/src/modules/user/uc/dto/user.dto.ts @@ -1,4 +1,5 @@ -import { EntityId, LanguageType } from '@shared/domain'; +import { LanguageType } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; export class UserDto { constructor(user: UserDto) { diff --git a/apps/server/src/modules/user/uc/user.uc.spec.ts b/apps/server/src/modules/user/uc/user.uc.spec.ts index 3781a8c914a..d47f3cf09b4 100644 --- a/apps/server/src/modules/user/uc/user.uc.spec.ts +++ b/apps/server/src/modules/user/uc/user.uc.spec.ts @@ -1,11 +1,12 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { UserService } from '@modules/user/service/user.service'; import { BadRequestException } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; -import { LanguageType, Permission, User } from '@shared/domain'; +import { LanguageType, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; import { UserRepo } from '@shared/repo'; import { roleFactory, setupEntities, userFactory } from '@shared/testing'; -import { UserService } from '@modules/user/service/user.service'; import { UserUc } from './user.uc'; describe('UserUc', () => { diff --git a/apps/server/src/modules/user/uc/user.uc.ts b/apps/server/src/modules/user/uc/user.uc.ts index 2f2661eb0a2..d0fd1aad29b 100644 --- a/apps/server/src/modules/user/uc/user.uc.ts +++ b/apps/server/src/modules/user/uc/user.uc.ts @@ -1,6 +1,7 @@ import { BadRequestException, Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { EntityId, LanguageType, User } from '@shared/domain'; +import { LanguageType, User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { UserRepo } from '@shared/repo'; import { ChangeLanguageParams } from '../controller/dto'; import { UserConfig } from '../interfaces'; diff --git a/apps/server/src/modules/video-conference/controller/api-test/video-conference.api.spec.ts b/apps/server/src/modules/video-conference/controller/api-test/video-conference.api.spec.ts index d8b81c0c698..9d45ef3d78e 100644 --- a/apps/server/src/modules/video-conference/controller/api-test/video-conference.api.spec.ts +++ b/apps/server/src/modules/video-conference/controller/api-test/video-conference.api.spec.ts @@ -1,31 +1,29 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; +import { ServerTestModule } from '@modules/server'; import { HttpStatus, INestApplication } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; import { Account, Course, - Permission, Role, - RoleName, SchoolEntity, SchoolFeatures, TargetModels, User, VideoConference, - VideoConferenceScope, -} from '@shared/domain'; +} from '@shared/domain/entity'; +import { Permission, RoleName, VideoConferenceScope } from '@shared/domain/interface'; import { + TestApiClient, + UserAndAccountTestFactory, accountFactory, cleanupCollections, courseFactory, roleFactory, schoolFactory, - TestApiClient, - UserAndAccountTestFactory, userFactory, } from '@shared/testing'; import { videoConferenceFactory } from '@shared/testing/factory/video-conference.factory'; -import { ServerTestModule } from '@modules/server'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import { Response } from 'supertest'; diff --git a/apps/server/src/modules/video-conference/controller/dto/request/video-conference-scope.params.ts b/apps/server/src/modules/video-conference/controller/dto/request/video-conference-scope.params.ts index 3db5849f873..2d713fc3398 100644 --- a/apps/server/src/modules/video-conference/controller/dto/request/video-conference-scope.params.ts +++ b/apps/server/src/modules/video-conference/controller/dto/request/video-conference-scope.params.ts @@ -1,6 +1,6 @@ -import { VideoConferenceScope } from '@shared/domain'; -import { IsEnum, IsMongoId } from 'class-validator'; import { ApiProperty } from '@nestjs/swagger'; +import { VideoConferenceScope } from '@shared/domain/interface'; +import { IsEnum, IsMongoId } from 'class-validator'; export class VideoConferenceScopeParams { @ApiProperty({ nullable: false, required: true, enum: VideoConferenceScope, enumName: 'VideoConferenceScope' }) diff --git a/apps/server/src/modules/video-conference/controller/dto/response/video-conference-deprecated.response.ts b/apps/server/src/modules/video-conference/controller/dto/response/video-conference-deprecated.response.ts index 366e817ab22..f944c578196 100644 --- a/apps/server/src/modules/video-conference/controller/dto/response/video-conference-deprecated.response.ts +++ b/apps/server/src/modules/video-conference/controller/dto/response/video-conference-deprecated.response.ts @@ -1,4 +1,4 @@ -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { VideoConferenceStateResponse } from './video-conference-state.response'; /** diff --git a/apps/server/src/modules/video-conference/mapper/vc-deprecated-response.mapper.spec.ts b/apps/server/src/modules/video-conference/mapper/vc-deprecated-response.mapper.spec.ts index ff3f99d2231..3cf401f08e2 100644 --- a/apps/server/src/modules/video-conference/mapper/vc-deprecated-response.mapper.spec.ts +++ b/apps/server/src/modules/video-conference/mapper/vc-deprecated-response.mapper.spec.ts @@ -1,4 +1,4 @@ -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { BBBBaseResponse } from '../bbb'; import { DeprecatedVideoConferenceInfoResponse, diff --git a/apps/server/src/modules/video-conference/mapper/video-conference.mapper.ts b/apps/server/src/modules/video-conference/mapper/video-conference.mapper.ts index 1f51a8cb3ff..87ef47335b9 100644 --- a/apps/server/src/modules/video-conference/mapper/video-conference.mapper.ts +++ b/apps/server/src/modules/video-conference/mapper/video-conference.mapper.ts @@ -1,4 +1,4 @@ -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { BBBRole } from '../bbb'; import { VideoConferenceCreateParams, @@ -7,7 +7,7 @@ import { VideoConferenceStateResponse, } from '../controller/dto'; import { VideoConferenceOptionsResponse } from '../controller/dto/response/video-conference-options.response'; -import { defaultVideoConferenceOptions, VideoConferenceOptions } from '../interface'; +import { VideoConferenceOptions, defaultVideoConferenceOptions } from '../interface'; import { VideoConferenceInfo, VideoConferenceJoin, VideoConferenceState } from '../uc/dto'; export const PermissionMapping = { diff --git a/apps/server/src/modules/video-conference/service/video-conference.service.spec.ts b/apps/server/src/modules/video-conference/service/video-conference.service.spec.ts index 2a5d223b553..47176aceffb 100644 --- a/apps/server/src/modules/video-conference/service/video-conference.service.spec.ts +++ b/apps/server/src/modules/video-conference/service/video-conference.service.spec.ts @@ -7,17 +7,11 @@ import { UserService } from '@modules/user'; import { BadRequestException, ForbiddenException } from '@nestjs/common'; import { NotFoundException } from '@nestjs/common/exceptions/not-found.exception'; import { Test, TestingModule } from '@nestjs/testing'; -import { - Course, - EntityId, - Permission, - RoleName, - SchoolFeatures, - TeamUserEntity, - UserDO, - VideoConferenceDO, - VideoConferenceScope, -} from '@shared/domain'; +import { Course, SchoolFeatures, TeamUserEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; + +import { UserDO, VideoConferenceDO } from '@shared/domain/domainobject'; +import { Permission, RoleName, VideoConferenceScope } from '@shared/domain/interface'; import { TeamsRepo, VideoConferenceRepo } from '@shared/repo'; import { courseFactory, roleFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing'; import { teamFactory } from '@shared/testing/factory/team.factory'; diff --git a/apps/server/src/modules/video-conference/service/video-conference.service.ts b/apps/server/src/modules/video-conference/service/video-conference.service.ts index 706a00e6e3b..7a285deb363 100644 --- a/apps/server/src/modules/video-conference/service/video-conference.service.ts +++ b/apps/server/src/modules/video-conference/service/video-conference.service.ts @@ -4,21 +4,10 @@ import { CourseService } from '@modules/learnroom'; import { LegacySchoolService } from '@modules/legacy-school'; import { UserService } from '@modules/user'; import { BadRequestException, ForbiddenException, Inject, Injectable } from '@nestjs/common'; -import { - Course, - EntityId, - Permission, - RoleName, - RoleReference, - SchoolFeatures, - TeamEntity, - TeamUserEntity, - User, - UserDO, - VideoConferenceDO, - VideoConferenceOptionsDO, - VideoConferenceScope, -} from '@shared/domain'; +import { RoleReference, UserDO, VideoConferenceDO, VideoConferenceOptionsDO } from '@shared/domain/domainobject'; +import { Course, SchoolFeatures, TeamEntity, TeamUserEntity, User } from '@shared/domain/entity'; +import { Permission, RoleName, VideoConferenceScope } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { TeamsRepo, VideoConferenceRepo } from '@shared/repo'; import { BBBRole } from '../bbb'; import { ErrorStatus } from '../error'; diff --git a/apps/server/src/modules/video-conference/uc/dto/scope-info.interface.ts b/apps/server/src/modules/video-conference/uc/dto/scope-info.interface.ts index 2469f49ad29..5ec0decd414 100644 --- a/apps/server/src/modules/video-conference/uc/dto/scope-info.interface.ts +++ b/apps/server/src/modules/video-conference/uc/dto/scope-info.interface.ts @@ -1,4 +1,4 @@ -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; export interface ScopeInfo { scopeId: EntityId; diff --git a/apps/server/src/modules/video-conference/uc/dto/scope-ref.ts b/apps/server/src/modules/video-conference/uc/dto/scope-ref.ts index 6cf75a54de6..c1650890f45 100644 --- a/apps/server/src/modules/video-conference/uc/dto/scope-ref.ts +++ b/apps/server/src/modules/video-conference/uc/dto/scope-ref.ts @@ -1,4 +1,5 @@ -import { EntityId, VideoConferenceScope } from '@shared/domain'; +import { VideoConferenceScope } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; export class ScopeRef { id: EntityId; diff --git a/apps/server/src/modules/video-conference/uc/dto/video-conference-join.ts b/apps/server/src/modules/video-conference/uc/dto/video-conference-join.ts index 4a02870e1e0..9639f3f9fac 100644 --- a/apps/server/src/modules/video-conference/uc/dto/video-conference-join.ts +++ b/apps/server/src/modules/video-conference/uc/dto/video-conference-join.ts @@ -1,4 +1,4 @@ -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; import { VideoConferenceState } from './video-conference-state.enum'; export class VideoConferenceJoin { diff --git a/apps/server/src/modules/video-conference/uc/dto/video-conference.ts b/apps/server/src/modules/video-conference/uc/dto/video-conference.ts index 9ee733d7a20..dd9181578e5 100644 --- a/apps/server/src/modules/video-conference/uc/dto/video-conference.ts +++ b/apps/server/src/modules/video-conference/uc/dto/video-conference.ts @@ -1,6 +1,6 @@ -import { Permission } from '@shared/domain'; -import { VideoConferenceState } from './video-conference-state.enum'; +import { Permission } from '@shared/domain/interface'; import { BBBBaseResponse, BBBResponse } from '../../bbb'; +import { VideoConferenceState } from './video-conference-state.enum'; export class VideoConference { state: VideoConferenceState; diff --git a/apps/server/src/modules/video-conference/uc/video-conference-create.uc.spec.ts b/apps/server/src/modules/video-conference/uc/video-conference-create.uc.spec.ts index 1361cb053ad..9f9af2fd9c6 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-create.uc.spec.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-create.uc.spec.ts @@ -2,7 +2,9 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { UserService } from '@modules/user'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserDO, VideoConferenceScope } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; +import {} from '@shared/domain/entity'; +import { VideoConferenceScope } from '@shared/domain/interface'; import { userDoFactory } from '@shared/testing'; import { ObjectId } from 'bson'; import { BBBCreateResponse, BBBMeetingInfoResponse, BBBResponse, BBBRole, BBBStatus } from '../bbb'; diff --git a/apps/server/src/modules/video-conference/uc/video-conference-create.uc.ts b/apps/server/src/modules/video-conference/uc/video-conference-create.uc.ts index d9ba4e0d61c..e67412b567d 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-create.uc.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-create.uc.ts @@ -1,6 +1,7 @@ import { UserService } from '@modules/user'; import { ForbiddenException, Injectable } from '@nestjs/common'; -import { EntityId, UserDO } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BBBBaseMeetingConfig, BBBCreateConfigBuilder, diff --git a/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts b/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts index a8caf8f2dc9..e4496406b9b 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts @@ -9,18 +9,10 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { UserService } from '@modules/user'; import { BadRequestException, ForbiddenException, InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { - Course, - EntityId, - Permission, - Role, - RoleName, - RoleReference, - TeamEntity, - UserDO, - VideoConferenceDO, -} from '@shared/domain'; -import { VideoConferenceScope } from '@shared/domain/interface'; +import { RoleReference, UserDO, VideoConferenceDO } from '@shared/domain/domainobject'; +import { Course, Role, TeamEntity } from '@shared/domain/entity'; +import { Permission, RoleName, VideoConferenceScope } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { TeamsRepo, VideoConferenceRepo } from '@shared/repo'; import { roleFactory, setupEntities, userDoFactory } from '@shared/testing'; import { teamFactory } from '@shared/testing/factory/team.factory'; diff --git a/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.ts b/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.ts index 14d8b594fb9..51b3bfd9b83 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.ts @@ -8,19 +8,10 @@ import { CourseService } from '@modules/learnroom'; import { LegacySchoolService } from '@modules/legacy-school'; import { UserService } from '@modules/user'; import { BadRequestException, ForbiddenException, Injectable } from '@nestjs/common'; -import { - Course, - EntityId, - Permission, - RoleName, - SchoolFeatures, - TeamEntity, - TeamUserEntity, - UserDO, - VideoConferenceDO, - VideoConferenceOptionsDO, -} from '@shared/domain'; -import { VideoConferenceScope } from '@shared/domain/interface'; +import { UserDO, VideoConferenceDO, VideoConferenceOptionsDO } from '@shared/domain/domainobject'; +import { Course, SchoolFeatures, TeamEntity, TeamUserEntity } from '@shared/domain/entity'; +import { Permission, RoleName, VideoConferenceScope } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { TeamsRepo } from '@shared/repo'; import { VideoConferenceRepo } from '@shared/repo/videoconference/video-conference.repo'; import { @@ -36,7 +27,7 @@ import { GuestPolicy, } from '../bbb'; import { ErrorStatus } from '../error/error-status.enum'; -import { defaultVideoConferenceOptions, VideoConferenceOptions } from '../interface'; +import { VideoConferenceOptions, defaultVideoConferenceOptions } from '../interface'; import { ScopeInfo, VideoConference, VideoConferenceInfo, VideoConferenceJoin, VideoConferenceState } from './dto'; const PermissionMapping = { diff --git a/apps/server/src/modules/video-conference/uc/video-conference-end.uc.spec.ts b/apps/server/src/modules/video-conference/uc/video-conference-end.uc.spec.ts index e18c7d7dc65..9f6cd1e55b7 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-end.uc.spec.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-end.uc.spec.ts @@ -2,7 +2,9 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { UserService } from '@modules/user'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { UserDO, VideoConferenceScope } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; +import {} from '@shared/domain/entity'; +import { VideoConferenceScope } from '@shared/domain/interface'; import { userDoFactory } from '@shared/testing'; import { ObjectId } from 'bson'; import { BBBBaseResponse, BBBResponse, BBBRole, BBBStatus } from '../bbb'; diff --git a/apps/server/src/modules/video-conference/uc/video-conference-end.uc.ts b/apps/server/src/modules/video-conference/uc/video-conference-end.uc.ts index a1648a4cba1..211ade03e79 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-end.uc.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-end.uc.ts @@ -1,7 +1,8 @@ import { UserService } from '@modules/user'; import { ErrorStatus } from '@modules/video-conference/error/error-status.enum'; import { ForbiddenException, Injectable } from '@nestjs/common'; -import { EntityId, UserDO } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BBBBaseMeetingConfig, BBBBaseResponse, BBBResponse, BBBRole, BBBService } from '../bbb'; import { PermissionMapping } from '../mapper/video-conference.mapper'; import { VideoConferenceService } from '../service'; diff --git a/apps/server/src/modules/video-conference/uc/video-conference-info.uc.spec.ts b/apps/server/src/modules/video-conference/uc/video-conference-info.uc.spec.ts index 3aac5d6e8ff..b80fcc297bd 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-info.uc.spec.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-info.uc.spec.ts @@ -2,7 +2,9 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { UserService } from '@modules/user'; import { ForbiddenException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { Permission, UserDO, VideoConferenceDO, VideoConferenceScope } from '@shared/domain'; +import { UserDO, VideoConferenceDO } from '@shared/domain/domainobject'; +import {} from '@shared/domain/entity'; +import { Permission, VideoConferenceScope } from '@shared/domain/interface'; import { userDoFactory } from '@shared/testing'; import { videoConferenceDOFactory } from '@shared/testing/factory/video-conference.do.factory'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/video-conference/uc/video-conference-info.uc.ts b/apps/server/src/modules/video-conference/uc/video-conference-info.uc.ts index 7e39db7bb7b..a490fa6f83a 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-info.uc.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-info.uc.ts @@ -1,7 +1,8 @@ import { UserService } from '@modules/user'; import { ErrorStatus } from '@modules/video-conference/error/error-status.enum'; import { ForbiddenException, Injectable } from '@nestjs/common'; -import { EntityId, UserDO, VideoConferenceDO, VideoConferenceOptionsDO } from '@shared/domain'; +import { UserDO, VideoConferenceDO, VideoConferenceOptionsDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BBBBaseMeetingConfig, BBBMeetingInfoResponse, BBBResponse, BBBRole, BBBService } from '../bbb'; import { defaultVideoConferenceOptions, VideoConferenceOptions } from '../interface'; import { PermissionMapping } from '../mapper/video-conference.mapper'; diff --git a/apps/server/src/modules/video-conference/uc/video-conference-join.uc.spec.ts b/apps/server/src/modules/video-conference/uc/video-conference-join.uc.spec.ts index 525a43b4c69..b3a3b13d3c4 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-join.uc.spec.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-join.uc.spec.ts @@ -1,16 +1,18 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { createMock, DeepMocked } from '@golevelup/ts-jest'; +import { DeepMocked, createMock } from '@golevelup/ts-jest'; import { UserService } from '@modules/user'; -import { userDoFactory } from '@shared/testing'; -import { Permission, UserDO, VideoConferenceDO, VideoConferenceScope } from '@shared/domain'; -import { ObjectId } from 'bson'; import { ForbiddenException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { UserDO, VideoConferenceDO } from '@shared/domain/domainobject'; +import {} from '@shared/domain/entity'; +import { Permission, VideoConferenceScope } from '@shared/domain/interface'; +import { userDoFactory } from '@shared/testing'; import { videoConferenceDOFactory } from '@shared/testing/factory/video-conference.do.factory'; -import { BBBService, VideoConferenceService } from '../service'; -import { VideoConferenceOptions } from '../interface'; +import { ObjectId } from 'bson'; import { BBBJoinConfig, BBBJoinResponse, BBBResponse, BBBRole } from '../bbb'; -import { VideoConferenceJoin, VideoConferenceState } from './dto'; import { ErrorStatus } from '../error/error-status.enum'; +import { VideoConferenceOptions } from '../interface'; +import { BBBService, VideoConferenceService } from '../service'; +import { VideoConferenceJoin, VideoConferenceState } from './dto'; import { VideoConferenceJoinUc } from './video-conference-join.uc'; describe('VideoConferenceJoinUc', () => { diff --git a/apps/server/src/modules/video-conference/uc/video-conference-join.uc.ts b/apps/server/src/modules/video-conference/uc/video-conference-join.uc.ts index 2015c20d381..ea9224feedf 100644 --- a/apps/server/src/modules/video-conference/uc/video-conference-join.uc.ts +++ b/apps/server/src/modules/video-conference/uc/video-conference-join.uc.ts @@ -1,11 +1,12 @@ -import { ForbiddenException, Injectable } from '@nestjs/common'; -import { EntityId, UserDO, VideoConferenceDO } from '@shared/domain'; -import { ErrorStatus } from '@modules/video-conference/error/error-status.enum'; import { UserService } from '@modules/user'; +import { ErrorStatus } from '@modules/video-conference/error/error-status.enum'; +import { ForbiddenException, Injectable } from '@nestjs/common'; +import { UserDO, VideoConferenceDO } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BBBJoinConfigBuilder, BBBRole, BBBService } from '../bbb'; -import { ScopeRef, VideoConferenceJoin, VideoConferenceState } from './dto'; -import { VideoConferenceService } from '../service'; import { PermissionMapping } from '../mapper/video-conference.mapper'; +import { VideoConferenceService } from '../service'; +import { ScopeRef, VideoConferenceJoin, VideoConferenceState } from './dto'; @Injectable() export class VideoConferenceJoinUc { diff --git a/apps/server/src/shared/controller/transformer/sanitize-html.transformer.spec.ts b/apps/server/src/shared/controller/transformer/sanitize-html.transformer.spec.ts index b74f458d282..75502ded02b 100644 --- a/apps/server/src/shared/controller/transformer/sanitize-html.transformer.spec.ts +++ b/apps/server/src/shared/controller/transformer/sanitize-html.transformer.spec.ts @@ -1,5 +1,6 @@ import { NotImplementedException } from '@nestjs/common'; -import { InputFormat } from '@shared/domain'; + +import { InputFormat } from '@shared/domain/types'; import { plainToClass } from 'class-transformer'; import { SanitizeHtml } from './sanitize-html.transformer'; diff --git a/apps/server/src/shared/domain/domainobject/board/board-composite.do.ts b/apps/server/src/shared/domain/domainobject/board/board-composite.do.ts index 3f5bfc8074d..fa3327524b8 100644 --- a/apps/server/src/shared/domain/domainobject/board/board-composite.do.ts +++ b/apps/server/src/shared/domain/domainobject/board/board-composite.do.ts @@ -1,6 +1,6 @@ import { BadRequestException, ForbiddenException } from '@nestjs/common'; -import { EntityId } from '@shared/domain'; import { DomainObject } from '@shared/domain/domain-object'; // fix import if it is avaible +import { EntityId } from '@shared/domain/types'; import type { AnyBoardDo, BoardCompositeVisitor, BoardCompositeVisitorAsync } from './types'; export abstract class BoardComposite extends DomainObject { diff --git a/apps/server/src/shared/domain/domainobject/board/submission-item.do.ts b/apps/server/src/shared/domain/domainobject/board/submission-item.do.ts index 4a96e562bb4..d6e1a462956 100644 --- a/apps/server/src/shared/domain/domainobject/board/submission-item.do.ts +++ b/apps/server/src/shared/domain/domainobject/board/submission-item.do.ts @@ -1,4 +1,5 @@ -import { EntityId, FileElement, isFileElement, isRichTextElement, RichTextElement } from '@shared/domain'; +import { FileElement, isFileElement, isRichTextElement, RichTextElement } from '@shared/domain/domainobject'; +import { EntityId } from '@shared/domain/types'; import { BoardComposite, BoardCompositeProps } from './board-composite.do'; import type { AnyBoardDo, BoardCompositeVisitor, BoardCompositeVisitorAsync } from './types'; diff --git a/apps/server/src/shared/domain/entity/boardnode/submission-item-node.entity.ts b/apps/server/src/shared/domain/entity/boardnode/submission-item-node.entity.ts index 0253252ac42..b265a3fb710 100644 --- a/apps/server/src/shared/domain/entity/boardnode/submission-item-node.entity.ts +++ b/apps/server/src/shared/domain/entity/boardnode/submission-item-node.entity.ts @@ -1,5 +1,5 @@ import { Entity, Property } from '@mikro-orm/core'; -import { EntityId } from '@shared/domain'; +import { EntityId } from '@shared/domain/types'; import { AnyBoardDo } from '../../domainobject'; import { BoardNode, BoardNodeProps } from './boardnode.entity'; import { BoardDoBuilder, BoardNodeType } from './types'; diff --git a/apps/server/src/shared/domain/entity/dashboard.entity.spec.ts b/apps/server/src/shared/domain/entity/dashboard.entity.spec.ts index 5086255e6cf..3383e9d51c3 100644 --- a/apps/server/src/shared/domain/entity/dashboard.entity.spec.ts +++ b/apps/server/src/shared/domain/entity/dashboard.entity.spec.ts @@ -1,5 +1,6 @@ import { BadRequestException, NotFoundException } from '@nestjs/common'; -import { Learnroom, LearnroomTypes } from '@shared/domain'; +import { LearnroomTypes } from '@shared/domain/types'; +import { Learnroom } from '../interface'; import { DashboardEntity, GridElement } from './dashboard.entity'; const getLearnroomMock = (id: string): Learnroom => { diff --git a/apps/server/src/shared/domain/entity/dashboardElement.entity.spec.ts b/apps/server/src/shared/domain/entity/dashboardElement.entity.spec.ts index 9ddac62ac53..dc5391284a7 100644 --- a/apps/server/src/shared/domain/entity/dashboardElement.entity.spec.ts +++ b/apps/server/src/shared/domain/entity/dashboardElement.entity.spec.ts @@ -1,5 +1,6 @@ import { BadRequestException } from '@nestjs/common'; -import { LearnroomMetadata, LearnroomTypes } from '@shared/domain'; + +import { LearnroomMetadata, LearnroomTypes } from '@shared/domain/types'; import { GridElement } from './dashboard.entity'; const learnroomMock = (id: string, name: string) => { diff --git a/apps/server/src/shared/domain/entity/ltitool.entity.spec.ts b/apps/server/src/shared/domain/entity/ltitool.entity.spec.ts index 9da232f13ca..257b5e72106 100644 --- a/apps/server/src/shared/domain/entity/ltitool.entity.spec.ts +++ b/apps/server/src/shared/domain/entity/ltitool.entity.spec.ts @@ -1,4 +1,4 @@ -import { LtiPrivacyPermission, LtiTool } from '@shared/domain'; +import { LtiPrivacyPermission, LtiTool } from '@shared/domain/entity'; import { setupEntities } from '@shared/testing'; import { ltiToolFactory } from '@shared/testing/factory/ltitool.factory'; diff --git a/apps/server/src/shared/domain/entity/role.entity.spec.ts b/apps/server/src/shared/domain/entity/role.entity.spec.ts index ae837dd264d..b0bb71775ed 100644 --- a/apps/server/src/shared/domain/entity/role.entity.spec.ts +++ b/apps/server/src/shared/domain/entity/role.entity.spec.ts @@ -1,7 +1,9 @@ import { MikroORM } from '@mikro-orm/core'; import { roleFactory, setupEntities } from '@shared/testing'; import { ObjectId } from 'bson'; -import { Permission, Role, RoleName } from '..'; +import { Permission, RoleName } from '../interface'; +import { Role } from './role.entity'; +// import { Permission, } from '..'; describe('Role Entity', () => { let orm: MikroORM; diff --git a/apps/server/src/shared/domain/entity/user.entity.spec.ts b/apps/server/src/shared/domain/entity/user.entity.spec.ts index e41a4060bf7..c10a26bc2c4 100644 --- a/apps/server/src/shared/domain/entity/user.entity.spec.ts +++ b/apps/server/src/shared/domain/entity/user.entity.spec.ts @@ -2,7 +2,7 @@ import { MikroORM } from '@mikro-orm/core'; import { roleFactory, schoolFactory, setupEntities, userFactory } from '@shared/testing'; import { ObjectId } from 'bson'; import { Role } from '.'; -import { Permission } from '..'; +import { Permission } from '../interface'; import { User } from './user.entity'; describe('User Entity', () => { diff --git a/apps/server/src/shared/domain/index.ts b/apps/server/src/shared/domain/index.ts deleted file mode 100644 index 5e1de8d650d..00000000000 --- a/apps/server/src/shared/domain/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -export * from './domainobject'; -export * from './entity'; -export * from './interface'; -export * from './service'; -export * from './types'; -// export * from './domain-object'; ~ Do not work for the moment, first import exports must be cleanup. diff --git a/apps/server/src/shared/domain/types/task.types.ts b/apps/server/src/shared/domain/types/task.types.ts index 8f77e209eed..c9ce4ebb698 100644 --- a/apps/server/src/shared/domain/types/task.types.ts +++ b/apps/server/src/shared/domain/types/task.types.ts @@ -1,4 +1,5 @@ -import type { Course, InputFormat, LessonEntity, SchoolEntity, Submission, User } from '@shared/domain/'; +import type { Course, LessonEntity, SchoolEntity, Submission, User } from '@shared/domain/entity'; +import type { InputFormat } from '@shared/domain/types'; interface ITask { name: string; diff --git a/apps/server/src/shared/repo/base.do.repo.integration.spec.ts b/apps/server/src/shared/repo/base.do.repo.integration.spec.ts index b9683fbf1ea..0e153d5e9df 100644 --- a/apps/server/src/shared/repo/base.do.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/base.do.repo.integration.spec.ts @@ -4,9 +4,10 @@ import { Entity, EntityName, Property } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; -import { BaseDO, BaseEntityWithTimestamps } from '@shared/domain'; +import { BaseEntityWithTimestamps } from '@shared/domain/entity'; import { BaseDORepo } from '@shared/repo/base.do.repo'; import { LegacyLogger } from '@src/core/logger'; +import { BaseDO } from '@src/shared/domain/domainobject'; describe('BaseDORepo', () => { @Entity() diff --git a/apps/server/src/shared/repo/base.do.repo.ts b/apps/server/src/shared/repo/base.do.repo.ts index 28fc8bf4d01..7121fc95a36 100644 --- a/apps/server/src/shared/repo/base.do.repo.ts +++ b/apps/server/src/shared/repo/base.do.repo.ts @@ -1,7 +1,9 @@ import { EntityName, FilterQuery } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { BaseDO, BaseEntity, baseEntityProperties, EntityId } from '@shared/domain'; +import { BaseDO } from '@shared/domain/domainobject'; +import { BaseEntity, baseEntityProperties } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; @Injectable() diff --git a/apps/server/src/shared/repo/base.repo.integration.spec.ts b/apps/server/src/shared/repo/base.repo.integration.spec.ts index 372a6ba4cda..b2575ed3151 100644 --- a/apps/server/src/shared/repo/base.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/base.repo.integration.spec.ts @@ -1,9 +1,9 @@ -import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { Test, TestingModule } from '@nestjs/testing'; -import { Entity, EntityName, Property } from '@mikro-orm/core'; -import { BaseEntity } from '@shared/domain'; import { MongoMemoryDatabaseModule } from '@infra/database'; +import { Entity, EntityName, Property } from '@mikro-orm/core'; +import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; +import { BaseEntity } from '@shared/domain/entity'; import { BaseRepo } from './base.repo'; /** diff --git a/apps/server/src/shared/repo/board/board.repo.spec.ts b/apps/server/src/shared/repo/board/board.repo.spec.ts index 7d5f4b71e41..f5cee46a11f 100644 --- a/apps/server/src/shared/repo/board/board.repo.spec.ts +++ b/apps/server/src/shared/repo/board/board.repo.spec.ts @@ -1,13 +1,13 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { Board, LessonEntity, Task } from '@shared/domain'; +import { Board, LessonEntity, Task } from '@shared/domain/entity'; import { - courseFactory, boardFactory, + cleanupCollections, + courseFactory, lessonBoardElementFactory, lessonFactory, taskBoardElementFactory, - cleanupCollections, } from '@shared/testing'; import { MongoMemoryDatabaseModule } from '@infra/database'; diff --git a/apps/server/src/shared/repo/board/board.repo.ts b/apps/server/src/shared/repo/board/board.repo.ts index 65ebd618548..653193cf483 100644 --- a/apps/server/src/shared/repo/board/board.repo.ts +++ b/apps/server/src/shared/repo/board/board.repo.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { Board, ColumnboardBoardElement, Course, EntityId, LessonBoardElement, TaskBoardElement } from '@shared/domain'; +import { Board, ColumnboardBoardElement, Course, LessonBoardElement, TaskBoardElement } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { BaseRepo } from '../base.repo'; @Injectable() diff --git a/apps/server/src/shared/repo/contextexternaltool/context-external-tool.repo.integration.spec.ts b/apps/server/src/shared/repo/contextexternaltool/context-external-tool.repo.integration.spec.ts index cb320249dad..04926002677 100644 --- a/apps/server/src/shared/repo/contextexternaltool/context-external-tool.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/contextexternaltool/context-external-tool.repo.integration.spec.ts @@ -8,7 +8,7 @@ import { ContextExternalToolEntity, ContextExternalToolType } from '@modules/too import { ContextExternalToolQuery } from '@modules/tool/context-external-tool/uc/dto/context-external-tool.types'; import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/entity'; import { Test, TestingModule } from '@nestjs/testing'; -import { SchoolEntity } from '@shared/domain'; +import { SchoolEntity } from '@shared/domain/entity'; import { ExternalToolRepoMapper } from '@shared/repo/externaltool/external-tool.repo.mapper'; import { cleanupCollections, diff --git a/apps/server/src/shared/repo/contextexternaltool/context-external-tool.repo.ts b/apps/server/src/shared/repo/contextexternaltool/context-external-tool.repo.ts index 17e998b8002..386cf02b880 100644 --- a/apps/server/src/shared/repo/contextexternaltool/context-external-tool.repo.ts +++ b/apps/server/src/shared/repo/contextexternaltool/context-external-tool.repo.ts @@ -11,9 +11,9 @@ import { ContextExternalToolQuery } from '@modules/tool/context-external-tool/uc import { SchoolExternalToolRefDO } from '@modules/tool/school-external-tool/domain'; import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/entity'; import { Injectable } from '@nestjs/common'; +import { EntityId } from '@shared/domain/types'; import { BaseDORepo } from '@shared/repo'; import { LegacyLogger } from '@src/core/logger'; -import { EntityId } from '../../domain'; import { ExternalToolRepoMapper } from '../externaltool'; import { ContextExternalToolScope } from './context-external-tool.scope'; diff --git a/apps/server/src/shared/repo/contextexternaltool/context-external-tool.scope.ts b/apps/server/src/shared/repo/contextexternaltool/context-external-tool.scope.ts index b2382c71c2c..b481f31b458 100644 --- a/apps/server/src/shared/repo/contextexternaltool/context-external-tool.scope.ts +++ b/apps/server/src/shared/repo/contextexternaltool/context-external-tool.scope.ts @@ -1,7 +1,7 @@ -import { Scope } from '@shared/repo'; -import { EntityId } from '@shared/domain'; import { ToolContextType } from '@modules/tool/common/enum'; import { ContextExternalToolEntity } from '@modules/tool/context-external-tool/entity'; +import { EntityId } from '@shared/domain/types'; +import { Scope } from '@shared/repo'; export class ContextExternalToolScope extends Scope { byId(id: EntityId | undefined): ContextExternalToolScope { diff --git a/apps/server/src/shared/repo/course/course.repo.integration.spec.ts b/apps/server/src/shared/repo/course/course.repo.integration.spec.ts index 2a77ad1f078..ea284dd547d 100644 --- a/apps/server/src/shared/repo/course/course.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/course/course.repo.integration.spec.ts @@ -1,7 +1,9 @@ import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { Course, EntityId, SortOrder } from '@shared/domain'; +import { Course } from '@shared/domain/entity'; +import { SortOrder } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { MongoMemoryDatabaseModule } from '@infra/database'; import { cleanupCollections, courseFactory, courseGroupFactory, userFactory } from '@shared/testing'; diff --git a/apps/server/src/shared/repo/course/course.repo.ts b/apps/server/src/shared/repo/course/course.repo.ts index b673dbfded8..fb52b8c115e 100644 --- a/apps/server/src/shared/repo/course/course.repo.ts +++ b/apps/server/src/shared/repo/course/course.repo.ts @@ -1,7 +1,9 @@ import { FilterQuery, QueryOrderMap } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; -import { Counted, Course, EntityId, IFindOptions } from '@shared/domain'; +import { Course } from '@shared/domain/entity'; +import { IFindOptions } from '@shared/domain/interface'; +import { Counted, EntityId } from '@shared/domain/types'; import { BaseRepo } from '../base.repo'; import { Scope } from '../scope'; diff --git a/apps/server/src/shared/repo/coursegroup/coursegroup.repo.integration.spec.ts b/apps/server/src/shared/repo/coursegroup/coursegroup.repo.integration.spec.ts index 805088480fd..ccf48f9182f 100644 --- a/apps/server/src/shared/repo/coursegroup/coursegroup.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/coursegroup/coursegroup.repo.integration.spec.ts @@ -1,7 +1,8 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { MongoMemoryDatabaseModule } from '@infra/database'; -import { EntityId, CourseGroup, Course } from '@shared/domain'; +import { Course, CourseGroup } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { courseFactory, courseGroupFactory } from '@shared/testing'; import { CourseGroupRepo } from './coursegroup.repo'; diff --git a/apps/server/src/shared/repo/coursegroup/coursegroup.repo.ts b/apps/server/src/shared/repo/coursegroup/coursegroup.repo.ts index d802632001d..50d9ab54727 100644 --- a/apps/server/src/shared/repo/coursegroup/coursegroup.repo.ts +++ b/apps/server/src/shared/repo/coursegroup/coursegroup.repo.ts @@ -1,7 +1,8 @@ import { Injectable } from '@nestjs/common'; -import { Counted, EntityId, CourseGroup } from '@shared/domain'; import { ObjectId } from '@mikro-orm/mongodb'; +import { CourseGroup } from '@shared/domain/entity'; +import { Counted, EntityId } from '@shared/domain/types'; import { BaseRepo } from '../base.repo'; @Injectable() diff --git a/apps/server/src/shared/repo/dashboard/dashboard.model.mapper.spec.ts b/apps/server/src/shared/repo/dashboard/dashboard.model.mapper.spec.ts index 32b35ced07e..9399da2542c 100644 --- a/apps/server/src/shared/repo/dashboard/dashboard.model.mapper.spec.ts +++ b/apps/server/src/shared/repo/dashboard/dashboard.model.mapper.spec.ts @@ -1,16 +1,15 @@ -import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { Test, TestingModule } from '@nestjs/testing'; import { MongoMemoryDatabaseModule } from '@infra/database'; +import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { InternalServerErrorException } from '@nestjs/common'; +import { Test, TestingModule } from '@nestjs/testing'; import { + Course, DashboardEntity, - GridElement, DashboardGridElementModel, DashboardModelEntity, - Course, - LearnroomMetadata, - LearnroomTypes, -} from '@shared/domain'; + GridElement, +} from '@shared/domain/entity'; +import { LearnroomMetadata, LearnroomTypes } from '@shared/domain/types'; import { courseFactory, userFactory } from '@shared/testing'; import { DashboardModelMapper } from './dashboard.model.mapper'; diff --git a/apps/server/src/shared/repo/dashboard/dashboard.model.mapper.ts b/apps/server/src/shared/repo/dashboard/dashboard.model.mapper.ts index e43f08d147d..8bdadf724f5 100644 --- a/apps/server/src/shared/repo/dashboard/dashboard.model.mapper.ts +++ b/apps/server/src/shared/repo/dashboard/dashboard.model.mapper.ts @@ -7,10 +7,10 @@ import { DashboardModelEntity, GridElement, GridElementWithPosition, - Learnroom, - LearnroomTypes, User, -} from '@shared/domain'; +} from '@shared/domain/entity'; +import { Learnroom } from '@shared/domain/interface'; +import { LearnroomTypes } from '@shared/domain/types'; @Injectable() export class DashboardModelMapper { diff --git a/apps/server/src/shared/repo/dashboard/dashboard.repo.integration.spec.ts b/apps/server/src/shared/repo/dashboard/dashboard.repo.integration.spec.ts index 3ca95112f4d..82e4c2dd03d 100644 --- a/apps/server/src/shared/repo/dashboard/dashboard.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/dashboard/dashboard.repo.integration.spec.ts @@ -1,7 +1,7 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { DashboardEntity, DashboardGridElementModel, GridElement } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { DashboardEntity, DashboardGridElementModel, GridElement } from '@shared/domain/entity'; import { courseFactory, userFactory } from '@shared/testing'; import { DashboardModelMapper } from './dashboard.model.mapper'; import { DashboardRepo } from './dashboard.repo'; diff --git a/apps/server/src/shared/repo/dashboard/dashboard.repo.ts b/apps/server/src/shared/repo/dashboard/dashboard.repo.ts index 30b463e9344..925a7760eba 100644 --- a/apps/server/src/shared/repo/dashboard/dashboard.repo.ts +++ b/apps/server/src/shared/repo/dashboard/dashboard.repo.ts @@ -1,6 +1,7 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { DashboardEntity, DashboardModelEntity, EntityId, GridElementWithPosition } from '@shared/domain'; +import { DashboardEntity, DashboardModelEntity, GridElementWithPosition } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { DashboardModelMapper } from './dashboard.model.mapper'; const generateEmptyDashboard = (userId: EntityId) => { diff --git a/apps/server/src/shared/repo/externaltool/external-tool-sorting.mapper.spec.ts b/apps/server/src/shared/repo/externaltool/external-tool-sorting.mapper.spec.ts index d3fe01c1b07..f5cce50cebf 100644 --- a/apps/server/src/shared/repo/externaltool/external-tool-sorting.mapper.spec.ts +++ b/apps/server/src/shared/repo/externaltool/external-tool-sorting.mapper.spec.ts @@ -1,8 +1,9 @@ import { QueryOrderMap } from '@mikro-orm/core'; -import { LtiTool, SortOrder, SortOrderMap } from '@shared/domain'; -import { ExternalToolSortingMapper } from '@shared/repo'; import { ExternalTool } from '@modules/tool/external-tool/domain'; import { ExternalToolEntity } from '@modules/tool/external-tool/entity'; +import { LtiTool } from '@shared/domain/entity'; +import { SortOrder, SortOrderMap } from '@shared/domain/interface'; +import { ExternalToolSortingMapper } from '@shared/repo'; describe('ExternalToolSortingMapper', () => { describe('mapDOSortOrderToQueryOrder', () => { diff --git a/apps/server/src/shared/repo/externaltool/external-tool-sorting.mapper.ts b/apps/server/src/shared/repo/externaltool/external-tool-sorting.mapper.ts index 893f5cbc923..d4c5a613e43 100644 --- a/apps/server/src/shared/repo/externaltool/external-tool-sorting.mapper.ts +++ b/apps/server/src/shared/repo/externaltool/external-tool-sorting.mapper.ts @@ -1,7 +1,7 @@ import { QueryOrderMap } from '@mikro-orm/core'; -import { SortOrderMap } from '@shared/domain'; import { ExternalTool } from '@modules/tool/external-tool/domain'; import { ExternalToolEntity } from '@modules/tool/external-tool/entity'; +import { SortOrderMap } from '@shared/domain/interface'; export class ExternalToolSortingMapper { static mapDOSortOrderToQueryOrder(sort: SortOrderMap): QueryOrderMap { diff --git a/apps/server/src/shared/repo/externaltool/external-tool.repo.integration.spec.ts b/apps/server/src/shared/repo/externaltool/external-tool.repo.integration.spec.ts index 1654da1b5b7..75fa86597fb 100644 --- a/apps/server/src/shared/repo/externaltool/external-tool.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/externaltool/external-tool.repo.integration.spec.ts @@ -1,11 +1,6 @@ import { createMock } from '@golevelup/ts-jest'; -import { EntityManager } from '@mikro-orm/mongodb'; -import { Test, TestingModule } from '@nestjs/testing'; -import { IFindOptions, Page, SortOrder } from '@shared/domain'; import { MongoMemoryDatabaseModule } from '@infra/database'; -import { ExternalToolRepo, ExternalToolRepoMapper } from '@shared/repo'; -import { cleanupCollections, externalToolEntityFactory } from '@shared/testing'; -import { LegacyLogger } from '@src/core/logger'; +import { EntityManager } from '@mikro-orm/mongodb'; import { ExternalToolSearchQuery } from '@modules/tool'; import { CustomParameter } from '@modules/tool/common/domain'; import { @@ -18,6 +13,13 @@ import { } from '@modules/tool/common/enum'; import { BasicToolConfig, ExternalTool, Lti11ToolConfig, Oauth2ToolConfig } from '@modules/tool/external-tool/domain'; import { ExternalToolEntity } from '@modules/tool/external-tool/entity'; +import { Test, TestingModule } from '@nestjs/testing'; +import { Page } from '@shared/domain/domainobject'; +import { IFindOptions, SortOrder } from '@shared/domain/interface'; + +import { ExternalToolRepo, ExternalToolRepoMapper } from '@shared/repo'; +import { cleanupCollections, externalToolEntityFactory } from '@shared/testing'; +import { LegacyLogger } from '@src/core/logger'; describe('ExternalToolRepo', () => { let module: TestingModule; diff --git a/apps/server/src/shared/repo/externaltool/external-tool.repo.ts b/apps/server/src/shared/repo/externaltool/external-tool.repo.ts index 3d071311d82..f03b29195d9 100644 --- a/apps/server/src/shared/repo/externaltool/external-tool.repo.ts +++ b/apps/server/src/shared/repo/externaltool/external-tool.repo.ts @@ -5,7 +5,8 @@ import { ExternalToolSearchQuery } from '@modules/tool/common/interface'; import { ExternalTool } from '@modules/tool/external-tool/domain'; import { ExternalToolEntity, IExternalToolProperties } from '@modules/tool/external-tool/entity'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { IFindOptions, Page, Pagination, SortOrder } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; +import { IFindOptions, Pagination, SortOrder } from '@shared/domain/interface'; import { BaseDORepo, ExternalToolRepoMapper, ExternalToolSortingMapper, Scope } from '@shared/repo'; import { LegacyLogger } from '@src/core/logger'; import { ExternalToolScope } from './external-tool.scope'; diff --git a/apps/server/src/shared/repo/federalstate/federal-state.repo.spec.ts b/apps/server/src/shared/repo/federalstate/federal-state.repo.spec.ts index 0b5742c7621..7755eefb4b4 100644 --- a/apps/server/src/shared/repo/federalstate/federal-state.repo.spec.ts +++ b/apps/server/src/shared/repo/federalstate/federal-state.repo.spec.ts @@ -1,8 +1,8 @@ -import { Test, TestingModule } from '@nestjs/testing'; +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager } from '@mikro-orm/mongodb'; -import { FederalStateEntity } from '@shared/domain'; +import { Test, TestingModule } from '@nestjs/testing'; +import { FederalStateEntity } from '@shared/domain/entity'; import { cleanupCollections, federalStateFactory } from '@shared/testing'; -import { MongoMemoryDatabaseModule } from '@infra/database'; import { FederalStateRepo } from './federal-state.repo'; describe('FederalStateRepo', () => { diff --git a/apps/server/src/shared/repo/federalstate/federal-state.repo.ts b/apps/server/src/shared/repo/federalstate/federal-state.repo.ts index 5f831990e7e..01d5665ef8e 100644 --- a/apps/server/src/shared/repo/federalstate/federal-state.repo.ts +++ b/apps/server/src/shared/repo/federalstate/federal-state.repo.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@nestjs/common'; -import { FederalStateEntity } from '@shared/domain'; import { EntityName } from '@mikro-orm/core'; +import { Injectable } from '@nestjs/common'; +import { FederalStateEntity } from '@shared/domain/entity'; import { BaseRepo } from '../base.repo'; @Injectable() diff --git a/apps/server/src/shared/repo/importuser/importuser.repo.integration.spec.ts b/apps/server/src/shared/repo/importuser/importuser.repo.integration.spec.ts index 148984c393a..1e5d40462db 100644 --- a/apps/server/src/shared/repo/importuser/importuser.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/importuser/importuser.repo.integration.spec.ts @@ -2,17 +2,11 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections, importUserFactory, schoolFactory, userFactory } from '@shared/testing'; -import { MikroORM, NotFoundError } from '@mikro-orm/core'; -import { - IImportUserRoleName, - ImportUser, - MatchCreator, - MatchCreatorScope, - RoleName, - SchoolEntity, - User, -} from '@shared/domain'; import { MongoMemoryDatabaseModule } from '@infra/database'; +import { MikroORM, NotFoundError } from '@mikro-orm/core'; +import { IImportUserRoleName, ImportUser, MatchCreator, SchoolEntity, User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; +import { MatchCreatorScope } from '@shared/domain/types'; import { ImportUserRepo } from '.'; describe('ImportUserRepo', () => { diff --git a/apps/server/src/shared/repo/importuser/importuser.repo.ts b/apps/server/src/shared/repo/importuser/importuser.repo.ts index c09e5f9ee87..c0ba08fa1fe 100644 --- a/apps/server/src/shared/repo/importuser/importuser.repo.ts +++ b/apps/server/src/shared/repo/importuser/importuser.repo.ts @@ -2,7 +2,9 @@ import { FilterQuery, QueryOrderMap } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; import { ObjectId } from '@mikro-orm/mongodb'; -import { Counted, EntityId, IFindOptions, IImportUserScope, ImportUser, SchoolEntity, User } from '@shared/domain'; +import { ImportUser, SchoolEntity, User } from '@shared/domain/entity'; +import { IFindOptions } from '@shared/domain/interface'; +import { Counted, EntityId, IImportUserScope } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo/base.repo'; import { ImportUserScope } from './importuser.scope'; diff --git a/apps/server/src/shared/repo/importuser/importuser.scope.ts b/apps/server/src/shared/repo/importuser/importuser.scope.ts index 025d562f5f4..2f0efffa30e 100644 --- a/apps/server/src/shared/repo/importuser/importuser.scope.ts +++ b/apps/server/src/shared/repo/importuser/importuser.scope.ts @@ -2,7 +2,9 @@ import { FilterQuery } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; import { StringValidator } from '@shared/common'; -import { ImportUser, MatchCreatorScope, RoleName, SchoolEntity, User } from '@shared/domain'; +import { ImportUser, SchoolEntity, User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; +import { MatchCreatorScope } from '@shared/domain/types'; import { MongoPatterns } from '../mongo.patterns'; import { Scope } from '../scope'; diff --git a/apps/server/src/shared/repo/ltitool/ltitool.repo.spec.ts b/apps/server/src/shared/repo/ltitool/ltitool.repo.spec.ts index 97fc81e9ea1..9993b5bf689 100644 --- a/apps/server/src/shared/repo/ltitool/ltitool.repo.spec.ts +++ b/apps/server/src/shared/repo/ltitool/ltitool.repo.spec.ts @@ -1,11 +1,11 @@ import { createMock } from '@golevelup/ts-jest'; +import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { ILtiToolProperties, LtiTool } from '@shared/domain'; import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; +import { ILtiToolProperties, LtiTool } from '@shared/domain/entity'; import { LtiPrivacyPermission, LtiRoleType } from '@shared/domain/entity/ltitool.entity'; -import { MongoMemoryDatabaseModule } from '@infra/database'; import { LtiToolRepo } from '@shared/repo/ltitool/ltitool.repo'; import { cleanupCollections } from '@shared/testing'; import { ltiToolFactory } from '@shared/testing/factory/ltitool.factory'; diff --git a/apps/server/src/shared/repo/ltitool/ltitool.repo.ts b/apps/server/src/shared/repo/ltitool/ltitool.repo.ts index eb12fff298b..d7ade1abcf4 100644 --- a/apps/server/src/shared/repo/ltitool/ltitool.repo.ts +++ b/apps/server/src/shared/repo/ltitool/ltitool.repo.ts @@ -1,7 +1,7 @@ import { EntityName, NotFoundError } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; -import { ILtiToolProperties, LtiPrivacyPermission, LtiTool } from '@shared/domain'; import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; +import { ILtiToolProperties, LtiPrivacyPermission, LtiTool } from '@shared/domain/entity'; import { BaseDORepo } from '@shared/repo/base.do.repo'; @Injectable() diff --git a/apps/server/src/shared/repo/news/news-inheritance.spec.ts b/apps/server/src/shared/repo/news/news-inheritance.spec.ts index d9d5a003d5d..cb4cdd155b8 100644 --- a/apps/server/src/shared/repo/news/news-inheritance.spec.ts +++ b/apps/server/src/shared/repo/news/news-inheritance.spec.ts @@ -1,8 +1,8 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { Collection, Entity, Enum, ManyToMany, ManyToOne, Property } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { BaseEntityWithTimestamps } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { BaseEntityWithTimestamps } from '@shared/domain/entity'; import { cleanupCollections } from '@shared/testing'; @Entity({ tableName: 'users' }) diff --git a/apps/server/src/shared/repo/news/news-scope.spec.ts b/apps/server/src/shared/repo/news/news-scope.spec.ts index 02c0b6dbe21..45fb3af1a2e 100644 --- a/apps/server/src/shared/repo/news/news-scope.spec.ts +++ b/apps/server/src/shared/repo/news/news-scope.spec.ts @@ -1,9 +1,10 @@ -import { News, NewsTargetModel } from '@shared/domain'; -import { ObjectId } from '@mikro-orm/mongodb'; import { FilterQuery } from '@mikro-orm/core'; +import { ObjectId } from '@mikro-orm/mongodb'; +import { News } from '@shared/domain/entity'; +import { NewsTargetModel } from '@shared/domain/types'; +import { EmptyResultQuery } from '../query'; import { NewsScope } from './news-scope'; import { NewsTargetFilter } from './news-target-filter'; -import { EmptyResultQuery } from '../query'; describe('News Scope', () => { describe('build scope query', () => { diff --git a/apps/server/src/shared/repo/news/news-scope.ts b/apps/server/src/shared/repo/news/news-scope.ts index 97a11680164..7f999205fa3 100644 --- a/apps/server/src/shared/repo/news/news-scope.ts +++ b/apps/server/src/shared/repo/news/news-scope.ts @@ -1,5 +1,6 @@ import { FilterQuery } from '@mikro-orm/core'; -import { EntityId, News } from '@shared/domain'; +import { News } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { EmptyResultQuery } from '../query'; import { Scope } from '../scope'; import { NewsTargetFilter } from './news-target-filter'; diff --git a/apps/server/src/shared/repo/news/news-target-filter.ts b/apps/server/src/shared/repo/news/news-target-filter.ts index 501981275ed..bffbec21c7d 100644 --- a/apps/server/src/shared/repo/news/news-target-filter.ts +++ b/apps/server/src/shared/repo/news/news-target-filter.ts @@ -1,4 +1,4 @@ -import { EntityId, NewsTargetModel } from '@shared/domain'; +import { EntityId, NewsTargetModel } from '@shared/domain/types'; export interface NewsTargetFilter { targetModel: NewsTargetModel; diff --git a/apps/server/src/shared/repo/news/news.repo.integration.spec.ts b/apps/server/src/shared/repo/news/news.repo.integration.spec.ts index d68e50e0df1..41df6d26b7c 100644 --- a/apps/server/src/shared/repo/news/news.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/news/news.repo.integration.spec.ts @@ -1,15 +1,17 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { News, NewsTargetModel, SortOrder } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { News } from '@shared/domain/entity'; +import { SortOrder } from '@shared/domain/interface'; +import { NewsTargetModel } from '@shared/domain/types'; import { - courseNewsFactory, - schoolNewsFactory, - teamNewsFactory, cleanupCollections, + courseNewsFactory, courseUnpublishedNewsFactory, + schoolNewsFactory, schoolUnpublishedNewsFactory, + teamNewsFactory, teamUnpublishedNewsFactory, userFactory, } from '@shared/testing'; diff --git a/apps/server/src/shared/repo/news/news.repo.ts b/apps/server/src/shared/repo/news/news.repo.ts index f6ff97cfa9c..d4cc86cc8f8 100644 --- a/apps/server/src/shared/repo/news/news.repo.ts +++ b/apps/server/src/shared/repo/news/news.repo.ts @@ -1,6 +1,8 @@ import { FilterQuery, QueryOrderMap } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; -import { Counted, CourseNews, EntityId, IFindOptions, News, SchoolNews, TeamNews } from '@shared/domain'; +import { CourseNews, News, SchoolNews, TeamNews } from '@shared/domain/entity'; +import { IFindOptions } from '@shared/domain/interface'; +import { Counted, EntityId } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo/base.repo'; import { NewsScope } from './news-scope'; import { NewsTargetFilter } from './news-target-filter'; diff --git a/apps/server/src/shared/repo/role/role.repo.integration.spec.ts b/apps/server/src/shared/repo/role/role.repo.integration.spec.ts index 65bc0931a6e..91b2a083fff 100644 --- a/apps/server/src/shared/repo/role/role.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/role/role.repo.integration.spec.ts @@ -1,8 +1,9 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError, NullCacheAdapter, ValidationError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { Role, RoleName } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { Role } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { cleanupCollections, roleFactory } from '@shared/testing'; import { RoleRepo } from './role.repo'; diff --git a/apps/server/src/shared/repo/role/role.repo.ts b/apps/server/src/shared/repo/role/role.repo.ts index 30c5425928d..29ad1263693 100644 --- a/apps/server/src/shared/repo/role/role.repo.ts +++ b/apps/server/src/shared/repo/role/role.repo.ts @@ -1,5 +1,7 @@ import { Injectable } from '@nestjs/common'; -import { EntityId, Role, RoleName } from '@shared/domain'; +import { Role } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { BaseRepo } from '../base.repo'; @Injectable() diff --git a/apps/server/src/shared/repo/school/legacy-school.repo.integration.spec.ts b/apps/server/src/shared/repo/school/legacy-school.repo.integration.spec.ts index 090e9fc4fd9..6afd59bcf46 100644 --- a/apps/server/src/shared/repo/school/legacy-school.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/school/legacy-school.repo.integration.spec.ts @@ -4,8 +4,8 @@ import { EntityManager } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; import { InternalServerErrorException } from '@nestjs/common'; import { Test, TestingModule } from '@nestjs/testing'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { - LegacySchoolDo, SchoolEntity, SchoolProperties, SchoolRolePermission, @@ -13,7 +13,7 @@ import { SchoolYearEntity, SystemEntity, UserLoginMigrationEntity, -} from '@shared/domain'; +} from '@shared/domain/entity'; import { legacySchoolDoFactory, schoolFactory, diff --git a/apps/server/src/shared/repo/school/legacy-school.repo.ts b/apps/server/src/shared/repo/school/legacy-school.repo.ts index a8b5265a5c4..215f36a33b6 100644 --- a/apps/server/src/shared/repo/school/legacy-school.repo.ts +++ b/apps/server/src/shared/repo/school/legacy-school.repo.ts @@ -1,14 +1,9 @@ import { EntityName } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; import { Injectable, InternalServerErrorException } from '@nestjs/common'; -import { - EntityId, - LegacySchoolDo, - SchoolEntity, - SchoolProperties, - SystemEntity, - UserLoginMigrationEntity, -} from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; +import { SchoolEntity, SchoolProperties, SystemEntity, UserLoginMigrationEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { BaseDORepo } from '../base.do.repo'; diff --git a/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.repo.integration.spec.ts b/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.repo.integration.spec.ts index 47196013b63..31040835ea2 100644 --- a/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.repo.integration.spec.ts @@ -1,7 +1,13 @@ +import { createMock } from '@golevelup/ts-jest'; +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; +import { CustomParameterEntry } from '@modules/tool/common/domain'; +import { ExternalToolEntity } from '@modules/tool/external-tool/entity'; +import { SchoolExternalTool } from '@modules/tool/school-external-tool/domain'; +import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/entity'; +import { SchoolExternalToolQuery } from '@modules/tool/school-external-tool/uc/dto/school-external-tool.types'; import { Test, TestingModule } from '@nestjs/testing'; -import { type SchoolEntity } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { type SchoolEntity } from '@shared/domain/entity'; import { ExternalToolRepoMapper } from '@shared/repo/externaltool/external-tool.repo.mapper'; import { cleanupCollections, @@ -10,12 +16,6 @@ import { schoolFactory, } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; -import { createMock } from '@golevelup/ts-jest'; -import { SchoolExternalToolQuery } from '@modules/tool/school-external-tool/uc/dto/school-external-tool.types'; -import { ExternalToolEntity } from '@modules/tool/external-tool/entity'; -import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/entity'; -import { CustomParameterEntry } from '@modules/tool/common/domain'; -import { SchoolExternalTool } from '@modules/tool/school-external-tool/domain'; import { SchoolExternalToolRepo } from './school-external-tool.repo'; describe('SchoolExternalToolRepo', () => { diff --git a/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.repo.ts b/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.repo.ts index ee1d49c5d05..c0f46c5e350 100644 --- a/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.repo.ts +++ b/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.repo.ts @@ -5,7 +5,7 @@ import { SchoolExternalTool } from '@modules/tool/school-external-tool/domain'; import { SchoolExternalToolEntity, SchoolExternalToolProperties } from '@modules/tool/school-external-tool/entity'; import { SchoolExternalToolQuery } from '@modules/tool/school-external-tool/uc/dto/school-external-tool.types'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { SchoolEntity } from '@shared/domain'; +import { SchoolEntity } from '@shared/domain/entity'; import { BaseDORepo } from '@shared/repo/base.do.repo'; import { LegacyLogger } from '@src/core/logger'; import { ExternalToolRepoMapper } from '../externaltool'; diff --git a/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.scope.ts b/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.scope.ts index eed938cd7f3..b36737aa262 100644 --- a/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.scope.ts +++ b/apps/server/src/shared/repo/schoolexternaltool/school-external-tool.scope.ts @@ -1,6 +1,6 @@ -import { Scope } from '@shared/repo/scope'; -import { EntityId } from '@shared/domain'; import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/entity'; +import { EntityId } from '@shared/domain/types'; +import { Scope } from '@shared/repo/scope'; export class SchoolExternalToolScope extends Scope { bySchoolId(schoolId: EntityId | undefined): this { diff --git a/apps/server/src/shared/repo/storageprovider/storageprovider.repo.spec.ts b/apps/server/src/shared/repo/storageprovider/storageprovider.repo.spec.ts index 1f24fe0bd0b..6e71c3d1d93 100644 --- a/apps/server/src/shared/repo/storageprovider/storageprovider.repo.spec.ts +++ b/apps/server/src/shared/repo/storageprovider/storageprovider.repo.spec.ts @@ -1,7 +1,7 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { StorageProviderEntity } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { StorageProviderEntity } from '@shared/domain/entity'; import { cleanupCollections, storageProviderFactory } from '@shared/testing'; import { StorageProviderRepo } from './storageprovider.repo'; diff --git a/apps/server/src/shared/repo/storageprovider/storageprovider.repo.ts b/apps/server/src/shared/repo/storageprovider/storageprovider.repo.ts index 010c2603a9f..092e24f138b 100644 --- a/apps/server/src/shared/repo/storageprovider/storageprovider.repo.ts +++ b/apps/server/src/shared/repo/storageprovider/storageprovider.repo.ts @@ -1,6 +1,6 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { StorageProviderEntity } from '@shared/domain'; +import { StorageProviderEntity } from '@shared/domain/entity'; import { BaseRepo } from '../base.repo'; @Injectable() diff --git a/apps/server/src/shared/repo/submission/submission.repo.integration.spec.ts b/apps/server/src/shared/repo/submission/submission.repo.integration.spec.ts index 547fe2f05a1..5ce4aef23cd 100644 --- a/apps/server/src/shared/repo/submission/submission.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/submission/submission.repo.integration.spec.ts @@ -1,7 +1,7 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { Submission } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { Submission } from '@shared/domain/entity'; import { cleanupCollections, courseFactory, diff --git a/apps/server/src/shared/repo/submission/submission.repo.ts b/apps/server/src/shared/repo/submission/submission.repo.ts index 148e29c7bb6..0508e19e7c8 100644 --- a/apps/server/src/shared/repo/submission/submission.repo.ts +++ b/apps/server/src/shared/repo/submission/submission.repo.ts @@ -1,6 +1,7 @@ import { FilterQuery } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; -import { Counted, CourseGroup, EntityId, Submission } from '@shared/domain'; +import { CourseGroup, Submission } from '@shared/domain/entity'; +import { Counted, EntityId } from '@shared/domain/types'; import { BaseRepo } from '../base.repo'; // TODO: add scope helper diff --git a/apps/server/src/shared/repo/system/legacy-system.repo.integration.spec.ts b/apps/server/src/shared/repo/system/legacy-system.repo.integration.spec.ts index bf8d9ea18fa..4b7f792b67d 100644 --- a/apps/server/src/shared/repo/system/legacy-system.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/system/legacy-system.repo.integration.spec.ts @@ -2,7 +2,8 @@ import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { SystemEntity, SystemTypeEnum } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; +import { SystemTypeEnum } from '@shared/domain/types'; import { LegacySystemRepo } from '@shared/repo'; import { systemEntityFactory } from '@shared/testing'; diff --git a/apps/server/src/shared/repo/system/legacy-system.repo.ts b/apps/server/src/shared/repo/system/legacy-system.repo.ts index 85a8fdbdc84..f5fa9324bf2 100644 --- a/apps/server/src/shared/repo/system/legacy-system.repo.ts +++ b/apps/server/src/shared/repo/system/legacy-system.repo.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; -import { SystemEntity, SystemTypeEnum } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; +import { SystemTypeEnum } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo/base.repo'; import { SystemScope } from '@shared/repo/system/system-scope'; diff --git a/apps/server/src/shared/repo/system/system-scope.ts b/apps/server/src/shared/repo/system/system-scope.ts index 2fea3720e19..77819f5afa4 100644 --- a/apps/server/src/shared/repo/system/system-scope.ts +++ b/apps/server/src/shared/repo/system/system-scope.ts @@ -1,4 +1,4 @@ -import { SystemEntity } from '@shared/domain'; +import { SystemEntity } from '@shared/domain/entity'; import { Scope } from '../scope'; export class SystemScope extends Scope { diff --git a/apps/server/src/shared/repo/task/task.repo.integration.spec.ts b/apps/server/src/shared/repo/task/task.repo.integration.spec.ts index b975f485dea..ea3b486c399 100644 --- a/apps/server/src/shared/repo/task/task.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/task/task.repo.integration.spec.ts @@ -1,7 +1,8 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { SortOrder, Task } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { Task } from '@shared/domain/entity'; +import { SortOrder } from '@shared/domain/interface'; import { cleanupCollections, courseFactory, diff --git a/apps/server/src/shared/repo/teams/team.repo.integration.spec.ts b/apps/server/src/shared/repo/teams/team.repo.integration.spec.ts index 92e3d9d63c7..3e6a07bbf66 100644 --- a/apps/server/src/shared/repo/teams/team.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/teams/team.repo.integration.spec.ts @@ -1,8 +1,9 @@ +import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { EntityId, TeamEntity, TeamUserEntity } from '@shared/domain'; -import { MongoMemoryDatabaseModule } from '@infra/database'; +import { TeamEntity, TeamUserEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { TeamsRepo } from '@shared/repo'; import { cleanupCollections, roleFactory } from '@shared/testing'; import { teamFactory } from '@shared/testing/factory/team.factory'; diff --git a/apps/server/src/shared/repo/teams/teams.repo.ts b/apps/server/src/shared/repo/teams/teams.repo.ts index ef4d5e9774b..f8b8f1e222a 100644 --- a/apps/server/src/shared/repo/teams/teams.repo.ts +++ b/apps/server/src/shared/repo/teams/teams.repo.ts @@ -1,6 +1,7 @@ -import { Injectable } from '@nestjs/common'; -import { EntityId, Role, TeamEntity, TeamUserEntity } from '@shared/domain'; import { ObjectId } from '@mikro-orm/mongodb'; +import { Injectable } from '@nestjs/common'; +import { Role, TeamEntity, TeamUserEntity } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { BaseRepo } from '../base.repo'; @Injectable() diff --git a/apps/server/src/shared/repo/user/user-do.repo.integration.spec.ts b/apps/server/src/shared/repo/user/user-do.repo.integration.spec.ts index ef01a96503c..96e0ed8bafa 100644 --- a/apps/server/src/shared/repo/user/user-do.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/user/user-do.repo.integration.spec.ts @@ -5,19 +5,10 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { UserQuery } from '@modules/user/service/user-query.type'; import { Test, TestingModule } from '@nestjs/testing'; import { EntityNotFoundError } from '@shared/common'; -import { - IFindOptions, - LanguageType, - Role, - RoleName, - SchoolEntity, - SortOrder, - SystemEntity, - User, - UserProperties, -} from '@shared/domain'; import { Page } from '@shared/domain/domainobject/page'; import { UserDO } from '@shared/domain/domainobject/user.do'; +import { LanguageType, Role, SchoolEntity, SystemEntity, User, UserProperties } from '@shared/domain/entity'; +import { IFindOptions, RoleName, SortOrder } from '@shared/domain/interface'; import { UserDORepo } from '@shared/repo/user/user-do.repo'; import { cleanupCollections, diff --git a/apps/server/src/shared/repo/user/user-do.repo.ts b/apps/server/src/shared/repo/user/user-do.repo.ts index c28a1915eda..1603563ec69 100644 --- a/apps/server/src/shared/repo/user/user-do.repo.ts +++ b/apps/server/src/shared/repo/user/user-do.repo.ts @@ -2,21 +2,11 @@ import { EntityName, FilterQuery, QueryOrderMap } from '@mikro-orm/core'; import { UserQuery } from '@modules/user/service/user-query.type'; import { Injectable } from '@nestjs/common'; import { EntityNotFoundError } from '@shared/common'; -import { - EntityId, - IFindOptions, - Pagination, - Role, - SchoolEntity, - SortOrder, - SortOrderMap, - SystemEntity, - User, - UserProperties, -} from '@shared/domain'; -import { RoleReference } from '@shared/domain/domainobject'; -import { Page } from '@shared/domain/domainobject/page'; +import { Page, RoleReference } from '@shared/domain/domainobject'; import { UserDO } from '@shared/domain/domainobject/user.do'; +import { Role, SchoolEntity, SystemEntity, User, UserProperties } from '@shared/domain/entity'; +import { IFindOptions, Pagination, SortOrder, SortOrderMap } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { BaseDORepo, Scope } from '@shared/repo'; import { UserScope } from './user.scope'; diff --git a/apps/server/src/shared/repo/user/user.repo.integration.spec.ts b/apps/server/src/shared/repo/user/user.repo.integration.spec.ts index 1ea116d995a..84e7c43f00f 100644 --- a/apps/server/src/shared/repo/user/user.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/user/user.repo.integration.spec.ts @@ -2,7 +2,8 @@ import { MongoMemoryDatabaseModule } from '@infra/database'; import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { MatchCreator, SortOrder, SystemEntity, User } from '@shared/domain'; +import { MatchCreator, SystemEntity, User } from '@shared/domain/entity'; +import { SortOrder } from '@shared/domain/interface'; import { cleanupCollections, importUserFactory, diff --git a/apps/server/src/shared/repo/user/user.repo.ts b/apps/server/src/shared/repo/user/user.repo.ts index 2f693ab7124..3fe94f5b229 100644 --- a/apps/server/src/shared/repo/user/user.repo.ts +++ b/apps/server/src/shared/repo/user/user.repo.ts @@ -2,17 +2,9 @@ import { QueryOrderMap, QueryOrderNumeric } from '@mikro-orm/core'; import { ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; import { StringValidator } from '@shared/common'; -import { - Counted, - EntityId, - IFindOptions, - ImportUser, - NameMatch, - Role, - SchoolEntity, - SortOrder, - User, -} from '@shared/domain'; +import { ImportUser, Role, SchoolEntity, User } from '@shared/domain/entity'; +import { IFindOptions, SortOrder } from '@shared/domain/interface'; +import { Counted, EntityId, NameMatch } from '@shared/domain/types'; import { BaseRepo } from '@shared/repo/base.repo'; import { MongoPatterns } from '../mongo.patterns'; diff --git a/apps/server/src/shared/repo/user/user.scope.ts b/apps/server/src/shared/repo/user/user.scope.ts index 605814dc4d8..a5576c18a2a 100644 --- a/apps/server/src/shared/repo/user/user.scope.ts +++ b/apps/server/src/shared/repo/user/user.scope.ts @@ -1,5 +1,6 @@ +import { User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { Scope } from '@shared/repo'; -import { EntityId, User } from '@shared/domain'; export class UserScope extends Scope { isOutdated(isOutdated?: boolean): UserScope { diff --git a/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.integration.spec.ts b/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.integration.spec.ts index a78424f7525..5e98fa2af14 100644 --- a/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.integration.spec.ts +++ b/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.integration.spec.ts @@ -2,7 +2,9 @@ import { createMock } from '@golevelup/ts-jest'; import { MongoMemoryDatabaseModule } from '@infra/database'; import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { SchoolEntity, SystemEntity, UserLoginMigrationDO } from '@shared/domain'; +import { SchoolEntity, SystemEntity } from '@shared/domain/entity'; + +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { cleanupCollections, schoolFactory, systemEntityFactory } from '@shared/testing'; import { LegacyLogger } from '@src/core/logger'; diff --git a/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.ts b/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.ts index 8c2af1f866f..764874bacbc 100644 --- a/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.ts +++ b/apps/server/src/shared/repo/userloginmigration/user-login-migration.repo.ts @@ -1,8 +1,10 @@ import { EntityName } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId, SchoolEntity, SystemEntity, UserLoginMigrationDO } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; +import { SchoolEntity, SystemEntity } from '@shared/domain/entity'; import { IUserLoginMigration, UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; +import { EntityId } from '@shared/domain/types'; import { LegacyLogger } from '@src/core/logger'; import { BaseDORepo } from '../base.do.repo'; diff --git a/apps/server/src/shared/repo/videoconference/video-conference.repo.spec.ts b/apps/server/src/shared/repo/videoconference/video-conference.repo.spec.ts index 06e4f057fa7..ca5fe19bd54 100644 --- a/apps/server/src/shared/repo/videoconference/video-conference.repo.spec.ts +++ b/apps/server/src/shared/repo/videoconference/video-conference.repo.spec.ts @@ -1,20 +1,19 @@ -import { VideoConferenceRepo } from '@shared/repo'; +import { createMock } from '@golevelup/ts-jest'; +import { MongoMemoryDatabaseModule } from '@infra/database'; +import { NotFoundError } from '@mikro-orm/core'; import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; -import { MongoMemoryDatabaseModule } from '@infra/database'; -import { cleanupCollections } from '@shared/testing'; +import { VideoConferenceDO, VideoConferenceOptionsDO } from '@shared/domain/domainobject'; import { IVideoConferenceProperties, TargetModels, VideoConference, - VideoConferenceDO, VideoConferenceOptions, - VideoConferenceOptionsDO, -} from '@shared/domain'; -import { videoConferenceFactory } from '@shared/testing/factory/video-conference.factory'; -import { NotFoundError } from '@mikro-orm/core'; +} from '@shared/domain/entity'; import { VideoConferenceScope } from '@shared/domain/interface'; -import { createMock } from '@golevelup/ts-jest'; +import { VideoConferenceRepo } from '@shared/repo'; +import { cleanupCollections } from '@shared/testing'; +import { videoConferenceFactory } from '@shared/testing/factory/video-conference.factory'; import { LegacyLogger } from '@src/core/logger'; class VideoConferenceRepoSpec extends VideoConferenceRepo { diff --git a/apps/server/src/shared/repo/videoconference/video-conference.repo.ts b/apps/server/src/shared/repo/videoconference/video-conference.repo.ts index 0fde1dc5f4e..96303269d87 100644 --- a/apps/server/src/shared/repo/videoconference/video-conference.repo.ts +++ b/apps/server/src/shared/repo/videoconference/video-conference.repo.ts @@ -1,9 +1,10 @@ +import { EntityName, Loaded } from '@mikro-orm/core'; import { Injectable } from '@nestjs/common'; -import { IVideoConferenceProperties, VideoConferenceDO } from '@shared/domain'; +import { VideoConferenceDO } from '@shared/domain/domainobject'; +import { IVideoConferenceProperties } from '@shared/domain/entity'; import { TargetModels, VideoConference } from '@shared/domain/entity/video-conference.entity'; import { VideoConferenceScope } from '@shared/domain/interface'; import { BaseDORepo } from '@shared/repo/base.do.repo'; -import { EntityName, Loaded } from '@mikro-orm/core'; const TargetModelsMapping = { [VideoConferenceScope.EVENT]: TargetModels.EVENTS, diff --git a/apps/server/src/shared/testing/factory/account.factory.ts b/apps/server/src/shared/testing/factory/account.factory.ts index b0c0b8434c1..1cdb3fdd26d 100644 --- a/apps/server/src/shared/testing/factory/account.factory.ts +++ b/apps/server/src/shared/testing/factory/account.factory.ts @@ -1,5 +1,6 @@ /* istanbul ignore file */ -import { Account, EntityId, IdmAccountProperties, User } from '@shared/domain'; +import { Account, IdmAccountProperties, User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { DeepPartial } from 'fishery'; diff --git a/apps/server/src/shared/testing/factory/board.factory.ts b/apps/server/src/shared/testing/factory/board.factory.ts index 39470e8200a..38f1e63fe3a 100644 --- a/apps/server/src/shared/testing/factory/board.factory.ts +++ b/apps/server/src/shared/testing/factory/board.factory.ts @@ -1,4 +1,4 @@ -import { Board, BoardProps } from '@shared/domain'; +import { Board, BoardProps } from '@shared/domain/entity'; import { BaseFactory } from './base.factory'; import { courseFactory } from './course.factory'; diff --git a/apps/server/src/shared/testing/factory/boardelement.factory.ts b/apps/server/src/shared/testing/factory/boardelement.factory.ts index 7d838582623..62414b4e07b 100644 --- a/apps/server/src/shared/testing/factory/boardelement.factory.ts +++ b/apps/server/src/shared/testing/factory/boardelement.factory.ts @@ -1,12 +1,12 @@ import { ColumnboardBoardElement, ColumnBoardTarget, - EntityId, - LessonEntity, LessonBoardElement, + LessonEntity, Task, TaskBoardElement, -} from '@shared/domain'; +} from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { BaseFactory } from './base.factory'; import { lessonFactory } from './lesson.factory'; diff --git a/apps/server/src/shared/testing/factory/boardnode/card-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/card-node.factory.ts index 2e6874154f5..07fed90ea83 100644 --- a/apps/server/src/shared/testing/factory/boardnode/card-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/card-node.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { CardNode, CardNodeProps } from '@shared/domain'; +import { CardNode, CardNodeProps } from '@shared/domain/entity'; import { BaseFactory } from '../base.factory'; export const cardNodeFactory = BaseFactory.define(CardNode, ({ sequence }) => { diff --git a/apps/server/src/shared/testing/factory/boardnode/column-board-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/column-board-node.factory.ts index 392e1724352..d9ab7d64dec 100644 --- a/apps/server/src/shared/testing/factory/boardnode/column-board-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/column-board-node.factory.ts @@ -1,6 +1,6 @@ /* istanbul ignore file */ -import { ColumnBoardNode, ColumnBoardNodeProps } from '@shared/domain'; import { BoardExternalReferenceType } from '@shared/domain/domainobject/board/types'; +import { ColumnBoardNode, ColumnBoardNodeProps } from '@shared/domain/entity'; import { ObjectId } from 'bson'; import { BaseFactory } from '../base.factory'; diff --git a/apps/server/src/shared/testing/factory/boardnode/column-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/column-node.factory.ts index 972ee730266..4430ceec554 100644 --- a/apps/server/src/shared/testing/factory/boardnode/column-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/column-node.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { BoardNodeProps, ColumnNode } from '@shared/domain'; +import { BoardNodeProps, ColumnNode } from '@shared/domain/entity'; import { BaseFactory } from '../base.factory'; export const columnNodeFactory = BaseFactory.define(ColumnNode, ({ sequence }) => { diff --git a/apps/server/src/shared/testing/factory/boardnode/drawing-element-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/drawing-element-node.factory.ts index 0298bee52b9..65a69dc382d 100644 --- a/apps/server/src/shared/testing/factory/boardnode/drawing-element-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/drawing-element-node.factory.ts @@ -1,5 +1,6 @@ /* istanbul ignore file */ -import { DrawingElementNode, DrawingElementNodeProps } from '@shared/domain'; + +import { DrawingElementNode, DrawingElementNodeProps } from '@shared/domain/entity'; import { BaseFactory } from '../base.factory'; export const drawingElementNodeFactory = BaseFactory.define( diff --git a/apps/server/src/shared/testing/factory/boardnode/external-tool-element-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/external-tool-element-node.factory.ts index b09c35d4733..c389c40d355 100644 --- a/apps/server/src/shared/testing/factory/boardnode/external-tool-element-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/external-tool-element-node.factory.ts @@ -1,4 +1,4 @@ -import { ExternalToolElementNodeEntity, ExternalToolElementNodeEntityProps } from '../../../domain'; +import { ExternalToolElementNodeEntity, ExternalToolElementNodeEntityProps } from '@shared/domain/entity'; import { BaseFactory } from '../base.factory'; export const externalToolElementNodeFactory = BaseFactory.define< diff --git a/apps/server/src/shared/testing/factory/boardnode/file-element-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/file-element-node.factory.ts index 7cd68f57d21..ed9b39990bc 100644 --- a/apps/server/src/shared/testing/factory/boardnode/file-element-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/file-element-node.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { FileElementNode, FileElementNodeProps } from '@shared/domain'; +import { FileElementNode, FileElementNodeProps } from '@shared/domain/entity'; import { BaseFactory } from '../base.factory'; export const fileElementNodeFactory = BaseFactory.define( diff --git a/apps/server/src/shared/testing/factory/boardnode/link-element-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/link-element-node.factory.ts index 1725634705f..fa8eb0ceaa2 100644 --- a/apps/server/src/shared/testing/factory/boardnode/link-element-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/link-element-node.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { LinkElementNode, LinkElementNodeProps } from '@shared/domain'; +import { LinkElementNode, LinkElementNodeProps } from '@shared/domain/entity'; import { BaseFactory } from '../base.factory'; export const linkElementNodeFactory = BaseFactory.define( diff --git a/apps/server/src/shared/testing/factory/boardnode/rich-text-element-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/rich-text-element-node.factory.ts index 9c977108b47..41aa45e74dc 100644 --- a/apps/server/src/shared/testing/factory/boardnode/rich-text-element-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/rich-text-element-node.factory.ts @@ -1,5 +1,6 @@ /* istanbul ignore file */ -import { InputFormat, RichTextElementNode, RichTextElementNodeProps } from '@shared/domain'; +import { RichTextElementNode, RichTextElementNodeProps } from '@shared/domain/entity'; +import { InputFormat } from '@shared/domain/types'; import { BaseFactory } from '../base.factory'; export const richTextElementNodeFactory = BaseFactory.define( diff --git a/apps/server/src/shared/testing/factory/boardnode/submission-container-element-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/submission-container-element-node.factory.ts index a0d65c152cb..e1c413c0589 100644 --- a/apps/server/src/shared/testing/factory/boardnode/submission-container-element-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/submission-container-element-node.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { SubmissionContainerElementNode, SubmissionContainerNodeProps } from '@shared/domain'; +import { SubmissionContainerElementNode, SubmissionContainerNodeProps } from '@shared/domain/entity'; import { BaseFactory } from '../base.factory'; export const submissionContainerElementNodeFactory = BaseFactory.define< diff --git a/apps/server/src/shared/testing/factory/boardnode/submission-item-node.factory.ts b/apps/server/src/shared/testing/factory/boardnode/submission-item-node.factory.ts index f1531c91382..336b2a34edd 100644 --- a/apps/server/src/shared/testing/factory/boardnode/submission-item-node.factory.ts +++ b/apps/server/src/shared/testing/factory/boardnode/submission-item-node.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { SubmissionItemNode, SubmissionItemNodeProps } from '@shared/domain'; +import { SubmissionItemNode, SubmissionItemNodeProps } from '@shared/domain/entity'; import { BaseFactory } from '../base.factory'; import { userFactory } from '../user.factory'; diff --git a/apps/server/src/shared/testing/factory/course.factory.ts b/apps/server/src/shared/testing/factory/course.factory.ts index a0418771486..6850160bd24 100644 --- a/apps/server/src/shared/testing/factory/course.factory.ts +++ b/apps/server/src/shared/testing/factory/course.factory.ts @@ -1,6 +1,6 @@ import { DeepPartial } from 'fishery'; -import { Course, CourseProperties } from '@shared/domain'; +import { Course, CourseProperties } from '@shared/domain/entity'; import { BaseFactory } from './base.factory'; import { schoolFactory } from './school.factory'; diff --git a/apps/server/src/shared/testing/factory/coursegroup.factory.ts b/apps/server/src/shared/testing/factory/coursegroup.factory.ts index 3b98de4a17c..3ea6b6a9dce 100644 --- a/apps/server/src/shared/testing/factory/coursegroup.factory.ts +++ b/apps/server/src/shared/testing/factory/coursegroup.factory.ts @@ -1,4 +1,4 @@ -import { CourseGroup, CourseGroupProperties } from '@shared/domain'; +import { CourseGroup, CourseGroupProperties } from '@shared/domain/entity'; import { DeepPartial } from 'fishery'; import { BaseFactory } from './base.factory'; import { courseFactory } from './course.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/card.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/card.do.factory.ts index 9780264d94b..0fbad6a0a13 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/card.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/card.do.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { Card, CardProps } from '@shared/domain'; +import { Card, CardProps } from '@shared/domain/domainobject'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/column-board.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/column-board.do.factory.ts index 84561f2ab75..39733d6e471 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/column-board.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/column-board.do.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { ColumnBoard, ColumnBoardProps } from '@shared/domain'; +import { ColumnBoard, ColumnBoardProps } from '@shared/domain/domainobject'; import { BoardExternalReferenceType } from '@shared/domain/domainobject/board/types'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/column.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/column.do.factory.ts index 9898398c290..ae129e115d9 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/column.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/column.do.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { Column, ColumnProps } from '@shared/domain'; +import { Column, ColumnProps } from '@shared/domain/domainobject'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/external-tool-element.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/external-tool-element.do.factory.ts index 314650758f8..d159836d8ea 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/external-tool-element.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/external-tool-element.do.factory.ts @@ -1,4 +1,4 @@ -import { ExternalToolElement, ExternalToolElementProps } from '@shared/domain'; +import { ExternalToolElement, ExternalToolElementProps } from '@shared/domain/domainobject'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/file-element.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/file-element.do.factory.ts index 03cdf90c797..17fa4e9e591 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/file-element.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/file-element.do.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { FileElement, FileElementProps } from '@shared/domain'; +import { FileElement, FileElementProps } from '@shared/domain/domainobject'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/link-element.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/link-element.do.factory.ts index 415cfeae1dc..e57270cfe75 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/link-element.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/link-element.do.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { LinkElement, LinkElementProps } from '@shared/domain'; +import { LinkElement, LinkElementProps } from '@shared/domain/domainobject'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/rich-text-element.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/rich-text-element.do.factory.ts index 8b26ef24537..058eabb2b42 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/rich-text-element.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/rich-text-element.do.factory.ts @@ -1,5 +1,6 @@ /* istanbul ignore file */ -import { InputFormat, RichTextElement, RichTextElementProps } from '@shared/domain'; +import { RichTextElement, RichTextElementProps } from '@shared/domain/domainobject'; +import { InputFormat } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/submission-container-element.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/submission-container-element.do.factory.ts index fd3ce83f959..b42ff6aff7e 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/submission-container-element.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/submission-container-element.do.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { SubmissionContainerElement, SubmissionContainerElementProps } from '@shared/domain'; +import { SubmissionContainerElement, SubmissionContainerElementProps } from '@shared/domain/domainobject'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/board/submission-item.do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/board/submission-item.do.factory.ts index 51594a1e88d..ce72751a5b9 100644 --- a/apps/server/src/shared/testing/factory/domainobject/board/submission-item.do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/board/submission-item.do.factory.ts @@ -1,5 +1,5 @@ /* istanbul ignore file */ -import { SubmissionItem, SubmissionItemProps } from '@shared/domain'; +import { SubmissionItem, SubmissionItemProps } from '@shared/domain/domainobject'; import { ObjectId } from 'bson'; import { BaseFactory } from '../../base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/groups/group.factory.ts b/apps/server/src/shared/testing/factory/domainobject/groups/group.factory.ts index ba0f8899249..051b6926387 100644 --- a/apps/server/src/shared/testing/factory/domainobject/groups/group.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/groups/group.factory.ts @@ -1,5 +1,5 @@ -import { ExternalSource } from '@shared/domain'; import { Group, GroupProps, GroupTypes } from '@modules/group/domain'; +import { ExternalSource } from '@shared/domain/domainobject'; import { ObjectId } from 'bson'; import { DomainObjectFactory } from '../domain-object.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/legacy-school.factory.ts b/apps/server/src/shared/testing/factory/domainobject/legacy-school.factory.ts index 9859721c9a5..d1dd6a8366a 100644 --- a/apps/server/src/shared/testing/factory/domainobject/legacy-school.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/legacy-school.factory.ts @@ -1,4 +1,4 @@ -import { LegacySchoolDo } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { federalStateFactory } from '../federal-state.factory'; import { schoolYearFactory } from '../schoolyear.factory'; import { DoBaseFactory } from './do-base.factory'; diff --git a/apps/server/src/shared/testing/factory/domainobject/lti-tool.factory.ts b/apps/server/src/shared/testing/factory/domainobject/lti-tool.factory.ts index d008e3a1fda..61db7a15fea 100644 --- a/apps/server/src/shared/testing/factory/domainobject/lti-tool.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/lti-tool.factory.ts @@ -1,4 +1,5 @@ -import { LtiPrivacyPermission, LtiToolDO } from '@shared/domain'; +import { LtiToolDO } from '@shared/domain/domainobject'; +import { LtiPrivacyPermission } from '@shared/domain/entity'; import { DoBaseFactory } from './do-base.factory'; export const ltiToolDOFactory = DoBaseFactory.define(LtiToolDO, ({ sequence }) => { diff --git a/apps/server/src/shared/testing/factory/domainobject/pseudonym.factory.ts b/apps/server/src/shared/testing/factory/domainobject/pseudonym.factory.ts index 08635e26e3c..2b77c4b21bb 100644 --- a/apps/server/src/shared/testing/factory/domainobject/pseudonym.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/pseudonym.factory.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { Pseudonym, PseudonymProps } from '@shared/domain'; +import { Pseudonym, PseudonymProps } from '@shared/domain/domainobject'; import { DomainObjectFactory } from './domain-object.factory'; export const pseudonymFactory = DomainObjectFactory.define(Pseudonym, ({ sequence }) => { diff --git a/apps/server/src/shared/testing/factory/domainobject/user-login-migration-do.factory.ts b/apps/server/src/shared/testing/factory/domainobject/user-login-migration-do.factory.ts index c1ff6e95a90..e68af3bab23 100644 --- a/apps/server/src/shared/testing/factory/domainobject/user-login-migration-do.factory.ts +++ b/apps/server/src/shared/testing/factory/domainobject/user-login-migration-do.factory.ts @@ -1,4 +1,4 @@ -import { UserLoginMigrationDO } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { DoBaseFactory } from './do-base.factory'; export const userLoginMigrationDOFactory = DoBaseFactory.define( diff --git a/apps/server/src/shared/testing/factory/external-group-dto.factory.ts b/apps/server/src/shared/testing/factory/external-group-dto.factory.ts index 562b68f8767..74bda384b18 100644 --- a/apps/server/src/shared/testing/factory/external-group-dto.factory.ts +++ b/apps/server/src/shared/testing/factory/external-group-dto.factory.ts @@ -1,7 +1,7 @@ -import { RoleName } from '@shared/domain'; -import { ObjectId } from 'bson'; -import { ExternalGroupDto } from '@modules/provisioning/dto'; import { GroupTypes } from '@modules/group'; +import { ExternalGroupDto } from '@modules/provisioning/dto'; +import { RoleName } from '@shared/domain/interface'; +import { ObjectId } from 'bson'; import { BaseFactory } from './base.factory'; export const externalGroupDtoFactory = BaseFactory.define( diff --git a/apps/server/src/shared/testing/factory/federal-state.factory.ts b/apps/server/src/shared/testing/factory/federal-state.factory.ts index 11a685140a5..52b054a51f5 100644 --- a/apps/server/src/shared/testing/factory/federal-state.factory.ts +++ b/apps/server/src/shared/testing/factory/federal-state.factory.ts @@ -1,4 +1,4 @@ -import { County, FederalStateEntity, FederalStateProperties } from '@shared/domain'; +import { County, FederalStateEntity, FederalStateProperties } from '@shared/domain/entity'; import { BaseFactory } from './base.factory'; export const federalStateFactory = BaseFactory.define( diff --git a/apps/server/src/shared/testing/factory/group-entity.factory.ts b/apps/server/src/shared/testing/factory/group-entity.factory.ts index 1e65d13d808..4cc6d86a7f2 100644 --- a/apps/server/src/shared/testing/factory/group-entity.factory.ts +++ b/apps/server/src/shared/testing/factory/group-entity.factory.ts @@ -1,5 +1,6 @@ import { GroupEntity, GroupEntityProps, GroupEntityTypes, GroupValidPeriodEntity } from '@modules/group/entity'; -import { ExternalSourceEntity, RoleName } from '@shared/domain'; +import { ExternalSourceEntity } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { BaseFactory } from './base.factory'; import { roleFactory } from './role.factory'; import { schoolFactory } from './school.factory'; diff --git a/apps/server/src/shared/testing/factory/import-user.factory.ts b/apps/server/src/shared/testing/factory/import-user.factory.ts index ce187638ed0..c76363aa6ac 100644 --- a/apps/server/src/shared/testing/factory/import-user.factory.ts +++ b/apps/server/src/shared/testing/factory/import-user.factory.ts @@ -1,4 +1,5 @@ -import { IImportUserRoleName, ImportUser, ImportUserProperties, MatchCreator, RoleName, User } from '@shared/domain'; +import { IImportUserRoleName, ImportUser, ImportUserProperties, MatchCreator, User } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { DeepPartial } from 'fishery'; import { v4 as uuidv4 } from 'uuid'; import { BaseFactory } from './base.factory'; diff --git a/apps/server/src/shared/testing/factory/lesson.factory.ts b/apps/server/src/shared/testing/factory/lesson.factory.ts index a83d47cec80..5d04cc2434a 100644 --- a/apps/server/src/shared/testing/factory/lesson.factory.ts +++ b/apps/server/src/shared/testing/factory/lesson.factory.ts @@ -1,4 +1,4 @@ -import { ComponentProperties, Course, LessonEntity, LessonProperties } from '@shared/domain'; +import { ComponentProperties, Course, LessonEntity, LessonProperties } from '@shared/domain/entity'; import { BaseFactory } from './base.factory'; import { courseFactory } from './course.factory'; diff --git a/apps/server/src/shared/testing/factory/ltitool.factory.ts b/apps/server/src/shared/testing/factory/ltitool.factory.ts index d982e851360..4f7526de981 100644 --- a/apps/server/src/shared/testing/factory/ltitool.factory.ts +++ b/apps/server/src/shared/testing/factory/ltitool.factory.ts @@ -1,5 +1,5 @@ -import { ILtiToolProperties, LtiPrivacyPermission, LtiRoleType, LtiTool } from '@shared/domain/'; import { CustomLtiPropertyDO } from '@shared/domain/domainobject/ltitool.do'; +import { ILtiToolProperties, LtiPrivacyPermission, LtiRoleType, LtiTool } from '@shared/domain/entity'; import { BaseFactory } from '@shared/testing/factory/base.factory'; import { DeepPartial } from 'fishery'; diff --git a/apps/server/src/shared/testing/factory/news.factory.ts b/apps/server/src/shared/testing/factory/news.factory.ts index 55788cea9de..af7de567f40 100644 --- a/apps/server/src/shared/testing/factory/news.factory.ts +++ b/apps/server/src/shared/testing/factory/news.factory.ts @@ -1,4 +1,4 @@ -import { CourseNews, NewsProperties, SchoolNews, TeamNews } from '@shared/domain'; +import { CourseNews, NewsProperties, SchoolNews, TeamNews } from '@shared/domain/entity'; import { BaseFactory } from './base.factory'; import { courseFactory } from './course.factory'; import { schoolFactory } from './school.factory'; diff --git a/apps/server/src/shared/testing/factory/role-dto.factory.ts b/apps/server/src/shared/testing/factory/role-dto.factory.ts index 2158580753d..b4df08b67f2 100644 --- a/apps/server/src/shared/testing/factory/role-dto.factory.ts +++ b/apps/server/src/shared/testing/factory/role-dto.factory.ts @@ -1,8 +1,8 @@ -import { RoleName } from '@shared/domain'; -import { ObjectId } from 'bson'; import { RoleDto } from '@modules/role/service/dto/role.dto'; -import { BaseFactory } from './base.factory'; +import { RoleName } from '@shared/domain/interface'; +import { ObjectId } from 'bson'; import { userPermissions } from '../user-role-permissions'; +import { BaseFactory } from './base.factory'; export const roleDtoFactory = BaseFactory.define(RoleDto, () => { return { diff --git a/apps/server/src/shared/testing/factory/role.factory.ts b/apps/server/src/shared/testing/factory/role.factory.ts index bd987e198b5..ea982edf1e5 100644 --- a/apps/server/src/shared/testing/factory/role.factory.ts +++ b/apps/server/src/shared/testing/factory/role.factory.ts @@ -1,4 +1,5 @@ -import { Role, RoleName, RoleProperties } from '@shared/domain'; +import { Role, RoleProperties } from '@shared/domain/entity'; +import { RoleName } from '@shared/domain/interface'; import { BaseFactory } from './base.factory'; export const roleFactory = BaseFactory.define(Role, ({ sequence }) => { diff --git a/apps/server/src/shared/testing/factory/school.factory.ts b/apps/server/src/shared/testing/factory/school.factory.ts index 1e71e816923..87c9b00f77f 100644 --- a/apps/server/src/shared/testing/factory/school.factory.ts +++ b/apps/server/src/shared/testing/factory/school.factory.ts @@ -1,4 +1,4 @@ -import { SchoolEntity, SchoolProperties } from '@shared/domain'; +import { SchoolEntity, SchoolProperties } from '@shared/domain/entity'; import { BaseFactory } from './base.factory'; import { federalStateFactory } from './federal-state.factory'; import { schoolYearFactory } from './schoolyear.factory'; diff --git a/apps/server/src/shared/testing/factory/share-token.do.factory.ts b/apps/server/src/shared/testing/factory/share-token.do.factory.ts index 2c23ca904be..95a8d67b379 100644 --- a/apps/server/src/shared/testing/factory/share-token.do.factory.ts +++ b/apps/server/src/shared/testing/factory/share-token.do.factory.ts @@ -1,6 +1,6 @@ /* istanbul ignore file */ -import { EntityId } from '@shared/domain'; import { ShareTokenDO, ShareTokenParentType } from '@modules/sharing/domainobject/share-token.do'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { Factory } from 'fishery'; diff --git a/apps/server/src/shared/testing/factory/storageprovider.factory.ts b/apps/server/src/shared/testing/factory/storageprovider.factory.ts index 0406b647978..55c646ebd1e 100644 --- a/apps/server/src/shared/testing/factory/storageprovider.factory.ts +++ b/apps/server/src/shared/testing/factory/storageprovider.factory.ts @@ -1,4 +1,4 @@ -import { StorageProviderEntity, StorageProviderProperties } from '@shared/domain'; +import { StorageProviderEntity, StorageProviderProperties } from '@shared/domain/entity'; import { BaseFactory } from './base.factory'; export const storageProviderFactory = BaseFactory.define( diff --git a/apps/server/src/shared/testing/factory/submission.factory.ts b/apps/server/src/shared/testing/factory/submission.factory.ts index a667e2de37c..7b4ee5f0455 100644 --- a/apps/server/src/shared/testing/factory/submission.factory.ts +++ b/apps/server/src/shared/testing/factory/submission.factory.ts @@ -1,4 +1,4 @@ -import { Submission, SubmissionProperties } from '@shared/domain'; +import { Submission, SubmissionProperties } from '@shared/domain/entity'; import { DeepPartial } from 'fishery'; import { BaseFactory } from './base.factory'; import { schoolFactory } from './school.factory'; diff --git a/apps/server/src/shared/testing/factory/systemEntityFactory.ts b/apps/server/src/shared/testing/factory/systemEntityFactory.ts index 567645210af..de6b026173d 100644 --- a/apps/server/src/shared/testing/factory/systemEntityFactory.ts +++ b/apps/server/src/shared/testing/factory/systemEntityFactory.ts @@ -1,4 +1,10 @@ -import { LdapConfigEntity, OauthConfigEntity, OidcConfigEntity, SystemEntity, SystemEntityProps } from '@shared/domain'; +import { + LdapConfigEntity, + OauthConfigEntity, + OidcConfigEntity, + SystemEntity, + SystemEntityProps, +} from '@shared/domain/entity'; import { SystemProvisioningStrategy } from '@shared/domain/interface/system-provisioning.strategy'; import { DeepPartial } from 'fishery'; import { BaseFactory } from './base.factory'; diff --git a/apps/server/src/shared/testing/factory/task.factory.ts b/apps/server/src/shared/testing/factory/task.factory.ts index c3860940163..5acc9ab2c77 100644 --- a/apps/server/src/shared/testing/factory/task.factory.ts +++ b/apps/server/src/shared/testing/factory/task.factory.ts @@ -1,5 +1,5 @@ -import { Task, TaskProperties } from '@shared/domain'; -import { User } from '@shared/domain/entity'; +import { Task, User } from '@shared/domain/entity'; +import { TaskProperties } from '@shared/domain/types'; import { DeepPartial } from 'fishery'; import { BaseFactory } from './base.factory'; import { schoolFactory } from './school.factory'; diff --git a/apps/server/src/shared/testing/factory/team.factory.ts b/apps/server/src/shared/testing/factory/team.factory.ts index 332d3190c34..41cb21da3b5 100644 --- a/apps/server/src/shared/testing/factory/team.factory.ts +++ b/apps/server/src/shared/testing/factory/team.factory.ts @@ -1,4 +1,4 @@ -import { Role, TeamEntity, TeamProperties, TeamUserEntity } from '@shared/domain'; +import { Role, TeamEntity, TeamProperties, TeamUserEntity } from '@shared/domain/entity'; import { BaseFactory } from '@shared/testing/factory/base.factory'; import { teamUserFactory } from '@shared/testing/factory/teamuser.factory'; import { DeepPartial } from 'fishery'; diff --git a/apps/server/src/shared/testing/factory/teamuser.factory.ts b/apps/server/src/shared/testing/factory/teamuser.factory.ts index 34fbba03c51..b2aaaf5749a 100644 --- a/apps/server/src/shared/testing/factory/teamuser.factory.ts +++ b/apps/server/src/shared/testing/factory/teamuser.factory.ts @@ -1,9 +1,9 @@ -import { Role, TeamUserEntity } from '@shared/domain'; +import { Role, TeamUserEntity } from '@shared/domain/entity'; import { BaseFactory } from '@shared/testing/factory/base.factory'; -import { DeepPartial } from 'fishery'; +import { roleFactory } from '@shared/testing/factory/role.factory'; import { schoolFactory } from '@shared/testing/factory/school.factory'; import { userFactory } from '@shared/testing/factory/user.factory'; -import { roleFactory } from '@shared/testing/factory/role.factory'; +import { DeepPartial } from 'fishery'; class TeamUserFactory extends BaseFactory { withRoleAndUserId(role: Role, userId: string): this { diff --git a/apps/server/src/shared/testing/factory/user-and-account.test.factory.spec.ts b/apps/server/src/shared/testing/factory/user-and-account.test.factory.spec.ts index 4ad66f8e2ba..fffa48d540b 100644 --- a/apps/server/src/shared/testing/factory/user-and-account.test.factory.spec.ts +++ b/apps/server/src/shared/testing/factory/user-and-account.test.factory.spec.ts @@ -1,4 +1,4 @@ -import { Account, User } from '@shared/domain'; +import { Account, User } from '@shared/domain/entity'; import { ObjectId } from 'bson'; import { setupEntities } from '../setup-entities'; import { schoolFactory } from './school.factory'; diff --git a/apps/server/src/shared/testing/factory/user-and-account.test.factory.ts b/apps/server/src/shared/testing/factory/user-and-account.test.factory.ts index a59bd25d1ea..2814dd2b5b5 100644 --- a/apps/server/src/shared/testing/factory/user-and-account.test.factory.ts +++ b/apps/server/src/shared/testing/factory/user-and-account.test.factory.ts @@ -1,4 +1,6 @@ -import { Account, EntityId, Permission, SchoolEntity, User } from '@shared/domain'; +import { Account, SchoolEntity, User } from '@shared/domain/entity'; +import { Permission } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import _ from 'lodash'; import { accountFactory } from './account.factory'; diff --git a/apps/server/src/shared/testing/factory/user.do.factory.ts b/apps/server/src/shared/testing/factory/user.do.factory.ts index b377b4b45af..9d7f80b7725 100644 --- a/apps/server/src/shared/testing/factory/user.do.factory.ts +++ b/apps/server/src/shared/testing/factory/user.do.factory.ts @@ -1,5 +1,6 @@ -import { EntityId, RoleName } from '@shared/domain'; import { UserDO } from '@shared/domain/domainobject/user.do'; +import { RoleName } from '@shared/domain/interface'; +import { EntityId } from '@shared/domain/types'; import { ObjectId } from 'bson'; import { DeepPartial } from 'fishery'; import { DoBaseFactory } from './domainobject'; diff --git a/apps/server/src/shared/testing/factory/user.factory.ts b/apps/server/src/shared/testing/factory/user.factory.ts index 5b09e5c46b5..99c3d45f126 100644 --- a/apps/server/src/shared/testing/factory/user.factory.ts +++ b/apps/server/src/shared/testing/factory/user.factory.ts @@ -1,5 +1,6 @@ /* istanbul ignore file */ -import { Permission, Role, RoleName, User, UserProperties } from '@shared/domain'; +import { Role, User, UserProperties } from '@shared/domain/entity'; +import { Permission, RoleName } from '@shared/domain/interface'; import { DeepPartial } from 'fishery'; import _ from 'lodash'; import { adminPermissions, studentPermissions, teacherPermissions, userPermissions } from '../user-role-permissions'; diff --git a/apps/server/src/shared/testing/factory/video-conference.do.factory.ts b/apps/server/src/shared/testing/factory/video-conference.do.factory.ts index 34e0cb70082..0ba97c5fa79 100644 --- a/apps/server/src/shared/testing/factory/video-conference.do.factory.ts +++ b/apps/server/src/shared/testing/factory/video-conference.do.factory.ts @@ -1,5 +1,6 @@ +import { VideoConferenceDO } from '@shared/domain/domainobject'; +import { VideoConferenceScope } from '@shared/domain/interface'; import { BaseFactory } from '@shared/testing'; -import { VideoConferenceDO, VideoConferenceScope } from '@shared/domain'; export const videoConferenceDOFactory: BaseFactory = BaseFactory.define< VideoConferenceDO, diff --git a/apps/server/src/shared/testing/map-user-to-current-user.ts b/apps/server/src/shared/testing/map-user-to-current-user.ts index 3c6a1eadc27..42125189a2f 100644 --- a/apps/server/src/shared/testing/map-user-to-current-user.ts +++ b/apps/server/src/shared/testing/map-user-to-current-user.ts @@ -1,6 +1,7 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { ICurrentUser } from '@modules/authentication'; -import { Account, EntityId, User } from '@shared/domain'; +import { Account, User } from '@shared/domain/entity'; +import { EntityId } from '@shared/domain/types'; export const mapUserToCurrentUser = ( user: User, diff --git a/apps/server/src/shared/testing/setup-entities.ts b/apps/server/src/shared/testing/setup-entities.ts index f35c6885551..552b66257e0 100644 --- a/apps/server/src/shared/testing/setup-entities.ts +++ b/apps/server/src/shared/testing/setup-entities.ts @@ -1,5 +1,5 @@ import { AnyEntity, EntityClass, MikroORM } from '@mikro-orm/core'; -import { ALL_ENTITIES } from '@shared/domain'; +import { ALL_ENTITIES } from '@shared/domain/entity'; /** * Test-Setup to make all entities available without a database connection. diff --git a/apps/server/src/shared/testing/test-api-client.ts b/apps/server/src/shared/testing/test-api-client.ts index 75be7b7dc5f..e264d54ec10 100644 --- a/apps/server/src/shared/testing/test-api-client.ts +++ b/apps/server/src/shared/testing/test-api-client.ts @@ -1,5 +1,5 @@ import { INestApplication } from '@nestjs/common'; -import { Account } from '@shared/domain'; +import { Account } from '@shared/domain/entity'; import supertest, { Response } from 'supertest'; import { defaultTestPassword } from './factory/account.factory'; diff --git a/apps/server/src/shared/testing/user-role-permissions.ts b/apps/server/src/shared/testing/user-role-permissions.ts index a3c82aecc7c..b1fd11955a9 100644 --- a/apps/server/src/shared/testing/user-role-permissions.ts +++ b/apps/server/src/shared/testing/user-role-permissions.ts @@ -2,7 +2,7 @@ This permission set is based on the current state of dBildungscloud. Last Update: 2023-03-21 */ -import { Permission } from '@shared/domain'; +import { Permission } from '@shared/domain/interface'; export const userPermissions = [ Permission.BASE_VIEW,