ECP-8327 Allow saving multiple statedata

Adyen · Nov 23, 2023 · bfc32fc · bfc32fc
1 parent 77fe0d6
commit bfc32fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/src/Controller/StoreApi/OrderApi/OrderApiController.php b/src/Controller/StoreApi/OrderApi/OrderApiController.php
@@ -188,7 +188,9 @@ public function giftcardStateData(SalesChannelContext $context, Request $request
      */
     public function deleteGiftCardStateData(SalesChannelContext $context, Request $request): JsonResponse
     {
-        $this->paymentStateDataService->deletePaymentStateDataFromContextToken($context->getToken());
+        $stateData = json_decode($request->request->get('stateData', ''), true);
+        $Id = $stateData['id'];
+        $this->paymentStateDataService->deletePaymentStateData($Id);
 
         return new JsonResponse(['token' => $context->getToken()]);
     }

diff --git a/src/Handlers/AbstractPaymentMethodHandler.php b/src/Handlers/AbstractPaymentMethodHandler.php
@@ -321,7 +321,7 @@ public function pay(
 
         if ($storedStateData) {
             // Remove the used state.data
-            $this->paymentStateDataService->deletePaymentStateDataFromContextToken($salesChannelContext->getToken());
+            $this->paymentStateDataService->deletePaymentStateData($storedStateData['id']);
         }
 
         try {
@@ -870,7 +870,7 @@ public function handleAdyenOrderPayment(
         ) - $partialAmount;
 
         // Remove the used state.data
-        $this->paymentStateDataService->deletePaymentStateDataFromContextToken($salesChannelContext->getToken());
+        $this->paymentStateDataService->deletePaymentStateData($storedStateData['id']);
     }
 
     /**

diff --git a/src/Service/PaymentStateDataService.php b/src/Service/PaymentStateDataService.php
@@ -115,24 +115,14 @@ public function updateStateDataContextToken(PaymentStateDataEntity $stateData, $
     /**
      * @param PaymentStateDataEntity $stateData
      */
-    public function deletePaymentStateData(PaymentStateDataEntity $stateData): void
+    public function deletePaymentStateData(string $Id): void
     {
         $this->paymentStateDataRepository->delete(
             [
-                ['id' => $stateData->getId()],
+                ['id' => $Id],
             ],
             Context::createDefaultContext()
         );
     }
 
-    /**
-     * @param string $contextToken
-     */
-    public function deletePaymentStateDataFromContextToken(string $contextToken): void
-    {
-        $stateData = $this->getPaymentStateDataFromContextToken($contextToken);
-        if (!empty($stateData)) {
-            $this->deletePaymentStateData($stateData);
-        }
-    }
 }