feat(air-discount-scheme): Add myflug + add more logs to ads

apps/air-discount-scheme/README.md

@@ -21,7 +21,7 @@ There are certain precondition to be eligible for a discount. They are:
 The API is used by airlines to verify the discount code validity and get basic
 booking info about the user.
 
-The airlines that have access to this api are `Icelandair`, `Ernir` and
+The airlines that have access to this api are `Icelandair`, `Ernir`, `Myflug` and
 `Norlandair`. Historically some flights were booked for `Norlandair` through
 `Icelandair`, those flights are marked with the `Icelandair` airline but have a
 cooperation field with `Norlandair`.

apps/air-discount-scheme/backend/infra/air-discount-scheme-backend.ts

@@ -7,6 +7,7 @@ export const serviceSetup = (): ServiceBuilder<'air-discount-scheme-backend'> =>
     .namespace('air-discount-scheme')
     .secrets({
       ICELANDAIR_API_KEY: '/k8s/air-discount-scheme/backend/ICELANDAIR_API_KEY',
+      MYFLUG_API_KEY: '/k8s/air-discount-scheme/backend/MYFLUG_API_KEY',
       ERNIR_API_KEY: '/k8s/air-discount-scheme/backend/ERNIR_API_KEY',
       NORLANDAIR_API_KEY: '/k8s/air-discount-scheme/backend/NORLANDAIR_API_KEY',
       NATIONAL_REGISTRY_PASSWORD:

apps/air-discount-scheme/backend/seeders/20211108100835-development.js

@@ -33,8 +33,8 @@ const getRandomFlightLeg = (flightId, flightDate, pairing) => {
     created: flightDate,
     modified: flightDate,
     financial_state: 'AWAITING_DEBIT',
-    airline: ['ernir', 'norlandair', 'icelandair'][
-      Math.floor(Math.random() * 3)
+    airline: ['ernir', 'norlandair', 'icelandair', 'myflug'][
+      Math.floor(Math.random() * 4)
     ],
     cooperation: null,
     financial_state_updated: flightDate,

apps/air-discount-scheme/backend/src/app/modules/common/test/unit/auth.guard.spec.ts

@@ -42,6 +42,18 @@ describe('AuthGuard', () => {
     expect(isValid).toBe(true)
   })
 
+  it('Api key should work for Myflug', async () => {
+    const request: any = {
+      headers: {
+        authorization: `bearer ${airlineApiKeys.myflug}`,
+      },
+    }
+
+    const isValid = authGuard.hasValidApiKey(request)
+
+    expect(isValid).toBe(true)
+  })
+
   it('Api key should not work with empty authorization header', async () => {
     const request: any = {
       headers: {},

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

@@ -258,7 +258,15 @@ export class NationalRegistryService {
   }
 
   async getRelations(authUser: AuthUser): Promise<Array<string>> {
-    return this.personApi.getCustodyChildren(authUser)
+    try {
+      return this.personApi.getCustodyChildren(authUser)
+    } catch (e) {
+      this.logger.info('getRelations custodychildren not successful', {
+        category: 'ads-backend',
+        e,
+      })
+      throw e
+    }
   }
 
   async getCustodians(

apps/air-discount-scheme/backend/src/environments/environment.ts

@@ -9,6 +9,7 @@ const devConfig = {
     [Airlines.icelandair]: Airlines.icelandair,
     [Airlines.ernir]: Airlines.ernir,
     [Airlines.norlandair]: Airlines.norlandair,
+    [Airlines.myflug]: Airlines.myflug,
   },
   redis: {
     urls: [
@@ -41,6 +42,7 @@ const prodConfig = {
     [Airlines.icelandair]: process.env.ICELANDAIR_API_KEY,
     [Airlines.ernir]: process.env.ERNIR_API_KEY,
     [Airlines.norlandair]: process.env.NORLANDAIR_API_KEY,
+    [Airlines.myflug]: process.env.MYFLUG_API_KEY,
   },
   redis: {
     urls: [process.env.REDIS_URL_NODE_01!],

apps/air-discount-scheme/web/screens/Admin/consts.ts

@@ -28,6 +28,10 @@ export const airlineOptions = [
     label: 'Icelandair',
     value: Airlines.icelandair,
   },
+  {
+    label: 'Mýflug',
+    value: Airlines.myflug,
+  },
   {
     label: 'Norlandair',
     value: Airlines.norlandair,

charts/islandis/values.dev.yaml

@@ -185,6 +185,7 @@ air-discount-scheme-backend:
     ERNIR_API_KEY: '/k8s/air-discount-scheme/backend/ERNIR_API_KEY'
     ICELANDAIR_API_KEY: '/k8s/air-discount-scheme/backend/ICELANDAIR_API_KEY'
     IDENTITY_SERVER_CLIENT_SECRET: '/k8s/air-discount-scheme-backend/VEGAGERDIN_IDS_CLIENTS_ADS_SECRET'
+    MYFLUG_API_KEY: '/k8s/air-discount-scheme/backend/MYFLUG_API_KEY'
     NATIONAL_REGISTRY_PASSWORD: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_PASSWORD'
     NATIONAL_REGISTRY_URL: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_URL'
     NATIONAL_REGISTRY_USERNAME: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_USERNAME'

charts/islandis/values.prod.yaml

@@ -177,6 +177,7 @@ air-discount-scheme-backend:
     ERNIR_API_KEY: '/k8s/air-discount-scheme/backend/ERNIR_API_KEY'
     ICELANDAIR_API_KEY: '/k8s/air-discount-scheme/backend/ICELANDAIR_API_KEY'
     IDENTITY_SERVER_CLIENT_SECRET: '/k8s/air-discount-scheme-backend/VEGAGERDIN_IDS_CLIENTS_ADS_SECRET'
+    MYFLUG_API_KEY: '/k8s/air-discount-scheme/backend/MYFLUG_API_KEY'
     NATIONAL_REGISTRY_PASSWORD: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_PASSWORD'
     NATIONAL_REGISTRY_URL: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_URL'
     NATIONAL_REGISTRY_USERNAME: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_USERNAME'

charts/islandis/values.staging.yaml

@@ -185,6 +185,7 @@ air-discount-scheme-backend:
     ERNIR_API_KEY: '/k8s/air-discount-scheme/backend/ERNIR_API_KEY'
     ICELANDAIR_API_KEY: '/k8s/air-discount-scheme/backend/ICELANDAIR_API_KEY'
     IDENTITY_SERVER_CLIENT_SECRET: '/k8s/air-discount-scheme-backend/VEGAGERDIN_IDS_CLIENTS_ADS_SECRET'
+    MYFLUG_API_KEY: '/k8s/air-discount-scheme/backend/MYFLUG_API_KEY'
     NATIONAL_REGISTRY_PASSWORD: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_PASSWORD'
     NATIONAL_REGISTRY_URL: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_URL'
     NATIONAL_REGISTRY_USERNAME: '/k8s/air-discount-scheme/backend/NATIONAL_REGISTRY_USERNAME'

libs/air-discount-scheme/consts/src/lib/flight.ts

@@ -15,4 +15,5 @@ export const Airlines = {
   ernir: 'ernir',
   icelandair: 'icelandair',
   norlandair: 'norlandair',
+  myflug: 'myflug',
 }

libs/portals/admin/air-discount-scheme/src/screens/Overview/consts.ts

@@ -28,6 +28,10 @@ export const airlineOptions = [
     label: 'Icelandair',
     value: Airlines.icelandair,
   },
+  {
+    label: 'Mýflug',
+    value: Airlines.myflug,
+  },
   {
     label: 'Norlandair',
     value: Airlines.norlandair,

libs/service-portal/air-discount/src/lib/messages.ts

@@ -55,6 +55,10 @@ export const messages = defineMessages({
     id: 'sp.air-discount:copy-code',
     defaultMessage: 'Afrita kóða',
   },
+  codeGenFailed: {
+    id: 'sp.air-discount:code-generation-fail',
+    defaultMessage: 'Ekki tókst að útbúa kóða',
+  },
   copied: {
     id: 'sp.air-discount:copied',
     defaultMessage: 'Afritað',

libs/service-portal/air-discount/src/screens/AirDiscountOverview/AirDiscountOverview.tsx

@@ -191,14 +191,14 @@ export const AirDiscountOverview = () => {
                         ? undefined
                         : item.discountCode
                         ? item.discountCode
-                        : '0'
+                        : formatMessage(m.codeGenFailed)
                     }
                     cta={{
                       label: formatMessage(m.copyCode),
                       onClick: () => copy(item.discountCode),
                       centered: true,
                       icon: isCopied ? 'checkmark' : 'copy',
-                      hide: item.user.fund?.credit === 0,
+                      hide: item.user.fund?.credit === 0 || !item.discountCode,
                     }}
                   />
                 )