Merge branch 'main' into regulations-admin/bugfixing-regs

island-is · May 15, 2024 · 7eb900c · 7eb900c
2 parents d8aae29 + 08e214d
commit 7eb900c
Show file tree

Hide file tree

Showing 133 changed files with 1,183 additions and 2,022 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -166,7 +166,6 @@ codemagic.yaml
 /libs/clients/license-client/                                                                            @island-is/hugsmidjan @island-is/aranja
 /libs/clients/intellectual-properties/                                                                   @island-is/hugsmidjan
 /libs/clients/islykill/                                                                                  @island-is/hugsmidjan
-/libs/clients/national-registry/v1/                                                                      @island-is/hugsmidjan
 /libs/clients/national-registry/v3/                                                                      @island-is/hugsmidjan
 /libs/clients/district-commissioners-licenses/                                                           @island-is/hugsmidjan
 /libs/clients/regulations/                                                                               @island-is/hugsmidjan

diff --git a/apps/api/infra/api.ts b/apps/api/infra/api.ts
@@ -1,5 +1,4 @@
 import { json, ref, service, ServiceBuilder } from '../../../infra/src/dsl/dsl'
-import { settings } from '../../../infra/src/dsl/settings'
 import {
   AdrAndMachine,
   Base,
@@ -198,12 +197,6 @@ export const serviceSetup = (services: {
         prod: 'https://samradapi.island.is',
       },
       FISKISTOFA_ZENTER_CLIENT_ID: '1114',
-      SOFFIA_SOAP_URL: {
-        dev: ref((h) => h.svc('https://soffiaprufa.skra.is')),
-        staging: ref((h) => h.svc('https://soffiaprufa.skra.is')),
-        prod: ref((h) => h.svc('https://soffia2.skra.is')),
-        local: ref((h) => h.svc('https://localhost:8443')),
-      },
       HSN_WEB_FORM_ID: '1dimJFHLFYtnhoYEA3JxRK',
       SESSIONS_API_URL: ref((h) => `http://${h.svc(services.sessionsApi)}`),
       AUTH_ADMIN_API_PATHS: {
@@ -288,12 +281,9 @@ export const serviceSetup = (services: {
         '/k8s/api/REGULATIONS_FILE_UPLOAD_KEY_PUBLISH',
       REGULATIONS_FILE_UPLOAD_KEY_PRESIGNED:
         '/k8s/api/REGULATIONS_FILE_UPLOAD_KEY_PRESIGNED',
-      SOFFIA_HOST_URL: '/k8s/api/SOFFIA_HOST_URL',
       CONTENTFUL_ACCESS_TOKEN: '/k8s/api/CONTENTFUL_ACCESS_TOKEN',
       ZENDESK_CONTACT_FORM_EMAIL: '/k8s/api/ZENDESK_CONTACT_FORM_EMAIL',
       ZENDESK_CONTACT_FORM_TOKEN: '/k8s/api/ZENDESK_CONTACT_FORM_TOKEN',
-      SOFFIA_USER: settings.SOFFIA_USER,
-      SOFFIA_PASS: settings.SOFFIA_PASS,
       POSTHOLF_CLIENTID: '/k8s/documents/POSTHOLF_CLIENTID',
       POSTHOLF_CLIENT_SECRET: '/k8s/documents/POSTHOLF_CLIENT_SECRET',
       POSTHOLF_TOKEN_URL: '/k8s/documents/POSTHOLF_TOKEN_URL',

diff --git a/apps/api/project.json b/apps/api/project.json
@@ -81,11 +81,7 @@
     "dev": {
       "executor": "nx:run-commands",
       "options": {
-        "commands": [
-          "./scripts/run-xroad-proxy.sh",
-          "./scripts/run-soffia-proxy.sh",
-          "yarn start api"
-        ],
+        "commands": ["./scripts/run-xroad-proxy.sh", "yarn start api"],
         "parallel": true
       }
     },

diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts
@@ -121,7 +121,6 @@ import {
   MachineDigitalLicenseClientConfig,
 } from '@island.is/clients/license-client'
 import { MunicipalitiesFinancialAidConfig } from '@island.is/clients/municipalities-financial-aid'
-import { NationalRegistrySoffiaClientConfig } from '@island.is/clients/national-registry-v1'
 import { NationalRegistryClientConfig } from '@island.is/clients/national-registry-v2'
 import { NationalRegistryV3ClientConfig } from '@island.is/clients/national-registry-v3'
 import { PassportsClientConfig } from '@island.is/clients/passports'
@@ -331,7 +330,6 @@ const environment = getConfig
         PCardClientConfig,
         DistrictCommissionersLicensesClientConfig,
         AdrAndMachineLicenseClientConfig,
-        NationalRegistrySoffiaClientConfig,
         NationalRegistryV3ClientConfig,
         FirearmLicenseClientConfig,
         DisabilityLicenseClientConfig,

diff --git a/apps/api/src/app/environments/environment.ts b/apps/api/src/app/environments/environment.ts
@@ -34,12 +34,6 @@ const prodConfig = () => ({
   fileStorage: {
     uploadBucket: process.env.FILE_STORAGE_UPLOAD_BUCKET,
   },
-  nationalRegistry: {
-    baseSoapUrl: process.env.SOFFIA_SOAP_URL,
-    user: process.env.SOFFIA_USER,
-    password: process.env.SOFFIA_PASS,
-    host: process.env.SOFFIA_HOST_URL,
-  },
   healthInsurance: {
     wsdlUrl: process.env.XROAD_HEALTH_INSURANCE_WSDLURL,
     baseUrl: process.env.XROAD_BASE_PATH,
@@ -148,12 +142,6 @@ const devConfig = () => ({
   fileStorage: {
     uploadBucket: process.env.FILE_STORAGE_UPLOAD_BUCKET,
   },
-  nationalRegistry: {
-    baseSoapUrl: 'https://localhost:8443',
-    user: process.env.SOFFIA_USER ?? '',
-    password: process.env.SOFFIA_PASS ?? '',
-    host: 'soffiaprufa.skra.is',
-  },
   healthInsurance: {
     wsdlUrl:
       process.env.XROAD_HEALTH_INSURANCE_WSDLURL ??

diff --git a/apps/application-system/api/project.json b/apps/application-system/api/project.json
@@ -179,8 +179,7 @@
         "commands": [
           "yarn nx run api:dev",
           "yarn nx run services-user-profile:dev",
-          "yarn start application-system-api",
-          "scripts/run-soffia-proxy.sh"
+          "yarn start application-system-api"
         ],
         "parallel": true
       }

diff --git a/apps/application-system/api/src/environments/environment.ts b/apps/application-system/api/src/environments/environment.ts
@@ -72,12 +72,6 @@ const devConfig = {
     userProfile: {
       serviceBasePath: 'http://localhost:3366',
     },
-    nationalRegistry: {
-      baseSoapUrl: 'https://localhost:8443',
-      user: process.env.SOFFIA_USER ?? '',
-      password: process.env.SOFFIA_PASS ?? '',
-      host: 'soffiaprufa.skra.is',
-    },
     islykill: {
       cert: process.env.ISLYKILL_CERT,
       passphrase: process.env.ISLYKILL_SERVICE_PASSPHRASE,
@@ -156,12 +150,6 @@ const prodConfig = {
     userProfile: {
       serviceBasePath: process.env.SERVICE_USER_PROFILE_URL,
     },
-    nationalRegistry: {
-      baseSoapUrl: process.env.SOFFIA_SOAP_URL,
-      user: process.env.SOFFIA_USER,
-      password: process.env.SOFFIA_PASS,
-      host: process.env.SOFFIA_HOST_URL,
-    },
     islykill: {
       cert: process.env.ISLYKILL_CERT,
       passphrase: process.env.ISLYKILL_SERVICE_PASSPHRASE,

diff --git a/apps/external-contracts-tests/infra/external-contracts-tests.ts b/apps/external-contracts-tests/infra/external-contracts-tests.ts
@@ -1,6 +1,5 @@
 import { service, ServiceBuilder } from '../../../infra/src/dsl/dsl'
 import { Base, NationalRegistry } from '../../../infra/src/dsl/xroad'
-import { settings } from '../../../infra/src/dsl/settings'
 
 export const serviceSetup = (): ServiceBuilder<'external-contracts-tests'> => {
   return service('external-contracts-tests')
@@ -11,12 +10,7 @@ export const serviceSetup = (): ServiceBuilder<'external-contracts-tests'> => {
       prod: { schedule: '0 11 * * *' },
     })
     .env({})
-    .secrets({
-      SOFFIA_SOAP_URL: '/k8s/api/SOFFIA_SOAP_URL',
-      SOFFIA_HOST_URL: '/k8s/api/SOFFIA_HOST_URL',
-      SOFFIA_USER: settings.SOFFIA_USER,
-      SOFFIA_PASS: settings.SOFFIA_PASS,
-    })
+    .secrets({})
     .resources({
       limits: {
         cpu: '1',

diff --git a/apps/external-contracts-tests/main.spec.ts b/apps/external-contracts-tests/main.spec.ts
@@ -1,3 +0,0 @@
-import * as testSuites from './test-suites/'
-
-console.log('Forcing esbuild visit to testSuites:', testSuites)

diff --git a/apps/external-contracts-tests/test-suites/index.ts b/apps/external-contracts-tests/test-suites/index.ts
diff --git a/apps/external-contracts-tests/test-suites/soffia.spec.ts b/apps/external-contracts-tests/test-suites/soffia.spec.ts
diff --git a/apps/financial-aid/web-veita/src/components/Profile/ApplicationProfile.tsx b/apps/financial-aid/web-veita/src/components/Profile/ApplicationProfile.tsx
@@ -34,6 +34,7 @@ import {
   getApplicant,
   getApplicantMoreInfo,
   getApplicantSpouse,
+  getChildrenInfo,
   getDirectTaxPayments,
   getNationalRegistryInfo,
 } from '@island.is/financial-aid-web/veita/src/utils/applicationHelper'
@@ -141,6 +142,8 @@ const ApplicationProfile = ({
 
   const nationalRegistryInfo = getNationalRegistryInfo(application)
 
+  const childrenInfo = getChildrenInfo(application)
+
   const modalInfo = getAidAmountModalInfo(
     calculationsModal.type,
     aidAmount,
@@ -206,17 +209,11 @@ const ApplicationProfile = ({
         />
 
         <CollapsibleProfileUnit
-          heading="Upplýsingar um staðgreiðslu"
-          info={getDirectTaxPayments(applicantDirectPayments)}
-          className={`contentUp delay-75`}
+          heading="Þjóðskrá"
+          info={nationalRegistryInfo}
+          className={`contentUp delay-125`}
           isPrint={isPrint}
-        >
-          {getDirectTaxPaymentsContent(
-            applicantDirectPayments,
-            application.hasFetchedDirectTaxPayment,
-            application.created,
-          )}
-        </CollapsibleProfileUnit>
+        />
 
         {showSpouseData[application.familyStatus] && (
           <>
@@ -242,16 +239,31 @@ const ApplicationProfile = ({
           </>
         )}
 
+        {childrenInfo?.length > 0 && (
+          <CollapsibleProfileUnit
+            heading="Börn"
+            info={childrenInfo}
+            className={`contentUp delay-125`}
+            isPrint={isPrint}
+          />
+        )}
+
         <CollapsibleProfileUnit
-          heading="Umsóknarferli"
-          info={applicantMoreInfo}
-          className={`contentUp delay-125`}
+          heading="Upplýsingar um staðgreiðslu"
+          info={getDirectTaxPayments(applicantDirectPayments)}
+          className={`contentUp delay-75`}
           isPrint={isPrint}
-        />
+        >
+          {getDirectTaxPaymentsContent(
+            applicantDirectPayments,
+            application.hasFetchedDirectTaxPayment,
+            application.created,
+          )}
+        </CollapsibleProfileUnit>
 
         <CollapsibleProfileUnit
-          heading="Þjóðskrá"
-          info={nationalRegistryInfo}
+          heading="Umsóknarferli"
+          info={applicantMoreInfo}
           className={`contentUp delay-125`}
           isPrint={isPrint}
         />

diff --git a/apps/financial-aid/web-veita/src/utils/applicationHelper.ts b/apps/financial-aid/web-veita/src/utils/applicationHelper.ts
@@ -117,6 +117,35 @@ export const getNationalRegistryInfo = (application: Application) => {
   ]
 }
 
+export const getChildrenInfo = (application: Application) => {
+  if (!application.children) {
+    return []
+  }
+
+  const allChildren = application.children.map((child) => {
+    return [
+      {
+        title: 'Nafn',
+        content: child.name,
+      },
+      {
+        title: 'Kennitala',
+        content: formatNationalId(child.nationalId),
+      },
+      {
+        title: 'Skólastofnun',
+        content: child.school,
+      },
+      {
+        title: '',
+        content: '',
+      },
+    ]
+  })
+
+  return allChildren.flat()
+}
+
 export const getApplicantSpouse = (application: Application) => {
   return [
     {

diff --git a/apps/judicial-system/backend/migrations/20240513130819-update-case.js b/apps/judicial-system/backend/migrations/20240513130819-update-case.js
@@ -0,0 +1,64 @@
+'use strict'
+
+const replaceEnum = require('sequelize-replace-enum-postgres').default
+
+module.exports = {
+  async up(queryInterface) {
+    return replaceEnum({
+      queryInterface,
+      tableName: 'case_file',
+      columnName: 'category',
+      newValues: [
+        'COURT_RECORD',
+        'RULING',
+        'COVER_LETTER',
+        'INDICTMENT',
+        'CRIMINAL_RECORD',
+        'COST_BREAKDOWN',
+        'CASE_FILE',
+        'PROSECUTOR_APPEAL_BRIEF',
+        'DEFENDANT_APPEAL_BRIEF',
+        'PROSECUTOR_APPEAL_BRIEF_CASE_FILE',
+        'DEFENDANT_APPEAL_BRIEF_CASE_FILE',
+        'PROSECUTOR_APPEAL_STATEMENT',
+        'DEFENDANT_APPEAL_STATEMENT',
+        'PROSECUTOR_APPEAL_STATEMENT_CASE_FILE',
+        'DEFENDANT_APPEAL_STATEMENT_CASE_FILE',
+        'PROSECUTOR_APPEAL_CASE_FILE',
+        'DEFENDANT_APPEAL_CASE_FILE',
+        'APPEAL_COURT_RECORD',
+        'APPEAL_RULING',
+        'CRIMINAL_RECORD_UPDATE', // new value
+      ],
+    })
+  },
+
+  async down(queryInterface) {
+    return replaceEnum({
+      queryInterface,
+      tableName: 'case_file',
+      columnName: 'category',
+      newValues: [
+        'COURT_RECORD',
+        'RULING',
+        'COVER_LETTER',
+        'INDICTMENT',
+        'CRIMINAL_RECORD',
+        'COST_BREAKDOWN',
+        'CASE_FILE',
+        'PROSECUTOR_APPEAL_BRIEF',
+        'DEFENDANT_APPEAL_BRIEF',
+        'PROSECUTOR_APPEAL_BRIEF_CASE_FILE',
+        'DEFENDANT_APPEAL_BRIEF_CASE_FILE',
+        'PROSECUTOR_APPEAL_STATEMENT',
+        'DEFENDANT_APPEAL_STATEMENT',
+        'PROSECUTOR_APPEAL_STATEMENT_CASE_FILE',
+        'DEFENDANT_APPEAL_STATEMENT_CASE_FILE',
+        'PROSECUTOR_APPEAL_CASE_FILE',
+        'DEFENDANT_APPEAL_CASE_FILE',
+        'APPEAL_COURT_RECORD',
+        'APPEAL_RULING',
+      ],
+    })
+  },
+}
diff --git a/apps/judicial-system/backend/src/app/modules/notification/notification.service.ts b/apps/judicial-system/backend/src/app/modules/notification/notification.service.ts
@@ -1281,6 +1281,17 @@ export class NotificationService {
       )
     }
 
+    if (theCase.defenderEmail) {
+      promises.push(
+        this.sendEmail(
+          subject,
+          html,
+          theCase.defenderName,
+          theCase.defenderEmail,
+        ),
+      )
+    }
+
     const recipients = await Promise.all(promises)
 
     return this.recordNotification(

diff --git a/apps/judicial-system/web/messages/Core/titles.ts b/apps/judicial-system/web/messages/Core/titles.ts
@@ -209,6 +209,12 @@ export const titles = {
         description:
           'Notaður sem titill fyrir Niðurstaða úrskurðar skjá hjá dómstólum í ákærum',
       },
+      completed: {
+        id: 'judicial.system.core:titles.court.indictments.completed',
+        defaultMessage: 'Máli lokið - Réttarvörslugátt',
+        description:
+          'Notaður sem titill fyrir Máli lokið skjá hjá dómstólum í ákærum',
+      },
     }),
   },
   defender: {

diff --git a/apps/judicial-system/web/pages/domur/akaera/lokid/[id].ts b/apps/judicial-system/web/pages/domur/akaera/lokid/[id].ts
@@ -0,0 +1,3 @@
+import Completed from '@island.is/judicial-system-web/src/routes/Court/Indictments/Completed/Completed'
+
+export default Completed