Merge branch 'main' into N21-1993-load-metadata-from-media-source

apps/server/src/modules/authorization-reference/authorization-reference.module.ts

@@ -2,10 +2,10 @@ import { LoggerModule } from '@core/logger';
 import { AuthorizationModule } from '@modules/authorization';
 import { InstanceModule } from '@modules/instance';
 import { LegacySchoolRepo } from '@modules/legacy-school/repo';
+import { TaskRepo } from '@modules/task/repo';
 import { UserModule } from '@modules/user';
 import { Module } from '@nestjs/common';
 import { SubmissionRepo } from '@shared/repo/submission';
-import { TaskRepo } from '@shared/repo/task';
 import { AuthorizationReferenceService, ReferenceLoader } from './domain';
 
 /**

apps/server/src/modules/authorization-reference/domain/reference.loader.spec.ts

@@ -3,13 +3,13 @@ import { ObjectId } from '@mikro-orm/mongodb';
 import { AuthorizableReferenceType, AuthorizationInjectionService } from '@modules/authorization';
 import { InstanceService } from '@modules/instance';
 import { LegacySchoolRepo } from '@modules/legacy-school/repo';
+import { TaskRepo } from '@modules/task/repo';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';
 import { NotImplementedException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { EntityId } from '@shared/domain/types';
 import { SubmissionRepo } from '@shared/repo/submission';
-import { TaskRepo } from '@shared/repo/task';
 import { setupEntities } from '@testing/database';
 import { ReferenceLoader } from './reference.loader';
 

apps/server/src/modules/authorization-reference/domain/reference.loader.ts

@@ -6,12 +6,12 @@ import {
 } from '@modules/authorization';
 import { InstanceService } from '@modules/instance';
 import { LegacySchoolRepo } from '@modules/legacy-school/repo';
+import { TaskRepo } from '@modules/task/repo';
 import { Injectable, NotImplementedException } from '@nestjs/common';
 import { AuthorizableObject } from '@shared/domain/domain-object';
 import { BaseDO } from '@shared/domain/domainobject';
 import { EntityId } from '@shared/domain/types';
 import { SubmissionRepo } from '@shared/repo/submission';
-import { TaskRepo } from '@shared/repo/task';
 
 @Injectable()
 export class ReferenceLoader {

apps/server/src/modules/authorization-rules/rules/lesson.rule.spec.ts

@@ -10,11 +10,12 @@ import { CourseEntity, CourseGroupEntity } from '@modules/course/repo';
 import { courseEntityFactory, courseGroupEntityFactory } from '@modules/course/testing';
 import { LessonEntity } from '@modules/lesson/repository';
 import { lessonFactory } from '@modules/lesson/testing';
+import { Task } from '@modules/task/repo';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';
 import { NotImplementedException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { Permission, RoleName } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
 import { roleFactory } from '@testing/factory/role.factory';

apps/server/src/modules/authorization-rules/rules/submission.rule.spec.ts

@@ -7,16 +7,17 @@ import {
 import { CourseEntity, CourseGroupEntity } from '@modules/course/repo';
 import { courseEntityFactory, courseGroupEntityFactory } from '@modules/course/testing';
 import { LessonEntity } from '@modules/lesson/repository';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';
 import { NotImplementedException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { Permission } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
 import { roleFactory } from '@testing/factory/role.factory';
 import { submissionFactory } from '@testing/factory/submission.factory';
-import { taskFactory } from '@testing/factory/task.factory';
 import { CourseGroupRule } from './course-group.rule';
 import { CourseRule } from './course.rule';
 import { LessonRule } from './lesson.rule';

apps/server/src/modules/authorization-rules/rules/task.rule.spec.ts

@@ -4,14 +4,15 @@ import { CourseEntity, CourseGroupEntity } from '@modules/course/repo';
 import { courseEntityFactory } from '@modules/course/testing';
 import { LessonEntity } from '@modules/lesson/repository';
 import { lessonFactory } from '@modules/lesson/testing';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { Permission, RoleName } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
 import { roleFactory } from '@testing/factory/role.factory';
-import { taskFactory } from '@testing/factory/task.factory';
 import { CourseGroupRule } from './course-group.rule';
 import { CourseRule } from './course.rule';
 import { LessonRule } from './lesson.rule';

apps/server/src/modules/authorization-rules/rules/task.rule.ts

@@ -5,9 +5,9 @@ import {
 	AuthorizationInjectionService,
 	Rule,
 } from '@modules/authorization';
+import { Task } from '@modules/task/repo';
 import { User } from '@modules/user/repo';
 import { Injectable } from '@nestjs/common';
-import { Task } from '@shared/domain/entity';
 import { CourseRule } from './course.rule';
 import { LessonRule } from './lesson.rule';
 

apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.spec.ts

@@ -7,7 +7,6 @@ import {
 	AuthorizationInjectionService,
 } from '@modules/authorization';
 import { schoolEntityFactory } from '@modules/school/testing';
-import { UserLoginMigrationDO } from '@modules/user-login-migration/domain';
 import { userLoginMigrationDOFactory } from '@modules/user-login-migration/testing';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';
@@ -87,7 +86,7 @@ describe('UserLoginMigrationRule', () => {
 			it('should return false', () => {
 				const { user, notUserLoginMigration } = setup();
 
-				const result = rule.isApplicable(user, notUserLoginMigration as unknown as UserLoginMigrationDO);
+				const result = rule.isApplicable(user, notUserLoginMigration);
 
 				expect(result).toEqual(false);
 			});

apps/server/src/modules/authorization-rules/rules/user-login-migration.rule.ts

@@ -1,5 +1,5 @@
 import { AuthorizationContext, AuthorizationHelper, AuthorizationInjectionService, Rule } from '@modules/authorization';
-import { UserLoginMigrationDO } from '@modules/user-login-migration/domain';
+import { UserLoginMigrationDO } from '@modules/user-login-migration';
 import { User } from '@modules/user/repo';
 import { Injectable } from '@nestjs/common';
 

apps/server/src/modules/authorization/domain/service/authorization.helper.spec.ts

@@ -1,13 +1,14 @@
 import { CourseEntity, CourseGroupEntity } from '@modules/course/repo';
 import { courseEntityFactory, courseFactory } from '@modules/course/testing';
 import { LessonEntity } from '@modules/lesson/repository';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { User } from '@modules/user/repo';
 import { userFactory } from '@modules/user/testing';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { Permission, RoleName } from '@shared/domain/interface';
 import { setupEntities } from '@testing/database';
 import { roleFactory } from '@testing/factory/role.factory';
-import { taskFactory } from '@testing/factory/task.factory';
 import { AuthorizationHelper } from './authorization.helper';
 
 describe('AuthorizationHelper', () => {

apps/server/src/modules/board/board.entity.imports.ts

@@ -36,6 +36,7 @@ import {
 } from '@modules/school/repo';
 import { ShareToken } from '@modules/sharing/entity/share-token.entity';
 import { SystemEntity } from '@modules/system/repo';
+import { Task } from '@modules/task/repo';
 import { ContextExternalToolEntity, LtiDeepLinkTokenEntity } from '@modules/tool/context-external-tool/repo';
 import { ExternalToolEntity } from '@modules/tool/external-tool/repo';
 import { SchoolExternalToolEntity } from '@modules/tool/school-external-tool/repo';
@@ -48,7 +49,6 @@ import { CourseNews, News, SchoolNews, TeamNews } from '@shared/domain/entity/ne
 import { Role } from '@shared/domain/entity/role.entity';
 import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.entity';
 import { Submission } from '@shared/domain/entity/submission.entity';
-import { Task } from '@shared/domain/entity/task.entity';
 import { TeamEntity, TeamUserEntity } from '@shared/domain/entity/team.entity';
 import { VideoConference } from '@shared/domain/entity/video-conference.entity';
 

apps/server/src/modules/copy-helper/mapper/copy.mapper.spec.ts

@@ -2,11 +2,11 @@ import { ObjectId } from '@mikro-orm/mongodb';
 import { CopyElementType, CopyStatusEnum } from '@modules/copy-helper';
 import { LessonCopyApiParams } from '@modules/learnroom/controller/dto/lesson/lesson-copy.params';
 import { LessonCopyParentParams } from '@modules/lesson';
-import { TaskCopyApiParams } from '@modules/task/controller/dto/task-copy.params';
-import { TaskCopyParentParams } from '@modules/task/types';
+import { TaskCopyApiParams } from '@modules/task/api/dto/task-copy.params';
 import { Test, TestingModule } from '@nestjs/testing';
 import { CopyApiResponse } from '../dto/copy.response';
 import { CopyMapper } from './copy.mapper';
+import { TaskCopyParentParams } from '@modules/task/api/dto';
 
 describe('copy mapper', () => {
 	let module: TestingModule;

apps/server/src/modules/copy-helper/mapper/copy.mapper.ts

@@ -2,9 +2,9 @@ import { ColumnBoard } from '@modules/board/domain/colum-board.do';
 import { LessonCopyApiParams } from '@modules/learnroom/controller/dto/lesson/lesson-copy.params';
 import { LessonEntity } from '@modules/lesson/repository';
 import { LessonCopyParentParams } from '@modules/lesson/types/lesson-copy-parent.params';
-import { TaskCopyApiParams } from '@modules/task/controller/dto/task-copy.params';
-import { TaskCopyParentParams } from '@modules/task/types/task-copy-parent.params';
-import { Task } from '@shared/domain/entity/task.entity';
+import { TaskCopyParentParams } from '@modules/task/api/dto/task-copy-parent.params';
+import { TaskCopyApiParams } from '@modules/task/api/dto/task-copy.params';
+import { Task } from '@modules/task/repo';
 import { EntityId } from '@shared/domain/types';
 import { CopyApiResponse } from '../dto/copy.response';
 import { CopyStatus, CopyStatusEnum } from '../types/copy.types';

apps/server/src/modules/course/repo/course.entity.ts

@@ -3,9 +3,10 @@ import { ClassEntity } from '@modules/class/entity/class.entity';
 import { GroupEntity } from '@modules/group/entity/group.entity';
 import { LessonParent } from '@modules/lesson/repository';
 import { SchoolEntity } from '@modules/school/repo';
+import { TaskParent } from '@modules/task/repo';
 import { User } from '@modules/user/repo';
 import { InternalServerErrorException } from '@nestjs/common/exceptions/internal-server-error.exception';
-import { BaseEntityWithTimestamps, TaskParent } from '@shared/domain/entity';
+import { BaseEntityWithTimestamps } from '@shared/domain/entity';
 import { EntityWithSchool } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
 // eslint-disable-next-line import/no-cycle

apps/server/src/modules/course/repo/coursegroup.entity.ts

@@ -1,8 +1,9 @@
 import { Collection, Entity, Index, ManyToMany, ManyToOne, Property } from '@mikro-orm/core';
 import { LessonParent } from '@modules/lesson/repository';
 import { SchoolEntity } from '@modules/school/repo';
+import { TaskParent } from '@modules/task/repo';
 import { User } from '@modules/user/repo';
-import { BaseEntityWithTimestamps, TaskParent } from '@shared/domain/entity';
+import { BaseEntityWithTimestamps } from '@shared/domain/entity';
 import { EntityWithSchool } from '@shared/domain/interface';
 import { EntityId } from '@shared/domain/types';
 // eslint-disable-next-line import/no-cycle

apps/server/src/modules/files-storage-client/interfaces/types.ts

@@ -1,5 +1,6 @@
 import { LessonEntity } from '@modules/lesson/repository';
-import { Submission, Task } from '@shared/domain/entity';
+import { Task } from '@modules/task/repo';
+import { Submission } from '@shared/domain/entity';
 
 export type EntitiesWithFiles = Task | LessonEntity | Submission;
 export type EntityWithEmbeddedFiles = Task | LessonEntity;

apps/server/src/modules/files-storage-client/mapper/copy-files-of-parent-param.builder.spec.ts

@@ -4,10 +4,11 @@ import { CourseEntity, CourseGroupEntity } from '@modules/course/repo';
 import { StorageLocation } from '@modules/files-storage/interface';
 import { LessonEntity } from '@modules/lesson/repository';
 import { lessonFactory } from '@modules/lesson/testing';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { User } from '@modules/user/repo';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { setupEntities } from '@testing/database';
-import { taskFactory } from '@testing/factory/task.factory';
 import { CopyFilesOfParentParamBuilder } from './copy-files-of-parent-param.builder';
 import { FileParamBuilder } from './files-storage-param.builder';
 

apps/server/src/modules/files-storage-client/mapper/files-storage-client.mapper.ts

@@ -1,6 +1,7 @@
 import { FileRecordParentType } from '@infra/rabbitmq';
 import { LessonEntity } from '@modules/lesson/repository';
-import { Submission, Task } from '@shared/domain/entity';
+import { Task } from '@modules/task/repo';
+import { Submission } from '@shared/domain/entity';
 import { CopyFileDto, FileDto } from '../dto';
 import { CopyFileDomainObjectProps, EntitiesWithFiles, FileDomainObjectProps } from '../interfaces';
 

apps/server/src/modules/files-storage-client/mapper/files-storage-param.builder.spec.ts

@@ -3,10 +3,11 @@ import { CourseEntity, CourseGroupEntity } from '@modules/course/repo';
 import { StorageLocation } from '@modules/files-storage/interface';
 import { LessonEntity } from '@modules/lesson/repository';
 import { lessonFactory } from '@modules/lesson/testing';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { User } from '@modules/user/repo';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { setupEntities } from '@testing/database';
-import { taskFactory } from '@testing/factory/task.factory';
 import { FileParamBuilder } from './files-storage-param.builder';
 
 describe('FileParamBuilder', () => {

apps/server/src/modules/files-storage-client/service/copy-files.service.spec.ts

@@ -5,9 +5,10 @@ import { courseEntityFactory } from '@modules/course/testing';
 import { ComponentProperties, ComponentType, LessonEntity } from '@modules/lesson/repository';
 import { lessonFactory } from '@modules/lesson/testing';
 import { schoolEntityFactory } from '@modules/school/testing';
+import { Task } from '@modules/task/repo';
 import { User } from '@modules/user/repo';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { setupEntities } from '@testing/database';
 import { legacyFileEntityMockFactory } from '@testing/factory/legacy-file-entity-mock.factory';
 import { CopyFilesService } from './copy-files.service';

apps/server/src/modules/files-storage-client/service/files-storage-client.service.spec.ts

@@ -15,12 +15,13 @@ import { deletionRequestFactory } from '@modules/deletion/domain/testing';
 import { StorageLocation } from '@modules/files-storage/interface';
 import { LessonEntity } from '@modules/lesson/repository';
 import { schoolEntityFactory } from '@modules/school/testing';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { User } from '@modules/user/repo';
 import { EventBus } from '@nestjs/cqrs';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { setupEntities } from '@testing/database';
-import { taskFactory } from '@testing/factory/task.factory';
 import { FileParamBuilder, FilesStorageClientMapper } from '../mapper';
 import { CopyFilesOfParentParamBuilder } from '../mapper/copy-files-of-parent-param.builder';
 import { FilesStorageClientAdapterService } from './files-storage-client.service';

apps/server/src/modules/learnroom/controller/api-test/course-rooms.api.spec.ts

@@ -10,11 +10,11 @@ import { LegacyBoard } from '@modules/learnroom/repo';
 import { boardFactory } from '@modules/learnroom/testing';
 import { lessonFactory } from '@modules/lesson/testing';
 import { ServerTestModule } from '@modules/server/server.app.module';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { INestApplication } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Task } from '@shared/domain/entity';
 import { cleanupCollections } from '@testing/cleanup-collections';
-import { taskFactory } from '@testing/factory/task.factory';
 import { UserAndAccountTestFactory } from '@testing/factory/user-and-account.test.factory';
 import { TestApiClient } from '@testing/test-api-client';
 

apps/server/src/modules/learnroom/mapper/board-taskStatus.mapper.ts

@@ -1,4 +1,4 @@
-import { TaskStatus } from '@shared/domain/types';
+import { TaskStatus } from '@modules/task';
 import { BoardTaskStatusResponse } from '../controller/dto';
 
 export class BoardTaskStatusMapper {

apps/server/src/modules/learnroom/mapper/room-board-response.mapper.spec.ts

@@ -3,10 +3,11 @@ import { BoardLayout } from '@modules/board';
 import { CourseEntity, CourseGroupEntity } from '@modules/course/repo';
 import { courseEntityFactory } from '@modules/course/testing';
 import { LessonEntity } from '@modules/lesson/repository';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { setupEntities } from '@testing/database';
-import { taskFactory } from '@testing/factory/task.factory';
 import { BoardElementResponse, SingleColumnBoardResponse } from '../controller/dto';
 import { ColumnBoardMetaData, RoomBoardDTO, RoomBoardElementTypes } from '../types';
 import { RoomBoardResponseMapper } from './room-board-response.mapper';

apps/server/src/modules/learnroom/mapper/room-board-response.mapper.ts

@@ -1,6 +1,6 @@
 import { CourseEntity } from '@modules/course/repo';
+import { TaskWithStatusVo } from '@modules/task/repo';
 import { Injectable } from '@nestjs/common';
-import { TaskWithStatusVo } from '@shared/domain/entity';
 import {
 	BoardElementResponse,
 	BoardLessonResponse,

apps/server/src/modules/learnroom/repo/mikro-orm/legacy-board-element.entity.ts

@@ -1,6 +1,7 @@
 import { Entity, Enum } from '@mikro-orm/core';
 import { LessonEntity } from '@modules/lesson/repository';
-import { BaseEntityWithTimestamps, Task } from '@shared/domain/entity';
+import { Task } from '@modules/task/repo';
+import { BaseEntityWithTimestamps } from '@shared/domain/entity';
 import { EntityId } from '@shared/domain/types';
 import { ColumnBoardNode } from './column-board-node.entity';
 

apps/server/src/modules/learnroom/repo/mikro-orm/legacy-board.entity.spec.ts

@@ -3,11 +3,12 @@ import { CourseEntity, CourseGroupEntity } from '@modules/course/repo';
 import { courseEntityFactory } from '@modules/course/testing';
 import { LessonEntity } from '@modules/lesson/repository';
 import { lessonFactory } from '@modules/lesson/testing';
+import { Task } from '@modules/task/repo';
+import { taskFactory } from '@modules/task/testing';
 import { User } from '@modules/user/repo';
 import { BadRequestException } from '@nestjs/common';
-import { Material, Submission, Task } from '@shared/domain/entity';
+import { Material, Submission } from '@shared/domain/entity';
 import { setupEntities } from '@testing/database';
-import { taskFactory } from '@testing/factory/task.factory';
 import {
 	boardFactory,
 	columnboardBoardElementFactory,

apps/server/src/modules/learnroom/repo/mikro-orm/legacy-board.entity.ts

@@ -1,8 +1,9 @@
 import { Collection, Entity, IdentifiedReference, ManyToMany, OneToOne, wrap } from '@mikro-orm/core';
 import { CourseEntity } from '@modules/course/repo';
 import { LessonEntity } from '@modules/lesson/repository';
+import { Task } from '@modules/task/repo';
 import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { BaseEntityWithTimestamps, Task } from '@shared/domain/entity';
+import { BaseEntityWithTimestamps } from '@shared/domain/entity';
 import { EntityId } from '@shared/domain/types';
 import { LearnroomElement } from '../../types';
 import { ColumnBoardBoardElement } from './column-board-board-element.entity';