From d436272dce2c2112f3ebef7c4eb63ae0029db708 Mon Sep 17 00:00:00 2001 From: Max Bischof Date: Fri, 7 Mar 2025 12:52:54 +0100 Subject: [PATCH] Remove mikro-orm folder --- .../sync/strategy/tsp/tsp-school.service.spec.ts | 2 +- .../infra/sync/strategy/tsp/tsp-school.service.ts | 2 +- .../media-school-license.entity.mapper.spec.ts | 4 ++-- .../service/media-school-license.service.spec.ts | 2 +- .../repo/{mikro-orm => }/federal-state.entity.ts | 0 .../{mikro-orm => }/federal-state.repo.spec.ts | 0 .../repo/{mikro-orm => }/federal-state.repo.ts | 0 apps/server/src/modules/school/repo/index.ts | 14 +++++++++----- .../mapper/county.embeddable.mapper.spec.ts | 4 ++-- .../mapper/county.embeddable.mapper.ts | 2 +- .../mapper/federal-state.entity.mapper.ts | 2 +- .../school/repo/{mikro-orm => }/mapper/index.ts | 0 .../mapper/school-year.entity.mapper.ts | 2 +- .../mapper/school.entity.mapper.spec.ts | 2 +- .../{mikro-orm => }/mapper/school.entity.mapper.ts | 4 ++-- .../{mikro-orm => }/school-year.entity.spec.ts | 2 +- .../repo/{mikro-orm => }/school-year.entity.ts | 0 .../school-year.repo.integration.spec.ts | 2 +- .../repo/{mikro-orm => }/school-year.repo.ts | 6 +++--- .../school/repo/{mikro-orm => }/school.entity.ts | 3 +-- .../school.repo.integration.spec.ts | 5 ++--- .../school/repo/{mikro-orm => }/school.repo.ts | 2 +- .../repo/{mikro-orm => }/scope/school.scope.ts | 0 apps/server/src/modules/school/school.module.ts | 3 +-- apps/server/src/modules/school/testing/index.ts | 1 + 25 files changed, 33 insertions(+), 31 deletions(-) rename apps/server/src/modules/school/repo/{mikro-orm => }/federal-state.entity.ts (100%) rename apps/server/src/modules/school/repo/{mikro-orm => }/federal-state.repo.spec.ts (100%) rename apps/server/src/modules/school/repo/{mikro-orm => }/federal-state.repo.ts (100%) rename apps/server/src/modules/school/repo/{mikro-orm => }/mapper/county.embeddable.mapper.spec.ts (92%) rename apps/server/src/modules/school/repo/{mikro-orm => }/mapper/county.embeddable.mapper.ts (93%) rename apps/server/src/modules/school/repo/{mikro-orm => }/mapper/federal-state.entity.mapper.ts (91%) rename apps/server/src/modules/school/repo/{mikro-orm => }/mapper/index.ts (100%) rename apps/server/src/modules/school/repo/{mikro-orm => }/mapper/school-year.entity.mapper.ts (91%) rename apps/server/src/modules/school/repo/{mikro-orm => }/mapper/school.entity.mapper.spec.ts (98%) rename apps/server/src/modules/school/repo/{mikro-orm => }/mapper/school.entity.mapper.ts (96%) rename apps/server/src/modules/school/repo/{mikro-orm => }/school-year.entity.spec.ts (86%) rename apps/server/src/modules/school/repo/{mikro-orm => }/school-year.entity.ts (100%) rename apps/server/src/modules/school/repo/{mikro-orm => }/school-year.repo.integration.spec.ts (99%) rename apps/server/src/modules/school/repo/{mikro-orm => }/school-year.repo.ts (88%) rename apps/server/src/modules/school/repo/{mikro-orm => }/school.entity.ts (96%) rename apps/server/src/modules/school/repo/{mikro-orm => }/school.repo.integration.spec.ts (98%) rename apps/server/src/modules/school/repo/{mikro-orm => }/school.repo.ts (99%) rename apps/server/src/modules/school/repo/{mikro-orm => }/scope/school.scope.ts (100%) diff --git a/apps/server/src/infra/sync/strategy/tsp/tsp-school.service.spec.ts b/apps/server/src/infra/sync/strategy/tsp/tsp-school.service.spec.ts index f9ca03657bb..009e3b67dcc 100644 --- a/apps/server/src/infra/sync/strategy/tsp/tsp-school.service.spec.ts +++ b/apps/server/src/infra/sync/strategy/tsp/tsp-school.service.spec.ts @@ -2,7 +2,7 @@ import { faker } from '@faker-js/faker'; import { createMock, DeepMocked } from '@golevelup/ts-jest'; import { School, SchoolService } from '@modules/school'; import { FederalStateService, FileStorageType, SchoolProps, SchoolYearService } from '@modules/school/domain'; -import { FederalStateEntityMapper, SchoolYearEntityMapper } from '@modules/school/repo/mikro-orm/mapper'; +import { FederalStateEntityMapper, SchoolYearEntityMapper } from '@modules/school/repo'; import { federalStateEntityFactory, schoolFactory, schoolYearEntityFactory } from '@modules/school/testing'; import { systemFactory } from '@modules/system/testing'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/apps/server/src/infra/sync/strategy/tsp/tsp-school.service.ts b/apps/server/src/infra/sync/strategy/tsp/tsp-school.service.ts index e28f37571da..664149e263f 100644 --- a/apps/server/src/infra/sync/strategy/tsp/tsp-school.service.ts +++ b/apps/server/src/infra/sync/strategy/tsp/tsp-school.service.ts @@ -3,7 +3,7 @@ import { School, SchoolService } from '@modules/school'; import { FederalState, FederalStateService, FileStorageType, SchoolYearService } from '@modules/school/domain'; import { SchoolFactory } from '@modules/school/domain/factory'; import { SchoolFeature, SchoolPermissions } from '@modules/school/domain/type'; -import { FederalStateEntityMapper, SchoolYearEntityMapper } from '@modules/school/repo/mikro-orm/mapper'; +import { FederalStateEntityMapper, SchoolYearEntityMapper } from '@modules/school/repo'; import { System } from '@modules/system'; import { Injectable } from '@nestjs/common'; import { ObjectId } from 'bson'; diff --git a/apps/server/src/modules/school-license/repo/mapper/media-school-license.entity.mapper.spec.ts b/apps/server/src/modules/school-license/repo/mapper/media-school-license.entity.mapper.spec.ts index 73c4578d740..600368e0dac 100644 --- a/apps/server/src/modules/school-license/repo/mapper/media-school-license.entity.mapper.spec.ts +++ b/apps/server/src/modules/school-license/repo/mapper/media-school-license.entity.mapper.spec.ts @@ -1,8 +1,8 @@ import { MediaSource } from '@modules/media-source'; -import { MediaSourceMapper } from '@modules/media-source/repo'; import { MediaSourceEntity } from '@modules/media-source/entity'; +import { MediaSourceMapper } from '@modules/media-source/repo'; import { School } from '@modules/school'; -import { SchoolEntityMapper } from '@modules/school/repo/mikro-orm/mapper'; +import { SchoolEntityMapper } from '@modules/school/repo'; import { MediaSchoolLicense } from '../../domain'; import { mediaSchoolLicenseEntityFactory, mediaSchoolLicenseFactory } from '../../testing'; import { MediaSchoolLicenseEntityMapper } from './media-school-license.entity.mapper'; diff --git a/apps/server/src/modules/school-license/service/media-school-license.service.spec.ts b/apps/server/src/modules/school-license/service/media-school-license.service.spec.ts index ec121d252a1..729db04306c 100644 --- a/apps/server/src/modules/school-license/service/media-school-license.service.spec.ts +++ b/apps/server/src/modules/school-license/service/media-school-license.service.spec.ts @@ -4,7 +4,7 @@ import { ObjectId } from '@mikro-orm/mongodb'; import { MediaSourceDataFormat, MediaSourceService } from '@modules/media-source'; import { mediaSourceFactory } from '@modules/media-source/testing'; import { SchoolService } from '@modules/school'; -import { FederalStateEntityMapper } from '@modules/school/repo/mikro-orm/mapper'; +import { FederalStateEntityMapper } from '@modules/school/repo'; import { federalStateEntityFactory, schoolFactory } from '@modules/school/testing'; import { ExternalToolMedium } from '@modules/tool/external-tool/domain'; import { Test, TestingModule } from '@nestjs/testing'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/federal-state.entity.ts b/apps/server/src/modules/school/repo/federal-state.entity.ts similarity index 100% rename from apps/server/src/modules/school/repo/mikro-orm/federal-state.entity.ts rename to apps/server/src/modules/school/repo/federal-state.entity.ts diff --git a/apps/server/src/modules/school/repo/mikro-orm/federal-state.repo.spec.ts b/apps/server/src/modules/school/repo/federal-state.repo.spec.ts similarity index 100% rename from apps/server/src/modules/school/repo/mikro-orm/federal-state.repo.spec.ts rename to apps/server/src/modules/school/repo/federal-state.repo.spec.ts diff --git a/apps/server/src/modules/school/repo/mikro-orm/federal-state.repo.ts b/apps/server/src/modules/school/repo/federal-state.repo.ts similarity index 100% rename from apps/server/src/modules/school/repo/mikro-orm/federal-state.repo.ts rename to apps/server/src/modules/school/repo/federal-state.repo.ts diff --git a/apps/server/src/modules/school/repo/index.ts b/apps/server/src/modules/school/repo/index.ts index 0f975ab1b42..ebe9f1599d7 100644 --- a/apps/server/src/modules/school/repo/index.ts +++ b/apps/server/src/modules/school/repo/index.ts @@ -1,5 +1,9 @@ -export { CountyEmbeddable, FederalStateEntity, FederalStateProperties } from './mikro-orm/federal-state.entity'; -export { FederalStateRepo } from './mikro-orm/federal-state.repo'; -export { SchoolYearEntity, SchoolYearProperties } from './mikro-orm/school-year.entity'; -export { SchoolYearMikroOrmRepo } from './mikro-orm/school-year.repo'; -export { SchoolEntity, SchoolProperties, SchoolRolePermission, SchoolRoles } from './mikro-orm/school.entity'; +export { CountyEmbeddable, FederalStateEntity, FederalStateProperties } from './federal-state.entity'; +export { FederalStateRepo } from './federal-state.repo'; +export { FederalStateEntityMapper } from './mapper/federal-state.entity.mapper'; +export { SchoolYearEntityMapper } from './mapper/school-year.entity.mapper'; +export { SchoolEntityMapper } from './mapper/school.entity.mapper'; +export { SchoolYearEntity, SchoolYearProperties } from './school-year.entity'; +export { SchoolYearMikroOrmRepo } from './school-year.repo'; +export { SchoolEntity, SchoolProperties, SchoolRolePermission, SchoolRoles } from './school.entity'; +export { SchoolMikroOrmRepo } from './school.repo'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/mapper/county.embeddable.mapper.spec.ts b/apps/server/src/modules/school/repo/mapper/county.embeddable.mapper.spec.ts similarity index 92% rename from apps/server/src/modules/school/repo/mikro-orm/mapper/county.embeddable.mapper.spec.ts rename to apps/server/src/modules/school/repo/mapper/county.embeddable.mapper.spec.ts index 4fd30269338..8d33710a2c6 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/mapper/county.embeddable.mapper.spec.ts +++ b/apps/server/src/modules/school/repo/mapper/county.embeddable.mapper.spec.ts @@ -1,7 +1,7 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { countyFactory } from '@modules/school/testing/county.factory'; -import { CountyEmbeddableMapper } from './county.embeddable.mapper'; +import { countyFactory } from '../../testing/county.factory'; import { CountyEmbeddable } from '../federal-state.entity'; +import { CountyEmbeddableMapper } from './county.embeddable.mapper'; describe('CountyEmbeddableMapper', () => { describe('mapToEntity', () => { diff --git a/apps/server/src/modules/school/repo/mikro-orm/mapper/county.embeddable.mapper.ts b/apps/server/src/modules/school/repo/mapper/county.embeddable.mapper.ts similarity index 93% rename from apps/server/src/modules/school/repo/mikro-orm/mapper/county.embeddable.mapper.ts rename to apps/server/src/modules/school/repo/mapper/county.embeddable.mapper.ts index 77e1bf4427a..c1d1c7de3f3 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/mapper/county.embeddable.mapper.ts +++ b/apps/server/src/modules/school/repo/mapper/county.embeddable.mapper.ts @@ -1,5 +1,5 @@ import { ObjectId } from '@mikro-orm/mongodb'; -import { County } from '../../../domain'; +import { County } from '../../domain'; import { CountyEmbeddable } from '../federal-state.entity'; export class CountyEmbeddableMapper { diff --git a/apps/server/src/modules/school/repo/mikro-orm/mapper/federal-state.entity.mapper.ts b/apps/server/src/modules/school/repo/mapper/federal-state.entity.mapper.ts similarity index 91% rename from apps/server/src/modules/school/repo/mikro-orm/mapper/federal-state.entity.mapper.ts rename to apps/server/src/modules/school/repo/mapper/federal-state.entity.mapper.ts index 950d0c2bed1..3ef18ea5a3a 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/mapper/federal-state.entity.mapper.ts +++ b/apps/server/src/modules/school/repo/mapper/federal-state.entity.mapper.ts @@ -1,4 +1,4 @@ -import { FederalState } from '../../../domain'; +import { FederalState } from '../../domain'; import { FederalStateEntity } from '../federal-state.entity'; import { CountyEmbeddableMapper } from './county.embeddable.mapper'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/mapper/index.ts b/apps/server/src/modules/school/repo/mapper/index.ts similarity index 100% rename from apps/server/src/modules/school/repo/mikro-orm/mapper/index.ts rename to apps/server/src/modules/school/repo/mapper/index.ts diff --git a/apps/server/src/modules/school/repo/mikro-orm/mapper/school-year.entity.mapper.ts b/apps/server/src/modules/school/repo/mapper/school-year.entity.mapper.ts similarity index 91% rename from apps/server/src/modules/school/repo/mikro-orm/mapper/school-year.entity.mapper.ts rename to apps/server/src/modules/school/repo/mapper/school-year.entity.mapper.ts index d3a725e51a6..0cea3249515 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/mapper/school-year.entity.mapper.ts +++ b/apps/server/src/modules/school/repo/mapper/school-year.entity.mapper.ts @@ -1,4 +1,4 @@ -import { SchoolYear } from '../../../domain'; +import { SchoolYear } from '../../domain'; import { SchoolYearEntity } from '../school-year.entity'; export class SchoolYearEntityMapper { diff --git a/apps/server/src/modules/school/repo/mikro-orm/mapper/school.entity.mapper.spec.ts b/apps/server/src/modules/school/repo/mapper/school.entity.mapper.spec.ts similarity index 98% rename from apps/server/src/modules/school/repo/mikro-orm/mapper/school.entity.mapper.spec.ts rename to apps/server/src/modules/school/repo/mapper/school.entity.mapper.spec.ts index 0ec33806d84..d03406b18a2 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/mapper/school.entity.mapper.spec.ts +++ b/apps/server/src/modules/school/repo/mapper/school.entity.mapper.spec.ts @@ -1,7 +1,7 @@ import { schoolEntityFactory } from '@modules/school/testing'; import { SystemEntity } from '@modules/system/repo'; import { setupEntities } from '@testing/database'; -import { School } from '../../../domain'; +import { School } from '../../domain'; import { SchoolEntity } from '../school.entity'; import { CountyEmbeddableMapper } from './county.embeddable.mapper'; import { FederalStateEntityMapper } from './federal-state.entity.mapper'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/mapper/school.entity.mapper.ts b/apps/server/src/modules/school/repo/mapper/school.entity.mapper.ts similarity index 96% rename from apps/server/src/modules/school/repo/mikro-orm/mapper/school.entity.mapper.ts rename to apps/server/src/modules/school/repo/mapper/school.entity.mapper.ts index 37bda44d6af..0f69a4ea3cd 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/mapper/school.entity.mapper.ts +++ b/apps/server/src/modules/school/repo/mapper/school.entity.mapper.ts @@ -1,8 +1,8 @@ import { EntityData } from '@mikro-orm/core'; import { EntityManager } from '@mikro-orm/mongodb'; -import { SchoolFactory } from '@modules/school/domain/factory'; import { SystemEntity } from '@modules/system/repo'; -import { School } from '../../../domain'; +import { School } from '../../domain'; +import { SchoolFactory } from '../../domain/factory'; import { FederalStateEntity } from '../federal-state.entity'; import { SchoolYearEntity } from '../school-year.entity'; import { SchoolEntity } from '../school.entity'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/school-year.entity.spec.ts b/apps/server/src/modules/school/repo/school-year.entity.spec.ts similarity index 86% rename from apps/server/src/modules/school/repo/mikro-orm/school-year.entity.spec.ts rename to apps/server/src/modules/school/repo/school-year.entity.spec.ts index 735a2c851a8..e1917cfbe75 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/school-year.entity.spec.ts +++ b/apps/server/src/modules/school/repo/school-year.entity.spec.ts @@ -1,4 +1,4 @@ -import { schoolYearEntityFactory } from '@modules/school/testing'; +import { schoolYearEntityFactory } from '../testing'; import { SchoolYearEntity } from './school-year.entity'; describe('schoolyear entity', () => { diff --git a/apps/server/src/modules/school/repo/mikro-orm/school-year.entity.ts b/apps/server/src/modules/school/repo/school-year.entity.ts similarity index 100% rename from apps/server/src/modules/school/repo/mikro-orm/school-year.entity.ts rename to apps/server/src/modules/school/repo/school-year.entity.ts diff --git a/apps/server/src/modules/school/repo/mikro-orm/school-year.repo.integration.spec.ts b/apps/server/src/modules/school/repo/school-year.repo.integration.spec.ts similarity index 99% rename from apps/server/src/modules/school/repo/mikro-orm/school-year.repo.integration.spec.ts rename to apps/server/src/modules/school/repo/school-year.repo.integration.spec.ts index c2a965f43c8..668a3c51053 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/school-year.repo.integration.spec.ts +++ b/apps/server/src/modules/school/repo/school-year.repo.integration.spec.ts @@ -2,7 +2,7 @@ import { EntityManager } from '@mikro-orm/mongodb'; import { Test, TestingModule } from '@nestjs/testing'; import { cleanupCollections } from '@testing/cleanup-collections'; import { MongoMemoryDatabaseModule } from '@testing/database'; -import { schoolYearEntityFactory } from '../../testing'; +import { schoolYearEntityFactory } from '../testing'; import { SchoolYearEntityMapper } from './mapper'; import { SchoolYearEntity } from './school-year.entity'; import { SchoolYearMikroOrmRepo } from './school-year.repo'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/school-year.repo.ts b/apps/server/src/modules/school/repo/school-year.repo.ts similarity index 88% rename from apps/server/src/modules/school/repo/mikro-orm/school-year.repo.ts rename to apps/server/src/modules/school/repo/school-year.repo.ts index 88c2d39c543..67a911c10ea 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/school-year.repo.ts +++ b/apps/server/src/modules/school/repo/school-year.repo.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { BaseRepo } from '@shared/repo/base.repo'; -import { SchoolYear } from '../../domain'; -import { SchoolYearsNoYearsLeft } from '../../domain/error'; -import { SchoolYearRepo } from '../../domain/interface'; +import { SchoolYear } from '../domain'; +import { SchoolYearsNoYearsLeft } from '../domain/error'; +import { SchoolYearRepo } from '../domain/interface'; import { SchoolYearEntityMapper } from './mapper'; import { SchoolYearEntity } from './school-year.entity'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/school.entity.ts b/apps/server/src/modules/school/repo/school.entity.ts similarity index 96% rename from apps/server/src/modules/school/repo/mikro-orm/school.entity.ts rename to apps/server/src/modules/school/repo/school.entity.ts index 75ff3f557c1..3e39d897ae1 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/school.entity.ts +++ b/apps/server/src/modules/school/repo/school.entity.ts @@ -12,13 +12,12 @@ import { Property, } from '@mikro-orm/core'; import { SchoolSystemOptionsEntity } from '@modules/legacy-school/entity'; -import { SchoolFeature, SchoolPurpose } from '@modules/school/domain'; -import { FileStorageType } from '@modules/school/domain/type/file-storage-type.enum'; import { SystemEntity } from '@modules/system/repo'; import { UserLoginMigrationEntity } from '@modules/user-login-migration/repo'; import { BaseEntityWithTimestamps } from '@shared/domain/entity/base.entity'; import { StorageProviderEntity } from '@shared/domain/entity/storageprovider.entity'; import { LanguageType } from '@shared/domain/interface'; +import { FileStorageType, SchoolFeature, SchoolPurpose } from '../domain'; import { CountyEmbeddable, FederalStateEntity } from './federal-state.entity'; import { SchoolYearEntity } from './school-year.entity'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/school.repo.integration.spec.ts b/apps/server/src/modules/school/repo/school.repo.integration.spec.ts similarity index 98% rename from apps/server/src/modules/school/repo/mikro-orm/school.repo.integration.spec.ts rename to apps/server/src/modules/school/repo/school.repo.integration.spec.ts index 92d426bb0d8..38c4662af8c 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/school.repo.integration.spec.ts +++ b/apps/server/src/modules/school/repo/school.repo.integration.spec.ts @@ -7,9 +7,8 @@ import { Test, TestingModule } from '@nestjs/testing'; import { LanguageType, SortOrder } from '@shared/domain/interface'; import { cleanupCollections } from '@testing/cleanup-collections'; import { MongoMemoryDatabaseModule } from '@testing/database'; -import { FileStorageType, SCHOOL_REPO, SchoolFeature, SchoolPurpose } from '../../domain'; -import { federalStateDoFactory, schoolEntityFactory, schoolFactory } from '../../testing'; -import { countyFactory } from '../../testing/county.factory'; +import { FileStorageType, SCHOOL_REPO, SchoolFeature, SchoolPurpose } from '../domain'; +import { countyFactory, federalStateDoFactory, schoolEntityFactory, schoolFactory } from '../testing'; import { FederalStateEntityMapper, SchoolEntityMapper, SchoolYearEntityMapper } from './mapper'; import { SchoolEntity } from './school.entity'; import { SchoolMikroOrmRepo } from './school.repo'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/school.repo.ts b/apps/server/src/modules/school/repo/school.repo.ts similarity index 99% rename from apps/server/src/modules/school/repo/mikro-orm/school.repo.ts rename to apps/server/src/modules/school/repo/school.repo.ts index 7cd52a92681..472c6d4d05c 100644 --- a/apps/server/src/modules/school/repo/mikro-orm/school.repo.ts +++ b/apps/server/src/modules/school/repo/school.repo.ts @@ -4,7 +4,7 @@ import { Injectable } from '@nestjs/common'; import { IFindOptions, SortOrder } from '@shared/domain/interface/find-options'; import { EntityId } from '@shared/domain/types/entity-id'; import { BaseDomainObjectRepo } from '@shared/repo/base-domain-object.repo'; -import { School, SchoolProps, SchoolQuery, SchoolRepo } from '../../domain'; +import { School, SchoolProps, SchoolQuery, SchoolRepo } from '../domain'; import { SchoolEntityMapper } from './mapper/school.entity.mapper'; import { SchoolEntity } from './school.entity'; import { SchoolScope } from './scope/school.scope'; diff --git a/apps/server/src/modules/school/repo/mikro-orm/scope/school.scope.ts b/apps/server/src/modules/school/repo/scope/school.scope.ts similarity index 100% rename from apps/server/src/modules/school/repo/mikro-orm/scope/school.scope.ts rename to apps/server/src/modules/school/repo/scope/school.scope.ts diff --git a/apps/server/src/modules/school/school.module.ts b/apps/server/src/modules/school/school.module.ts index 51137609594..ae5b96e9cd4 100644 --- a/apps/server/src/modules/school/school.module.ts +++ b/apps/server/src/modules/school/school.module.ts @@ -2,8 +2,7 @@ import { Module } from '@nestjs/common'; import { SystemModule } from '../system'; import { FederalStateService, SCHOOL_REPO, SCHOOL_YEAR_REPO, SchoolService, SchoolYearService } from './domain'; import { SystemDeletedHandler } from './domain/event-handler'; -import { FederalStateRepo, SchoolYearMikroOrmRepo } from './repo'; -import { SchoolMikroOrmRepo } from './repo/mikro-orm/school.repo'; +import { FederalStateRepo, SchoolMikroOrmRepo, SchoolYearMikroOrmRepo } from './repo'; @Module({ imports: [SystemModule], diff --git a/apps/server/src/modules/school/testing/index.ts b/apps/server/src/modules/school/testing/index.ts index fb6bee5d676..1761b5ea48b 100644 --- a/apps/server/src/modules/school/testing/index.ts +++ b/apps/server/src/modules/school/testing/index.ts @@ -1,4 +1,5 @@ export * from './county.embeddable.factory'; +export * from './county.factory'; export * from './federal-state.do.factory'; export * from './federal-state.entity.factory'; export * from './school-entity.factory';