Hotfix/v24.12 9 (#6332)

* Fix filter for fsp name * update snap create program --------- Co-authored-by: Ruben <vandervalk@geoit.nl>
global-121 · Dec 23, 2024 · b8cfe43 · b8cfe43
1 parent 342df86
commit b8cfe43
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 22 deletions.
diff --git a/interfaces/Portal/src/assets/i18n/ar.json b/interfaces/Portal/src/assets/i18n/ar.json
@@ -378,6 +378,7 @@
           "phoneNumber": "رقم الهاتف",
           "preferredLanguage": "اللغة المفضلة",
           "programFinancialServiceProviderConfigurationLabel": "مزود الخدمات المالية",
+          "programFinancialServiceProviderConfigurationName": "مزود الخدمات المالية",
           "referenceId": "الرقم المرجعي",
           "registration-attribute-false": "لا",
           "registration-attribute-true": "نعم",

diff --git a/interfaces/Portal/src/assets/i18n/en.json b/interfaces/Portal/src/assets/i18n/en.json
@@ -358,6 +358,7 @@
           "phoneNumber": "Phonenumber",
           "preferredLanguage": "Preferred language",
           "programFinancialServiceProviderConfigurationLabel": "Financial Service Provider",
+          "programFinancialServiceProviderConfigurationName": "Financial Service Provider",
           "referenceId": "Reference ID",
           "registration-attribute-false": "No",
           "registration-attribute-true": "Yes",

diff --git a/interfaces/Portal/src/assets/i18n/es.json b/interfaces/Portal/src/assets/i18n/es.json
@@ -378,6 +378,7 @@
           "phoneNumber": "Número de teléfono",
           "preferredLanguage": "Idioma preferido",
           "programFinancialServiceProviderConfigurationLabel": "Proveedor de servicios financieros",
+          "programFinancialServiceProviderConfigurationName": "Proveedor de servicios financieros",
           "referenceId": "ID de referencia",
           "registration-attribute-false": "No",
           "registration-attribute-true": "Sí",

diff --git a/interfaces/Portal/src/assets/i18n/fr.json b/interfaces/Portal/src/assets/i18n/fr.json
@@ -389,6 +389,7 @@
           "phoneNumber": "Numéro de téléphone",
           "preferredLanguage": "Langue préférée",
           "programFinancialServiceProviderConfigurationLabel": "Prestataire de Services Financiers",
+          "programFinancialServiceProviderConfigurationName": "Prestataire de Services Financiers",
           "referenceId": "Identifiant de référence",
           "registration-attribute-false": "Non",
           "registration-attribute-true": "Oui",

diff --git a/interfaces/Portal/src/assets/i18n/nl.json b/interfaces/Portal/src/assets/i18n/nl.json
@@ -393,6 +393,7 @@
           "phoneNumber": "Telefoonnummer",
           "preferredLanguage": "Voorkeurstaal",
           "programFinancialServiceProviderConfigurationLabel": "Type hulp",
+          "programFinancialServiceProviderConfigurationName": "Type hulp",
           "referenceId": "Referentie nummer",
           "registration-attribute-false": "Nee",
           "registration-attribute-true": "Ja",

diff --git a/interfaces/Portal/src/assets/i18n/ru.json b/interfaces/Portal/src/assets/i18n/ru.json
@@ -361,6 +361,8 @@
           "personAffectedSequence": "Пострадавшее лицо",
           "phoneNumber": "Номер телефона",
           "preferredLanguage": "Предпочитаемый язык",
+          "programFinancialServiceProviderConfigurationLabel": "Поставщик финансовых услуг",
+          "programFinancialServiceProviderConfigurationName": "Поставщик финансовых услуг",
           "referenceId": "Идентификатор ссылки",
           "registrationCreated": "Регистрация создана",
           "registrationCreatedDate": "Дата создания регистрации",

diff --git a/...121-service/src/payments/fsp-integration/intersolve-voucher/intersolve-voucher.service.ts b/...121-service/src/payments/fsp-integration/intersolve-voucher/intersolve-voucher.service.ts
@@ -580,7 +580,7 @@ export class IntersolveVoucherService
 
     const credentials =
       await this.programFspConfigurationRepository.getUsernamePasswordProperties(
-        programFinancialServiceProviderConfiguration[0].id, // TODO: take the 0-th element, because the above method returns an array of entities as e.g. multiple Excel FSPs can be defined per program. For Intersolve-voucher this is not currently the case, so this is needed and worsk, but should be improved.
+        programFinancialServiceProviderConfiguration[0].id, // TODO: take the 0-th element, because the above method returns an array of entities as e.g. multiple Excel FSPs can be defined per program. For Intersolve-voucher this is not currently the case, so this is needed and works, but should be improved.
       );
     if (!credentials?.username || !credentials?.password) {
       throw new Error(

diff --git a/services/121-service/src/program-attributes/program-attributes.service.ts b/services/121-service/src/program-attributes/program-attributes.service.ts
@@ -33,7 +33,7 @@ export class ProgramAttributesService {
       'preferredLanguage',
       'inclusionScore',
       'paymentAmountMultiplier',
-      'financialServiceProvider',
+      'programFinancialServiceProviderConfigurationName',
     ];
     const paAttributesNameArray = program['paTableAttributes'].map(
       (paAttribute: Attribute) => paAttribute.name,

diff --git a/services/121-service/test/program/__snapshots__/create-program.test.ts.snap b/services/121-service/test/program/__snapshots__/create-program.test.ts.snap
@@ -219,16 +219,6 @@ exports[`Create program should post a program: Create program response for progr
           "isInteger": false,
           "name": "bankAccountNumber",
         },
-        {
-          "allowedOperators": [
-            "$eq",
-            "$in",
-            "$ilike",
-            "$null",
-          ],
-          "isInteger": false,
-          "name": "financialServiceProvider",
-        },
         {
           "allowedOperators": [
             "$eq",
@@ -405,6 +395,16 @@ exports[`Create program should post a program: Create program response for progr
           "isInteger": false,
           "name": "preferredLanguage",
         },
+        {
+          "allowedOperators": [
+            "$eq",
+            "$in",
+            "$ilike",
+            "$null",
+          ],
+          "isInteger": false,
+          "name": "programFinancialServiceProviderConfigurationName",
+        },
         {
           "allowedOperators": [
             "$eq",
@@ -1219,16 +1219,6 @@ exports[`Create program should post a program: Create program response for progr
           "isInteger": false,
           "name": "addressStreet",
         },
-        {
-          "allowedOperators": [
-            "$eq",
-            "$in",
-            "$ilike",
-            "$null",
-          ],
-          "isInteger": false,
-          "name": "financialServiceProvider",
-        },
         {
           "allowedOperators": [
             "$eq",
@@ -1285,6 +1275,16 @@ exports[`Create program should post a program: Create program response for progr
           "isInteger": false,
           "name": "preferredLanguage",
         },
+        {
+          "allowedOperators": [
+            "$eq",
+            "$in",
+            "$ilike",
+            "$null",
+          ],
+          "isInteger": false,
+          "name": "programFinancialServiceProviderConfigurationName",
+        },
         {
           "allowedOperators": [
             "$eq",