Merge branch 'SPSH-1654' of https://github.com/dBildungsplattform/dbi…

…ldungs-iam-server into SPSH-1654
dBildungsplattform · Jan 14, 2025 · 0dd684a · 0dd684a
2 parents b3d6b30 + e16f253
commit 0dd684a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/src/modules/person/domain/person-time-limit-info.service.spec.ts b/src/modules/person/domain/person-time-limit-info.service.spec.ts
@@ -8,7 +8,7 @@ import { DoFactory } from '../../../../test/utils/do-factory.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';
+import { KOPERS_DEADLINE_IN_DAYS, NO_KONTEXTE_DEADLINE_IN_DAYS } from './person-time-limit.js';
 
 describe('PersonTimeLimitService', () => {
     let module: TestingModule;
@@ -49,7 +49,7 @@ describe('PersonTimeLimitService', () => {
 
     describe('getPersonTimeLimitInfo', () => {
         it('should return PersonTimeLimitInfo array', async () => {
-            const person: Person<true> = DoFactory.createPerson(true);
+            const person: Person<true> = DoFactory.createPerson(true, { orgUnassignmentDate: new Date('2024-01-01') });
             person.personalnummer = undefined;
             personRepoMock.findById.mockResolvedValue(person);
 
@@ -58,13 +58,20 @@ describe('PersonTimeLimitService', () => {
 
             const result: PersonTimeLimitInfo[] = await sut.getPersonTimeLimitInfo(person.id);
 
-            const expectedDeadline: Date = new Date(pesonenkontext.createdAt);
-            expectedDeadline.setDate(expectedDeadline.getDate() + KOPERS_DEADLINE_IN_DAYS);
+            const expectedKopersDeadline: Date = new Date(pesonenkontext.createdAt);
+            expectedKopersDeadline.setDate(expectedKopersDeadline.getDate() + KOPERS_DEADLINE_IN_DAYS);
+
+            const expectedNoKontexteDeadline: Date = new Date(person.orgUnassignmentDate!);
+            expectedNoKontexteDeadline.setDate(expectedNoKontexteDeadline.getDate() + NO_KONTEXTE_DEADLINE_IN_DAYS);
 
             expect(result).toEqual<PersonTimeLimitInfo[]>([
                 {
                     occasion: TimeLimitOccasion.KOPERS,
-                    deadline: expectedDeadline,
+                    deadline: expectedKopersDeadline,
+                },
+                {
+                    occasion: TimeLimitOccasion.NO_KONTEXTE,
+                    deadline: expectedNoKontexteDeadline,
                 },
             ]);
         });

diff --git a/src/modules/person/domain/person-time-limit-info.service.ts b/src/modules/person/domain/person-time-limit-info.service.ts
@@ -5,7 +5,7 @@ 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';
+import { KOPERS_DEADLINE_IN_DAYS, NO_KONTEXTE_DEADLINE_IN_DAYS } from './person-time-limit.js';
 
 @Injectable()
 export default class PersonTimeLimitService {
@@ -34,6 +34,13 @@ export default class PersonTimeLimitService {
                 lockInfos.push(new PersonTimeLimitInfo(TimeLimitOccasion.KOPERS, kopersdeadline));
             }
         }
+
+        if (person.orgUnassignmentDate) {
+            const noKontexteDeadline: Date = new Date(person.orgUnassignmentDate);
+            noKontexteDeadline.setDate(noKontexteDeadline.getDate() + NO_KONTEXTE_DEADLINE_IN_DAYS);
+            lockInfos.push(new PersonTimeLimitInfo(TimeLimitOccasion.NO_KONTEXTE, noKontexteDeadline));
+        }
+
         return lockInfos;
     }
 }
diff --git a/src/modules/person/domain/person-time-limit.ts b/src/modules/person/domain/person-time-limit.ts
@@ -1 +1,2 @@
 export const KOPERS_DEADLINE_IN_DAYS: number = 56;
+export const NO_KONTEXTE_DEADLINE_IN_DAYS: number = 84;
diff --git a/src/modules/person/domain/time-limit-occasion.enums.ts b/src/modules/person/domain/time-limit-occasion.enums.ts
@@ -1,3 +1,4 @@
 export enum TimeLimitOccasion {
     KOPERS = 'KOPERS',
+    NO_KONTEXTE = 'NO_KONTEXTE',
 }
diff --git a/src/modules/person/persistence/person.repository.ts b/src/modules/person/persistence/person.repository.ts
@@ -40,7 +40,7 @@ import { SystemConfig } from '../../../shared/config/system.config.js';
 import { UserLock } from '../../keycloak-administration/domain/user-lock.js';
 import { ClassLogger } from '../../../core/logging/class-logger.js';
 import { DownstreamKeycloakError } from '../domain/person-keycloak.error.js';
-import { KOPERS_DEADLINE_IN_DAYS } from '../domain/person-time-limit.js';
+import { KOPERS_DEADLINE_IN_DAYS, NO_KONTEXTE_DEADLINE_IN_DAYS } from '../domain/person-time-limit.js';
 
 /**
  * Return email-address for person, if an enabled email-address exists, return it.
@@ -828,7 +828,7 @@ export class PersonRepository {
 
     public async getPersonWithoutOrgDeleteList(): Promise<string[]> {
         const daysAgo: Date = new Date();
-        daysAgo.setDate(daysAgo.getDate() - 84);
+        daysAgo.setDate(daysAgo.getDate() - NO_KONTEXTE_DEADLINE_IN_DAYS);
 
         const filters: QBFilterQuery<PersonEntity> = {
             personenKontexte: {
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export const KOPERS_DEADLINE_IN_DAYS: number = 56;
		export const NO_KONTEXTE_DEADLINE_IN_DAYS: number = 84;