Merge pull request #35 from spryker-eco/bugfix/supesc-180-notificatio…

…ns-are-not-processed Release 3.1.0
spryker-eco · Oct 9, 2020 · 85e8b47 · 85e8b47
2 parents 7171e1a + 58e6a7d
commit 85e8b47
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
-MIT License
+The MIT License (MIT)
 
-Copyright (c) 2017 SPRYKER SYSTEMS GMBH
+Copyright (c) 2016-present Spryker Systems GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/src/SprykerEco/Shared/Computop/Transfer/computop.transfer.xml b/src/SprykerEco/Shared/Computop/Transfer/computop.transfer.xml
@@ -566,6 +566,7 @@
         <property name="description" type="string"/>
         <property name="type" type="string"/>
         <property name="isSuccess" type="bool"/>
+        <property name="isProcessed" type="bool"/>
     </transfer>
 
 </transfers>
diff --git a/src/SprykerEco/Yves/Computop/Controller/CallbackController.php b/src/SprykerEco/Yves/Computop/Controller/CallbackController.php
@@ -213,9 +213,13 @@ public function notifyAction(Request $request)
             ->fromArray($responseHeaderTransfer->toArray(), true)
             ->setType($decryptedArray[ComputopApiConfig::NOTIFICATION_PARAMETER_PAYMENT_TYPE] ?? '');
 
-        $this->getClient()->processNotification($computopNotificationTransfer);
+        $computopNotificationTransfer = $this->getClient()->processNotification($computopNotificationTransfer);
 
-        return new Response();
+        if ($computopNotificationTransfer->getIsProcessed()) {
+            return new Response();
+        }
+
+        return new Response('', Response::HTTP_NOT_ACCEPTABLE);
     }
 
     /**

diff --git a/src/SprykerEco/Zed/Computop/Business/Processor/NotificationProcessor.php b/src/SprykerEco/Zed/Computop/Business/Processor/NotificationProcessor.php
@@ -36,24 +36,27 @@ public function __construct(ComputopEntityManagerInterface $computopEntityManage
     public function processNotification(
         ComputopNotificationTransfer $computopNotificationTransfer
     ): ComputopNotificationTransfer {
-        $this->getTransactionHandler()->handleTransaction(
-            function () use ($computopNotificationTransfer): void {
-                $this->executeSaveComputopNotificationTransaction($computopNotificationTransfer);
+        return $this->getTransactionHandler()->handleTransaction(
+            function () use ($computopNotificationTransfer): ComputopNotificationTransfer {
+                return $this->executeSaveComputopNotificationTransaction($computopNotificationTransfer);
             }
         );
-
-        return $computopNotificationTransfer;
     }
 
     /**
      * @param \Generated\Shared\Transfer\ComputopNotificationTransfer $computopNotificationTransfer
      *
-     * @return void
+     * @return \Generated\Shared\Transfer\ComputopNotificationTransfer
      */
     protected function executeSaveComputopNotificationTransaction(
         ComputopNotificationTransfer $computopNotificationTransfer
-    ): void {
+    ): ComputopNotificationTransfer {
         $this->computopEntityManager->savePaymentComputopNotification($computopNotificationTransfer);
-        $this->computopEntityManager->updatePaymentComputopOrderItemPaymentConfirmation($computopNotificationTransfer);
+        $isProcessed = $this->computopEntityManager
+            ->updatePaymentComputopOrderItemPaymentConfirmation($computopNotificationTransfer);
+
+        $computopNotificationTransfer->setIsProcessed($isProcessed);
+
+        return $computopNotificationTransfer;
     }
 }
diff --git a/src/SprykerEco/Zed/Computop/Persistence/ComputopEntityManager.php b/src/SprykerEco/Zed/Computop/Persistence/ComputopEntityManager.php
@@ -38,11 +38,11 @@ public function savePaymentComputopNotification(ComputopNotificationTransfer $co
     /**
      * @param \Generated\Shared\Transfer\ComputopNotificationTransfer $computopNotificationTransfer
      *
-     * @return void
+     * @return bool
      */
     public function updatePaymentComputopOrderItemPaymentConfirmation(
         ComputopNotificationTransfer $computopNotificationTransfer
-    ): void {
+    ): bool {
         $paymentComputopOrderItemEntities = $this->getFactory()
             ->createPaymentComputopOrderItemQuery()
             ->useSpyPaymentComputopQuery()
@@ -51,9 +51,15 @@ public function updatePaymentComputopOrderItemPaymentConfirmation(
             ->endUse()
             ->find();
 
+        if (!$paymentComputopOrderItemEntities->count()) {
+            return false;
+        }
+
         foreach ($paymentComputopOrderItemEntities as $paymentComputopOrderItemEntity) {
             $paymentComputopOrderItemEntity->setIsPaymentConfirmed($computopNotificationTransfer->getIsSuccess());
             $paymentComputopOrderItemEntity->save();
         }
+
+        return true;
     }
 }
diff --git a/src/SprykerEco/Zed/Computop/Persistence/ComputopEntityManagerInterface.php b/src/SprykerEco/Zed/Computop/Persistence/ComputopEntityManagerInterface.php
@@ -21,9 +21,9 @@ public function savePaymentComputopNotification(ComputopNotificationTransfer $co
     /**
      * @param \Generated\Shared\Transfer\ComputopNotificationTransfer $computopNotificationTransfer
      *
-     * @return void
+     * @return bool
      */
     public function updatePaymentComputopOrderItemPaymentConfirmation(
         ComputopNotificationTransfer $computopNotificationTransfer
-    ): void;
+    ): bool;
 }