chore(inao-pp-cem): dataverse check and template-api-module adjustments

.github/CODEOWNERS

@@ -234,6 +234,7 @@ codemagic.yaml
 /libs/application/template-api-modules/src/lib/modules/templates/general-fishing-license/                @island-is/norda
 /libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/              @island-is/norda
 /libs/shared/form-fields/                                                                                @island-is/norda @island-is/island-ui
+/libs/clients/financial-statements-inao                                                                  @island-is/norda
 
 /libs/portals/my-pages/applications/                                                                     @island-is/norda-applications
 /libs/portals/admin/application-system/                                                                  @island-is/norda-applications
@@ -316,7 +317,6 @@ codemagic.yaml
 /apps/services/auth/personal-representative/                                                             @island-is/programm @island-is/aranja
 /apps/services/auth/personal-representative-public/                                                      @island-is/programm @island-is/aranja
 /libs/api/domains/financial-statements-inao/                                                             @island-is/programm
-/libs/clients/financial-statements-inao                                                                  @island-is/programm
 /libs/application/templates/financial-statements-inao/                                                   @island-is/programm
 /libs/application/template-api-modules/src/lib/modules/templates/financial-statements-inao               @island-is/programm
 

libs/application/template-api-modules/src/lib/modules/templates/financial-statement-cemetery/financial-statement-cemetery.service.ts

@@ -5,7 +5,6 @@ import { LOGGER_PROVIDER } from '@island.is/logging'
 import {
   CemeteryFinancialStatementValues,
   FinancialStatementsInaoClientService,
-  ClientRoles,
 } from '@island.is/clients/financial-statements-inao'
 import {
   ApplicationTypes,
@@ -36,9 +35,9 @@ export const getCurrentUserType = (
   answers: Application['answers'],
   externalData: Application['externalData'],
 ) => {
-  const fakeUserType: any = getValueViaPath(answers, 'fakeData.options')
+  const fakeUserType = getValueViaPath<number>(answers, 'fakeData.options')
 
-  const currentUserType: any = getValueViaPath(
+  const currentUserType = getValueViaPath<number>(
     externalData,
     'getUserType.data.value',
   )
@@ -86,9 +85,7 @@ export class FinancialStatementCemeteryTemplateService extends BaseTemplateApiSe
   async getUserType({ auth }: TemplateApiModuleActionProps) {
     const { nationalId } = auth
     if (kennitala.isPerson(nationalId)) {
-      return this.financialStatementClientService.getClientType(
-        ClientRoles.Individual,
-      )
+      return null
     } else {
       return this.financialStatementClientService.getUserClientType(nationalId)
     }
@@ -97,63 +94,51 @@ export class FinancialStatementCemeteryTemplateService extends BaseTemplateApiSe
   async submitApplication({ application, auth }: TemplateApiModuleActionProps) {
     const { nationalId, actor } = auth
     const answers = application.answers
-    const externalData = application.externalData
-    const currentUserType = getCurrentUserType(answers, externalData)
-
-    // Todo test before this goes live
-    // if (currentUserType !== FSIUSERTYPE.CEMETRY) {
-    //   throw new Error('Application submission failed')
-    // }
-
     if (!actor) {
       return new Error('Enginn umboðsmaður fannst')
     }
 
-    const values: CemeteryFinancialStatementValues =
-      mapValuesToCemeterytype(answers)
-
+    const values = this.prepareValues(application)
+    const client = { nationalId }
     const { year, actorsName, contactsAnswer, clientPhone, clientEmail, file } =
       getNeededCemeteryValues(answers)
-
+    const digitalSignee = mapDigitalSignee(clientEmail, clientPhone)
     const fileName = file ? await this.getAttachments(application) : undefined
-
-    const client = { nationalId }
-
     const contacts = mapContactsAnswersToContacts(
       actor,
       actorsName,
       contactsAnswer,
     )
-    const digitalSignee = mapDigitalSignee(clientEmail, clientPhone)
 
-    const result: DataResponse = await this.financialStatementClientService
-      .postFinancialStatementForCemetery(
-        client,
-        contacts,
-        digitalSignee,
-        year,
-        '',
-        values,
-        fileName,
-      )
-      .then((data) => {
-        if (data === true) {
-          return { success: true }
-        } else {
-          return { success: false }
-        }
-      })
-      .catch((e) => {
-        return {
-          success: false,
-          errorMessages: e.message,
-        }
-      })
-
-    if (!result.success) {
-      throw new Error('Application submission failed')
+    try {
+      const result =
+        await this.financialStatementClientService.postFinancialStatementForCemetery(
+          client,
+          contacts,
+          digitalSignee,
+          year,
+          '',
+          values,
+          fileName,
+        )
+
+      if (!result) {
+        throw new Error('Application submission failed')
+      }
+
+      return { success: true }
+    } catch (error) {
+      this.logger.error('Error submitting application', error)
+      return {
+        success: false,
+        message: error.message,
+      }
     }
+  }
 
-    return { success: result.success }
+  private prepareValues(
+    application: Application,
+  ): CemeteryFinancialStatementValues {
+    return mapValuesToCemeterytype(application.answers)
   }
 }

libs/application/template-api-modules/src/lib/modules/templates/financial-statement-political-party/financial-statement-political-party.service.ts

@@ -33,13 +33,13 @@ export const getCurrentUserType = (
   answers: Application['answers'],
   externalData: Application['externalData'],
 ) => {
+  const fakeUserType = getValueViaPath<number>(answers, 'fakeData.options')
+
   const currentUserType = getValueViaPath<number>(
     externalData,
     'getUserType.data.value',
   )
 
-  const fakeUserType = getValueViaPath<number>(answers, 'fakeData.options')
-
   return fakeUserType ?? currentUserType
 }
 
@@ -89,7 +89,7 @@ export class FinancialStatementPoliticalPartyTemplateService extends BaseTemplat
   async getUserType({ auth }: TemplateApiModuleActionProps) {
     const { nationalId } = auth
     if (kennitala.isPerson(nationalId)) {
-      return this.financialStatementClientService.getClientType('Einstaklingur')
+      return null
     } else {
       return this.financialStatementClientService.getUserClientType(nationalId)
     }

libs/application/templates/inao/financial-statement-cemetery/src/forms/notAllowed/index.ts

@@ -0,0 +1,10 @@
+import { buildForm } from '@island.is/application/core'
+import { notAllowedSection } from './notAllowedSection'
+import Logo from '../../components/Logo'
+
+export const notAllowedForm = buildForm({
+  id: 'notAllowedForm',
+  title: '',
+  logo: Logo,
+  children: [notAllowedSection],
+})

libs/application/templates/inao/financial-statement-cemetery/src/forms/notAllowed/notAllowedSection.ts

@@ -0,0 +1,17 @@
+import {
+  buildDescriptionField,
+  buildSection,
+} from '@island.is/application/core'
+import { m } from '../../lib/messages'
+
+export const notAllowedSection = buildSection({
+  id: 'notAllowedSection',
+  title: '',
+  children: [
+    buildDescriptionField({
+      id: 'notAllowedDescription',
+      title: m.notAllowedTitle,
+      description: m.notAllowedDescription,
+    }),
+  ],
+})

libs/application/templates/inao/financial-statement-cemetery/src/lib/financialStatementCemeteryTemplate.ts

@@ -1,8 +1,8 @@
 import {
   DefaultStateLifeCycle,
   pruneAfterDays,
+  getValueViaPath,
 } from '@island.is/application/core'
-
 import {
   ApplicationTemplate,
   ApplicationTypes,
@@ -17,7 +17,6 @@ import {
 import { m } from './messages'
 import { AuthDelegationType } from '@island.is/shared/types'
 import { dataSchema } from './dataSchema'
-
 import {
   CurrentUserTypeProvider,
   IndentityApiProvider,
@@ -26,6 +25,7 @@ import {
 } from '../dataProviders'
 import { ApiActions, Events, Roles, States } from '../types/types'
 import { Features } from '@island.is/feature-flags'
+import { CEMETERY_USER_TYPE } from '../utils/constants'
 
 const configuration =
   ApplicationConfigurations[ApplicationTypes.FINANCIAL_STATEMENT_CEMETERY]
@@ -50,6 +50,10 @@ const FinancialStatementCemeteryTemplate: ApplicationTemplate<
           name: States.PREREQUISITES,
           progress: 0,
           status: 'draft',
+          onEntry: defineTemplateApi({
+            action: ApiActions.getUserType,
+            shouldPersistToExternalData: true,
+          }),
           actionCard: {
             pendingAction: {
               title: '',
@@ -80,6 +84,15 @@ const FinancialStatementCemeteryTemplate: ApplicationTemplate<
                 UserInfoApi,
               ],
             },
+            {
+              id: Roles.NOTALLOWED,
+              formLoader: () =>
+                import('../forms/notAllowed').then((val) =>
+                  Promise.resolve(val.notAllowedForm),
+                ),
+              write: 'all',
+              delete: true,
+            },
           ],
         },
         on: {
@@ -136,13 +149,18 @@ const FinancialStatementCemeteryTemplate: ApplicationTemplate<
     },
   },
   mapUserToRole(
-    nationalId: string,
+    _nationalId: string,
     application: Application,
   ): ApplicationRole | undefined {
-    if (application.applicant === nationalId) {
+    const userType = getValueViaPath<number>(
+      application.externalData,
+      'getUserType.data.value',
+    )
+
+    if (userType === CEMETERY_USER_TYPE) {
       return Roles.APPLICANT
     }
-    return undefined
+    return Roles.NOTALLOWED
   },
 }
 

libs/application/templates/inao/financial-statement-cemetery/src/lib/messages.ts

@@ -670,4 +670,16 @@ export const m = defineMessages({
     defaultMessage: 'Áfram',
     description: 'continue',
   },
+  notAllowedTitle: {
+    id: 'fsc.application:notAllowedTitle',
+    defaultMessage:
+      'Þessi kennitala er ekki skráð sem kirkjugarður hjá Ríkisendurskoðun',
+    description: 'Title when user is not allowed to apply',
+  },
+  notAllowedDescription: {
+    id: 'fsc.application:notAllowedDescription',
+    defaultMessage:
+      'Ef þú telur að þessi kennitala ætti að vera skráð sem kirkjugarður þá bendum við þér á að hafa samband við Ríkisendurskoðun í síma 448 8800',
+    description: 'Descriptionwhen user is not allowed to apply',
+  },
 })

libs/application/templates/inao/financial-statement-cemetery/src/types/types.ts

@@ -34,4 +34,5 @@ export enum States {
 
 export enum Roles {
   APPLICANT = 'applicant',
+  NOTALLOWED = 'notAllowed',
 }

libs/application/templates/inao/financial-statement-cemetery/src/utils/constants.ts

@@ -14,6 +14,7 @@ export const PartiesBackwardLimit = 'PartiesBackwardLimit'
 export const CemeteriesBackwardLimit = 'CemeteriesBackwardLimit'
 export const PartiesYearAllowed = 'PartiesYearAllowed'
 export const CemeteriesYearAllowed = 'CemeteriesYearAllowed'
+export const CEMETERY_USER_TYPE = 150000002
 
 // error helpers
 export const VALIDATOR = 'validator'

libs/application/templates/inao/financial-statement-political-party/src/forms/notAllowedForm/index.ts

@@ -0,0 +1,10 @@
+import { buildForm } from '@island.is/application/core'
+import { notAllowedSection } from './notAllowedSection'
+import Logo from '../../components/Logo'
+
+export const notAllowedForm = buildForm({
+  id: 'notAllowedForm',
+  title: '',
+  logo: Logo,
+  children: [notAllowedSection],
+})

libs/application/templates/inao/financial-statement-political-party/src/forms/notAllowedForm/notAllowedSection.ts

@@ -0,0 +1,17 @@
+import {
+  buildDescriptionField,
+  buildSection,
+} from '@island.is/application/core'
+import { m } from '../../lib/messages'
+
+export const notAllowedSection = buildSection({
+  id: 'notAllowedSection',
+  title: '',
+  children: [
+    buildDescriptionField({
+      id: 'notAllowedDescription',
+      title: m.notAllowedTitle,
+      description: m.notAllowedDescription,
+    }),
+  ],
+})