From abe58bde7e2b7ce2d667c3864ae57681efa88b1b Mon Sep 17 00:00:00 2001
From: Nghia Tran <n.tran@shopmacher.de>
Date: Wed, 11 Dec 2024 15:10:45 +0700
Subject: [PATCH] Resolve conflicts

---
 processor/src/service/payment.service.ts      | 30 +++++++------------
 processor/src/utils/constant.utils.ts         |  3 +-
 .../tests/service/payment.service.spec.ts     | 13 ++++----
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/processor/src/service/payment.service.ts b/processor/src/service/payment.service.ts
index 9388ff9..22fbf9d 100644
--- a/processor/src/service/payment.service.ts
+++ b/processor/src/service/payment.service.ts
@@ -423,10 +423,6 @@ export const handleCreatePayment = async (ctPayment: Payment): Promise<Controlle
 
   const paymentParams = createMollieCreatePaymentParams(ctPayment, extensionUrl, surchargeAmountInCent, cart);
 
-  if (method && method.toString() === 'googlepay') {
-    paymentParams.method = PaymentMethod.creditcard;
-  }
-
   let molliePayment;
   if (PaymentMethod[paymentParams.method as PaymentMethod]) {
     logger.debug('SCTM - handleCreatePayment - Attempt creating a payment with method defined in Mollie NodeJS Client');
@@ -531,9 +527,8 @@ export const getCreatePaymentUpdateAction = async (
 };
 
 export const handleCreateRefund = async (ctPayment: Payment): Promise<ControllerResponseType> => {
-  const successChargeTransaction = ctPayment.transactions.find(
-    (transaction) => transaction.type === CTTransactionType.Charge && transaction.state === CTTransactionState.Success,
-  );
+  let successChargeTransaction;
+  const updateActions = [] as UpdateAction[];
 
   const initialRefundTransaction = ctPayment.transactions.find(
     (transaction) => transaction.type === CTTransactionType.Refund && transaction.state === CTTransactionState.Initial,
@@ -577,12 +572,14 @@ export const handleCreateRefund = async (ctPayment: Payment): Promise<Controller
 
   const refund = await createPaymentRefund(paymentCreateRefundParams);
 
+  updateActions.push(
+    changeTransactionInteractionId(initialRefundTransaction?.id as string, refund.id),
+    changeTransactionState(initialRefundTransaction?.id as string, CTTransactionState.Pending),
+  );
+
   return {
     statusCode: 201,
-    actions: [
-      changeTransactionInteractionId(initialRefundTransaction?.id as string, refund.id),
-      changeTransactionState(initialRefundTransaction?.id as string, CTTransactionState.Pending),
-    ],
+    actions: updateActions,
   };
 };
 
@@ -594,13 +591,8 @@ export const handleCreateRefund = async (ctPayment: Payment): Promise<Controller
  * @throws {CustomError} If there is an error in the process.
  */
 export const handlePaymentCancelRefund = async (ctPayment: Payment): Promise<ControllerResponseType> => {
-  const successChargeTransaction = ctPayment.transactions.find(
-    (transaction) => transaction.type === CTTransactionType.Charge && transaction.state === CTTransactionState.Success,
-  );
-
-  const pendingRefundTransaction = ctPayment.transactions.find(
-    (transaction) => transaction.type === CTTransactionType.Refund && transaction.state === CTTransactionState.Pending,
-  );
+  let pendingRefundTransaction: any;
+  let successChargeTransaction: any;
 
   const initialCancelAuthorization = ctPayment.transactions.find(
     (transaction) =>
@@ -841,4 +833,4 @@ export const handleGetApplePaySession = async (ctPayment: Payment): Promise<Cont
     statusCode: 200,
     actions: ctActions,
   };
-};
+};
\ No newline at end of file
diff --git a/processor/src/utils/constant.utils.ts b/processor/src/utils/constant.utils.ts
index 3e39cee..aab693f 100644
--- a/processor/src/utils/constant.utils.ts
+++ b/processor/src/utils/constant.utils.ts
@@ -39,6 +39,7 @@ export const CustomFields = {
     },
   },
   transactionSurchargeCost: 'sctm_transaction_surcharge_cost',
+  transactionRefundForMolliePayment: 'sctm_transaction_refund_for_mollie_payment',
 };
 
 export enum ConnectorActions {
@@ -69,4 +70,4 @@ export const MOLLIE_SURCHARGE_CUSTOM_LINE_ITEM = 'mollie-surcharge-line-item';
 
 export const MOLLIE_SURCHARGE_LINE_DESCRIPTION = 'Total surcharge amount';
 
-export const MOLLIE_SHIPPING_LINE_DESCRIPTION = 'Shipping amount';
+export const MOLLIE_SHIPPING_LINE_DESCRIPTION = 'Shipping amount';
\ No newline at end of file
diff --git a/processor/tests/service/payment.service.spec.ts b/processor/tests/service/payment.service.spec.ts
index f40a69b..bf2e5ed 100644
--- a/processor/tests/service/payment.service.spec.ts
+++ b/processor/tests/service/payment.service.spec.ts
@@ -1814,7 +1814,7 @@ describe('Test handleCreatePayment', () => {
       ],
       interfaceInteractions: [],
       paymentMethodInfo: {
-        method: 'googlepay',
+        method: 'ideal',
       },
       custom: {
         type: {
@@ -1904,7 +1904,7 @@ describe('Test handleCreatePayment', () => {
     });
 
     (createMollieCreatePaymentParams as jest.Mock).mockReturnValueOnce({
-      method: 'googlepay',
+      method: 'ideal',
     });
 
     (changeTransactionState as jest.Mock).mockReturnValueOnce({
@@ -1961,7 +1961,7 @@ describe('Test handleCreatePayment', () => {
           sctm_id: '5c8b0375-305a-4f19-ae8e-07806b101999',
           sctm_action_type: 'createPayment',
           sctm_created_at: '2024-03-20T09:13:37+00:00',
-          sctm_request: '{"transactionId":"5c8b0375-305a-4f19-ae8e-07806b101999","paymentMethod":"googlepay"}',
+          sctm_request: '{"transactionId":"5c8b0375-305a-4f19-ae8e-07806b101999","paymentMethod":"ideal"}',
           sctm_response:
             '{"molliePaymentId":"tr_7UhSN1zuXS","checkoutUrl":"https://www.mollie.com/checkout/select-method/7UhSN1zuXS","transactionId":"5c8b0375-305a-4f19-ae8e-07806b101999"}',
         },
@@ -2001,7 +2001,7 @@ describe('Test handleCreatePayment', () => {
 });
 
 describe('Test handleCreateRefund', () => {
-  it('should return status code and array of actions', async () => {
+  it('should return status code and array of actions (1 success charge transaction)', async () => {
     const CTPayment: Payment = {
       id: '5c8b0375-305a-4f19-ae8e-07806b101999',
       version: 1,
@@ -2458,7 +2458,6 @@ describe('Test handlePaymentCancelRefund', () => {
       {
         id: '5c8b0375-305a-4f19-ae8e-07806b102000',
         type: 'CancelAuthorization',
-        interactionId: 're_4qqhO89gsT',
         amount: {
           type: 'centPrecision',
           currencyCode: 'EUR',
@@ -2533,7 +2532,7 @@ describe('Test handlePaymentCancelRefund', () => {
     }
   });
 
-  it('should return status code and array of actions', async () => {
+  it('should return status code and array of actions (interactionId is not defined in the Initial CancelAuthorization transaction)', async () => {
     const mollieRefund: Refund = {
       resource: 'refund',
       id: CTPayment.transactions[1].interactionId,
@@ -3540,4 +3539,4 @@ describe('Test handleGetApplePaySession', () => {
       expect(mockMakeCTMoney).toHaveBeenCalledWith({ currency: 'EUR', value: '20.00' });
     });
   });
-});
+});
\ No newline at end of file