add istTechnisch field to person

dBildungsplattform · Jan 14, 2025 · 1bab7ae · 1bab7ae
1 parent 3173196
commit 1bab7ae
Show file tree

Hide file tree

Showing 13 changed files with 129 additions and 9 deletions.
diff --git a/migrations/.snapshot-dbildungs-iam-server.json b/migrations/.snapshot-dbildungs-iam-server.json
@@ -2177,6 +2177,16 @@
           "nullable": true,
           "length": 6,
           "mappedType": "datetime"
+        },
+        "ist_technisch": {
+          "name": "ist_technisch",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "default": "false",
+          "mappedType": "boolean"
         }
       },
       "name": "person",

diff --git a/migrations/Migration20250114120248-S.ts b/migrations/Migration20250114120248-S.ts
@@ -0,0 +1,11 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20250114120248 extends Migration {
+    public async up(): Promise<void> {
+        this.addSql('alter table "person" add column "ist_technisch" boolean not null default false;');
+    }
+
+    public override async down(): Promise<void> {
+        this.addSql('alter table "person" drop column "ist_technisch";');
+    }
+}
diff --git a/migrations/Migration20250114133700-D.ts b/migrations/Migration20250114133700-D.ts
@@ -0,0 +1,9 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20250114120248 extends Migration {
+    public async up(): Promise<void> {
+        this.addSql(
+            'update person as p set ist_technisch = true where p.id in (select pk.person_id from personenkontext as pk join rolle as r on r.id = pk.rolle_id where r.ist_technisch = true);',
+        );
+    }
+}
diff --git a/src/console/dbseed/domain/db-seed.service.ts b/src/console/dbseed/domain/db-seed.service.ts
@@ -314,6 +314,7 @@ export class DbSeedService {
                 vorname: file.vorname,
                 username: file.username,
                 password: file.password,
+                istTechnisch: true,
             };
 
             const person: Person<false> | DomainError = await this.personFactory.createNew(creationParams);

diff --git a/src/console/dbseed/file/person-file.ts b/src/console/dbseed/file/person-file.ts
@@ -54,4 +54,6 @@ export class PersonFile {
     public revision!: string;
 
     public personalnummer?: string;
+
+    public istTechnisch?: string;
 }
diff --git a/src/modules/person/domain/person.spec.ts b/src/modules/person/domain/person.spec.ts
@@ -75,6 +75,7 @@ describe('Person', () => {
             expect(person).toBeInstanceOf(Person<true>);
             expect(person.revision).toEqual('5');
             expect(person.userLock).toEqual([]);
+            expect(person.istTechnisch).toEqual(false);
         });
     });
 
@@ -296,12 +297,88 @@ describe('Person', () => {
                     faker.lorem.word(),
                     faker.string.uuid(),
                 );
+                const initialIstTechnisch: boolean = person.istTechnisch;
                 const result: void | DomainError = person.update('5', undefined, undefined, 'abc');
 
                 expect(result).not.toBeInstanceOf(DomainError);
                 expect(person.vorname).toEqual('Max');
                 expect(person.familienname).toEqual('Mustermann');
                 expect(person.referrer).toEqual('abc');
+                expect(person.istTechnisch).toEqual(initialIstTechnisch);
+            });
+        });
+        describe('revision does match and istTechnisch is updated', () => {
+            it('should update istTechnisch in the person', () => {
+                const person: Person<true> = Person.construct(
+                    faker.string.uuid(),
+                    faker.date.past(),
+                    faker.date.recent(),
+                    'Mustermann',
+                    'Max',
+                    '5',
+                    faker.lorem.word(),
+                    faker.lorem.word(),
+                    faker.string.uuid(),
+                );
+                let result: void | DomainError = person.update(
+                    '5',
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    '',
+                    true,
+                );
+                expect(result).not.toBeInstanceOf(DomainError);
+                expect(person.istTechnisch).toEqual(true);
+
+                result = person.update(
+                    '6',
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    '',
+                    false,
+                );
+                expect(result).not.toBeInstanceOf(DomainError);
+                expect(person.istTechnisch).toEqual(false);
             });
         });
         describe('revision does not match', () => {

diff --git a/src/modules/person/domain/person.ts b/src/modules/person/domain/person.ts
@@ -36,6 +36,7 @@ export type PersonCreationParams = {
     userLock?: UserLock[];
     isLocked?: boolean;
     orgUnassignmentDate?: Date;
+    istTechnisch?: boolean;
 };
 
 export class Person<WasPersisted extends boolean> {
@@ -79,8 +80,10 @@ export class Person<WasPersisted extends boolean> {
         public isLocked: boolean | undefined,
         public email: string | undefined,
         public oxUserId: string | undefined,
+        public istTechnisch: boolean,
     ) {
         this.mandant = Person.CREATE_PERSON_DTO_MANDANT_UUID;
+        this.istTechnisch = istTechnisch ?? false;
     }
 
     public get newPassword(): string | undefined {
@@ -122,6 +125,7 @@ export class Person<WasPersisted extends boolean> {
         isLocked?: boolean,
         email?: string,
         oxUserId?: string,
+        istTechnisch?: boolean,
     ): Person<WasPersisted> {
         return new Person(
             id,
@@ -154,6 +158,7 @@ export class Person<WasPersisted extends boolean> {
             isLocked,
             email,
             oxUserId,
+            istTechnisch ?? false,
         );
     }
 
@@ -202,6 +207,7 @@ export class Person<WasPersisted extends boolean> {
             undefined,
             undefined,
             undefined,
+            creationParams.istTechnisch ?? false,
         );
 
         if (creationParams.password) {
@@ -252,6 +258,7 @@ export class Person<WasPersisted extends boolean> {
         orgUnassignmentDate?: Date,
         isLocked?: boolean,
         email?: string,
+        istTechnisch?: boolean,
     ): void | DomainError {
         if (this.revision !== revision) {
             return new MismatchedRevisionError(
@@ -295,6 +302,7 @@ export class Person<WasPersisted extends boolean> {
         this.isLocked = isLocked;
         this.email = email;
         this.userLock = userLock ?? [];
+        if (istTechnisch !== undefined) this.istTechnisch = istTechnisch;
     }
 
     public resetPassword(): void {

diff --git a/src/modules/person/persistence/person.entity.ts b/src/modules/person/persistence/person.entity.ts
@@ -175,4 +175,8 @@ export class PersonEntity extends TimestampedEntity {
         orphanRemoval: true,
     })
     public userLocks: Collection<UserLockEntity> = new Collection<UserLockEntity>(this);
+
+    @AutoMap()
+    @Property({ default: false })
+    public istTechnisch!: boolean;
 }
diff --git a/src/modules/person/persistence/person.repository.integration-spec.ts b/src/modules/person/persistence/person.repository.integration-spec.ts
@@ -1109,6 +1109,7 @@ describe('PersonRepository Integration', () => {
                 'auskunftssperre',
                 'dataProvider',
                 'revision',
+                'istTechnisch',
             ];
 
             const result: RequiredEntityData<PersonEntity> = mapAggregateToData(person);
@@ -1271,6 +1272,7 @@ describe('PersonRepository Integration', () => {
 
         it('should return DomainError when user is technical', async () => {
             const person1: Person<true> = DoFactory.createPerson(true);
+            person1.istTechnisch = true;
             const personEntity: PersonEntity = new PersonEntity();
             await em.persistAndFlush(personEntity.assign(mapAggregateToData(person1)));
             person1.id = personEntity.id;

diff --git a/src/modules/person/persistence/person.repository.ts b/src/modules/person/persistence/person.repository.ts
@@ -88,6 +88,7 @@ export function mapAggregateToData(person: Person<boolean>): RequiredEntityData<
         revision: person.revision,
         personalnummer: person.personalnummer,
         orgUnassignmentDate: person.orgUnassignmentDate,
+        istTechnisch: person.istTechnisch,
     };
 }
 
@@ -123,6 +124,7 @@ export function mapEntityToAggregate(entity: PersonEntity): Person<true> {
         undefined,
         getEnabledOrAlternativeEmailAddress(entity),
         getOxUserId(entity),
+        entity.istTechnisch,
     );
 }
 

diff --git a/src/modules/person/persistence/person.scope.integration-spec.ts b/src/modules/person/persistence/person.scope.integration-spec.ts
@@ -301,16 +301,11 @@ describe('PersonScope', () => {
         });
 
         it('should not return technical users', async () => {
-            const orgnisationID: string = faker.string.uuid();
             const person1: PersonEntity = createPersonEntity();
             const person2: PersonEntity = createPersonEntity();
-            const rolle: Rolle<true> | DomainError = await rolleRepo.save(
-                DoFactory.createRolle(false, { istTechnisch: true }),
-            );
-            if (rolle instanceof DomainError) throw Error();
+            person2.istTechnisch = true;
 
             await em.persistAndFlush([person1, person2]);
-            await createPersonenkontext(person1.id, orgnisationID, rolle.id);
 
             const scope: PersonScope = new PersonScope()
                 .findBy({ ids: [person1.id, person2.id] })

diff --git a/src/modules/person/persistence/person.scope.ts b/src/modules/person/persistence/person.scope.ts
@@ -29,9 +29,7 @@ export class PersonScope extends ScopeBase<PersonEntity> {
                 findProps.organisationen !== undefined && {
                     personenKontexte: { $some: { organisationId: { $in: findProps.organisationen } } },
                 },
-                {
-                    personenKontexte: { $none: { rolleId: { istTechnisch: true } } },
-                },
+                { istTechnisch: false },
             ].filter(Boolean),
         };
 

diff --git a/test/utils/do-factory.ts b/test/utils/do-factory.ts
@@ -51,6 +51,7 @@ export class DoFactory {
             personalnummer: faker.string.numeric({ length: 7 }),
             revision: '1',
         };
+        person.istTechnisch = false;
         return Object.assign(Object.create(Person.prototype) as Person<boolean>, person, props);
     }