Merge pull request #20 from thelia-modules/feat/notification_history

Save refund notification id (avoid duplicate refund)

Author: leanormandon

Config/thelia.sql Config/TheliaMain.sqlConfig/thelia.sql renamed to Config/TheliaMain.sql

@@ -93,5 +93,26 @@ CREATE TABLE `pay_plug_module_delivery_type`
         ON DELETE CASCADE
 ) ENGINE=InnoDB;
 
+-- ---------------------------------------------------------------------
+-- pay_plug_notification_history
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `pay_plug_notification_history`;
+
+CREATE TABLE `pay_plug_notification_history`
+(
+    `uuid` VARCHAR(150) NOT NULL,
+    `order_id` INTEGER NOT NULL,
+    `created_at` DATETIME,
+    `updated_at` DATETIME,
+    PRIMARY KEY (`uuid`,`order_id`),
+    INDEX `pay_plug_notification_history_fi_75704f` (`order_id`),
+    CONSTRAINT `pay_plug_notification_history_fk_75704f`
+        FOREIGN KEY (`order_id`)
+        REFERENCES `order` (`id`)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) ENGINE=InnoDB;
+
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;

Config/module.xml

@@ -17,7 +17,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
     <authors>
         <author>
             <name>Vincent Lopes-Vicente</name>

Config/schema.xml

@@ -53,5 +53,15 @@
         </foreign-key>
     </table>
 
+
+    <table name="pay_plug_notification_history" namespace="PayPlugModule\Model">
+        <column name="uuid" type="VARCHAR" size="150" primaryKey="true"/>
+        <column name="order_id" type="INTEGER" required="true" primaryKey="true"/>
+        <foreign-key foreignTable="order" onDelete="CASCADE" onUpdate="CASCADE">
+            <reference local="order_id" foreign="id" />
+        </foreign-key>
+        <behavior name="timestampable" />
+    </table>
+
     <external-schema filename="local/config/schema.xml" referenceOnly="true" />
 </database>

Config/sqldb.map

@@ -1,2 +1,2 @@
 # Sqlfile -> Database map
-thelia.sql=thelia
+TheliaMain.sql=TheliaMain

Config/update/2.1.2.sql

@@ -0,0 +1,27 @@
+# This is a fix for InnoDB in MySQL >= 4.1.x
+# It "suspends judgement" for fkey relationships until are tables are set.
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ---------------------------------------------------------------------
+-- pay_plug_notification_history
+-- ---------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `pay_plug_notification_history`;
+
+CREATE TABLE `pay_plug_notification_history`
+(
+    `uuid` VARCHAR(150) NOT NULL,
+    `order_id` INTEGER NOT NULL,
+    `created_at` DATETIME,
+    `updated_at` DATETIME,
+    PRIMARY KEY (`uuid`,`order_id`),
+    INDEX `pay_plug_notification_history_fi_75704f` (`order_id`),
+    CONSTRAINT `pay_plug_notification_history_fk_75704f`
+        FOREIGN KEY (`order_id`)
+            REFERENCES `order` (`id`)
+            ON UPDATE CASCADE
+            ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+# This restores the fkey checks, after having unset them earlier
+SET FOREIGN_KEY_CHECKS = 1;

EventListener/NotificationListener.php

@@ -14,13 +14,16 @@
 use PayPlugModule\Model\PayPlugCard;
 use PayPlugModule\Model\PayPlugCardQuery;
 use PayPlugModule\Model\PayPlugConfigValue;
+use PayPlugModule\Model\PayPlugNotificationHistory;
+use PayPlugModule\Model\PayPlugNotificationHistoryQuery;
 use PayPlugModule\PayPlugModule;
 use PayPlugModule\Service\OrderStatusService;
 use Propel\Runtime\Collection\Collection;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\Order\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Log\Tlog;
 use Thelia\Model\Order;
 use Thelia\Model\OrderQuery;
 use Thelia\Model\OrderStatusQuery;
@@ -164,11 +167,20 @@ public function handleRefundNotification(RefundNotificationEvent $event)
         if (!$transactionRef) {
             return;
         }
-
+        $id = $event->getResource()->id;
         $order =  OrderQuery::create()
             ->filterByTransactionRef($transactionRef)
             ->findOne();
 
+        $notificationHistory = PayPlugNotificationHistoryQuery::create()
+            ->filterByUuid($id)
+            ->findOne();
+
+        if (!!$notificationHistory) {
+            Tlog::getInstance()->addAlert("Notification '{$id}' already exist");
+            return;
+        }
+
         $multiPayment = OrderPayPlugMultiPaymentQuery::create()
             ->findOneByPaymentId($transactionRef);
 
@@ -182,6 +194,8 @@ public function handleRefundNotification(RefundNotificationEvent $event)
             return;
         }
 
+        (new PayPlugNotificationHistory())->setUuid($id)->setOrderId($order->getId())->save();
+
         $orderPayPlugData = OrderPayPlugDataQuery::create()
             ->findOneById($order->getId());
 
@@ -204,4 +218,4 @@ public static function getSubscribedEvents()
             RefundNotificationEvent::REFUND_NOTIFICATION_EVENT => ['handleRefundNotification', 128]
         ];
     }
-}
+}

Model/PayPlugNotificationHistory.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace PayPlugModule\Model;
+
+use PayPlugModule\Model\Base\PayPlugNotificationHistory as BasePayPlugNotificationHistory;
+
+/**
+ * Skeleton subclass for representing a row from the 'pay_plug_notification_history' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ */
+class PayPlugNotificationHistory extends BasePayPlugNotificationHistory
+{
+
+}

Model/PayPlugNotificationHistoryQuery.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace PayPlugModule\Model;
+
+use PayPlugModule\Model\Base\PayPlugNotificationHistoryQuery as BasePayPlugNotificationHistoryQuery;
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'pay_plug_notification_history' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ */
+class PayPlugNotificationHistoryQuery extends BasePayPlugNotificationHistoryQuery
+{
+
+}

PayPlugModule.php

@@ -37,7 +37,7 @@ public function postActivation(ConnectionInterface $con = null): void
     {
         if (!$this->getConfigValue('is_initialized', false)) {
             $database = new Database($con);
-            $database->insertSql(null, [__DIR__ . "/Config/thelia.sql"]);
+            $database->insertSql(null, [__DIR__ . "/Config/TheliaMain.sql"]);
         }
     }