fix(AOSH): Fixing a few minor bugs on AOSH applications

libs/application/template-api-modules/src/lib/modules/templates/aosh/transfer-of-machine-ownership/emailGenerators/applicationRejectedEmail.ts

@@ -69,7 +69,6 @@ export const generateApplicationRejectedEmail: ApplicationRejectedEmail = (
               `<span>Beiðni um eigendaskipti á tækinu ${regNumber} hefur verið afturkölluð þar sem eftirfarandi aðilar staðfestu ekki:</span><br/>` +
               `<ul><li><p>${rejectedByStr}</p></li></ul>` +
               `<span>Til þess að skrá eigendaskiptin rafrænt verður að byrja ferlið að upp á nýtt á umsóknarvef island.is: island.is/umsoknir, ásamt því að allir aðilar þurfa að staðfesta rafrænt innan gefins tímafrests.</span><br/>` +
-              `<span>Þessi tilkynning á aðeins við um rafræna umsókn af umsóknarvef island.is en ekki um eigendaskipti sem skilað hefur verið inn til Vinnueftirlitsins á pappír.</span><br/>` +
               `<span>Vinsamlegast hafið samband við Vinnueftirlitið [email protected] ef nánari upplýsinga er þörf.</span>`,
           },
         },

libs/application/template-api-modules/src/lib/modules/templates/aosh/transfer-of-machine-ownership/transfer-of-machine-ownership.service.ts

@@ -77,26 +77,9 @@ export class TransferOfMachineOwnershipTemplateService extends BaseTemplateApiSe
   async submitApplication({
     application,
     auth,
+    currentUserLocale,
   }: TemplateApiModuleActionProps): Promise<void> {
-    // Validate payment
-    // Make sure a paymentUrl was created
-    const { paymentUrl } = application.externalData.createCharge.data as {
-      paymentUrl: string
-    }
-    if (!paymentUrl) {
-      throw new Error(
-        'Ekki er búið að staðfesta greiðslu, hinkraðu þar til greiðslan er staðfest.',
-      )
-    }
-
-    // Make sure payment is fulfilled (has been paid)
-    const payment: { fulfilled: boolean } | undefined =
-      await this.sharedTemplateAPIService.getPaymentStatus(auth, application.id)
-    if (!payment?.fulfilled) {
-      throw new Error(
-        'Ekki er búið að staðfesta greiðslu, hinkraðu þar til greiðslan er staðfest.',
-      )
-    }
+    await this.handlePayment({ application, auth, currentUserLocale })
 
     // Confirm owner change in AOSH
     const answers = application.answers as TransferOfMachineOwnershipAnswers
@@ -141,9 +124,10 @@ export class TransferOfMachineOwnershipTemplateService extends BaseTemplateApiSe
               generateApplicationSubmittedEmail(props, recipientList[i]),
             application,
           )
-          .catch(() => {
+          .catch((e) => {
             this.logger.error(
               `Error sending email about submit application to ${recipientList[i].email}`,
+              e,
             )
           })
       }
@@ -155,9 +139,10 @@ export class TransferOfMachineOwnershipTemplateService extends BaseTemplateApiSe
               generateApplicationSubmittedSms(application, recipientList[i]),
             application,
           )
-          .catch(() => {
+          .catch((e) => {
             this.logger.error(
               `Error sending sms about submit application to ${recipientList[i].phone}`,
+              e,
             )
           })
       }
@@ -166,32 +151,22 @@ export class TransferOfMachineOwnershipTemplateService extends BaseTemplateApiSe
   async initReview({
     application,
     auth,
+    currentUserLocale,
   }: TemplateApiModuleActionProps): Promise<Array<EmailRecipient>> {
-    // 1. Validate payment
-
-    // 1a. Make sure a paymentUrl was created
-    const { paymentUrl, id: paymentId } = application.externalData.createCharge
-      .data as {
-      paymentUrl: string
-      id: string
-    }
+    const answers = application.answers as TransferOfMachineOwnershipAnswers
 
-    if (!paymentUrl) {
-      throw new Error(
-        'Ekki er búið að staðfesta greiðslu, hinkraðu þar til greiðslan er staðfest.',
-      )
-    }
-
-    // 1b. Make sure payment is fulfilled (has been paid)
-    const payment: { fulfilled: boolean } | undefined =
-      await this.sharedTemplateAPIService.getPaymentStatus(auth, application.id)
-    if (!payment?.fulfilled) {
-      throw new Error(
-        'Ekki er búið að staðfesta greiðslu, hinkraðu þar til greiðslan er staðfest.',
-      )
+    if (
+      answers.machine.paymentRequiredForOwnerChange &&
+      application.state === 'draft'
+    ) {
+      return []
     }
+    const paymentId = await this.handlePayment({
+      application,
+      auth,
+      currentUserLocale,
+    })
 
-    const answers = application.answers as TransferOfMachineOwnershipAnswers
     const machineId = answers.machine.id || answers.pickMachine.id
     if (!machineId) {
       throw new Error('Ekki er búið að velja vél')
@@ -221,9 +196,10 @@ export class TransferOfMachineOwnershipTemplateService extends BaseTemplateApiSe
             (props) => generateRequestReviewEmail(props, recipientList[i]),
             application,
           )
-          .catch(() => {
+          .catch((e) => {
             this.logger.error(
               `Error sending email about initReview to ${recipientList[i].email}`,
+              e,
             )
           })
       }
@@ -235,16 +211,57 @@ export class TransferOfMachineOwnershipTemplateService extends BaseTemplateApiSe
               generateRequestReviewSms(application, options, recipientList[i]),
             application,
           )
-          .catch(() => {
+          .catch((e) => {
             this.logger.error(
               `Error sending sms about initReview to ${recipientList[i].phone}`,
+              e,
             )
           })
       }
     }
 
     return recipientList
   }
+
+  private async handlePayment({
+    application,
+    auth,
+  }: TemplateApiModuleActionProps): Promise<string | null> {
+    const answers = application.answers as TransferOfMachineOwnershipAnswers
+
+    if (answers.machine.paymentRequiredForOwnerChange) {
+      // 1. Validate payment
+
+      // 1a. Make sure a paymentUrl was created
+
+      const { paymentUrl = '', id: paymentId = '' } = (application.externalData
+        ?.createCharge?.data ?? {}) as {
+        paymentUrl: string
+        id: string
+      }
+
+      if (!paymentUrl) {
+        throw new Error(
+          'Ekki er búið að staðfesta greiðslu, hinkraðu þar til greiðslan er staðfest.',
+        )
+      }
+
+      // 1b. Make sure payment is fulfilled (has been paid)
+      const payment: { fulfilled: boolean } | undefined =
+        await this.sharedTemplateAPIService.getPaymentStatus(
+          auth,
+          application.id,
+        )
+      if (!payment?.fulfilled) {
+        throw new Error(
+          'Ekki er búið að staðfesta greiðslu, hinkraðu þar til greiðslan er staðfest.',
+        )
+      }
+      return paymentId
+    }
+    return null
+  }
+
   async rejectApplication({
     application,
     auth,

libs/application/templates/aosh/change-machine-supervisor/src/forms/ChangeMachineSupervisorForm/InformationSection/machineSubSection.ts

@@ -102,19 +102,6 @@ export const machineSubSection = buildSubSection({
             return machine?.plate || ''
           },
         }),
-        buildDateField({
-          id: 'machine.date',
-          title: information.labels.machine.date,
-          required: false,
-          width: 'half',
-          maxDate: new Date(),
-          minDate: () => {
-            const minDate = new Date()
-            minDate.setDate(minDate.getDate() - 7)
-            return minDate
-          },
-          defaultValue: new Date().toISOString().substring(0, 10),
-        }),
       ],
     }),
   ],

libs/application/templates/aosh/change-machine-supervisor/src/forms/ChangeMachineSupervisorForm/InformationSection/pickMachineSubSection.ts

@@ -18,7 +18,7 @@ export const pickMachineSubSection = buildSubSection({
       description: information.labels.pickMachine.description,
       children: [
         buildRadioField({
-          id: 'pickMachine.id',
+          id: 'machine.id',
           title: information.labels.pickMachine.title,
           condition: (_, externalData) => {
             const machines = getValueViaPath(

libs/application/templates/aosh/change-machine-supervisor/src/utils/getSelectedMachine.ts

@@ -7,11 +7,17 @@ export const getSelectedMachine = (
   externalData: ExternalData,
   answers: FormValue,
 ) => {
-  const machineId = getValueViaPath(answers, 'pickMachine.id', '') as Machine
+  if (answers.findVehicle) {
+    const machine = getValueViaPath(answers, 'machine') as Machine
+    return machine
+  }
+
+  const machineId = getValueViaPath(answers, 'machine.id', '') as Machine
   const machinesWithTotal = getValueViaPath(
     externalData,
     'machinesList.data',
     {},
   ) as MachinesWithTotalCount
+
   return machinesWithTotal.machines.find((machine) => machine.id === machineId)
 }

libs/application/templates/aosh/deregister-machine/src/forms/DeregisterMachineForm/InformationSection/pickMachineSubSection.ts

@@ -18,7 +18,7 @@ export const pickMachineSubSection = buildSubSection({
       description: information.labels.pickMachine.description,
       children: [
         buildRadioField({
-          id: 'pickMachine.id',
+          id: 'machine.id',
           title: information.labels.pickMachine.title,
           condition: (_, externalData) => {
             const machines = getValueViaPath(

libs/application/templates/aosh/deregister-machine/src/utils/getSelectedMachine.ts

@@ -7,11 +7,17 @@ export const getSelectedMachine = (
   externalData: ExternalData,
   answers: FormValue,
 ) => {
-  const machineId = getValueViaPath(answers, 'pickMachine.id', '') as Machine
-  const machines = getValueViaPath(
+  if (answers.findVehicle) {
+    const machine = getValueViaPath(answers, 'machine') as Machine
+    return machine
+  }
+
+  const machineId = getValueViaPath(answers, 'machine.id', '') as Machine
+  const machinesWithTotal = getValueViaPath(
     externalData,
     'machinesList.data',
     {},
   ) as MachinesWithTotalCount
-  return machines.machines.find((machine) => machine.id === machineId)
+
+  return machinesWithTotal.machines.find((machine) => machine.id === machineId)
 }

libs/application/templates/aosh/request-for-inspection/project.json

@@ -17,7 +17,7 @@
     "extract-strings": {
       "executor": "nx:run-commands",
       "options": {
-        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/aosh/request-for-inspection1/src/**/*.{js,ts,tsx}'"
+        "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/aosh/request-for-inspection/src/**/*.{js,ts,tsx}'"
       }
     },
     "test": {

libs/application/templates/aosh/request-for-inspection/src/forms/RequestMachineForInspectionForm/InformationSection/pickMachineSubSection.ts

@@ -25,7 +25,7 @@ export const pickMachineSubSection = buildSubSection({
           alertType: 'info',
         }),
         buildRadioField({
-          id: 'pickMachine.id',
+          id: 'machine.id',
           title: information.labels.pickMachine.title,
           condition: (_, externalData) => {
             const machines = getValueViaPath(

libs/application/templates/aosh/request-for-inspection/src/lib/messages/conclusion.ts

@@ -30,7 +30,7 @@ export const conclusion = {
       description: 'Conclusion seller alert message',
     },
     alertTitle: {
-      id: 'aosh.rifm.application:conclusion.default.alertMessage',
+      id: 'aosh.rifm.application:conclusion.default.alertTitle',
       defaultMessage: 'Beiðni um skoðun á tæki hefur verið móttekin!',
       description: 'Conclusion seller alert title',
     },

libs/application/templates/aosh/request-for-inspection/src/utils/getSelectedMachine.ts

@@ -7,11 +7,17 @@ export const getSelectedMachine = (
   externalData: ExternalData,
   answers: FormValue,
 ) => {
-  const machineId = getValueViaPath(answers, 'pickMachine.id', '') as Machine
+  if (answers.findVehicle) {
+    const machine = getValueViaPath(answers, 'machine') as Machine
+    return machine
+  }
+
+  const machineId = getValueViaPath(answers, 'machine.id', '') as Machine
   const machinesWithTotal = getValueViaPath(
     externalData,
     'machinesList.data',
     {},
   ) as MachinesWithTotalCount
+
   return machinesWithTotal.machines.find((machine) => machine.id === machineId)
 }

libs/application/templates/aosh/street-registration/src/forms/StreetRegistrationForm/InformationSection/pickMachineSubSection.ts

@@ -20,7 +20,7 @@ export const pickMachineSubSection = buildSubSection({
       description: information.labels.pickMachine.description,
       children: [
         buildRadioField({
-          id: 'pickMachine.id',
+          id: 'machine.id',
           title: '',
           condition: (_, externalData) => {
             const machines = getValueViaPath(

libs/application/templates/aosh/street-registration/src/utils/getSelectedMachine.ts

@@ -13,13 +13,19 @@ export const getSelectedMachine = (
   externalData: ExternalData,
   answers: FormValue,
 ) => {
-  const machineId = getValueViaPath(answers, 'pickMachine.id', '') as Machine
-  const machines = getValueViaPath(
+  if (answers.findVehicle) {
+    const machine = getValueViaPath(answers, 'machine') as Machine
+    return machine
+  }
+
+  const machineId = getValueViaPath(answers, 'machine.id', '') as Machine
+  const machinesWithTotal = getValueViaPath(
     externalData,
     'machinesList.data',
     {},
   ) as MachinesWithTotalCount
-  return machines.machines.find((machine) => machine.id === machineId)
+
+  return machinesWithTotal.machines.find((machine) => machine.id === machineId)
 }
 
 export const mustInspectBeforeStreetRegistration = (