SPSH-610-klassen-ergebnisliste (#534)

* searchstring for Klasse handled differently * test
dBildungsplattform · Jun 12, 2024 · 51ae7bd · 51ae7bd
1 parent 64f6e02
commit 51ae7bd
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/src/modules/organisation/api/organisation.controller.spec.ts b/src/modules/organisation/api/organisation.controller.spec.ts
@@ -283,6 +283,46 @@ describe('OrganisationController', () => {
 
                 expect(result.items.length).toEqual(1);
             });
+            it('should find all organizations that match with Klasse Typ', async () => {
+                const queryParams: FindOrganisationQueryParams = {
+                    typ: OrganisationsTyp.KLASSE,
+                    searchString: faker.lorem.word(),
+                    systemrechte: [],
+                    administriertVon: [faker.string.uuid(), faker.string.uuid()],
+                };
+
+                const mockedRepoResponse: Counted<Organisation<true>> = [
+                    [
+                        {
+                            id: faker.string.uuid(),
+                            createdAt: faker.date.recent(),
+                            updatedAt: faker.date.recent(),
+                            administriertVon: faker.string.uuid(),
+                            zugehoerigZu: faker.string.uuid(),
+                            kennung: faker.lorem.word(),
+                            name: faker.lorem.word(),
+                            namensergaenzung: faker.lorem.word(),
+                            kuerzel: faker.lorem.word(),
+                            typ: OrganisationsTyp.KLASSE,
+                            traegerschaft: Traegerschaft.LAND,
+                        },
+                    ],
+                    1,
+                ];
+
+                const permissionsMock: DeepMocked<PersonPermissions> = createMock<PersonPermissions>();
+                permissionsMock.getOrgIdsWithSystemrecht.mockResolvedValueOnce([]);
+
+                organisationRepositoryMock.findBy.mockResolvedValue(mockedRepoResponse);
+
+                const result: Paged<OrganisationResponse> = await organisationController.findOrganizations(
+                    queryParams,
+                    permissionsMock,
+                );
+
+                expect(organisationRepositoryMock.findBy).toHaveBeenCalledTimes(1);
+                expect(result.items.length).toEqual(1);
+            });
         });
     });
 

diff --git a/src/modules/organisation/api/organisation.controller.ts b/src/modules/organisation/api/organisation.controller.ts
@@ -45,6 +45,7 @@ import { DbiamOrganisationError } from './dbiam-organisation.error.js';
 import { OrganisationExceptionFilter } from './organisation-exception-filter.js';
 import { OrganisationSpecificationError } from '../specification/error/organisation-specification.error.js';
 import { OrganisationByIdQueryParams } from './organisation-by-id.query.js';
+import { OrganisationsTyp } from '../domain/organisation.enums.js';
 
 @UseFilters(new SchulConnexValidationErrorFilter(), new OrganisationExceptionFilter())
 @ApiTags('organisationen')
@@ -192,7 +193,24 @@ export class OrganisationController {
             true,
         );
 
-        const scope: OrganisationScope = new OrganisationScope()
+        const scope: OrganisationScope = new OrganisationScope();
+
+        // If the typ is Klasse then only search by Name using the search string
+        if (queryParams.typ === OrganisationsTyp.KLASSE) {
+            scope
+                .findBy({
+                    kennung: queryParams.kennung,
+                    name: queryParams.name,
+                    typ: queryParams.typ,
+                })
+                .setScopeWhereOperator(ScopeOperator.AND)
+                .findByAdministriertVonArray(queryParams.administriertVon)
+                .searchStringAdministriertVon(queryParams.searchString)
+                .excludeTyp(queryParams.excludeTyp)
+                .byIDs(validOrgaIDs)
+                .paged(queryParams.offset, queryParams.limit);
+        }
+        scope
             .findBy({
                 kennung: queryParams.kennung,
                 name: queryParams.name,