Added securityCode field and fixed tests

Amsterdam · Nov 7, 2024 · 58c08e3 · 58c08e3
1 parent 155e18d
commit 58c08e3
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 9 deletions.
diff --git a/src/server/routing/router-stadspas-external-consumer.test.ts b/src/server/routing/router-stadspas-external-consumer.test.ts
@@ -216,7 +216,6 @@ describe('hli/router-external-consumer', async () => {
         content: [
           {
             foo: 'bar',
-            securityCode: null,
             transactionsKeyEncrypted: TRANSACTIONS_KEY_ENCRYPTED,
           },
         ],

diff --git a/src/server/routing/router-stadspas-external-consumer.ts b/src/server/routing/router-stadspas-external-consumer.ts
@@ -220,7 +220,6 @@ async function sendStadspassenResponse(
           return {
             ...stadspas,
             // AMSAPP wants this extra field because GPASS promises to deliver this in the fourth quarter (Q4).
-            securityCode: null,
             transactionsKeyEncrypted,
           };
         });

diff --git a/src/server/services/hli/stadspas-gpass-service.test.ts b/src/server/services/hli/stadspas-gpass-service.test.ts
@@ -121,6 +121,14 @@ describe('stadspas-gpass-service', () => {
           id: 0,
           naam: '',
         },
+        pashouder: {
+          initialen: '',
+          achternaam: '',
+          tussenvoegsel: '',
+          voornaam: '',
+          passen: [],
+          volledige_naam: '',
+        },
       };
       const pashouder: StadspasHouderSource = {
         voornaam: 'John',
@@ -131,7 +139,8 @@ describe('stadspas-gpass-service', () => {
       };
       const transformedResponse = forTesting.transformStadspasResponse(
         gpassStadspasResonseData,
-        pashouder
+        pashouder,
+        '0123456'
       );
       expect(transformedResponse).toStrictEqual({
         id: '1',
@@ -160,6 +169,7 @@ describe('stadspas-gpass-service', () => {
         balanceFormatted: '€500,00',
         passNumber: 12345,
         passNumberComplete: '12345-67890',
+        securityCode: '0123456',
       });
     });
 
@@ -178,7 +188,8 @@ describe('stadspas-gpass-service', () => {
 
       const transformedResponse = forTesting.transformStadspasResponse(
         gpassStadspasResonseData,
-        pashouder
+        pashouder,
+        '0123456'
       );
       expect(transformedResponse).toEqual(gpassStadspasResonseData);
     });
@@ -458,8 +469,18 @@ describe('stadspas-gpass-service', () => {
         initialen: 'J.D.',
         passen: [
           {
-            pasnummer: 999999999,
             actief: true,
+            budgetten: [],
+            categorie: '',
+            categorie_code: '',
+            expiry_date: '',
+            heeft_budget: false,
+            id: 1,
+            pasnummer: 999999999,
+            pasnummer_volledig: '',
+            passoort: { id: 1, naam: '' },
+            securitycode: '0123456',
+            vervangen: false,
           },
         ],
       };
@@ -504,6 +525,14 @@ describe('stadspas-gpass-service', () => {
           id: 0,
           naam: '',
         },
+        pashouder: {
+          initialen: '',
+          achternaam: '',
+          tussenvoegsel: '',
+          voornaam: '',
+          passen: [],
+          volledige_naam: '',
+        },
       };
 
       (requestData as Mock)
@@ -514,7 +543,11 @@ describe('stadspas-gpass-service', () => {
         .mockResolvedValueOnce({
           status: 'OK',
           content: [
-            forTesting.transformStadspasResponse(stadspasDetail, pashouder),
+            forTesting.transformStadspasResponse(
+              stadspasDetail,
+              pashouder,
+              '0123456'
+            ),
           ],
         });
 
@@ -553,6 +586,7 @@ describe('stadspas-gpass-service', () => {
               balanceFormatted: '€500,00',
               passNumber: 999999999,
               passNumberComplete: '12345-67890',
+              securityCode: '0123456',
             },
           ],
           administratienummer: '12345',

diff --git a/src/server/services/hli/stadspas-gpass-service.ts b/src/server/services/hli/stadspas-gpass-service.ts
@@ -3,6 +3,7 @@ import memoizee from 'memoizee';
 import { fetchAdministratienummer } from './hli-zorgned-service';
 import { GPASS_API_TOKEN } from './stadspas-config-and-content';
 import {
+  SecurityCode,
   Stadspas,
   StadspasAanbiedingSource,
   StadspasBudget,
@@ -73,7 +74,8 @@ function transformBudget(budget: StadspasDetailBudgetSource) {
 
 function transformStadspasResponse(
   gpassStadspasResonseData: StadspasDetailSource,
-  pashouder: StadspasHouderSource
+  pashouder: StadspasHouderSource,
+  securityCode: SecurityCode
 ) {
   if (
     typeof gpassStadspasResonseData === 'object' &&
@@ -97,6 +99,7 @@ function transformStadspasResponse(
       balanceFormatted: `€${displayAmount(balance)}`,
       passNumber: gpassStadspasResonseData.pasnummer,
       passNumberComplete: gpassStadspasResonseData.pasnummer_volledig,
+      securityCode
     };
 
     return stadspasTransformed;
@@ -154,7 +157,7 @@ export async function fetchStadspassenByAdministratienummer(
           ...dataRequestConfig,
           url,
           transformResponse: (stadspas) =>
-            transformStadspasResponse(stadspas, pashouder),
+            transformStadspasResponse(stadspas, pashouder, pas.securitycode),
           headers,
           params: {
             include_balance: true,

diff --git a/src/server/services/hli/stadspas-types.ts b/src/server/services/hli/stadspas-types.ts
@@ -81,6 +81,8 @@ export interface StadspasDiscountTransactionsResponseSource {
   transacties: StadspasAanbiedingSource[];
 }
 
+export type SecurityCode = string;
+
 export interface StadspasHouderPasSource {
   actief: boolean;
   budgetten: unknown[];  // Did not see the exact shape of this data, encountered an empty array.
@@ -92,7 +94,7 @@ export interface StadspasHouderPasSource {
   pasnummer: number;
   pasnummer_volledig: string;
   passoort: { id: number, naam: string };
-  securitycode: string;
+  securitycode: SecurityCode;
   vervangen: boolean;
 }
 
@@ -171,6 +173,7 @@ export interface Stadspas {
   budgets: StadspasBudget[];
   balanceFormatted: string;
   balance: number;
+  securityCode: SecurityCode;
 }
 
 export interface StadspasFrontend extends Stadspas {

diff --git a/src/server/services/hli/stadspas.test.ts b/src/server/services/hli/stadspas.test.ts
@@ -20,10 +20,12 @@ const pashouderResponse = {
     {
       actief: false,
       pasnummer: 444444444444,
+      securitycode: '012345',
     },
     {
       actief: true,
       pasnummer: 333333333333,
+      securitycode: '012345',
     },
   ],
   sub_pashouders: [
@@ -35,10 +37,12 @@ const pashouderResponse = {
         {
           actief: true,
           pasnummer: 666666666666,
+          securitycode: '012345',
         },
         {
           actief: false,
           pasnummer: 555555555555,
+          securitycode: '012345',
         },
       ],
     },
@@ -50,10 +54,12 @@ const pashouderResponse = {
         {
           actief: true,
           pasnummer: 777777777777,
+          securitycode: '012345',
         },
         {
           actief: false,
           pasnummer: 888888888888,
+          securitycode: '012345',
         },
       ],
     },
@@ -224,6 +230,7 @@ describe('stadspas services', () => {
               },
               "passNumber": 6666666666666,
               "passNumberComplete": "6666666666666666666",
+              "securityCode": "012345",
             },
           ],
         },
@@ -297,6 +304,7 @@ describe('stadspas services', () => {
               },
               "passNumber": 6666666666666,
               "passNumberComplete": "6666666666666666666",
+              "securityCode": "012345",
             },
             {
               "balance": 0,
@@ -325,6 +333,7 @@ describe('stadspas services', () => {
               },
               "passNumber": 6666666666666,
               "passNumberComplete": "6666666666666666666",
+              "securityCode": "012345",
             },
             {
               "balance": 0,
@@ -353,6 +362,7 @@ describe('stadspas services', () => {
               },
               "passNumber": 6666666666666,
               "passNumberComplete": "6666666666666666666",
+              "securityCode": "012345",
             },
           ],
         },