Merge branch 'main' into feat/umsokn-um-framhaldsskola

.dockerignore

@@ -6,11 +6,17 @@
 /scripts/ci/
 /.env.*
 /.envrc*
+/.nx/
 
 # Cache and packages
 **/node_modules/
-**/cache/
+# Ignoring _all_ cache folders dosen't work, because we have libraries named `cache`
+# **/cache/
+/.yarn/cache/
+/.yarn/install-state*
+# Ignores e.g. `cache/` and `cache_outptut/`
 /cache*
+/.cache*/
 
 # Logs and temporaries
 **/log/

.github/workflows/pullrequest.yml

@@ -288,8 +288,7 @@ jobs:
         with:
           github_token: ${{ secrets.github_token }}
           reporter: github-pr-review
-          fail_on_error: true
-          level: info
+          fail-level: info
           exclude: >-
             */node_modules/*
 

.github/workflows/revert-pr.yaml

@@ -0,0 +1,105 @@
+name: Checksuit
+
+on:
+  workflow_run:
+    workflows:
+      - Monorepo pipeline - build and deploy
+    types:
+      - completed
+    branches:
+      - main
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - labeled
+
+permissions:
+  contents: write
+  pull-requests: write
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  detect-failure:
+    name: Determine Failure
+    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+    runs-on: ec2-runners
+    container:
+      image: public.ecr.aws/m3u4c4h9/island-is/actions-runner-public:latest
+    outputs:
+      PR_NUMBER: ${{ steps.fetch-pr.outputs.PR_NUMBER }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Debug
+        run: |
+          echo "Conclusion: ${{ github.event.workflow_run.conclusion }}"
+
+      - name: Fetch PR
+        id: fetch-pr
+        run: |
+          COMMIT_SHA="${{ github.event.workflow_run.head_commit.id }}"
+          if ! PR_NUMBER=$(bash ./scripts/ci/get-pr.sh "$COMMIT_SHA"); then
+            echo "Error: Failed to get PR number for commit $COMMIT_SHA"
+            exit 1
+          fi
+
+          if [ -n "$PR_NUMBER" ]; then
+            echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_OUTPUT
+          else
+            echo "No merged PR found for commit $COMMIT_SHA."
+          fi
+
+      - name: Add Revert Label
+        id: add-revert-label
+        if: ${{ steps.fetch-pr.outputs.PR_NUMBER && github.event.workflow_run.conclusion == 'failure' }}
+        run: |
+          PR_NUMBER="${{ steps.fetch-pr.outputs.PR_NUMBER }}"
+          if [ -z "$PR_NUMBER" ]; then
+            echo "Error: PR number is empty"
+            exit 1
+          fi
+          echo "Adding revert label to PR: $PR_NUMBER"
+          if ! gh pr edit "$PR_NUMBER" --add-label "revert"; then
+            echo "Error: Failed to add revert label"
+            exit 1
+          fi
+
+  create-revert-pr:
+    name: Automated PR revert
+    needs: detect-failure
+    if: ${{ needs.detect-failure.outputs.PR_NUMBER && github.event.workflow_run.conclusion == 'failure' }}
+    runs-on: ec2-runners
+    container:
+      image: public.ecr.aws/m3u4c4h9/island-is/actions-runner-public:latest
+    steps:
+      - name: Debug
+        run: |
+          PR_NUMBER=${{ needs.detect-failure.outputs.PR_NUMBER }}
+          echo "Reverting PR: $PR_NUMBER"
+
+      - name: Execute PR revert
+        if: ${{ vars.ENABLE_PR_REVERT == 'true' }}
+        run: |
+          REVERT_PR=$(bash ./scripts/ci/revert-pr.sh "$PR_NUMBER")
+          gh pr edit $REVERT_PR --add-label "automerge,high priority"
+
+  manual-revert-pr:
+    name: Manual PR revert
+    runs-on: ec2-runners
+    container:
+      image: public.ecr.aws/m3u4c4h9/island-is/actions-runner-public:latest
+    if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'revert') && (github.event.pull_request.merged == true || github.event.pull_request.draft == true) && github.actor != 'github-actions' }}
+    steps:
+      - name: Debug
+        run: |
+          echo "actor: ${{ github.actor }}"
+          echo "Reverting PR: ${{ github.event.pull_request.number }}"
+
+      - name: Execute PR revert
+        if: ${{ vars.ENABLE_PR_REVERT == 'true' }}
+        run: |
+          REVERT_PR=$(bash ./scripts/ci/revert-pr.sh "${{ github.event.pull_request.number }}")
+          gh pr edit $REVERT_PR --add-label "automerge,high priority"

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

@@ -477,5 +477,7 @@ export const serviceSetup = (services: {
       'application-system',
       'consultation-portal',
       'portals-admin',
+      'service-portal',
+      'portals-my-pages',
     )
 }

apps/api/src/app/app.module.ts

@@ -154,6 +154,7 @@ import {
   IdsClientConfig,
   XRoadConfig,
 } from '@island.is/nest/config'
+import { CodeOwnerInterceptor } from '@island.is/nest/core'
 import { DataLoaderInterceptor } from '@island.is/nest/dataloader'
 import { FeatureFlagConfig } from '@island.is/nest/feature-flags'
 import { ProblemModule } from '@island.is/nest/problem'
@@ -175,6 +176,7 @@ import { FormSystemModule } from '@island.is/api/domains/form-system'
 import { HealthDirectorateModule } from '@island.is/api/domains/health-directorate'
 
 import { VehiclesMileageClientConfig } from '@island.is/clients/vehicles-mileage'
+
 import { getConfig } from './environments'
 import { GraphqlOptionsFactory } from './graphql-options.factory'
 import { GraphQLConfig } from './graphql.config'
@@ -214,6 +216,10 @@ const environment = getConfig
       provide: APP_INTERCEPTOR,
       useClass: DataLoaderInterceptor,
     },
+    {
+      provide: APP_INTERCEPTOR,
+      useClass: CodeOwnerInterceptor,
+    },
   ],
   imports: [
     GraphQLModule.forRootAsync({