feat(accident-notification): connect new api for accident-notification

apps/application-system/api/src/app/app.module.ts

@@ -55,6 +55,7 @@ import { DataProtectionComplaintClientConfig } from '@island.is/clients/data-pro
 import { CriminalRecordClientConfig } from '@island.is/clients/criminal-record'
 import { HealthInsuranceV2ClientConfig } from '@island.is/clients/icelandic-health-insurance/health-insurance'
 import { VmstClientConfig } from '@island.is/clients/vmst'
+import { RightsPortalClientConfig } from '@island.is/clients/icelandic-health-insurance/rights-portal'
 import { FriggClientConfig } from '@island.is/clients/mms/frigg'
 import { smsModuleConfig } from '@island.is/nova-sms'
 import { emailModuleConfig } from '@island.is/email-service'
@@ -112,6 +113,7 @@ import { emailModuleConfig } from '@island.is/email-service'
         CriminalRecordClientConfig,
         HealthInsuranceV2ClientConfig,
         VmstClientConfig,
+        RightsPortalClientConfig,
         FriggClientConfig,
         smsModuleConfig,
         emailModuleConfig,

libs/api/domains/application/src/lib/application.service.ts

@@ -115,6 +115,7 @@ export class ApplicationService {
       to: input.to,
     })
   }
+
   async create(input: CreateApplicationInput, auth: Auth) {
     return this.applicationApiWithAuth(auth).applicationControllerCreate({
       createApplicationDto: input,

libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.module.ts

@@ -3,11 +3,11 @@ import { SharedTemplateAPIModule } from '../../shared'
 import { BaseTemplateAPIModuleConfig } from '../../../types'
 import { ACCIDENT_NOTIFICATION_CONFIG } from './config'
 import { AccidentNotificationService } from './accident-notification.service'
-import { HealthInsuranceV2ClientModule } from '@island.is/clients/icelandic-health-insurance/health-insurance'
 import { ApplicationAttachmentService } from './attachments/applicationAttachment.service'
 import { AccidentNotificationAttachmentProvider } from './attachments/applicationAttachmentProvider'
 import { S3 } from 'aws-sdk'
 import { S3Service } from './attachments/s3.service'
+import { RightsPortalClientModule } from '@island.is/clients/icelandic-health-insurance/rights-portal'
 
 const applicationRecipientName =
   process.env.ACCIDENT_NOTIFICATION_APPLICATION_RECIPIENT_NAME ?? ''
@@ -26,7 +26,7 @@ export class AccidentNotificationModule {
       module: AccidentNotificationModule,
       imports: [
         SharedTemplateAPIModule.register(config),
-        HealthInsuranceV2ClientModule,
+        RightsPortalClientModule,
       ],
       providers: [
         {

libs/application/template-api-modules/src/lib/modules/templates/accident-notification/accident-notification.service.ts

@@ -4,14 +4,12 @@ import {
   ReviewApprovalEnum,
   utils,
 } from '@island.is/application/templates/accident-notification'
-import { DocumentApi } from '@island.is/clients/icelandic-health-insurance/health-insurance'
 import { LOGGER_PROVIDER } from '@island.is/logging'
 import type { Logger } from '@island.is/logging'
 import { Inject, Injectable } from '@nestjs/common'
 import { TemplateApiModuleActionProps } from '../../../types'
 import { SharedTemplateApiService } from '../../shared'
 import {
-  applictionAnswersToXml,
   getApplicationDocumentId,
   whiteListedErrorCodes,
 } from './accident-notification.utils'
@@ -28,9 +26,11 @@ import {
   getAddAttachmentSentDocumentHashList,
   getApplicationAttachmentStatus,
 } from './attachments/attachment.utils'
-import { AccidentNotificationAttachment } from './types/attachments'
 import { BaseTemplateApiService } from '../../base-template-api.service'
 import { ApplicationTypes } from '@island.is/application/types'
+import { applicationToAccidentReport } from './accodent-notification-v2.utils'
+import { AccidentreportsApi } from '@island.is/clients/icelandic-health-insurance/rights-portal'
+import { Auth, AuthMiddleware } from '@island.is/auth-nest-tools'
 
 const SIX_MONTHS_IN_SECONDS_EXPIRES = 6 * 30 * 24 * 60 * 60
 
@@ -42,36 +42,41 @@ export class AccidentNotificationService extends BaseTemplateApiService {
     private accidentConfig: AccidentNotificationConfig,
     private readonly sharedTemplateAPIService: SharedTemplateApiService,
     private readonly attachmentProvider: AccidentNotificationAttachmentProvider,
-    private readonly documentApi: DocumentApi,
+    private readonly accidentReportsApi: AccidentreportsApi,
   ) {
     super(ApplicationTypes.ACCIDENT_NOTIFICATION)
   }
 
-  async submitApplication({ application }: TemplateApiModuleActionProps) {
+  private accidentsReportsApiWithAuth(auth: Auth) {
+    return this.accidentReportsApi.withMiddleware(new AuthMiddleware(auth))
+  }
+
+  async submitApplication({ application, auth }: TemplateApiModuleActionProps) {
     try {
       const requests = attachmentStatusToAttachmentRequests()
-
       const attachments = await this.attachmentProvider.getFiles(
         requests,
         application,
       )
 
       const fileHashList = attachments.map((attachment) => attachment.hash)
-
       const answers = application.answers as AccidentNotificationAnswers
-      const xml = applictionAnswersToXml(answers, attachments)
+      const accidentReport = applicationToAccidentReport(answers, attachments)
 
-      const { ihiDocumentID } = await this.documentApi.documentPost({
-        document: { doc: xml, documentType: 801 },
+      const res = await this.accidentsReportsApiWithAuth(
+        auth,
+      ).submitAccidentReport({
+        minarsidurAPIModelsAccidentReportsAccidentReportDTO: accidentReport,
       })
+      const reportId = res.reportId
 
       await this.sharedTemplateAPIService.sendEmail(
         (props) =>
           generateConfirmationEmail(
             props,
             this.accidentConfig.applicationSenderName,
             this.accidentConfig.applicationSenderEmail,
-            ihiDocumentID,
+            reportId ?? undefined,
           ),
         application,
       )
@@ -85,13 +90,17 @@ export class AccidentNotificationService extends BaseTemplateApiService {
 
         await this.sharedTemplateAPIService.assignApplicationThroughEmail(
           (props, assignLink) =>
-            generateAssignReviewerEmail(props, assignLink, ihiDocumentID),
+            generateAssignReviewerEmail(
+              props,
+              assignLink,
+              reportId ?? undefined,
+            ),
           application,
           token,
         )
       }
       return {
-        documentId: ihiDocumentID,
+        documentId: reportId,
         sentDocuments: fileHashList,
       }
     } catch (e) {
@@ -131,18 +140,18 @@ export class AccidentNotificationService extends BaseTemplateApiService {
 
     const documentId = getApplicationDocumentId(application)
 
-    const promises = newAttachments.map((attachment) =>
-      this.sendAttachment(attachment, documentId),
-    )
+    // const promises = newAttachments.map((attachment) =>
+    //   this.sendAttachment(attachment, documentId),
+    // )
 
-    const successfulAttachments = (await Promise.all(promises)).filter(
-      (x) => x !== null,
-    )
+    // const successfulAttachments = (await Promise.all(promises)).filter(
+    //   (x) => x !== null,
+    // )
 
     return {
       sentDocuments: [
         ...getAddAttachmentSentDocumentHashList(application),
-        ...successfulAttachments,
+        // ...successfulAttachments,
       ],
     }
   }
@@ -151,25 +160,25 @@ export class AccidentNotificationService extends BaseTemplateApiService {
    * Sends the attachment to SÍ and returns the document hash on success and null on failure
    * @param attachment attachment to send
    */
-  private async sendAttachment(
-    attachment: AccidentNotificationAttachment,
-    documentId: number,
-  ): Promise<string | null> {
-    try {
-      await this.documentApi.documentDocumentAttachment({
-        documentAttachment: {
-          attachmentBody: attachment.content,
-          attachmentType: attachment.attachmentType,
-          title: attachment.name,
-        },
-        ihiDocumentID: documentId,
-      })
-      return attachment.hash
-    } catch (e) {
-      this.logger.error('Error sending document to SÍ', e)
-      return null
-    }
-  }
+  // private async sendAttachment(
+  //   attachment: AccidentNotificationAttachment,
+  //   documentId: number,
+  // ): Promise<string | null> {
+  //   try {
+  //     // await this.documentApi.documentDocumentAttachment({
+  //     //   documentAttachment: {
+  //     //     attachmentBody: attachment.content,
+  //     //     attachmentType: attachment.attachmentType,
+  //     //     title: attachment.name,
+  //     //   },
+  //     //   ihiDocumentID: documentId,
+  //     // })
+  //     return attachment.hash
+  //   } catch (e) {
+  //     this.logger.error('Error sending document to SÍ', e)
+  //     return null
+  //   }
+  // }
 
   async reviewApplication({ application }: TemplateApiModuleActionProps) {
     const documentId = getApplicationDocumentId(application)
@@ -182,14 +191,14 @@ export class AccidentNotificationService extends BaseTemplateApiService {
     ) as ReviewApprovalEnum
     const reviewComment =
       getValueViaPath(application.answers, 'reviewComment') || ''
-    await this.documentApi.documentSendConfirmation({
-      ihiDocumentID: documentId,
-      confirmationIN: {
-        confirmationType:
-          reviewApproval === ReviewApprovalEnum.APPROVED ? 1 : 2,
-        confirmationParty: isRepresentativeOfCompanyOrInstitue ? 1 : 2,
-        objection: reviewComment as string,
-      },
-    })
+    // await this.documentApi.documentSendConfirmation({
+    //   ihiDocumentID: documentId,
+    //   confirmationIN: {
+    //     confirmationType:
+    //       reviewApproval === ReviewApprovalEnum.APPROVED ? 1 : 2,
+    //     confirmationParty: isRepresentativeOfCompanyOrInstitue ? 1 : 2,
+    //     objection: reviewComment as string,
+    //   },
+    // })
   }
 }