PR related improvements

island-is · Nov 28, 2024 · af739e4 · af739e4
1 parent 846bd06
commit af739e4
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 31 deletions.
diff --git a/...ication-system/api/src/app/modules/application/lifecycle/application-lifecycle.service.ts b/...ication-system/api/src/app/modules/application/lifecycle/application-lifecycle.service.ts
@@ -155,25 +155,33 @@ export class ApplicationLifeCycleService {
     const stateConfig = template.stateMachineConfig.states[application.state]
     const lifeCycle = stateConfig.meta?.lifecycle
     if (lifeCycle && lifeCycle.shouldBePruned && lifeCycle.pruneMessage) {
-      const pruneMessage =
-        typeof lifeCycle.pruneMessage === 'function'
-          ? lifeCycle.pruneMessage(application as ApplicationWithAttachments)
-          : lifeCycle.pruneMessage
-      const notification = {
-        recipient: application.applicant,
-        templateId: pruneMessage.notificationTemplateId,
-        args: [
-          {
-            key: 'externalBody',
-            value: pruneMessage.externalBody || '',
-          },
-          {
-            key: 'internalBody',
-            value: pruneMessage.internalBody || '',
-          },
-        ],
+      try {
+        const pruneMessage =
+          typeof lifeCycle.pruneMessage === 'function'
+            ? lifeCycle.pruneMessage(application as ApplicationWithAttachments)
+            : lifeCycle.pruneMessage
+        const notification = {
+          recipient: application.applicant,
+          templateId: pruneMessage.notificationTemplateId,
+          args: [
+            {
+              key: 'externalBody',
+              value: pruneMessage.externalBody || '',
+            },
+            {
+              key: 'internalBody',
+              value: pruneMessage.internalBody || '',
+            },
+          ],
+        }
+        return notification
+      } catch (error) {
+        this.logger.error(
+          `Failed to prepare pruning notification for application ${application.id}`,
+          error,
+        )
+        return null
       }
-      return notification
     }
     return null
   }

diff --git a/...api/src/app/modules/application/lifecycle/test/application-lifecycle-notification.spec.ts b/...api/src/app/modules/application/lifecycle/test/application-lifecycle-notification.spec.ts
@@ -307,5 +307,42 @@ describe('ApplicationLifeCycleService', () => {
         `Failed to send pruning notification with error: ${mockError} for application ${mockApplicationId}`,
       )
     })
+
+    it('should handle malformed pruneMessage function', async () => {
+      const mockApplication = {
+        id: '123',
+        typeId: ApplicationTypes.EXAMPLE,
+        state: 'draft',
+        applicant: 'user123',
+        answers: {},
+        externalData: {},
+        attachments: [],
+      }
+
+      const mockTemplate = {
+        stateMachineConfig: {
+          states: {
+            draft: {
+              meta: {
+                lifecycle: {
+                  shouldBePruned: true,
+                  pruneMessage: () => {
+                    throw new Error('Unexpected error')
+                  },
+                },
+              },
+            },
+          },
+        },
+      }
+
+      ;(getApplicationTemplateByTypeId as jest.Mock).mockResolvedValue(
+        mockTemplate,
+      )
+
+      const result = await service['preparePrunedNotification'](mockApplication)
+      expect(result).toBeNull()
+      expect(mockLogger.error).toHaveBeenCalled()
+    })
   })
 })
diff --git a/libs/application/types/src/lib/StateMachine.ts b/libs/application/types/src/lib/StateMachine.ts
@@ -16,7 +16,7 @@ import {
 import { Condition } from './Condition'
 import { TestSupport } from '@island.is/island-ui/utils'
 import { TemplateApi } from './template-api/TemplateApi'
-import { PruningNotification } from './ApplicationLifecycle'
+import { PruningApplication, PruningNotification } from './ApplicationLifecycle'
 
 export type ApplicationRole = 'applicant' | 'assignee' | string
 
@@ -76,18 +76,7 @@ export type StateLifeCycle =
       shouldDeleteChargeIfPaymentFulfilled?: boolean | null
       pruneMessage?:
         | PruningNotification
-        | ((
-            application: Pick<
-              ApplicationWithAttachments,
-              | 'id'
-              | 'typeId'
-              | 'state'
-              | 'applicant'
-              | 'attachments'
-              | 'answers'
-              | 'externalData'
-            >,
-          ) => PruningNotification)
+        | ((application: PruningApplication) => PruningNotification)
     }
 
 export type PendingActionDisplayType = 'warning' | 'success' | 'info' | 'error'