feat(occupational-licenses): Add license number to health directorate license (#15396)

Co-authored-by: Þorkell Máni Þorkelsson <[email protected]>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Author: thorkellmani

libs/api/domains/occupational-licenses-v2/src/lib/models/license.model.ts

@@ -8,12 +8,12 @@ export class License {
   @Field()
   licenseId!: string
 
-  @Field()
-  licenseNumber!: string
-
   @Field(() => LicenseType)
   type!: LicenseType
 
+  @Field({ nullable: true })
+  licenseNumber?: string
+
   @Field({ nullable: true })
   legalEntityId?: string
 

libs/api/domains/occupational-licenses-v2/src/lib/models/licenseResult.model.ts

@@ -6,7 +6,7 @@ export const LicenseResult = createUnionType({
   name: 'OccupationalLicensesV2LicenseResult',
   types: () => [License, LicenseError] as const,
   resolveType(value) {
-    if (value.licenseNumber) {
+    if (value.licenseId) {
       return License
     }
 

libs/api/domains/occupational-licenses-v2/src/lib/occupationalLicensesV2.service.ts

@@ -69,7 +69,6 @@ export class OccupationalLicensesV2Service {
             }
             return {
               licenseId: addLicenseTypePrefix(l.id, 'DistrictCommissioners'),
-              licenseNumber: l.id,
               type: LicenseType.DISTRICT_COMMISSIONERS,
               issuer: l.issuerId,
               issuerTitle: l.issuerTitle,
@@ -110,7 +109,6 @@ export class OccupationalLicensesV2Service {
         ),
         type: LicenseType.DISTRICT_COMMISSIONERS,
         licenseHolderName: license.holderName,
-        licenseNumber: license.licenseInfo.id,
         issuer: license.licenseInfo.issuerId,
         profession: license.licenseInfo.title,
         dateOfBirth: info(user.nationalId).birthday,
@@ -283,7 +281,6 @@ export class OccupationalLicensesV2Service {
     const issuer: OrganizationSlugType = 'haskoli-islands'
     return {
       licenseId: addLicenseTypePrefix(data.id, 'Education'),
-      licenseNumber: data.id,
       type: LicenseType.EDUCATION,
       issuer,
       issuerTitle: data.issuer,

libs/api/domains/occupational-licenses/src/index.ts

@@ -1 +1 @@
-export { OccupationalLicensesModule } from './lib/occupationalLicenses.module'
+export * from './lib/occupationalLicenses.module'

libs/service-portal/occupational-licenses/src/lib/messages.ts

@@ -87,6 +87,10 @@ export const olMessage = defineMessages({
     id: 'sp.occupational-licenses:name-of-individual',
     defaultMessage: 'Nafn einstaklings',
   },
+  licenseNumber: {
+    id: 'sp.occupational-licenses:license-number',
+    defaultMessage: 'Skírteinisnúmer',
+  },
   dateOfBirth: {
     id: 'sp.occupational-licenses:date-of-birth',
     defaultMessage: 'Fæðingardagur',

libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql

@@ -5,6 +5,7 @@ query getOccupationalLicenseById($input: OccupationalLicensesV2LicenseInput!) {
       __typename
       type
       licenseId
+      licenseNumber
       profession
       licenseHolderName
       dateOfBirth

libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx

@@ -134,6 +134,13 @@ const OccupationalLicenseDetail = () => {
             label={formatMessage(om.nameOfIndividual)}
             content={license?.licenseHolderName ?? ''}
           />
+          {license?.licenseNumber && (
+            <UserInfoLine
+              loading={loading}
+              label={formatMessage(om.licenseNumber)}
+              content={license?.licenseNumber ?? ''}
+            />
+          )}
           {(license?.dateOfBirth || loading) && (
             <UserInfoLine
               loading={loading}

libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql

@@ -5,7 +5,6 @@ query getOccupationalLicenses {
       ... on OccupationalLicenseV2 {
         __typename
         licenseId
-        licenseNumber
         legalEntityId
         issuer
         type