Merge branch 'main' into fix/ff-income-plan

.gitignore

@@ -102,4 +102,70 @@ apps/**/index.html
 # E2E outputs
 test-results/
 playwright-report/
-tmp-sessions/
+tmp-sessions/
+
+# React Native
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.dSYM.zip
+*.xcuserstate
+**/.xcode.env.local
+ios/*.cer
+ios/*.certSigningRequest
+ios/*.mobileprovision
+ios/*.p12
+
+# Android/IntelliJ
+#
+build/
+.idea
+.gradle
+local.properties
+*.iml
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
+google-services.json
+service-account.json
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/
+
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
+
+# Bundle artifact
+*.jsbundle
+
+# Ruby / CocoaPods
+**/Pods/
+**/vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# testing
+/coverage

apps/air-discount-scheme/backend/src/app/modules/discount/discount.service.ts

@@ -17,6 +17,8 @@ import { UserService } from '../user/user.service'
 import type { User as AuthUser } from '@island.is/auth-nest-tools'
 import { ExplicitFlight } from './dto/ExplicitFlight.dto'
 import { CreateSuperExplicitDiscountCodeParams } from './dto'
+import type { Logger } from '@island.is/logging'
+import { LOGGER_PROVIDER } from '@island.is/logging'
 
 interface CachedDiscount {
   user: User
@@ -47,6 +49,8 @@ export class DiscountService {
 
     @InjectModel(ExplicitCode)
     private explicitModel: typeof ExplicitCode,
+    @Inject(LOGGER_PROVIDER)
+    private readonly logger: Logger,
 
     private readonly userService: UserService,
   ) {}
@@ -197,13 +201,19 @@ export class DiscountService {
     unConnectedFlights: Flight[] | ExplicitFlight[],
     isExplicit: boolean,
     flightLegs = 1,
+    isManual?: boolean,
   ): Promise<Array<Discount> | null> {
     const user = await this.userService.getUserInfoByNationalId(
       nationalId,
       auth,
+      isExplicit,
+      isManual,
     )
 
     if (!user) {
+      this.logger.warn('User by national id not found for explicit discount.', {
+        category: 'ads-backend',
+      })
       return null
     }
     // overwrite credit since validation may return 0 depending on what the problem is
@@ -212,10 +222,19 @@ export class DiscountService {
         user.fund.credit = 2 //making sure we can get flight from and to
         user.fund.total = 2
       } else {
+        this.logger.warn(
+          `User fund used requirements not met: ${user.fund.used}.`,
+          {
+            category: 'ads-backend',
+          },
+        )
         return null
       }
     }
     if (user.fund.credit === 0 && user.fund.total !== undefined) {
+      this.logger.warn(`User fund no credit, has total: ${user.fund.total}.`, {
+        category: 'ads-backend',
+      })
       return null
     }
 
@@ -477,6 +496,7 @@ export class DiscountService {
       ],
     }
 
+    const isManual = true
     const discount = await this.createExplicitDiscountCode(
       auth,
       body.nationalId,
@@ -487,6 +507,7 @@ export class DiscountService {
       body.needsConnectionFlight ? [flight] : [],
       isExplicit,
       1,
+      isManual,
     )
     if (!discount) {
       throw new Error(`Could not create explicit discount`)

apps/air-discount-scheme/backend/src/app/modules/discount/test/unit/discount.service.spec.ts

@@ -64,7 +64,9 @@ describe('DiscountService', () => {
         {
           provide: LOGGER_PROVIDER,
           useClass: jest.fn(() => ({
-            error: () => ({}),
+            error: jest.fn(),
+            info: jest.fn(),
+            warn: jest.fn(),
           })),
         },
         {

apps/air-discount-scheme/backend/src/app/modules/user/user.service.ts

@@ -17,6 +17,12 @@ const ONE_WEEK = 604800 // seconds
 const CACHE_KEY = 'userService'
 const MAX_AGE_LIMIT = 18
 
+const DEFAULT_FUND: Fund = {
+  credit: 2,
+  total: 2,
+  used: 0,
+}
+
 interface CustodianCache {
   custodians: Array<NationalRegistryUser | null>
 }
@@ -42,14 +48,15 @@ export class UserService {
   private async getFund(
     user: NationalRegistryUser,
     auth?: AuthUser,
+    isManual?: boolean,
   ): Promise<Fund> {
     const { used, unused, total } =
       await this.flightService.countThisYearsFlightLegsByNationalId(
         user.nationalId,
       )
     let meetsADSRequirements = false
 
-    if (this.flightService.isADSPostalCode(user.postalcode)) {
+    if (this.flightService.isADSPostalCode(user.postalcode) || isManual) {
       meetsADSRequirements = true
     } else if (info(user.nationalId).age < MAX_AGE_LIMIT) {
       // NationalId is a minor and doesn't live in ADS postal codes.
@@ -95,20 +102,33 @@ export class UserService {
     nationalId: string,
     model: new (user: NationalRegistryUser, fund: Fund) => T,
     auth: AuthUser,
+    isExplicit?: boolean,
+    isManual?: boolean,
   ): Promise<T | null> {
     const user = await this.nationalRegistryService.getUser(nationalId, auth)
     if (!user) {
       return null
     }
-    const fund = await this.getFund(user, auth)
+    if (isExplicit) {
+      return new model(user, DEFAULT_FUND)
+    }
+    const fund = await this.getFund(user, auth, isManual)
     return new model(user, fund)
   }
 
   async getUserInfoByNationalId(
     nationalId: string,
     auth: AuthUser,
+    isExplicit?: boolean,
+    isManual?: boolean,
   ): Promise<User | null> {
-    return this.getUserByNationalId<User>(nationalId, User, auth)
+    return this.getUserByNationalId<User>(
+      nationalId,
+      User,
+      auth,
+      isExplicit,
+      isManual,
+    )
   }
 
   async getMultipleUsersByNationalIdArray(

apps/application-system/api/src/app/modules/application/lifecycle/application-lifecycle.service.ts

@@ -151,39 +151,52 @@ export class ApplicationLifeCycleService {
   private async preparePrunedNotification(
     application: PruningApplication,
   ): Promise<CreateHnippNotificationDto | null> {
-    const template = await getApplicationTemplateByTypeId(application.typeId)
-    const stateConfig = template.stateMachineConfig.states[application.state]
-    const lifeCycle = stateConfig.meta?.lifecycle
-    if (lifeCycle && lifeCycle.shouldBePruned && lifeCycle.pruneMessage) {
-      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,
-        )
+    try {
+      const template = await getApplicationTemplateByTypeId(application.typeId)
+      if (!template) {
         return null
       }
+      const stateConfig = template.stateMachineConfig.states[application.state]
+      const lifeCycle = stateConfig.meta?.lifecycle
+      if (lifeCycle && lifeCycle.shouldBePruned && lifeCycle.pruneMessage) {
+        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 null
+    } catch (error) {
+      this.logger.error(
+        `Failed to get application template for application typeId ${application.typeId}`,
+        error,
+      )
+      return null
     }
-    return null
   }
 
   private async sendPrunedNotification(

apps/judicial-system/api/infra/judicial-system-api.ts

@@ -47,8 +47,8 @@ export const serviceSetup = (services: {
       },
       HIDDEN_FEATURES: {
         dev: '',
-        staging: '',
-        prod: '',
+        staging: 'MULTIPLE_INDICTMENT_SUBTYPES',
+        prod: 'MULTIPLE_INDICTMENT_SUBTYPES',
       },
     })
     .secrets({

apps/judicial-system/api/src/app/modules/indictment-count/dto/updateIndictmentCount.input.ts

@@ -4,7 +4,10 @@ import { GraphQLJSONObject } from 'graphql-type-json'
 import { Field, ID, InputType } from '@nestjs/graphql'
 
 import type { SubstanceMap } from '@island.is/judicial-system/types'
-import { IndictmentCountOffense } from '@island.is/judicial-system/types'
+import {
+  IndictmentCountOffense,
+  IndictmentSubtype,
+} from '@island.is/judicial-system/types'
 
 @InputType()
 export class UpdateIndictmentCountInput {
@@ -53,4 +56,11 @@ export class UpdateIndictmentCountInput {
   @IsOptional()
   @Field(() => String, { nullable: true })
   readonly legalArguments?: string
+
+  @Allow()
+  @IsOptional()
+  @IsArray()
+  @IsEnum(IndictmentSubtype, { each: true })
+  @Field(() => [IndictmentSubtype], { nullable: true })
+  readonly indictmentCountSubtypes?: IndictmentSubtype[]
 }

apps/judicial-system/api/src/app/modules/indictment-count/models/indictmentCount.model.ts

@@ -3,9 +3,13 @@ import { GraphQLJSONObject } from 'graphql-type-json'
 import { Field, ID, ObjectType, registerEnumType } from '@nestjs/graphql'
 
 import type { SubstanceMap } from '@island.is/judicial-system/types'
-import { IndictmentCountOffense } from '@island.is/judicial-system/types'
+import {
+  IndictmentCountOffense,
+  IndictmentSubtype,
+} from '@island.is/judicial-system/types'
 
 registerEnumType(IndictmentCountOffense, { name: 'IndictmentCountOffense' })
+registerEnumType(IndictmentSubtype, { name: 'IndictmentSubtype' })
 
 @ObjectType()
 export class IndictmentCount {
@@ -41,4 +45,7 @@ export class IndictmentCount {
 
   @Field(() => String, { nullable: true })
   readonly legalArguments?: string
+
+  @Field(() => [IndictmentSubtype], { nullable: true })
+  readonly indictmentCountSubtypes?: IndictmentSubtype[]
 }

apps/judicial-system/backend/infra/judicial-system-backend.ts

@@ -68,6 +68,8 @@ export const serviceSetup = (): ServiceBuilder<'judicial-system-backend'> =>
       EMAIL_FROM_NAME: '/k8s/judicial-system/EMAIL_FROM_NAME',
       EMAIL_REPLY_TO: '/k8s/judicial-system/EMAIL_REPLY_TO',
       EMAIL_REPLY_TO_NAME: '/k8s/judicial-system/EMAIL_REPLY_TO_NAME',
+      POLICE_INSTITUTIONS_EMAILS:
+        '/k8s/judicial-system/POLICE_INSTITUTIONS_EMAILS',
       PRISON_EMAIL: '/k8s/judicial-system/PRISON_EMAIL',
       PRISON_ADMIN_EMAIL: '/k8s/judicial-system/PRISON_ADMIN_EMAIL',
       PRISON_ADMIN_INDICTMENT_EMAILS:

apps/judicial-system/backend/migrations/20241204124025-update-indictment-count.js

@@ -0,0 +1,25 @@
+'use strict'
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.sequelize.transaction((transaction) =>
+      queryInterface.addColumn(
+        'indictment_count',
+        'indictment_count_subtypes',
+        {
+          type: Sequelize.ARRAY(Sequelize.STRING),
+          allowNull: true,
+          defaultValue: [],
+        },
+        { transaction },
+      ),
+    )
+  },
+
+  async down(queryInterface) {
+    await queryInterface.removeColumn(
+      'indictment_count',
+      'indictment_count_subtypes',
+    )
+  },
+}