From c564371dc5d04646cf8cc151c053c8f5ee390c5d Mon Sep 17 00:00:00 2001 From: wolfganggreschus Date: Wed, 22 Nov 2023 14:09:15 +0100 Subject: [PATCH] removed export * from './domainobject' --- .../strategy/nextcloud/nextcloud.strategy.ts | 2 +- .../authentication/strategy/ldap.strategy.ts | 3 ++- .../domain/rules/legacy-school.rule.ts | 6 ++--- .../domain/service/authorization.service.ts | 7 +++--- .../domain/service/reference.loader.ts | 3 ++- .../domain/service/rule-manager.ts | 7 +++--- .../type/authorization-loader-service.ts | 3 ++- .../domain/type/rule.interface.ts | 3 ++- apps/server/src/modules/board/board.module.ts | 4 ++-- .../dto/board/board-context.reponse.ts | 2 +- .../dto/card/create-card.body.params.ts | 2 +- .../create-content-element.body.params.ts | 2 +- .../element/external-tool-element.response.ts | 2 +- .../dto/element/file-element.response.ts | 2 +- .../dto/element/link-element.response.ts | 2 +- .../dto/element/rich-text-element.response.ts | 3 ++- .../submission-container-element.response.ts | 2 +- .../update-element-content.body.params.ts | 2 +- .../mapper/base-mapper.interface.ts | 2 +- .../mapper/board-response.mapper.ts | 2 +- .../controller/mapper/card-response.mapper.ts | 2 +- .../mapper/column-response.mapper.ts | 2 +- .../content-element-response.factory.ts | 4 ++-- .../external-tool-element-response.mapper.ts | 2 +- .../mapper/file-element-response.mapper.ts | 2 +- .../mapper/link-element-response.mapper.ts | 2 +- .../rich-text-element-response.mapper.ts | 2 +- ...ssion-container-element-response.mapper.ts | 2 +- .../mapper/submission-item-response.mapper.ts | 8 ++++++- .../board/repo/board-do.builder-impl.ts | 4 ++-- .../src/modules/board/repo/board-do.repo.ts | 3 ++- .../board/repo/recursive-delete.vistor.ts | 4 ++-- .../board/repo/recursive-save.visitor.ts | 24 ++++++++++--------- .../service/board-do-authorizable.service.ts | 7 +++--- .../board-do-copy.service.ts | 4 ++-- .../recursive-copy.visitor.ts | 8 +++---- .../modules/board/service/board-do.service.ts | 2 +- .../src/modules/board/service/card.service.ts | 3 ++- .../service/column-board-copy.service.ts | 8 +++---- .../board/service/column-board.service.ts | 4 ++-- .../modules/board/service/column.service.ts | 3 ++- .../service/content-element-update.visitor.ts | 4 ++-- .../board/service/content-element.service.ts | 4 ++-- .../board/service/submission-item.service.ts | 5 ++-- apps/server/src/modules/board/uc/base.uc.ts | 5 ++-- apps/server/src/modules/board/uc/board.uc.ts | 7 +++--- apps/server/src/modules/board/uc/card.uc.ts | 5 ++-- apps/server/src/modules/board/uc/column.uc.ts | 7 +++--- .../server/src/modules/board/uc/element.uc.ts | 6 ++--- .../modules/board/uc/submission-item.uc.ts | 6 ++--- .../group/controller/group.controller.ts | 2 +- .../mapper/group-response.mapper.ts | 2 +- apps/server/src/modules/group/domain/group.ts | 3 ++- .../modules/group/repo/group-domain.mapper.ts | 3 ++- .../src/modules/group/repo/group.repo.ts | 2 +- .../modules/group/service/group.service.ts | 5 ++-- .../group/uc/dto/resolved-group-user.ts | 2 +- .../group/uc/dto/resolved-group.dto.ts | 2 +- apps/server/src/modules/group/uc/group.uc.ts | 7 +++--- .../group/uc/mapper/group-uc.mapper.ts | 3 ++- .../learnroom/service/board-copy.service.ts | 14 +++++------ .../learnroom/service/rooms.service.ts | 3 ++- .../service/legacy-school.service.ts | 3 ++- .../validation/school-validation.service.ts | 2 +- .../management/uc/board-management.uc.ts | 5 ++-- .../service/url-handler/board-url-handler.ts | 2 +- .../service/id-token.service.ts | 7 +++--- .../uc/oauth-provider.login-flow.uc.ts | 7 +++--- .../modules/oauth/service/oauth.service.ts | 3 ++- .../strategy/iserv/iserv-do.mapper.ts | 3 ++- .../strategy/iserv/iserv.strategy.ts | 9 +++---- .../strategy/oidc/oidc.strategy.ts | 2 +- .../oidc/service/oidc-provisioning.service.ts | 4 ++-- .../controller/pseudonym.controller.ts | 2 +- .../pseudonym/mapper/pseudonym.mapper.ts | 2 +- .../repo/external-tool-pseudonym.repo.ts | 3 ++- .../modules/pseudonym/repo/pseudonyms.repo.ts | 5 ++-- .../service/feathers-roster.service.ts | 7 +++--- .../pseudonym/service/pseudonym.service.ts | 5 ++-- .../src/modules/pseudonym/uc/pseudonym.uc.ts | 7 +++--- .../tool/common/uc/tool-permission-helper.ts | 3 ++- .../controller/tool.controller.ts | 7 +++--- .../external-tool-configuration.service.ts | 3 ++- .../service/external-tool.service.ts | 3 ++- .../tool/external-tool/uc/external-tool.uc.ts | 7 +++--- .../auto-context-name.strategy.ts | 4 +++- .../auto-school-number.strategy.ts | 2 +- .../lti11-tool-launch.strategy.ts | 4 ++-- .../modules/user-import/uc/user-import.uc.ts | 2 +- .../user-login-migration.controller.ts | 2 +- .../school-migration-successful.loggable.ts | 2 +- .../debug/user-migration-started.loggable.ts | 3 ++- .../user-migration-successful.loggable.ts | 3 ++- ...ase-operation-failed.loggable-exception.ts | 2 +- .../mapper/user-login-migration.mapper.ts | 2 +- .../service/migration-check.service.ts | 3 ++- .../service/school-migration.service.ts | 2 +- .../user-login-migration-revert.service.ts | 5 ++-- .../service/user-login-migration.service.ts | 3 ++- .../uc/close-user-login-migration.uc.ts | 3 ++- .../uc/restart-user-login-migration.uc.ts | 3 ++- .../uc/start-user-login-migration.uc.ts | 3 ++- .../uc/toggle-user-login-migration.uc.ts | 3 ++- .../uc/user-login-migration.uc.ts | 7 +++--- .../service/video-conference.service.ts | 5 +--- .../uc/video-conference-create.uc.ts | 3 ++- .../uc/video-conference-deprecated.uc.ts | 14 ++--------- .../uc/video-conference-end.uc.ts | 3 ++- .../uc/video-conference-info.uc.ts | 3 ++- .../uc/video-conference-join.uc.ts | 11 +++++---- .../domainobject/board/submission-item.do.ts | 3 ++- apps/server/src/shared/domain/index.ts | 2 +- apps/server/src/shared/repo/base.do.repo.ts | 3 ++- .../repo/externaltool/external-tool.repo.ts | 3 ++- .../shared/repo/school/legacy-school.repo.ts | 10 ++------ .../user-login-migration.repo.ts | 3 ++- .../videoconference/video-conference.repo.ts | 5 ++-- .../domainobject/board/card.do.factory.ts | 2 +- .../board/column-board.do.factory.ts | 2 +- .../domainobject/board/column.do.factory.ts | 2 +- .../board/external-tool-element.do.factory.ts | 2 +- .../board/file-element.do.factory.ts | 2 +- .../board/link-element.do.factory.ts | 2 +- .../board/rich-text-element.do.factory.ts | 3 ++- ...submission-container-element.do.factory.ts | 2 +- .../board/submission-item.do.factory.ts | 2 +- .../domainobject/groups/group.factory.ts | 2 +- .../domainobject/legacy-school.factory.ts | 2 +- .../factory/domainobject/lti-tool.factory.ts | 3 ++- .../factory/domainobject/pseudonym.factory.ts | 2 +- .../user-login-migration-do.factory.ts | 2 +- .../factory/video-conference.do.factory.ts | 3 ++- 132 files changed, 283 insertions(+), 235 deletions(-) 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/modules/authentication/strategy/ldap.strategy.ts b/apps/server/src/modules/authentication/strategy/ldap.strategy.ts index 6f33e92f21a..d7a29d63cdf 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 { SystemEntity, User } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject/legacy-school.do'; import { LegacySchoolRepo, SystemRepo, 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/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/service/authorization.service.ts b/apps/server/src/modules/authorization/domain/service/authorization.service.ts index 5218dffda81..dc1e13393f4 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,12 @@ import { Injectable, UnauthorizedException } from '@nestjs/common'; -import { BaseDO, EntityId, User } from '@shared/domain'; +import { EntityId, User } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; +import { BaseDO } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/authorization/domain/service/reference.loader.ts index 7fb574a4d6e..5d620fd931c 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 { EntityId } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; +import { BaseDO } from '@shared/domain/domainobject'; 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 6e6237d125f..2c499907779 100644 --- a/apps/server/src/modules/authorization/domain/service/rule-manager.ts +++ b/apps/server/src/modules/authorization/domain/service/rule-manager.ts @@ -1,12 +1,13 @@ import { Injectable, InternalServerErrorException, NotImplementedException } from '@nestjs/common'; -import { BaseDO, User } from '@shared/domain'; +import { User } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; // fix import when it is avaible -import type { AuthorizationContext, Rule } from '../type'; +import { BaseDO } from '@shared/domain/domainobject'; import { BoardDoRule, ContextExternalToolRule, CourseGroupRule, CourseRule, + GroupRule, LegacySchoolRule, LessonRule, SchoolExternalToolRule, @@ -15,8 +16,8 @@ import { TeamRule, UserLoginMigrationRule, UserRule, - GroupRule, } from '../rules'; +import type { AuthorizationContext, Rule } from '../type'; @Injectable() export class RuleManager { 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..5baf175036f 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 { EntityId } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; // fix import when it is avaible +import { BaseDO } from '@shared/domain/domainobject'; 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..e2afd33c0e2 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 { User } from '@shared/domain'; import { AuthorizableObject } from '@shared/domain/domain-object'; // fix import when it is avaible +import { BaseDO } from '@shared/domain/domainobject'; import { AuthorizationContext } from './authorization-context.interface'; export interface Rule { diff --git a/apps/server/src/modules/board/board.module.ts b/apps/server/src/modules/board/board.module.ts index ffa1e7ad580..108d15da653 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 { BoardDoRepo, BoardNodeRepo, RecursiveDeleteVisitor } from './repo'; 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/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..f2e14d710be 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 { InputFormat } from '@shared/domain'; +import { ContentElementType } from '@shared/domain/domainobject'; 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 7d0314208c6..ed5a9a804bf 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 8431b630be9..47736542aa9 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 { ExternalToolElementResponseMapper } from './external-tool-element-response.mapper'; 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.ts b/apps/server/src/modules/board/repo/board-do.builder-impl.ts index 6e2b375991e..671105e3465 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 @@ -12,9 +12,9 @@ import type { SubmissionContainerElementNode, SubmissionItemNode, } from '@shared/domain'; +import { BoardNodeType } from '@shared/domain'; import { AnyBoardDo, - BoardNodeType, Card, Column, ColumnBoard, @@ -24,7 +24,7 @@ import { RichTextElement, SubmissionContainerElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; export class BoardDoBuilderImpl implements BoardDoBuilder { private childrenMap: Record = {}; 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..068414f038c 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,8 @@ 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 { BoardNode, ColumnBoardNode, EntityId } from '@shared/domain'; +import { AnyBoardDo, BoardExternalReference } from '@shared/domain/domainobject'; 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/recursive-delete.vistor.ts b/apps/server/src/modules/board/repo/recursive-delete.vistor.ts index 0a1b08e663a..5c14c1fc9f1 100644 --- a/apps/server/src/modules/board/repo/recursive-delete.vistor.ts +++ b/apps/server/src/modules/board/repo/recursive-delete.vistor.ts @@ -3,10 +3,10 @@ import { FilesStorageClientAdapterService } from '@modules/files-storage-client' import { ContextExternalTool } from '@modules/tool/context-external-tool/domain'; import { ContextExternalToolService } from '@modules/tool/context-external-tool/service'; import { Injectable } from '@nestjs/common'; +import { BoardNode } from '@shared/domain/'; import { AnyBoardDo, BoardCompositeVisitorAsync, - BoardNode, Card, Column, ColumnBoard, @@ -15,7 +15,7 @@ import { RichTextElement, SubmissionContainerElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; import { LinkElement } from '@shared/domain/domainobject/board/link-element.do'; @Injectable() 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 e379cd5c788..53c8a2b13c9 100644 --- a/apps/server/src/modules/board/repo/recursive-save.visitor.ts +++ b/apps/server/src/modules/board/repo/recursive-save.visitor.ts @@ -1,30 +1,32 @@ 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, ColumnBoardNode, ColumnNode, EntityId, - ExternalToolElement, ExternalToolElementNodeEntity, - FileElement, FileElementNode, - RichTextElement, RichTextElementNode, - SubmissionContainerElement, SubmissionContainerElementNode, - SubmissionItem, SubmissionItemNode, } from '@shared/domain'; +import { + AnyBoardDo, + BoardCompositeVisitor, + Card, + Column, + ColumnBoard, + ExternalToolElement, + FileElement, + RichTextElement, + SubmissionContainerElement, + SubmissionItem, +} from '@shared/domain/domainobject'; 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 { BoardNodeRepo } from './board-node.repo'; type ParentData = { 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..2a3e8dbbd0e 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,17 +1,16 @@ +import { AuthorizationLoaderService } from '@modules/authorization'; import { forwardRef, Inject, Injectable } from '@nestjs/common'; +import { Course, EntityId } from '@shared/domain'; import { AnyBoardDo, BoardDoAuthorizable, BoardExternalReferenceType, BoardRoles, ColumnBoard, - Course, - EntityId, UserBoardRoles, UserRoleEnum, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; 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.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.ts b/apps/server/src/modules/board/service/board-do-copy-service/recursive-copy.visitor.ts index 137f189319c..2b1af075720 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 @@ -1,19 +1,19 @@ +import { FileRecordParentType } from '@infra/rabbitmq'; +import { CopyElementType, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; +import { EntityId } from '@shared/domain'; import { AnyBoardDo, BoardCompositeVisitorAsync, Card, Column, ColumnBoard, - EntityId, ExternalToolElement, FileElement, RichTextElement, SubmissionContainerElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; import { LinkElement } from '@shared/domain/domainobject/board/link-element.do'; -import { FileRecordParentType } from '@infra/rabbitmq'; -import { CopyElementType, CopyStatus, CopyStatusEnum } from '@modules/copy-helper'; import { ObjectId } from 'bson'; import { SchoolSpecificFileCopyService } from './school-specific-file-copy.interface'; 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.ts b/apps/server/src/modules/board/service/card.service.ts index b7fee25c94f..ea02a910e73 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 { EntityId } from '@shared/domain'; +import { Card, Column, ContentElementType } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/service/column-board-copy.service.ts index 79ef29f4752..e7a00307cf5 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 { EntityId } from '@shared/domain'; import { BoardExternalReference, BoardExternalReferenceType, ColumnBoard, - EntityId, isColumnBoard, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/service/column-board.service.ts index 7a455e0fcfa..57552d729b1 100644 --- a/apps/server/src/modules/board/service/column-board.service.ts +++ b/apps/server/src/modules/board/service/column-board.service.ts @@ -1,6 +1,7 @@ import { Configuration } from '@hpi-schul-cloud/commons/lib'; import { Injectable } from '@nestjs/common'; import { NotFoundLoggableException } from '@shared/common/loggable-exception'; +import { EntityId } from '@shared/domain'; import { AnyBoardDo, BoardExternalReference, @@ -9,9 +10,8 @@ import { ColumnBoard, ContentElementFactory, ContentElementType, - EntityId, RichTextElement, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/service/column.service.ts index 6da6dfa4c95..655c1577f07 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 { EntityId } from '@shared/domain'; +import { Column, ColumnBoard } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/service/content-element-update.visitor.ts index 86e3fb67985..ebdb423551a 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 @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; import { sanitizeRichText } from '@shared/controller'; +import { InputFormat } from '@shared/domain'; import { AnyBoardDo, BoardCompositeVisitorAsync, @@ -8,11 +9,10 @@ import { ColumnBoard, ExternalToolElement, FileElement, - InputFormat, RichTextElement, SubmissionContainerElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; import { LinkElement } from '@shared/domain/domainobject/board/link-element.do'; import { AnyElementContentBody, 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..bfba6fe79b8 100644 --- a/apps/server/src/modules/board/service/content-element.service.ts +++ b/apps/server/src/modules/board/service/content-element.service.ts @@ -1,14 +1,14 @@ import { Injectable, NotFoundException } from '@nestjs/common'; +import { EntityId } from '@shared/domain'; import { AnyBoardDo, AnyContentElementDo, Card, ContentElementFactory, ContentElementType, - EntityId, isAnyContentElement, SubmissionItem, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/service/submission-item.service.ts index 0fc67ba694f..9ea7bcebbac 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 { EntityId } from '@shared/domain'; +import { isSubmissionContainerElement, SubmissionContainerElement, SubmissionItem } from '@shared/domain/domainobject'; 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..fea02dfae18 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 { EntityId } from '@shared/domain'; +import { AnyBoardDo, SubmissionItem, UserRoleEnum } from '@shared/domain/domainobject'; import { BoardDoAuthorizableService } from '../service'; export abstract class BaseUc { diff --git a/apps/server/src/modules/board/uc/board.uc.ts b/apps/server/src/modules/board/uc/board.uc.ts index 62559bd966f..583cdaf7847 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 { EntityId } from '@shared/domain'; +import { BoardExternalReference, Column, ColumnBoard } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/uc/card.uc.ts index 97289984922..549703781ab 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 { EntityId } from '@shared/domain'; +import { AnyBoardDo, AnyContentElementDo, Card, ContentElementType } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/uc/column.uc.ts index da8eceedbe3..f559f36103e 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 { EntityId } from '@shared/domain'; +import { Card, ContentElementType } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/uc/element.uc.ts index d094e758fd5..125dd612630 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 { EntityId } from '@shared/domain'; import { AnyBoardDo, AnyContentElementDo, - EntityId, isSubmissionContainerElement, isSubmissionItem, SubmissionItem, UserRoleEnum, -} from '@shared/domain'; +} from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/board/uc/submission-item.uc.ts index 3fb87f2b5dc..7b365268995 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, @@ -6,9 +7,9 @@ import { NotFoundException, UnprocessableEntityException, } from '@nestjs/common'; +import { EntityId } from '@shared/domain'; import { ContentElementType, - EntityId, FileElement, isFileElement, isRichTextElement, @@ -18,8 +19,7 @@ import { SubmissionItem, UserBoardRoles, UserRoleEnum, -} from '@shared/domain'; -import { AuthorizationService, Action } from '@modules/authorization'; +} from '@shared/domain/domainobject'; import { BoardDoAuthorizableService, ContentElementService, SubmissionItemService } from '../service'; import { BaseUc } from './base.uc'; 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.ts b/apps/server/src/modules/group/domain/group.ts index 3d1f19bc312..6dc21d4924d 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 { EntityId } from '@shared/domain'; import { AuthorizableObject, DomainObject } from '@shared/domain/domain-object'; +import { ExternalSource, type UserDO } from '@shared/domain/domainobject'; 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..515206a9579 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 { ExternalSourceEntity, Role, SchoolEntity, SystemEntity, User } from '@shared/domain'; +import { ExternalSource } from '@shared/domain/domainobject'; 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.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.ts b/apps/server/src/modules/group/service/group.service.ts index 0ccded2442b..b2e8ee0a235 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 { EntityId } from '@shared/domain'; +import { type UserDO } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/group/uc/group.uc.ts index f7399fa2fc9..9e682b34ed1 100644 --- a/apps/server/src/modules/group/uc/group.uc.ts +++ b/apps/server/src/modules/group/uc/group.uc.ts @@ -7,14 +7,15 @@ import { RoleDto } from '@modules/role/service/dto/role.dto'; import { SystemDto, SystemService } 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 { EntityId, Permission, SchoolYearEntity, SortOrder, User } from '@shared/domain'; +import { LegacySchoolDo, Page, UserDO } from '@shared/domain/domainobject'; +import { SchoolYearQueryType } from '../controller/dto/interface'; import { Group, GroupUser } from '../domain'; +import { UnknownQueryTypeLoggableException } from '../loggable'; import { GroupService } from '../service'; import { SortHelper } from '../util'; import { ClassInfoDto, ResolvedGroupDto, ResolvedGroupUser } from './dto'; import { GroupUcMapper } from './mapper/group-uc.mapper'; -import { SchoolYearQueryType } from '../controller/dto/interface'; -import { UnknownQueryTypeLoggableException } from '../loggable'; @Injectable() export class GroupUc { 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..cd42c559c4f 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,7 @@ import { Class } from '@modules/class/domain'; import { SystemDto } from '@modules/system'; -import { RoleName, SchoolYearEntity, UserDO } from '@shared/domain'; +import { RoleName, SchoolYearEntity } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; import { Group } from '../../domain'; import { ClassInfoDto, ResolvedGroupDto, ResolvedGroupUser } from '../dto'; import { ClassRootType } from '../dto/class-root-type'; 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..5fd68faa88a 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 { Board, BoardElement, BoardElementType, - ColumnBoard, ColumnboardBoardElement, ColumnBoardTarget, Course, isColumnBoardTarget, isLesson, isTask, - LessonEntity, LessonBoardElement, + LessonEntity, Task, TaskBoardElement, User, } from '@shared/domain'; +import { ColumnBoard } from '@shared/domain/domainobject'; import { BoardExternalReferenceType } from '@shared/domain/domainobject/board/types'; 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/rooms.service.ts b/apps/server/src/modules/learnroom/service/rooms.service.ts index 19ddfd57be8..275fd277faf 100644 --- a/apps/server/src/modules/learnroom/service/rooms.service.ts +++ b/apps/server/src/modules/learnroom/service/rooms.service.ts @@ -3,7 +3,8 @@ 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 { Board, ColumnBoardTarget, EntityId } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; import { BoardRepo } from '@shared/repo'; import { ColumnBoardTargetService } from './column-board-target.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..1b2c71c28d6 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,6 @@ import { Injectable } from '@nestjs/common'; -import { EntityId, LegacySchoolDo, SchoolFeatures } from '@shared/domain'; +import { EntityId, SchoolFeatures } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { LegacySchoolRepo } from '@shared/repo'; import { SchoolValidationService } from './validation'; 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/management/uc/board-management.uc.ts b/apps/server/src/modules/management/uc/board-management.uc.ts index 8fa595690e8..fc00da523d8 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,8 @@ +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 { BoardNode, Course, EntityId, InputFormat } from '@shared/domain'; +import { BoardExternalReferenceType } from '@shared/domain/domainobject'; import { cardNodeFactory, columnBoardNodeFactory, 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/oauth-provider/service/id-token.service.ts b/apps/server/src/modules/oauth-provider/service/id-token.service.ts index 998ff46f15f..3f95231f1a6 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 { TeamEntity } from '@shared/domain'; +import { LtiToolDO, Pseudonym, UserDO } from '@shared/domain/domainobject'; +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/uc/oauth-provider.login-flow.uc.ts b/apps/server/src/modules/oauth-provider/uc/oauth-provider.login-flow.uc.ts index cfe208c477c..c8e5909b452 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,10 @@ 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 { Permission, User } from '@shared/domain'; +import { Pseudonym, UserDO } from '@shared/domain/domainobject'; +import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do'; import { OauthProviderLoginFlowService } from '../service/oauth-provider.login-flow.service'; @Injectable() diff --git a/apps/server/src/modules/oauth/service/oauth.service.ts b/apps/server/src/modules/oauth/service/oauth.service.ts index 299198ef33a..633bef2cc46 100644 --- a/apps/server/src/modules/oauth/service/oauth.service.ts +++ b/apps/server/src/modules/oauth/service/oauth.service.ts @@ -7,7 +7,8 @@ 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, OauthConfig, SchoolFeatures, UserDO } from '@shared/domain'; +import { EntityId, OauthConfig, SchoolFeatures } from '@shared/domain'; +import { LegacySchoolDo, UserDO } from '@shared/domain/domainobject'; import { LegacyLogger } from '@src/core/logger'; import jwt, { JwtPayload } from 'jsonwebtoken'; import { OAuthTokenDto } from '../interface'; 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..5981ecd828b 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 { RoleName } from '@shared/domain'; +import { LegacySchoolDo, UserDO } from '@shared/domain/domainobject'; import { ExternalSchoolDto, ExternalUserDto } from '../../dto'; export class IservMapper { 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..a4ca1d606ab 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,11 @@ -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 { RoleName, User } from '@shared/domain'; +import { LegacySchoolDo, RoleReference, UserDO } from '@shared/domain/domainobject'; +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.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.ts b/apps/server/src/modules/provisioning/strategy/oidc/service/oidc-provisioning.service.ts index 52b0e7472e2..0d8e18a2428 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,8 @@ 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 { EntityId, FederalStateEntity, SchoolFeatures, SchoolYearEntity } from '@shared/domain'; +import { ExternalSource, LegacySchoolDo, RoleReference, UserDO } from '@shared/domain/domainobject'; import { Logger } from '@src/core/logger'; import { ObjectId } from 'bson'; import CryptoJS from 'crypto-js'; 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/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.ts b/apps/server/src/modules/pseudonym/repo/external-tool-pseudonym.repo.ts index 65ef03cd539..ae8587a55ae 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,7 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; import { Injectable } from '@nestjs/common'; -import { EntityId, IFindOptions, Page, Pagination, Pseudonym } from '@shared/domain'; +import { EntityId, IFindOptions, Pagination } from '@shared/domain'; +import { Page, Pseudonym } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.ts index c4e40535ddb..1d9cd4b5491 100644 --- a/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.ts +++ b/apps/server/src/modules/pseudonym/repo/pseudonyms.repo.ts @@ -1,9 +1,8 @@ import { EntityManager, ObjectId } from '@mikro-orm/mongodb'; -import { Injectable } from '@nestjs/common'; -import { EntityId, Pseudonym } from '@shared/domain'; +import { EntityId } from '@shared/domain'; +import { Pseudonym } from '@shared/domain/domainobject'; import { PseudonymEntity, PseudonymEntityProps } from '../entity'; -@Injectable() export class PseudonymsRepo { constructor(private readonly em: EntityManager) {} 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..2f660371aa6 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,10 @@ 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 { Course, EntityId, RoleName } from '@shared/domain'; +import { Pseudonym, RoleReference, UserDO } from '@shared/domain/domainobject'; import { PseudonymService } from './pseudonym.service'; interface UserMetdata { diff --git a/apps/server/src/modules/pseudonym/service/pseudonym.service.ts b/apps/server/src/modules/pseudonym/service/pseudonym.service.ts index 6d15d6a1ec9..2c5e007e13b 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 { IFindOptions } from '@shared/domain'; +import { LtiToolDO, Page, Pseudonym, UserDO } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/pseudonym/uc/pseudonym.uc.ts index 4c0ecb19a36..a5f1fd6641c 100644 --- a/apps/server/src/modules/pseudonym/uc/pseudonym.uc.ts +++ b/apps/server/src/modules/pseudonym/uc/pseudonym.uc.ts @@ -1,8 +1,9 @@ -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 { EntityId, User } from '@shared/domain'; +import { LegacySchoolDo, Pseudonym } from '@shared/domain/domainobject'; import { PseudonymService } from '../service'; @Injectable() 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..4173a97a55c 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 @@ -4,7 +4,8 @@ import { BoardDoAuthorizableService, ContentElementService } from '@modules/boar 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 { Course, EntityId, User } from '@shared/domain'; +import { BoardDoAuthorizable, LegacySchoolDo } from '@shared/domain/domainobject'; 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/external-tool/controller/tool.controller.ts b/apps/server/src/modules/tool/external-tool/controller/tool.controller.ts index b534b01b83b..8644397ec4b 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 { IFindOptions } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; 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/service/external-tool-configuration.service.ts b/apps/server/src/modules/tool/external-tool/service/external-tool-configuration.service.ts index 3d021c592fc..0dbb93669bd 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 { EntityId } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; 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.service.ts b/apps/server/src/modules/tool/external-tool/service/external-tool.service.ts index 8fb5d8e4387..a302a4443d8 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,8 @@ 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 { EntityId, IFindOptions } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; 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.uc.ts b/apps/server/src/modules/tool/external-tool/uc/external-tool.uc.ts index 9880994272a..67f33dd32bc 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,14 @@ -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 { EntityId, IFindOptions, Permission, User } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; 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/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..4c9faeea573 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,9 @@ 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 { Course, EntityId } from '@shared/domain'; +import { AnyContentElementDo, BoardExternalReferenceType, ColumnBoard } from '@shared/domain/domainobject'; + 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.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/lti11-tool-launch.strategy.ts b/apps/server/src/modules/tool/tool-launch/service/launch-strategy/lti11-tool-launch.strategy.ts index fca44aaf90b..781399a8375 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,8 @@ 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 { EntityId, LtiPrivacyPermission, RoleName } from '@shared/domain'; +import { Pseudonym, RoleReference, UserDO } from '@shared/domain/domainobject'; import { Authorization } from 'oauth-1.0a'; import { LtiRole } from '../../../common/enum'; import { ExternalTool } from '../../../external-tool/domain'; 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 a9290bb5e42..83414a81167 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 @@ -12,7 +12,6 @@ import { IFindOptions, IImportUserScope, ImportUser, - LegacySchoolDo, MatchCreator, MatchCreatorScope, NameMatch, @@ -21,6 +20,7 @@ import { SystemEntity, User, } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { ImportUserRepo, SystemRepo, 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/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..aba5a0f8312 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 { EntityId } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; 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..a426a7efa24 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 { EntityId } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Loggable, LogMessage } from '@src/core/logger'; export class UserMigrationSuccessfulLoggable 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/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.ts b/apps/server/src/modules/user-login-migration/service/migration-check.service.ts index 4c30cc2f8c0..5d366b89e2e 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 { EntityId } from '@shared/domain'; +import { LegacySchoolDo, UserDO, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationRepo } from '@shared/repo'; @Injectable() 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.ts b/apps/server/src/modules/user-login-migration/service/user-login-migration-revert.service.ts index 6d6512bc700..bf7842d9bf0 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 { SchoolFeatures } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationService } from './user-login-migration.service'; @Injectable() 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 459b163f119..7399448ab3f 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,8 @@ import { LegacySchoolService } from '@modules/legacy-school'; import { SystemDto, SystemService } 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 { EntityId, SchoolFeatures, SystemTypeEnum } from '@shared/domain'; +import { LegacySchoolDo, UserDO, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { UserLoginMigrationRepo } from '@shared/repo'; import { UserLoginMigrationAlreadyClosedLoggableException, 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..f4d75adaa79 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,7 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { EntityId, Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { EntityId, Permission, User } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/user-login-migration/uc/restart-user-login-migration.uc.ts index 60be2ca956b..a16fbe0aab0 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,7 @@ import { AuthorizationContextBuilder, AuthorizationService } from '@modules/authorization'; import { Injectable } from '@nestjs/common/decorators/core/injectable.decorator'; -import { Permission, User, UserLoginMigrationDO } from '@shared/domain'; +import { Permission, User } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/user-login-migration/uc/start-user-login-migration.uc.ts index 1bf47635d83..a4cfe99a57f 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,8 @@ 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 { EntityId, Permission, User } from '@shared/domain'; +import { LegacySchoolDo, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Logger } from '@src/core/logger'; import { SchoolNumberMissingLoggableException, 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..87f30c7a231 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,8 @@ 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 { EntityId, Permission, User } from '@shared/domain/'; +import { LegacySchoolDo, UserLoginMigrationDO } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/user-login-migration/uc/user-login-migration.uc.ts index 8314cbfd455..d5833a4bc56 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,11 @@ 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 { EntityId, Permission, User } from '@shared/domain'; +import { LegacySchoolDo, Page, UserLoginMigrationDO } from '@shared/domain/domainobject'; import { Logger } from '@src/core/logger'; import { ExternalSchoolNumberMissingLoggableException, 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..e7cbb5f4c80 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 @@ -9,16 +9,13 @@ import { 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 { TeamsRepo, VideoConferenceRepo } from '@shared/repo'; import { BBBRole } from '../bbb'; import { ErrorStatus } from '../error'; 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..16bb61375c4 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 { EntityId } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; import { BBBBaseMeetingConfig, BBBCreateConfigBuilder, 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..744438bcbc0 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,18 +8,8 @@ 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 { Course, EntityId, Permission, RoleName, SchoolFeatures, TeamEntity, TeamUserEntity } from '@shared/domain'; +import { UserDO, VideoConferenceDO, VideoConferenceOptionsDO } from '@shared/domain/domainobject'; import { VideoConferenceScope } from '@shared/domain/interface'; import { TeamsRepo } from '@shared/repo'; import { VideoConferenceRepo } from '@shared/repo/videoconference/video-conference.repo'; 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..b27c165b0bc 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 { EntityId } from '@shared/domain'; +import { UserDO } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/video-conference/uc/video-conference-info.uc.ts index 7e39db7bb7b..3d430907ac5 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 { EntityId } from '@shared/domain'; +import { UserDO, VideoConferenceDO, VideoConferenceOptionsDO } from '@shared/domain/domainobject'; 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.ts b/apps/server/src/modules/video-conference/uc/video-conference-join.uc.ts index 2015c20d381..e878f4f7af9 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 { EntityId } from '@shared/domain'; +import { UserDO, VideoConferenceDO } from '@shared/domain/domainobject'; 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/domain/domainobject/board/submission-item.do.ts b/apps/server/src/shared/domain/domainobject/board/submission-item.do.ts index 4a96e562bb4..77e4c88e048 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 { EntityId } from '@shared/domain'; +import { FileElement, isFileElement, isRichTextElement, RichTextElement } from '@shared/domain/domainobject'; import { BoardComposite, BoardCompositeProps } from './board-composite.do'; import type { AnyBoardDo, BoardCompositeVisitor, BoardCompositeVisitorAsync } from './types'; diff --git a/apps/server/src/shared/domain/index.ts b/apps/server/src/shared/domain/index.ts index 8224960a713..77aa1c69282 100644 --- a/apps/server/src/shared/domain/index.ts +++ b/apps/server/src/shared/domain/index.ts @@ -1,4 +1,4 @@ -export * from './domainobject'; +// export * from './domainobject'; export * from './entity'; export * from './interface'; export * from './service'; diff --git a/apps/server/src/shared/repo/base.do.repo.ts b/apps/server/src/shared/repo/base.do.repo.ts index 28fc8bf4d01..6b60ca31011 100644 --- a/apps/server/src/shared/repo/base.do.repo.ts +++ b/apps/server/src/shared/repo/base.do.repo.ts @@ -1,7 +1,8 @@ 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 { BaseEntity, baseEntityProperties, EntityId } from '@shared/domain'; +import { BaseDO } from '@shared/domain/domainobject'; import { LegacyLogger } from '@src/core/logger'; @Injectable() 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..d8e066b2f77 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 { IFindOptions, Pagination, SortOrder } from '@shared/domain'; +import { Page } from '@shared/domain/domainobject'; 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/school/legacy-school.repo.ts b/apps/server/src/shared/repo/school/legacy-school.repo.ts index a8b5265a5c4..b6c4b26383d 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,8 @@ 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 { EntityId, SchoolEntity, SchoolProperties, SystemEntity, UserLoginMigrationEntity } from '@shared/domain'; +import { LegacySchoolDo } from '@shared/domain/domainobject'; import { LegacyLogger } from '@src/core/logger'; import { BaseDORepo } from '../base.do.repo'; 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..239a37d1de8 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,7 +1,8 @@ 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 { EntityId, SchoolEntity, SystemEntity } from '@shared/domain'; +import { UserLoginMigrationDO } from '@shared/domain/domainobject'; import { IUserLoginMigration, UserLoginMigrationEntity } from '@shared/domain/entity/user-login-migration.entity'; import { LegacyLogger } from '@src/core/logger'; import { BaseDORepo } from '../base.do.repo'; 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..587deb763ee 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 { IVideoConferenceProperties } from '@shared/domain'; +import { VideoConferenceDO } from '@shared/domain/domainobject'; 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/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..3e74f5aefe8 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 { InputFormat } from '@shared/domain'; +import { RichTextElement, RichTextElementProps } 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-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..2799ba188af 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 { LtiPrivacyPermission } from '@shared/domain'; +import { LtiToolDO } from '@shared/domain/domainobject'; 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/video-conference.do.factory.ts b/apps/server/src/shared/testing/factory/video-conference.do.factory.ts index 34e0cb70082..bbed6de812a 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 { VideoConferenceScope } from '@shared/domain'; +import { VideoConferenceDO } from '@shared/domain/domainobject'; import { BaseFactory } from '@shared/testing'; -import { VideoConferenceDO, VideoConferenceScope } from '@shared/domain'; export const videoConferenceDOFactory: BaseFactory = BaseFactory.define< VideoConferenceDO,