Merge branch 'j-s/update-punishment-type-prison-indictment-overview' of

https://github.com/island-is/island.is into j-s/update-punishment-type-prison-indictment-overview

.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/infra/application-system-api.ts

@@ -49,80 +49,83 @@ export const GRAPHQL_API_URL_ENV_VAR_NAME = 'GRAPHQL_API_URL' // This property i
 
 const namespace = 'application-system'
 const serviceAccount = 'application-system-api'
-export const workerSetup =
-  (): ServiceBuilder<'application-system-api-worker'> =>
-    service('application-system-api-worker')
-      .namespace(namespace)
-      .image('application-system-api')
-      .db()
-      .serviceAccount('application-system-api-worker')
-      .redis()
-      .codeOwner(CodeOwners.NordaApplications)
-      .env({
-        IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/application-system',
-        IDENTITY_SERVER_ISSUER_URL: {
-          dev: 'https://identity-server.dev01.devland.is',
-          staging: 'https://identity-server.staging01.devland.is',
-          prod: 'https://innskra.island.is',
-        },
-        XROAD_CHARGE_FJS_V2_PATH: {
-          dev: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
-          staging: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2',
-          prod: 'IS/GOV/5402697509/FJS-Public/chargeFJS_v2',
-        },
-        APPLICATION_ATTACHMENT_BUCKET: {
-          dev: 'island-is-dev-storage-application-system',
-          staging: 'island-is-staging-storage-application-system',
-          prod: 'island-is-prod-storage-application-system',
-        },
-        FILE_SERVICE_PRESIGN_BUCKET: {
-          dev: 'island-is-dev-fs-presign-bucket',
-          staging: 'island-is-staging-fs-presign-bucket',
-          prod: 'island-is-prod-fs-presign-bucket',
-        },
-        FILE_STORAGE_UPLOAD_BUCKET: {
-          dev: 'island-is-dev-upload-api',
-          staging: 'island-is-staging-upload-api',
-          prod: 'island-is-prod-upload-api',
-        },
-        CLIENT_LOCATION_ORIGIN: {
-          dev: 'https://beta.dev01.devland.is/umsoknir',
-          staging: 'https://beta.staging01.devland.is/umsoknir',
-          prod: 'https://island.is/umsoknir',
-          local: 'http://localhost:4200/umsoknir',
-        },
-      })
-      .xroad(Base, Client, Payment, Inna, EHIC, WorkMachines)
-      .secrets({
-        IDENTITY_SERVER_CLIENT_SECRET:
-          '/k8s/application-system/api/IDENTITY_SERVER_CLIENT_SECRET',
-        SYSLUMENN_HOST: '/k8s/application-system-api/SYSLUMENN_HOST',
-        SYSLUMENN_USERNAME: '/k8s/application-system/api/SYSLUMENN_USERNAME',
-        SYSLUMENN_PASSWORD: '/k8s/application-system/api/SYSLUMENN_PASSWORD',
-        DRIVING_LICENSE_BOOK_XROAD_PATH:
-          '/k8s/application-system-api/DRIVING_LICENSE_BOOK_XROAD_PATH',
-        DRIVING_LICENSE_BOOK_USERNAME:
-          '/k8s/application-system-api/DRIVING_LICENSE_BOOK_USERNAME',
-        DRIVING_LICENSE_BOOK_PASSWORD:
-          '/k8s/application-system-api/DRIVING_LICENSE_BOOK_PASSWORD',
-        DOKOBIT_ACCESS_TOKEN:
-          '/k8s/application-system/api/DOKOBIT_ACCESS_TOKEN',
-        DOKOBIT_URL: '/k8s/application-system-api/DOKOBIT_URL',
-        ARK_BASE_URL: '/k8s/application-system-api/ARK_BASE_URL',
-        DOMSYSLA_PASSWORD: '/k8s/application-system-api/DOMSYSLA_PASSWORD',
-        DOMSYSLA_USERNAME: '/k8s/application-system-api/DOMSYSLA_USERNAME',
-      })
-      .args('main.js', '--job', 'worker')
-      .command('node')
-      .extraAttributes({
-        dev: { schedule: '*/30 * * * *' },
-        staging: { schedule: '*/30 * * * *' },
-        prod: { schedule: '*/30 * * * *' },
-      })
-      .resources({
-        limits: { cpu: '400m', memory: '768Mi' },
-        requests: { cpu: '150m', memory: '384Mi' },
-      })
+export const workerSetup = (services: {
+  userNotificationService: ServiceBuilder<'services-user-notification'>
+}): ServiceBuilder<'application-system-api-worker'> =>
+  service('application-system-api-worker')
+    .namespace(namespace)
+    .image('application-system-api')
+    .db()
+    .serviceAccount('application-system-api-worker')
+    .redis()
+    .codeOwner(CodeOwners.NordaApplications)
+    .env({
+      IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/application-system',
+      IDENTITY_SERVER_ISSUER_URL: {
+        dev: 'https://identity-server.dev01.devland.is',
+        staging: 'https://identity-server.staging01.devland.is',
+        prod: 'https://innskra.island.is',
+      },
+      XROAD_CHARGE_FJS_V2_PATH: {
+        dev: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
+        staging: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2',
+        prod: 'IS/GOV/5402697509/FJS-Public/chargeFJS_v2',
+      },
+      APPLICATION_ATTACHMENT_BUCKET: {
+        dev: 'island-is-dev-storage-application-system',
+        staging: 'island-is-staging-storage-application-system',
+        prod: 'island-is-prod-storage-application-system',
+      },
+      FILE_SERVICE_PRESIGN_BUCKET: {
+        dev: 'island-is-dev-fs-presign-bucket',
+        staging: 'island-is-staging-fs-presign-bucket',
+        prod: 'island-is-prod-fs-presign-bucket',
+      },
+      FILE_STORAGE_UPLOAD_BUCKET: {
+        dev: 'island-is-dev-upload-api',
+        staging: 'island-is-staging-upload-api',
+        prod: 'island-is-prod-upload-api',
+      },
+      CLIENT_LOCATION_ORIGIN: {
+        dev: 'https://beta.dev01.devland.is/umsoknir',
+        staging: 'https://beta.staging01.devland.is/umsoknir',
+        prod: 'https://island.is/umsoknir',
+        local: 'http://localhost:4200/umsoknir',
+      },
+      USER_NOTIFICATION_API_URL: ref(
+        (h) => `http://${h.svc(services.userNotificationService)}`,
+      ),
+    })
+    .xroad(Base, Client, Payment, Inna, EHIC, WorkMachines)
+    .secrets({
+      IDENTITY_SERVER_CLIENT_SECRET:
+        '/k8s/application-system/api/IDENTITY_SERVER_CLIENT_SECRET',
+      SYSLUMENN_HOST: '/k8s/application-system-api/SYSLUMENN_HOST',
+      SYSLUMENN_USERNAME: '/k8s/application-system/api/SYSLUMENN_USERNAME',
+      SYSLUMENN_PASSWORD: '/k8s/application-system/api/SYSLUMENN_PASSWORD',
+      DRIVING_LICENSE_BOOK_XROAD_PATH:
+        '/k8s/application-system-api/DRIVING_LICENSE_BOOK_XROAD_PATH',
+      DRIVING_LICENSE_BOOK_USERNAME:
+        '/k8s/application-system-api/DRIVING_LICENSE_BOOK_USERNAME',
+      DRIVING_LICENSE_BOOK_PASSWORD:
+        '/k8s/application-system-api/DRIVING_LICENSE_BOOK_PASSWORD',
+      DOKOBIT_ACCESS_TOKEN: '/k8s/application-system/api/DOKOBIT_ACCESS_TOKEN',
+      DOKOBIT_URL: '/k8s/application-system-api/DOKOBIT_URL',
+      ARK_BASE_URL: '/k8s/application-system-api/ARK_BASE_URL',
+      DOMSYSLA_PASSWORD: '/k8s/application-system-api/DOMSYSLA_PASSWORD',
+      DOMSYSLA_USERNAME: '/k8s/application-system-api/DOMSYSLA_USERNAME',
+    })
+    .args('main.js', '--job', 'worker')
+    .command('node')
+    .extraAttributes({
+      dev: { schedule: '*/30 * * * *' },
+      staging: { schedule: '*/30 * * * *' },
+      prod: { schedule: '*/30 * * * *' },
+    })
+    .resources({
+      limits: { cpu: '400m', memory: '768Mi' },
+      requests: { cpu: '150m', memory: '384Mi' },
+    })
 
 export const serviceSetup = (services: {
   documentsService: ServiceBuilder<'services-documents'>