feat(id-card): updates to application

libs/application/template-api-modules/src/lib/modules/shared/api/national-registry/national-registry.service.ts

@@ -51,6 +51,25 @@ export class NationalRegistryService extends BaseTemplateApiService {
       await this.validateChildren(params, children)
     }
 
+    //allow parents whose children are icelandic citizenships in, but if no children, then check citizenship
+    if (params?.allowIfChildHasCitizenship) {
+      const children = await this.nationalRegistryApi.getCustodyChildren(auth)
+      if (children.length > 0) {
+        let foundChildWithIcelandicCitizenship = false
+        for (const child of children) {
+          const individual = await this.getIndividual(child)
+          if (individual?.citizenship?.code === 'IS') {
+            foundChildWithIcelandicCitizenship = true
+            break
+          }
+        }
+        //if child validates with icelandic citizenship, then do not check parents citizenship
+        if (foundChildWithIcelandicCitizenship) {
+          params = { ...params, icelandicCitizenship: false }
+        }
+      }
+    }
+
     // Validate individual
     this.validateIndividual(individual, false, params)
 

libs/application/template-api-modules/src/lib/modules/templates/id-card/constants.ts

@@ -12,26 +12,3 @@ export type DistrictCommissionerAgencies = {
   address: string
   key: string
 }
-
-export interface IdentityDocumentChild {
-  childNationalId: string
-  secondParent: string
-  secondParentName: string
-  childName: string
-  passports?: IdentityDocument[]
-}
-
-export type IdentityDocument = {
-  number: string
-  type: string
-  verboseType: string
-  subType: string
-  status: string
-  issuingDate: string
-  expirationDate: string
-  displayFirstName: string
-  displayLastName: string
-  mrzFirstName: string
-  mrzLastName: string
-  sex: string
-}

libs/application/template-api-modules/src/lib/modules/templates/id-card/id-card.service.ts

@@ -4,16 +4,16 @@ import { LOGGER_PROVIDER } from '@island.is/logging'
 import { SharedTemplateApiService } from '../../shared'
 import { TemplateApiModuleActionProps } from '../../../types'
 import { coreErrorMessages, getValueViaPath } from '@island.is/application/core'
-import {
-  DistrictCommissionerAgencies,
-  IdentityDocumentChild,
-} from './constants'
+import { DistrictCommissionerAgencies } from './constants'
 import {
   ChargeFjsV2ClientService,
   getPaymentIdFromExternalData,
 } from '@island.is/clients/charge-fjs-v2'
 import { generateAssignParentBApplicationEmail } from './emailGenerators/assignParentBEmail'
-import { PassportsService } from '@island.is/clients/passports'
+import {
+  IdentityDocumentChild,
+  PassportsService,
+} from '@island.is/clients/passports'
 import { BaseTemplateApiService } from '../../base-template-api.service'
 import {
   ApplicationTypes,
@@ -27,7 +27,7 @@ import {
 } from '@island.is/application/templates/id-card'
 import { generateApplicationRejectEmail } from './emailGenerators/rejectApplicationEmail'
 import { generateApplicationSubmittedEmail } from './emailGenerators/applicationSubmittedEmail'
-
+import { info } from 'kennitala'
 @Injectable()
 export class IdCardService extends BaseTemplateApiService {
   constructor(
@@ -57,41 +57,56 @@ export class IdCardService extends BaseTemplateApiService {
       )
     }
 
-    const expDate = identityDocument.userPassport?.expirationDate?.toString()
     // if applicant has valid id that is not withinExpirationDate, then not available for application,
     // otherwise available, either with no id or id within expiration limit
     // applicant can have a valid ID and apply for II
-    const applicantIdentityWithinLimits = expDate
-      ? isAvailableForApplication(
-          expDate,
-          'ID',
-          `${identityDocument.userPassport?.type}${identityDocument.userPassport?.subType}`,
-        )
-      : true
+    const applicantAge = info(auth.nationalId).age
+    const applicantInformation = {
+      age: applicantAge,
+      nationalId: auth.nationalId,
+      passport: identityDocument.userPassport,
+      children: identityDocument.childPassports,
+    }
+    const applicantIDWithinLimits = isAvailableForApplication(
+      'ID',
+      applicantInformation,
+    )
+    const applicantIIWithinLimits = isAvailableForApplication(
+      'II',
+      applicantInformation,
+    )
 
     let childIdentityWithinLimits = false
     identityDocument.childPassports?.map((child) => {
       if (child.passports && child.passports.length > 0) {
         child.passports.map((id) => {
-          const withinLimits = id.expirationDate
-            ? isAvailableForApplication(
-                id.expirationDate.toString(),
-                'ID',
-                `${id.type}${id.subType}`,
-              )
-            : true
+          if (child.childNationalId) {
+            const childInformation = {
+              age: info(child.childNationalId).age,
+              nationalId: child.childNationalId,
+              passport: child.passports?.[0],
+            }
+            const withinLimits = isAvailableForApplication(
+              'ID',
+              childInformation,
+            )
 
-          if (withinLimits) {
-            // if there is any id for any child that is within limits then user should be let through dataProvider
-            childIdentityWithinLimits = true
+            if (withinLimits) {
+              // if there is any id for any child that is within limits then user should be let through dataProvider
+              childIdentityWithinLimits = true
+            }
           }
         })
       } else {
         childIdentityWithinLimits = true // if child has no id, then let through for application of new id
       }
     })
 
-    if (!applicantIdentityWithinLimits && !childIdentityWithinLimits) {
+    if (
+      !applicantIDWithinLimits &&
+      !applicantIIWithinLimits &&
+      !childIdentityWithinLimits
+    ) {
       throw new TemplateApiError(
         {
           title: coreErrorMessages.idCardApplicationRequirementsNotMet,
@@ -278,7 +293,6 @@ export class IdCardService extends BaseTemplateApiService {
         guid: application.id,
         appliedForPersonId: auth.nationalId,
         priority: answers.priceList.priceChoice === Services.EXPRESS ? 1 : 0,
-        deliveryName: answers.priceList.location,
         contactInfo: {
           phoneAtHome: applicantInformation.phoneNumber,
           phoneAtWork: applicantInformation.phoneNumber,
@@ -298,7 +312,6 @@ export class IdCardService extends BaseTemplateApiService {
         guid: application.id,
         appliedForPersonId: applicantInformation.nationalId,
         priority: answers.priceList.priceChoice === Services.EXPRESS ? 1 : 0,
-        deliveryName: answers.priceList.location,
         approvalA: {
           personId:
             firstGuardianInformation?.nationalId?.replace('-', '') || '',

libs/application/templates/id-card/project.json

@@ -20,18 +20,18 @@
       "options": {
         "jestConfig": "libs/application/templates/id-card/jest.config.ts",
         "passWithNoTests": true
-      },
-      "extract-strings": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/id-card/src/**/*.{js,ts,tsx}'"
-        }
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+      }
+    },
+    "extract-strings": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/id-card/src/**/*.{js,ts,tsx}'"
+      }
+    },
+    "configurations": {
+      "ci": {
+        "ci": true,
+        "codeCoverage": true
       }
     }
   }

libs/application/templates/id-card/src/dataProviders/index.ts

@@ -33,7 +33,7 @@ const defaultParams = {
     summary: error.invalidAgeDescription,
   },
   icelandicCitizenship: true,
-  allowPassOnChild: true,
+  allowIfChildHasCitizenship: true,
 }
 
 export const NationalRegistryUser = NationalRegistryUserApi.configure({
@@ -45,6 +45,7 @@ export const NationalRegistryUserParentB = NationalRegistryUserApi.configure({
     ...defaultParams,
     icelandicCitizenship: false,
   },
+  externalDataId: 'nationalRegistryParentB',
 })
 
 export const SyslumadurPaymentCatalogApi = PaymentCatalogApi.configure({

libs/application/templates/id-card/src/fields/ClearAnswers/index.tsx

@@ -18,13 +18,13 @@ export const ClearAnswers: FC<React.PropsWithChildren<FieldBaseProps>> = ({
   setBeforeSubmitCallback &&
     setBeforeSubmitCallback(async () => {
       const chosenApplicants = getValues(Routes.CHOSENAPPLICANTS)
-
+      const newAnswers = updateAnswers(application, chosenApplicants, setValue)
       try {
         await updateApplication({
           variables: {
             input: {
               id: application.id,
-              answers: updateAnswers(application, chosenApplicants, setValue),
+              answers: newAnswers,
             },
             locale,
           },

libs/application/templates/id-card/src/fields/RejectApproveButtons/index.tsx

@@ -51,7 +51,10 @@ export const RejectApproveButtons: FC<
         input: {
           id: application.id,
           event: DefaultEvents.SUBMIT,
-          answers: {},
+          answers: {
+            ...application.answers,
+            'secondGuardianInformation.approved': true,
+          },
         },
       },
     })