diff --git a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts index d204df4df6d3..02638dd0f0f3 100644 --- a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts +++ b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts @@ -15,6 +15,7 @@ import type { User } from '@island.is/auth-nest-tools' import type { ConfigType } from '@island.is/nest/config' export const mockFullName = 'mockFullName' +export const mockBirtNafn = 'mockBirtNafn' export const delegationSubjectId = 'delegation-subject-id' interface MockUserProfileDto extends UserProfileDto { @@ -218,6 +219,7 @@ export class MockNationalRegistryV3ClientService { return { fulltNafn: user?.name ?? mockFullName, + birtNafn: user?.name ?? mockBirtNafn, } } } diff --git a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts index ad6163f1d511..051cbc948f69 100644 --- a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts +++ b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts @@ -236,7 +236,7 @@ describe('NotificationsWorkerService', () => { expect(notificationDispatch.sendPushNotification).toHaveBeenCalledWith( expect.objectContaining({ nationalId: userWithDelegations.nationalId, - notificationId: recipientMessage.id, + notificationId: recipientMessage?.id, }), ) diff --git a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts index 764593d87619..cb40722cf3dc 100644 --- a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts +++ b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts @@ -7,6 +7,7 @@ import { User } from '@island.is/auth-nest-tools' import { DocumentsScope } from '@island.is/auth/scopes' import { EinstaklingurDTONafnAllt, + EinstaklingurDTONafnItar, NationalRegistryV3ClientService, } from '@island.is/clients/national-registry-v3' import { @@ -469,7 +470,7 @@ export class NotificationsWorkerService implements OnApplicationBootstrap { } private async getFullName(nationalId: string): Promise { - let identity: CompanyExtendedInfo | EinstaklingurDTONafnAllt | null + let identity: CompanyExtendedInfo | EinstaklingurDTONafnItar | null if (isCompany(nationalId)) { identity = await this.companyRegistryService.getCompany(nationalId) @@ -477,7 +478,7 @@ export class NotificationsWorkerService implements OnApplicationBootstrap { } identity = await this.nationalRegistryService.getName(nationalId) - return identity?.fulltNafn ?? '' + return identity?.birtNafn ?? '' } /* Private methods */ diff --git a/libs/clients/national-registry/v3/src/clientConfig.json b/libs/clients/national-registry/v3/src/clientConfig.json index bafe5f6ed07d..9d467dc01fef 100644 --- a/libs/clients/national-registry/v3/src/clientConfig.json +++ b/libs/clients/national-registry/v3/src/clientConfig.json @@ -24,8 +24,8 @@ "examples": { "Grunnpakki": { "value": { - "nafn": "Jón Jónsson", "kennitala": "1234567890", + "nafn": "Jón Jónsson", "tegundKennitolu": "Kennitala á Þjóðskrá", "tegundEinstaklingsNr": 1, "tegundEinstaklingsLysing": "Kennitala á Þjóðskrá", @@ -43,8 +43,8 @@ }, "Allir pakkar": { "value": { - "nafn": "Jón Jónsson", "kennitala": "1234567890", + "nafn": "Jón Jónsson", "tegundKennitolu": "Kennitala á Þjóðskrá", "tegundEinstaklingsNr": 1, "tegundEinstaklingsLysing": "Kennitala á Þjóðskrá", @@ -167,8 +167,8 @@ }, "Kerfiskennitölur - Grunnpakki": { "value": { - "nafn": "Jens Larson", "kennitala": "1122335000", + "nafn": "Jens Larson", "tegundKennitolu": "Kerfiskennitala", "tegundEinstaklingsNr": 2, "tegundEinstaklingsLysing": "Kerfiskennitala", @@ -186,8 +186,8 @@ }, "Kerfiskennitölur - Allir pakkar": { "value": { - "nafn": "Jens Larson", "kennitala": "1122335000", + "nafn": "Jens Larson", "tegundKennitolu": "Kerfiskennitala", "tegundEinstaklingsNr": 2, "tegundEinstaklingsLysing": "Kerfiskennitala", @@ -207,14 +207,14 @@ "rikisfangLand": "Danmörk" }, "nyskraningDagsetning": { - "nyskraningDagur": "2023-12-05T16:21:19.5180577+00:00" + "nyskraningDagur": "2024-10-31T10:33:19.2136626+00:00" } } }, "Látnir - grunnpakki": { "value": { - "nafn": "Jóna Jónsdóttir", "kennitala": "1122335678", + "nafn": "Jóna Jónsdóttir", "tegundKennitolu": "Kennitala á Þjóðskrá", "tegundEinstaklingsNr": 3, "tegundEinstaklingsLysing": "Lést", @@ -225,8 +225,8 @@ }, "Látnir - allir pakkar": { "value": { - "nafn": "Jóna Jónsdóttir", "kennitala": "1122335678", + "nafn": "Jóna Jónsdóttir", "tegundKennitolu": "Kennitala á Þjóðskrá", "tegundEinstaklingsNr": 3, "tegundEinstaklingsLysing": "Lést", @@ -295,8 +295,8 @@ "examples": { "Grunnpakki": { "value": { - "nafn": "Jón Jónsson", "kennitala": "1234567890", + "nafn": "Jón Jónsson", "tegundKennitolu": "Kennitala á Þjóðskrá", "tegundEinstaklingsNr": 1, "tegundEinstaklingsLysing": "Kennitala á Þjóðskrá", @@ -1132,8 +1132,8 @@ "examples": { "Grunnpakki": { "value": { - "nafn": "Jón Jónsson", "kennitala": "1234567890", + "nafn": "Jón Jónsson", "tegundKennitolu": "Kennitala á Þjóðskrá", "tegundEinstaklingsNr": 1, "tegundEinstaklingsLysing": "Kennitala á Þjóðskrá", diff --git a/libs/clients/national-registry/v3/src/lib/nationalRegistryV3.service.ts b/libs/clients/national-registry/v3/src/lib/nationalRegistryV3.service.ts index 85e2b5e296e9..1f8e09ec369e 100644 --- a/libs/clients/national-registry/v3/src/lib/nationalRegistryV3.service.ts +++ b/libs/clients/national-registry/v3/src/lib/nationalRegistryV3.service.ts @@ -13,7 +13,7 @@ import { EinstaklingurDTOItarAuka, EinstaklingurDTOLogforeldrar, EinstaklingurDTOLoghTengsl, - EinstaklingurDTONafnAllt, + EinstaklingurDTONafnItar, EinstaklingurDTORikisfang, EinstaklingurDTOTru, GerviEinstaklingarApi, @@ -97,7 +97,7 @@ export class NationalRegistryV3ClientService { ) } - getName(nationalId: string): Promise { + getName(nationalId: string): Promise { return handle204( this.individualApi.midlunV1EinstaklingarNationalIdNafnItarGetRaw({ nationalId,