Code re-factor and error handling

island-is · Jan 14, 2025 · d922aa1 · d922aa1
1 parent 889876f
commit d922aa1
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 28 deletions.
diff --git a/...modules/src/lib/modules/templates/aosh/street-registration/street-registration.service.ts b/...modules/src/lib/modules/templates/aosh/street-registration/street-registration.service.ts
@@ -3,7 +3,7 @@ import { SharedTemplateApiService } from '../../../shared'
 import { TemplateApiModuleActionProps } from '../../../../types'
 import { ApplicationTypes } from '@island.is/application/types'
 import { BaseTemplateApiService } from '../../../base-template-api.service'
-
+import { error as errorMsg } from '@island.is/application/templates/aosh/street-registration'
 import { TemplateApiError } from '@island.is/nest/problem'
 import { coreErrorMessages } from '@island.is/application/core'
 import { StreetRegistrationAnswers } from '@island.is/application/templates/aosh/street-registration'
@@ -61,17 +61,41 @@ export class StreetRegistrationTemplateService extends BaseTemplateApiService {
   async getTypesMustInspectBeforeRegistration({
     auth,
   }: TemplateApiModuleActionProps): Promise<string[]> {
-    return await this.workMachineClientService.mustInspectBeforeRegistration(
-      auth,
-    )
+    return await this.workMachineClientService
+      .mustInspectBeforeRegistration(auth)
+      .catch((error) => {
+        this.logger.warning(
+          '[street-registration-service]: Error fetching types requires for inspection',
+          error,
+        )
+        throw new TemplateApiError(
+          {
+            title: coreErrorMessages.defaultTemplateApiError,
+            summary: errorMsg.errorGetFromAOSH,
+          },
+          500,
+        )
+      })
   }
 
   async getAvailableRegistrationTypes({
     auth,
   }: TemplateApiModuleActionProps): Promise<string[]> {
-    return await this.workMachineClientService.getAvailableRegistrationTypes(
-      auth,
-    )
+    return await this.workMachineClientService
+      .getAvailableRegistrationTypes(auth)
+      .catch((error) => {
+        this.logger.warning(
+          '[street-registration-service]: Error fetching available types for registration',
+          error,
+        )
+        throw new TemplateApiError(
+          {
+            title: coreErrorMessages.defaultTemplateApiError,
+            summary: errorMsg.errorGetFromAOSH,
+          },
+          500,
+        )
+      })
   }
 
   async submitApplication({

diff --git a/libs/application/templates/aosh/register-new-machine/src/index.ts b/libs/application/templates/aosh/register-new-machine/src/index.ts
@@ -3,7 +3,7 @@ import RegisterNewMachineTemplate from './lib/RegisterNewMachineTemplate'
 export const getDataProviders = () => import('./dataProviders/')
 export const getFields = () => import('./fields/')
 
-export { NewMachineAnswers } from './lib/dataSchema'
+export type { NewMachineAnswers } from './lib/dataSchema'
 
 export * from './utils'
 export * from './shared/types'

diff --git a/...registration/src/forms/StreetRegistrationForm/InformationSection/pickMachineSubSection.ts b/...registration/src/forms/StreetRegistrationForm/InformationSection/pickMachineSubSection.ts
@@ -6,13 +6,36 @@ import {
   getValueViaPath,
 } from '@island.is/application/core'
 import { information } from '../../../lib/messages'
-import { MachinesWithTotalCount } from '@island.is/clients/work-machines'
+import {
+  MachineDto,
+  MachinesWithTotalCount,
+} from '@island.is/clients/work-machines'
 import {
   isInvalidRegistrationType,
   isMachineDisabled,
   mustInspectBeforeStreetRegistration,
 } from '../../../utils/getSelectedMachine'
 import { useLocale } from '@island.is/localization'
+import { ExternalData } from '@island.is/application/types'
+import { MessageDescriptor } from 'react-intl'
+
+const getTagLabel = (
+  externalData: ExternalData,
+  machine: MachineDto,
+  formatMessage: (message: MessageDescriptor) => string,
+): string => {
+  if (
+    mustInspectBeforeStreetRegistration(externalData, machine?.regNumber || '')
+  ) {
+    return formatMessage(
+      information.labels.pickMachine.inspectBeforeRegistration,
+    )
+  }
+  if (isInvalidRegistrationType(externalData, machine?.regNumber || '')) {
+    return formatMessage(information.labels.pickMachine.invalidRegistrationType)
+  }
+  return machine?.status || ''
+}
 
 export const pickMachineSubSection = buildSubSection({
   id: 'pickMachine',
@@ -53,23 +76,11 @@ export const pickMachineSubSection = buildSubSection({
                   machine?.disabled ||
                   isMachineDisabled(externalData, machine?.regNumber || '')
                     ? {
-                        label: mustInspectBeforeStreetRegistration(
-                          application?.externalData,
-                          machine?.regNumber || '',
-                        )
-                          ? useLocale().formatMessage(
-                              information.labels.pickMachine
-                                .inspectBeforeRegistration,
-                            )
-                          : isInvalidRegistrationType(
-                              externalData,
-                              machine?.regNumber || '',
-                            )
-                          ? useLocale().formatMessage(
-                              information.labels.pickMachine
-                                .invalidRegistrationType,
-                            )
-                          : machine?.status || '',
+                        label: getTagLabel(
+                          externalData,
+                          machine,
+                          useLocale().formatMessage,
+                        ),
                         variant: 'red',
                         outlined: true,
                       }

diff --git a/libs/application/templates/aosh/street-registration/src/index.ts b/libs/application/templates/aosh/street-registration/src/index.ts
@@ -9,4 +9,5 @@ export type StreetRegistrationAnswers = MachineAnswers
 export * from './utils'
 export * from './lib/messages/externalData'
 export * from './lib/messages/applicationCheck'
+export * from './lib/messages/error'
 export default template
diff --git a/libs/application/templates/aosh/street-registration/src/lib/messages/error.ts b/libs/application/templates/aosh/street-registration/src/lib/messages/error.ts
@@ -43,4 +43,9 @@ export const error = defineMessages({
     defaultMessage: 'Villa kom upp við að skila inn umsókn',
     description: 'Failed to submit application',
   },
+  errorGetFromAOSH: {
+    id: 'aosh.sr.application:error.errorGetFromAOSH',
+    defaultMessage: 'Ekki tókst að sækja gögn frá Vinnueftirlitinu',
+    description: 'Failed to fetch data from AOSH',
+  },
 })
diff --git a/libs/application/ui-fields/src/lib/FindVehicleFormField/FindVehicleFormField.util.ts b/libs/application/ui-fields/src/lib/FindVehicleFormField/FindVehicleFormField.util.ts
@@ -8,6 +8,8 @@ import {
 } from '@island.is/application/types'
 import { MessageDescriptor } from 'react-intl'
 
+const REGISTRATION_TYPE_LENGTH = 2
+
 export const energyFundsLabel = function (
   energyDetails: EnergyFundVehicleDetailsWithGrant | null,
   energyFundsMessages: Record<string, FormText> | undefined,
@@ -49,13 +51,20 @@ export const mustInspectBeforeStreetRegistration = (
     'typesMustInspectBeforeRegistration.data',
     [],
   )
-  return inspectBeforeTypes?.includes(regNumber.substring(0, 2)) || false
+  return (
+    inspectBeforeTypes?.includes(
+      regNumber.substring(0, REGISTRATION_TYPE_LENGTH),
+    ) || false
+  )
 }
 
 export const isInvalidRegistrationType = (
   externalData: ExternalData,
   regNumber: string,
 ) => {
+  if (!regNumber || regNumber.length < REGISTRATION_TYPE_LENGTH) {
+    return true
+  }
   const validTypes = getValueViaPath<string[]>(
     externalData,
     'availableRegistrationTypes.data',
@@ -67,7 +76,7 @@ export const isInvalidRegistrationType = (
     [],
   )
 
-  const regType = regNumber.substring(0, 2)
+  const regType = regNumber.substring(0, REGISTRATION_TYPE_LENGTH)
 
   return (
     !validTypes?.includes(regType) && !inspectBeforeTypes?.includes(regType)