Merge pull request #37 from mollie/feature/MOL-268/MOL-282

MOL-268/MOL-282: add supported methods check
mollie · Aug 12, 2024 · f557963 · f557963
2 parents 651dd3b + 6ce9441
commit f557963
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/processor/src/service/payment.service.ts b/processor/src/service/payment.service.ts
@@ -55,7 +55,7 @@ import {
 import { getPaymentExtension } from '../commercetools/extensions.commercetools';
 import { HttpDestination } from '@commercetools/platform-sdk/dist/declarations/src/generated/models/extension';
 import { cancelPaymentRefund, createPaymentRefund, getPaymentRefund } from '../mollie/refund.mollie';
-import { ApplePaySessionRequest, CustomPayment } from '../types/mollie.types';
+import { ApplePaySessionRequest, CustomPayment, SupportedPaymentMethods } from '../types/mollie.types';
 import { parseStringToJsonObject } from '../utils/app.utils';
 import ApplePaySession from '@mollie/api-client/dist/types/src/data/applePaySession/ApplePaySession';
 
@@ -82,6 +82,13 @@ export const handleListPaymentMethodsByPayment = async (ctPayment: Payment): Pro
       );
     }
 
+    methods.splice(
+      methods.findIndex((method: Method) => {
+        return !SupportedPaymentMethods[method.id.toString() as SupportedPaymentMethods];
+      }),
+      1,
+    );
+
     const availableMethods = JSON.stringify({
       count: methods.length,
       methods: methods.length ? methods : [],

diff --git a/processor/src/types/mollie.types.ts b/processor/src/types/mollie.types.ts
@@ -23,3 +23,16 @@ export type CustomPayment = Readonly<
     method: CustomPaymentMethod;
   }
 >;
+
+export enum SupportedPaymentMethods {
+  ideal = 'ideal',
+  creditcard = 'creditcard',
+  bancontact = 'bancontact',
+  banktransfer = 'banktransfer',
+  przelewy24 = 'przelewy24',
+  kbc = 'kbc',
+  blik = 'blik',
+  applepay = 'applepay',
+  paypal = 'paypal',
+  giftcard = 'giftcard',
+}
diff --git a/processor/src/validators/payment.validators.ts b/processor/src/validators/payment.validators.ts
@@ -9,7 +9,7 @@ import { CTTransactionState, CTTransactionType } from '../types/commercetools.ty
 import { parseStringToJsonObject, validateEmail } from '../utils/app.utils';
 import { readConfiguration } from '../utils/config.utils';
 import { toBoolean } from 'validator';
-import { CustomPaymentMethod } from '../types/mollie.types';
+import { CustomPaymentMethod, SupportedPaymentMethods } from '../types/mollie.types';
 
 /**
  * Checks if the given action is either 'Create' or 'Update'.
@@ -51,7 +51,7 @@ export const checkPaymentInterface = (ctPayment: CTPayment): true | SkipError =>
  * @return {boolean} Returns true if the method is supported by Mollie
  */
 export const hasValidPaymentMethod: (method: string | undefined) => boolean = (method: string | undefined): boolean => {
-  return !!MolliePaymentMethods[method as MolliePaymentMethods] || !!CustomPaymentMethod[method as CustomPaymentMethod];
+  return !!SupportedPaymentMethods[method as SupportedPaymentMethods];
 };
 
 /**

diff --git a/processor/tests/validators/payment.validators.spec.ts b/processor/tests/validators/payment.validators.spec.ts
@@ -145,11 +145,15 @@ describe('hasValidPaymentMethod', () => {
   it('should return true if the payment method is defined and is supported by Mollie', () => {
     expect(hasValidPaymentMethod('applepay')).toBe(true);
     expect(hasValidPaymentMethod('paypal')).toBe(true);
-    expect(hasValidPaymentMethod('dummy')).toBe(true);
   });
 
   it('should return false if the payment method is defined and is not supported by Mollie', () => {
     expect(hasValidPaymentMethod('test')).toBe(false);
+    expect(hasValidPaymentMethod('dummy')).toBe(false);
+    expect(hasValidPaymentMethod('eps')).toBe(false);
+    expect(hasValidPaymentMethod('twint')).toBe(false);
+    expect(hasValidPaymentMethod('bancomat')).toBe(false);
+    expect(hasValidPaymentMethod('trustly')).toBe(false);
   });
 });
 
@@ -232,7 +236,7 @@ describe('checkPaymentMethodInput', () => {
       transactions: [],
       interfaceInteractions: [],
       paymentMethodInfo: {
-        method: 'dummy',
+        method: 'paypal',
       },
     };