SPSH-1288 #774
Open
SPSH-1288 #774
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tikle-cap
reviewed
Nov 22, 2024
| if (permissions) { | ||
| if (error) { | ||
| this.logger.error( | ||
| `Admin ${permissions.personFields.familienname} (${permissions.personFields.id}) hat versucht eine neue Klasse ${organisation.name} (${schoolName}) anzulegen. Fehler: ${error.message}`, |
There was a problem hiding this comment.
ist familienname richtig? ich würde einfach den username nehmen
DeFi3298
requested changes
Nov 25, 2024
Comment on lines
92
to
105
| const permissionsMock: PersonPermissions = createMock<PersonPermissions>({ | ||
| get personFields(): Person<true> { | ||
| return createMock<Person<true>>({ | ||
| familienname: 'current-user', | ||
| }); | ||
| }, | ||
| getPersonenkontextewithRoles: (): Promise<PersonenkontextRolleFields[]> => | ||
| Promise.resolve([ | ||
| { | ||
| organisationsId: '', | ||
| rolle: { systemrechte: [], serviceProviderIds: [] }, | ||
| }, | ||
| ]), | ||
| }); |
There was a problem hiding this comment.
Leeres Permissions-Objekt sollte an dieser Stelle ausreichend sein.
Comment on lines
737
to
750
| const permissionsMock: PersonPermissions = createMock<PersonPermissions>({ | ||
| get personFields(): Person<true> { | ||
| return createMock<Person<true>>({ | ||
| familienname: 'current-user', | ||
| }); | ||
| }, | ||
| getPersonenkontextewithRoles: (): Promise<PersonenkontextRolleFields[]> => | ||
| Promise.resolve([ | ||
| { | ||
| organisationsId: '', | ||
| rolle: { systemrechte: [], serviceProviderIds: [] }, | ||
| }, | ||
| ]), | ||
| }); |
Comment on lines
820
to
833
| const permissionsMock: PersonPermissions = createMock<PersonPermissions>({ | ||
| get personFields(): Person<true> { | ||
| return createMock<Person<true>>({ | ||
| familienname: 'current-user', | ||
| }); | ||
| }, | ||
| getPersonenkontextewithRoles: (): Promise<PersonenkontextRolleFields[]> => | ||
| Promise.resolve([ | ||
| { | ||
| organisationsId: '', | ||
| rolle: { systemrechte: [], serviceProviderIds: [] }, | ||
| }, | ||
| ]), | ||
| }); |
Comment on lines
68
to
82
| const permissionsMock: DeepMocked<PersonPermissions> = createMock<PersonPermissions>({ | ||
| get personFields(): Person<true> { | ||
| return createMock<Person<true>>({ | ||
| id: 'test-id', | ||
| keycloakUserId: 'test-keycloak', | ||
| vorname: 'test-vorname', | ||
| familienname: 'test-familienname', | ||
| rufname: 'test-rufname', | ||
| username: 'test-username', | ||
| geschlecht: Geschlecht.M, | ||
| geburtsdatum: faker.date.past(), | ||
| updatedAt: faker.date.recent(), | ||
| }); | ||
| }, | ||
| }); |
There was a problem hiding this comment.
Permissions-Objekt kann hier auch ohne die Spezifizierung für den Test gemocked werden
Comment on lines
373
to
387
| const permissionsMock: DeepMocked<PersonPermissions> = createMock<PersonPermissions>({ | ||
| get personFields(): Person<true> { | ||
| return createMock<Person<true>>({ | ||
| id: 'test-id', | ||
| keycloakUserId: 'test-keycloak', | ||
| vorname: 'test-vorname', | ||
| familienname: 'test-familienname', | ||
| rufname: 'test-rufname', | ||
| username: 'test-username', | ||
| geschlecht: Geschlecht.M, | ||
| geburtsdatum: faker.date.past(), | ||
| updatedAt: faker.date.recent(), | ||
| }); | ||
| }, | ||
| }); |
There was a problem hiding this comment.
Siehe oben. Überflüssige Importe können dann entfernt werden.
Comment on lines
845
to
859
| const permissionsMock: PersonPermissions = createMock<PersonPermissions>({ | ||
| get personFields(): Person<true> { | ||
| return createMock<Person<true>>({ | ||
| id: 'test-id', | ||
| keycloakUserId: 'test-keycloak', | ||
| vorname: 'test-vorname', | ||
| familienname: 'test-familienname', | ||
| rufname: 'test-rufname', | ||
| username: 'test-username', | ||
| geschlecht: Geschlecht.M, | ||
| geburtsdatum: faker.date.past(), | ||
| updatedAt: faker.date.recent(), | ||
| }); | ||
| }, | ||
| }); |
| @@ -423,13 +428,24 @@ export class OrganisationRepository { | |||
| await this.em.removeAndFlush(organisationEntity); | |||
| this.eventService.publish(new KlasseDeletedEvent(organisationEntity.id)); | |||
|
|
|||
| let schoolName: string = 'SCHOOL_NOT_FOUND'; | |||
| if (permissions) | |||
Comment on lines
139
to
153
| permissionsMock = createMock<PersonPermissions>({ | ||
| get personFields(): Person<true> { | ||
| return createMock<Person<true>>({ | ||
| id: 'test-id', | ||
| keycloakUserId: 'test-keycloak', | ||
| vorname: 'test-vorname', | ||
| familienname: 'test-familienname', | ||
| rufname: 'test-rufname', | ||
| username: 'test-username', | ||
| geschlecht: Geschlecht.M, | ||
| geburtsdatum: faker.date.past(), | ||
| updatedAt: faker.date.recent(), | ||
| }); | ||
| }, | ||
| }); |
| rolle: { systemrechte: [], serviceProviderIds: [] }, | ||
| }, | ||
| ]), | ||
| }); |
Comment on lines
468
to
480
|
|
||
| private async getOrganisationNameForCurrentUser(permissions: PersonPermissions): Promise<string> { | ||
| const personenkontextRolleFields: PersonenkontextRolleFields[] = | ||
| await permissions?.getPersonenkontextewithRoles(); | ||
| const organisationIdUser: string | undefined = personenkontextRolleFields.at(0)?.organisationsId; | ||
| if (organisationIdUser) { | ||
| const organisationUser: Option<Organisation<true>> = | ||
| await this.organisationRepository.findById(organisationIdUser); | ||
| if (organisationUser) if (organisationUser.name) return organisationUser.name; | ||
| } | ||
| this.logger.error(`No Organisation id found for given Person id: ${permissions.personFields.id}`); | ||
| return 'ORGANISATION_NOT_FOUND'; | ||
| } |
There was a problem hiding this comment.
Ein Benutzer kann mehrere Organisationen und Rollen haben, bzw. eine Person kann mehrere Personenkontexte haben. Ich glaube der Mehrwert ist hier nicht gegeben, sich den ersten Index des Arrays für die Rollen anzuschauen.
DeFi3298
requested changes
Nov 26, 2024
Comment on lines
193
to
196
| if (!orgResult.ok) { | ||
| this.logger.info( | ||
| `Admin ${permissions.personFields.username} (${permissions.personFields.id}) hat versucht eine neue Rolle ${params.name} anzulegen. Fehler: ${orgResult.error.message}`, | ||
| ); |
There was a problem hiding this comment.
Hier logger.error verwenden. Am Besten nochmal überall prüfen.
DeFi3298
approved these changes
Nov 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Links to Tickets or other pull requests
https://ticketsystem.dbildungscloud.de/browse/SPSH-1288
Changes
Datasecurity
Deployment
New Repos, NPM pakages or vendor scripts
Approval for review