Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(auth-admin): Use birtNafn instead of fulltNafn #16684

Merged
merged 10 commits into from
Nov 12, 2024
Merged

feat(auth-admin): Use birtNafn instead of fulltNafn #16684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3df25d5
Use birtNafn instead of fulltNafn
magnearun Oct 31, 2024
7a8853d
Merge branch 'main' into fix/email-name
magnearun Oct 31, 2024
b1b1c2c
chore: nx format:write update dirty files
andes-it Oct 31, 2024
a22d18d
Merge branch 'main' into fix/email-name
magnearun Nov 7, 2024
d9b20d2
Merge branch 'main' into fix/email-name
magnearun Nov 7, 2024
8467e54
Merge branch 'main' into fix/email-name
magnearun Nov 8, 2024
e2221f9
fix tests
magnearun Nov 11, 2024
33a1ef0
Merge branch 'main' into fix/email-name
magnearun Nov 11, 2024
aedd6c7
Merge branch 'main' into fix/email-name
magnearun Nov 12, 2024
4a16c7c
Merge branch 'main' into fix/email-name
kodiakhq[bot] Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/services/user-notification/src/app/modules/notifications/notificationsWorker/mocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -218,6 +219,7 @@ export class MockNationalRegistryV3ClientService {

return {
fulltNafn: user?.name ?? mockFullName,
birtNafn: user?.name ?? mockBirtNafn,
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ion/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ describe('NotificationsWorkerService', () => {
expect(notificationDispatch.sendPushNotification).toHaveBeenCalledWith(
expect.objectContaining({
nationalId: userWithDelegations.nationalId,
notificationId: recipientMessage.id,
notificationId: recipientMessage?.id,
}),
)

Expand Down
5 changes: 3 additions & 2 deletions ...fication/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -469,15 +470,15 @@ export class NotificationsWorkerService implements OnApplicationBootstrap {
}

private async getFullName(nationalId: string): Promise<string> {
let identity: CompanyExtendedInfo | EinstaklingurDTONafnAllt | null
let identity: CompanyExtendedInfo | EinstaklingurDTONafnItar | null

if (isCompany(nationalId)) {
identity = await this.companyRegistryService.getCompany(nationalId)
return identity?.name ?? ''
}

identity = await this.nationalRegistryService.getName(nationalId)
rafnarnason marked this conversation as resolved.
Show resolved Hide resolved
return identity?.fulltNafn ?? ''
return identity?.birtNafn ?? ''
}

/* Private methods */
Expand Down
18 changes: 9 additions & 9 deletions libs/clients/national-registry/v3/src/clientConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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á",
Expand All @@ -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á",
Expand Down Expand Up @@ -167,8 +167,8 @@
},
"Kerfiskennitölur - Grunnpakki": {
"value": {
"nafn": "Jens Larson",
"kennitala": "1122335000",
"nafn": "Jens Larson",
"tegundKennitolu": "Kerfiskennitala",
"tegundEinstaklingsNr": 2,
"tegundEinstaklingsLysing": "Kerfiskennitala",
Expand All @@ -186,8 +186,8 @@
},
"Kerfiskennitölur - Allir pakkar": {
"value": {
"nafn": "Jens Larson",
"kennitala": "1122335000",
"nafn": "Jens Larson",
"tegundKennitolu": "Kerfiskennitala",
"tegundEinstaklingsNr": 2,
"tegundEinstaklingsLysing": "Kerfiskennitala",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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á",
Expand Down Expand Up @@ -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á",
Expand Down
4 changes: 2 additions & 2 deletions libs/clients/national-registry/v3/src/lib/nationalRegistryV3.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
EinstaklingurDTOItarAuka,
EinstaklingurDTOLogforeldrar,
EinstaklingurDTOLoghTengsl,
EinstaklingurDTONafnAllt,
EinstaklingurDTONafnItar,
EinstaklingurDTORikisfang,
EinstaklingurDTOTru,
GerviEinstaklingarApi,
Expand Down Expand Up @@ -97,7 +97,7 @@ export class NationalRegistryV3ClientService {
)
}

getName(nationalId: string): Promise<EinstaklingurDTONafnAllt | null> {
getName(nationalId: string): Promise<EinstaklingurDTONafnItar | null> {
return handle204(
this.individualApi.midlunV1EinstaklingarNationalIdNafnItarGetRaw({
nationalId,
Expand Down
Loading