BC - 5654 Remove usage of @shared/domain/index.ts (#4563)

* removed export * from './domainobject'

* corrected apps/server/src/modules/authentication/strategy/ldap.strategy.ts

* removed: export * from './types';

* removed: export * from './service'

* removed: export * from './interface'

* removed: export * from './interface';

* removed: export * from './entity';

* removed index in shared/domain


---------

Co-authored-by: Wolfgang Greschus <[email protected]>

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';
 

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';

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';

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;

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 {

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';

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 {

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';
 

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;

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';

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';

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';

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';
 

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;
 

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],

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';

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,

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';
 

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 {

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()

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';

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';
 

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';

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';
 

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', () => {

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 {

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';
 

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()

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';

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 {

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;

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';

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 {