removed export * from './domainobject'

apps/server/src/infra/collaborative-storage/strategy/nextcloud/nextcloud.strategy.ts

@@ -4,7 +4,7 @@ import { ExternalTool } from '@modules/tool/external-tool/domain';
 import { ExternalToolService } from '@modules/tool/external-tool/service';
 import { UserService } from '@modules/user';
 import { Injectable, UnprocessableEntityException } from '@nestjs/common';
-import { Pseudonym, UserDO } from '@shared/domain/';
+import { Pseudonym, UserDO } from '@shared/domain/domainobject';
 import { LtiToolDO } from '@shared/domain/domainobject/ltitool.do';
 import { LtiToolRepo } from '@shared/repo/ltitool/';
 import { LegacyLogger } from '@src/core/logger';

apps/server/src/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';

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.

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 {

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,

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 {

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<AuthorizableObject | BaseDO>;

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<T = AuthorizableObject | BaseDO> {

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

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

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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

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<T = AnyBoardDo> {

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

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

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 {

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

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

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

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

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

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

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

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<string, BoardNode[]> = {};

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

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

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 = {

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

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