refactoring

dBildungsplattform · Dec 9, 2024 · 239bf42 · 239bf42
1 parent ea8b059
commit 239bf42
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 15 deletions.
diff --git a/src/modules/authentication/api/authentication.controller.integration-spec.ts b/src/modules/authentication/api/authentication.controller.integration-spec.ts
@@ -26,8 +26,8 @@ import { RolleRepo } from '../../rolle/repo/rolle.repo.js';
 import { OrganisationRepository } from '../../organisation/persistence/organisation.repository.js';
 import { KeycloakConfig } from '../../../shared/config/keycloak.config.js';
 import { KeycloakUserService } from '../../keycloak-administration/index.js';
-import PersonTimeLimitService from '../services/person-time-limit-info.service.js';
-import { TimeLimitOccasion } from '../domain/time-limit-occasion.enums.js';
+import { TimeLimitOccasion } from '../../person/domain/time-limit-occasion.enums.js';
+import PersonTimeLimitService from '../../person/domain/person-time-limit-info.service.js';
 
 describe('AuthenticationController', () => {
     let module: TestingModule;

diff --git a/src/modules/authentication/api/authentication.controller.ts b/src/modules/authentication/api/authentication.controller.ts
@@ -31,9 +31,9 @@ import { AuthenticationExceptionFilter } from './authentication-exception-filter
 import { KeycloakUserService } from '../../keycloak-administration/index.js';
 import { DomainError } from '../../../shared/error/domain.error.js';
 import { getLowestStepUpLevel } from '../passport/oidc.strategy.js';
-import PersonTimeLimitService from '../services/person-time-limit-info.service.js';
-import { PersonTimeLimitInfo } from '../domain/person-time-limit-info.js';
+import { PersonTimeLimitInfo } from '../../person/domain/person-time-limit-info.js';
 import { PersonTimeLimitInfoResponse } from './person-time-limit-info.reponse.js';
+import PersonTimeLimitService from '../../person/domain/person-time-limit-info.service.js';
 
 @UseFilters(new AuthenticationExceptionFilter())
 @ApiTags('auth')

diff --git a/src/modules/authentication/api/person-time-limit-info.reponse.ts b/src/modules/authentication/api/person-time-limit-info.reponse.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { TimeLimitOccasion } from '../domain/time-limit-occasion.enums.js';
+import { TimeLimitOccasion } from '../../person/domain/time-limit-occasion.enums.js';
 
 export class PersonTimeLimitInfoResponse {
     @ApiProperty({ nullable: true })

diff --git a/src/modules/authentication/api/userinfo.response.spec.ts b/src/modules/authentication/api/userinfo.response.spec.ts
@@ -10,7 +10,7 @@ import { PersonenkontextRolleFieldsResponse } from './personen-kontext-rolle-fie
 import { createMock } from '@golevelup/ts-jest';
 import { StepUpLevel } from '../passport/oidc.strategy.js';
 import { PersonTimeLimitInfoResponse } from './person-time-limit-info.reponse.js';
-import { TimeLimitOccasion } from '../domain/time-limit-occasion.enums.js';
+import { TimeLimitOccasion } from '../../person/domain/time-limit-occasion.enums.js';
 
 describe('UserinfoResponse', () => {
     const permissions: PersonPermissions = new PersonPermissions(

diff --git a/src/modules/authentication/authentication-api.module.ts b/src/modules/authentication/authentication-api.module.ts
@@ -13,7 +13,7 @@ import { JwtStrategy } from './passport/jwt.strategy.js';
 import { OrganisationModule } from '../organisation/organisation.module.js';
 import { RolleModule } from '../rolle/rolle.module.js';
 import { KeycloakAdministrationModule } from '../keycloak-administration/keycloak-administration.module.js';
-import PersonTimeLimitService from './services/person-time-limit-info.service.js';
+import PersonTimeLimitService from '../person/domain/person-time-limit-info.service.js';
 
 @Module({
     imports: [

diff --git a/src/modules/person/api/person.controller.ts b/src/modules/person/api/person.controller.ts
@@ -78,6 +78,7 @@ import { PersonEmailResponse } from './person-email-response.js';
 import { UserLock } from '../../keycloak-administration/domain/user-lock.js';
 import { StepUpGuard } from '../../authentication/api/steup-up.guard.js';
 import { PersonLockOccasion } from '../domain/person.enums.js';
+import { KOPERS_DEADLINE_IN_DAYS } from '../domain/person-time-limit.js';
 
 @UseFilters(SchulConnexValidationErrorFilter, new AuthenticationExceptionFilter(), new PersonExceptionFilter())
 @ApiTags('personen')
@@ -218,7 +219,7 @@ export class PersonController {
                 await this.dBiamPersonenkontextService.getKopersPersonenkontext(personResult.value.id);
             if (kopersKontext) {
                 const koperslockDate: Date = new Date(kopersKontext.createdAt);
-                koperslockDate.setDate(koperslockDate.getDate() + 56);
+                koperslockDate.setDate(koperslockDate.getDate() + KOPERS_DEADLINE_IN_DAYS);
             }
         }
         const response: PersonendatensatzResponse = new PersonendatensatzResponse(

diff --git a/...es/person-time-limit-info.service.spec.ts → ...in/person-time-limit-info.service.spec.ts b/...es/person-time-limit-info.service.spec.ts → ...in/person-time-limit-info.service.spec.ts
@@ -5,9 +5,10 @@ import PersonTimeLimitService from './person-time-limit-info.service.js';
 import { DBiamPersonenkontextService } from '../../personenkontext/domain/dbiam-personenkontext.service.js';
 import { Person } from '../../person/domain/person.js';
 import { DoFactory } from '../../../../test/utils/do-factory.js';
-import { PersonTimeLimitInfo } from '../domain/person-time-limit-info.js';
 import { TimeLimitOccasion } from '../domain/time-limit-occasion.enums.js';
 import { Personenkontext } from '../../personenkontext/domain/personenkontext.js';
+import { PersonTimeLimitInfo } from './person-time-limit-info.js';
+import { KOPERS_DEADLINE_IN_DAYS } from './person-time-limit.js';
 
 describe('PersonTimeLimitService', () => {
     let module: TestingModule;
@@ -61,7 +62,7 @@ describe('PersonTimeLimitService', () => {
             const result: PersonTimeLimitInfo[] = await sut.getPersonTimeLimitInfo(person.id);
 
             const expectedDeadline: Date = new Date(pesonenkontext.createdAt);
-            expectedDeadline.setDate(expectedDeadline.getDate() + 56);
+            expectedDeadline.setDate(expectedDeadline.getDate() + KOPERS_DEADLINE_IN_DAYS);
 
             expect(result).toEqual<PersonTimeLimitInfo[]>([
                 {

diff --git a/...ervices/person-time-limit-info.service.ts → .../domain/person-time-limit-info.service.ts b/...ervices/person-time-limit-info.service.ts → .../domain/person-time-limit-info.service.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { Personenkontext } from '../../personenkontext/domain/personenkontext.js';
-import { PersonTimeLimitInfo } from '../domain/person-time-limit-info.js';
 import { DBiamPersonenkontextService } from '../../personenkontext/domain/dbiam-personenkontext.service.js';
-import { TimeLimitOccasion } from '../domain/time-limit-occasion.enums.js';
 import { PersonRepository } from '../../person/persistence/person.repository.js';
 import { Person } from '../../person/domain/person.js';
+import { PersonTimeLimitInfo } from './person-time-limit-info.js';
+import { TimeLimitOccasion } from './time-limit-occasion.enums.js';
+import { KOPERS_DEADLINE_IN_DAYS } from './person-time-limit.js';
 
 @Injectable()
 export default class PersonTimeLimitService {
@@ -27,7 +28,7 @@ export default class PersonTimeLimitService {
                 await this.dBiamPersonenkontextService.getKopersPersonenkontext(person.id);
             if (kopersKontext) {
                 const kopersdeadline: Date = new Date(kopersKontext.createdAt);
-                kopersdeadline.setDate(kopersdeadline.getDate() + 56);
+                kopersdeadline.setDate(kopersdeadline.getDate() + KOPERS_DEADLINE_IN_DAYS);
                 lockInfos.push(new PersonTimeLimitInfo(TimeLimitOccasion.KOPERS, kopersdeadline));
             }
         }

diff --git a/...tication/domain/person-time-limit-info.ts → ...s/person/domain/person-time-limit-info.ts b/...tication/domain/person-time-limit-info.ts → ...s/person/domain/person-time-limit-info.ts
diff --git a/src/modules/person/domain/person-time-limit.ts b/src/modules/person/domain/person-time-limit.ts
@@ -0,0 +1 @@
+export const KOPERS_DEADLINE_IN_DAYS: number = 56;
diff --git a/...ation/domain/time-limit-occasion.enums.ts → ...erson/domain/time-limit-occasion.enums.ts b/...ation/domain/time-limit-occasion.enums.ts → ...erson/domain/time-limit-occasion.enums.ts
diff --git a/src/modules/person/persistence/person.repository.ts b/src/modules/person/persistence/person.repository.ts
@@ -38,6 +38,7 @@ import { PersonalNummerForPersonWithTrailingSpaceError } from '../domain/persona
 import { VornameForPersonWithTrailingSpaceError } from '../domain/vorname-with-trailing-space.error.js';
 import { SystemConfig } from '../../../shared/config/system.config.js';
 import { UserLock } from '../../keycloak-administration/domain/user-lock.js';
+import { KOPERS_DEADLINE_IN_DAYS } from '../domain/person-time-limit.js';
 
 /**
  * Return email-address for person, if an enabled email-address exists, return it.
@@ -761,15 +762,15 @@ export class PersonRepository {
 
     public async getKoPersUserLockList(): Promise<[PersonID, string][]> {
         const daysAgo: Date = new Date();
-        daysAgo.setDate(daysAgo.getDate() - 56);
+        daysAgo.setDate(daysAgo.getDate() - KOPERS_DEADLINE_IN_DAYS);
 
         const filters: QBFilterQuery<PersonEntity> = {
             $and: [
                 { personalnummer: { $eq: null } },
                 {
                     personenKontexte: {
                         $some: {
-                            createdAt: { $lte: daysAgo }, // Check that createdAt is older than 56 days
+                            createdAt: { $lte: daysAgo }, // Check that createdAt is older than KOPERS_DEADLINE_IN_DAYS
                             rolleId: {
                                 merkmale: { merkmal: RollenMerkmal.KOPERS_PFLICHT },
                             },
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const KOPERS_DEADLINE_IN_DAYS: number = 56;