Cleanup import / exports

apps/server/src/modules/authorization/domain/index.ts

@@ -1,3 +1,4 @@
 export * from './service';
 export * from './mapper';
 export * from './error';
+export * from './type';

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

@@ -3,7 +3,7 @@ import { NotFoundException } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
 import { courseFactory, setupEntities, userFactory } from '@shared/testing';
 import { ObjectId } from 'bson';
-import { AuthorizableReferenceType } from '../types';
+import { AuthorizableReferenceType } from '../type';
 import { AuthorizationService } from './authorization.service';
 import { ReferenceLoader } from './reference.loader';
 import { AuthorizationContextBuilder } from '../mapper/authorization-context.builder';

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

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { EntityId } from '@shared/domain';
 import { ReferenceLoader } from './reference.loader';
 import { AuthorizationContext } from '../../type';
-import { AuthorizableReferenceType } from '../types';
+import { AuthorizableReferenceType } from '../type';
 import { ForbiddenLoggableException } from '../error';
 import { AuthorizationService } from './authorization.service';
 

apps/server/src/modules/authorization/domain/service/index.ts

@@ -1,4 +1,3 @@
-export * from '../types';
 export * from './authorization.service';
 export * from './authorization.helper';
 export * from './rule-manager';

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

@@ -18,7 +18,7 @@ import { setupEntities, userFactory } from '@shared/testing';
 import { BoardDoAuthorizableService } from '@src/modules/board';
 import { ContextExternalToolAuthorizableService } from '@src/modules/tool/context-external-tool/service/context-external-tool-authorizable.service';
 import { ReferenceLoader } from './reference.loader';
-import { AuthorizableReferenceType } from '../types';
+import { AuthorizableReferenceType } from '../type';
 
 describe('reference.loader', () => {
 	let service: ReferenceLoader;

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

@@ -14,7 +14,7 @@ import {
 } from '@shared/repo';
 import { BoardDoAuthorizableService } from '@src/modules/board/service';
 import { ContextExternalToolAuthorizableService } from '@src/modules/tool/context-external-tool/service';
-import { AuthorizableReferenceType } from '../types';
+import { AuthorizableReferenceType } from '../type';
 
 type RepoType =
 	| TaskRepo

apps/server/src/modules/board/uc/board.uc.ts

@@ -9,7 +9,7 @@ import {
 	EntityId,
 } from '@shared/domain';
 import { LegacyLogger } from '@src/core/logger';
-import { AuthorizationService } from '@src/modules/authorization/domain/service/authorization.service';
+import { AuthorizationService } from '@src/modules/authorization/domain';
 import { Action } from '@src/modules/authorization/type/action.enum';
 import { CardService, ColumnBoardService, ColumnService } from '../service';
 import { BoardDoAuthorizableService } from '../service/board-do-authorizable.service';

apps/server/src/modules/board/uc/card.uc.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { AnyBoardDo, AnyContentElementDo, Card, ContentElementType, EntityId } from '@shared/domain';
 import { LegacyLogger } from '@src/core/logger';
-import { AuthorizationService } from '@src/modules/authorization/domain/service/authorization.service';
+import { AuthorizationService } from '@src/modules/authorization';
 import { Action } from '@src/modules/authorization/type/action.enum';
 import { BoardDoAuthorizableService, CardService, ContentElementService } from '../service';
 

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

@@ -1,6 +1,6 @@
 import { NotImplementedException } from '@nestjs/common';
 import { fileRecordFactory, setupEntities } from '@shared/testing';
-import { AuthorizableReferenceType } from '@src/modules/authorization/domain/types';
+import { AuthorizableReferenceType } from '@src/modules/authorization/domain/type';
 import {
 	DownloadFileParams,
 	FileRecordListResponse,

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

@@ -1,5 +1,5 @@
 import { NotImplementedException, StreamableFile } from '@nestjs/common';
-import { AuthorizableReferenceType } from '@src/modules/authorization/domain/types';
+import { AuthorizableReferenceType } from '@src/modules/authorization/domain/type';
 import { plainToClass } from 'class-transformer';
 import {
 	DownloadFileParams,

apps/server/src/modules/learnroom/uc/course-copy.uc.spec.ts

@@ -4,9 +4,9 @@ import { ForbiddenException, InternalServerErrorException } from '@nestjs/common
 import { Test, TestingModule } from '@nestjs/testing';
 import { Permission } from '@shared/domain';
 import { courseFactory, setupEntities, userFactory } from '@shared/testing';
-import { AuthorizableReferenceType } from '@src/modules/authorization/domain/types';
+import { AuthorizableReferenceType } from '@src/modules/authorization/domain/type';
 import { AuthorizationContextBuilder } from '@src/modules/authorization';
-import { AuthorizationReferenceService } from '@src/modules/authorization/domain/service';
+import { AuthorizationReferenceService } from '@src/modules/authorization/domain';
 import { CopyElementType, CopyStatusEnum } from '@src/modules/copy-helper';
 import { CourseCopyService } from '../service';
 import { CourseCopyUC } from './course-copy.uc';

apps/server/src/modules/learnroom/uc/course-copy.uc.ts

@@ -2,7 +2,7 @@ import { Configuration } from '@hpi-schul-cloud/commons';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { EntityId, Permission } from '@shared/domain';
 import { AuthorizationContextBuilder } from '@src/modules/authorization';
-import { AuthorizationReferenceService, AuthorizableReferenceType } from '@src/modules/authorization/domain/service';
+import { AuthorizationReferenceService, AuthorizableReferenceType } from '@src/modules/authorization/domain';
 import { CopyStatus } from '@src/modules/copy-helper';
 import { CourseCopyService } from '../service';
 

apps/server/src/modules/learnroom/uc/course-export.uc.spec.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { CommonCartridgeExportService } from '@src/modules/learnroom/service/common-cartridge-export.service';
-import { AuthorizationReferenceService } from '@src/modules/authorization/domain/service';
+import { AuthorizationReferenceService } from '@src/modules/authorization/domain';
 import { ObjectId } from 'bson';
 import { ForbiddenException } from '@nestjs/common';
 import { CourseExportUc } from './course-export.uc';

apps/server/src/modules/learnroom/uc/course-export.uc.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { EntityId, Permission } from '@shared/domain';
 import { AuthorizationContextBuilder } from '@src/modules/authorization';
-import { AuthorizationReferenceService, AuthorizableReferenceType } from '@src/modules/authorization/domain/service';
+import { AuthorizationReferenceService, AuthorizableReferenceType } from '@src/modules/authorization/domain';
 import { CommonCartridgeVersion } from '../common-cartridge';
 import { CommonCartridgeExportService } from '../service/common-cartridge-export.service';
 

apps/server/src/modules/learnroom/uc/room-board-dto.factory.ts

@@ -14,8 +14,7 @@ import {
 	TaskWithStatusVo,
 	User,
 } from '@shared/domain';
-import { AuthorizationService } from '@src/modules/authorization/domain/service/authorization.service';
-import { Action } from '@src/modules/authorization/type/action.enum';
+import { AuthorizationService, Action } from '@src/modules/authorization';
 import {
 	ColumnBoardMetaData,
 	LessonMetaData,

apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { OauthProviderService } from '@shared/infra/oauth-provider/index';
 import { Permission, User } from '@shared/domain/index';
-import { AuthorizationService } from '@src/modules/authorization/domain/service/authorization.service';
+import { AuthorizationService } from '@src/modules/authorization';
 import { ProviderOauthClient } from '@shared/infra/oauth-provider/dto';
 import { ICurrentUser } from '@src/modules/authentication';
 

apps/server/src/modules/sharing/mapper/context-type.mapper.spec.ts

@@ -1,5 +1,5 @@
 import { NotImplementedException } from '@nestjs/common';
-import { AuthorizableReferenceType } from '@src/modules/authorization/domain/types';
+import { AuthorizableReferenceType } from '@src/modules/authorization/domain/type';
 import { ShareTokenContextType } from '../domainobject/share-token.do';
 import { ShareTokenContextTypeMapper } from './context-type.mapper';
 

apps/server/src/modules/sharing/mapper/context-type.mapper.ts

@@ -1,5 +1,5 @@
 import { NotImplementedException } from '@nestjs/common';
-import { AuthorizableReferenceType } from '@src/modules/authorization/domain/types';
+import { AuthorizableReferenceType } from '@src/modules/authorization/domain/type';
 import { ShareTokenContextType } from '../domainobject/share-token.do';
 
 export class ShareTokenContextTypeMapper {

apps/server/src/modules/sharing/mapper/parent-type.mapper.spec.ts

@@ -1,5 +1,5 @@
 import { NotImplementedException } from '@nestjs/common';
-import { AuthorizableReferenceType } from '@src/modules/authorization/domain/types';
+import { AuthorizableReferenceType } from '@src/modules/authorization/domain/type';
 import { ShareTokenParentType } from '../domainobject/share-token.do';
 import { ShareTokenParentTypeMapper } from './parent-type.mapper';
 

apps/server/src/modules/sharing/mapper/parent-type.mapper.ts

@@ -1,5 +1,5 @@
 import { NotImplementedException } from '@nestjs/common';
-import { AuthorizableReferenceType } from '@src/modules/authorization/domain/types';
+import { AuthorizableReferenceType } from '@src/modules/authorization/domain/type';
 import { ShareTokenParentType } from '../domainobject/share-token.do';
 
 export class ShareTokenParentTypeMapper {

apps/server/src/modules/sharing/uc/share-token.uc.ts

@@ -3,7 +3,7 @@ import { BadRequestException, Injectable, InternalServerErrorException, NotImple
 import { EntityId, Permission } from '@shared/domain';
 import { LegacyLogger } from '@src/core/logger';
 import { AuthorizationContextBuilder, AuthorizationService } from '@src/modules/authorization';
-import { AuthorizationReferenceService } from '@src/modules/authorization/domain/service';
+import { AuthorizationReferenceService } from '@src/modules/authorization/domain';
 import { CopyStatus } from '@src/modules/copy-helper';
 import { CourseCopyService } from '@src/modules/learnroom';
 import { CourseService } from '@src/modules/learnroom/service';

apps/server/src/modules/tool/common/mapper/context-type.mapper.ts

@@ -1,4 +1,4 @@
-import { AuthorizableReferenceType } from '@src/modules/authorization/domain/types';
+import { AuthorizableReferenceType } from '@src/modules/authorization/domain/type';
 import { ToolContextType } from '../enum';
 
 const typeMapping: Record<ToolContextType, AuthorizableReferenceType> = {

apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts

@@ -20,9 +20,9 @@ import { TeamsRepo, VideoConferenceRepo } from '@shared/repo';
 import { roleFactory, setupEntities, userDoFactory } from '@shared/testing';
 import { teamFactory } from '@shared/testing/factory/team.factory';
 import { LegacySchoolService, UserService } from '@src/modules';
-import { AuthorizationReferenceService } from '@src/modules/authorization/domain/service';
+import { AuthorizationReferenceService } from '@src/modules/authorization/domain';
 import { ICurrentUser } from '@src/modules/authentication';
-import { CourseService } from '@src/modules/learnroom/service';
+import { CourseService } from '@src/modules/learnroom';
 import { IScopeInfo, VideoConference, VideoConferenceJoin, VideoConferenceState } from './dto';
 import { VideoConferenceDeprecatedUc } from './video-conference-deprecated.uc';
 import {

apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.ts

@@ -19,7 +19,7 @@ import { TeamsRepo } from '@shared/repo';
 import { VideoConferenceRepo } from '@shared/repo/videoconference/video-conference.repo';
 import { ICurrentUser } from '@src/modules/authentication';
 import { Action, AuthorizationContextBuilder } from '@src/modules/authorization';
-import { AuthorizationReferenceService, AuthorizableReferenceType } from '@src/modules/authorization/domain/service';
+import { AuthorizationReferenceService, AuthorizableReferenceType } from '@src/modules/authorization/domain';
 import { LegacySchoolService } from '@src/modules/legacy-school';
 import { CourseService } from '@src/modules/learnroom/service/course.service';
 import { UserService } from '@src/modules/user';