Version bump 4.2.0 (#531)

* Enhance webhook handling by adding filter rzp_order_id

* Version bump 4.2.0

Author: shubham-razorpay

Controller/Payment/Webhook.php

@@ -251,7 +251,7 @@ public function execute()
 
                     $this->setWebhookData($post, $orderWebhookData['entity_id'], true, $paymentId, $amountPaid);
 
-                    $this->setWebhookNotifiedAt($orderWebhookData['entity_id']);
+                    $this->setWebhookNotifiedAt($orderWebhookData['entity_id'], $post);
                 }
             }
         }
@@ -286,12 +286,27 @@ protected function getOrderData($orderId) : array
         return $collection->getData();
     }
 
-    protected function setWebhookNotifiedAt($entity_id)
+    protected function setWebhookNotifiedAt($entity_id, $post)
     {
         $order = $this->order->load($entity_id);
 
         $orderLink = $this->_objectManager->get('Razorpay\Magento\Model\OrderLink')
-                        ->load($order->getEntityId(), 'order_id');
+                            ->getCollection()
+                            ->addFieldToFilter('order_id', $order->getEntityId())
+                            ->addFieldToFilter('rzp_order_id', $post['payload']['payment']['entity']['order_id'])
+                            ->getFirstItem();
+
+        if (!$orderLink->getId()) {
+            $properties = [
+                "error_message" => "OrderLink not found at setWebhookNotifiedAt",
+                "file_path" => "controller/Payment/Webhook.php",
+                "exception_type" => null,
+                "notes" => null
+            ];
+
+            $this->trackPluginInstrumentation->rzpTrackDataLake('razorpay.std.webhook.setdata.failed', $properties);
+            return;
+        }
 
         $orderLink->setRzpWebhookNotifiedAt(time());
         $orderLink->save();
@@ -312,7 +327,23 @@ protected function setWebhookData($post, $entityId, $webhookVerifiedStatus, $pay
             $order = $this->order->load($entityId);
 
             $orderLink = $this->_objectManager->get('Razorpay\Magento\Model\OrderLink')
-                            ->load($order->getEntityId(), 'order_id');
+                            ->getCollection()
+                            ->addFieldToFilter('order_id', $order->getEntityId())
+                            ->addFieldToFilter('rzp_order_id', $post['payload']['payment']['entity']['order_id'])
+                            ->getFirstItem();
+
+            if (!$orderLink->getId()) {
+                
+                $properties = [
+                    "error_message" => "OrderLink not found at setWebhookData",
+                    "file_path" => "controller/Payment/Webhook.php",
+                    "exception_type" => null,
+                    "notes" => "OrderLink not found",
+                ];
+
+                $this->trackPluginInstrumentation->rzpTrackDataLake('razorpay.std.webhook.setdata.failed', $properties);
+                return;
+            }
 
             $existingWebhookData    = $orderLink->getRzpWebhookData();
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "razorpay/magento",
     "description": "Razorpay Magento 2.0 plugin for accepting payments.",
-    "version": "4.1.9",
+    "version": "4.2.0",
     "require": {
         "php": "7.*|^8.1",
         "razorpay/razorpay": "2.*"

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Razorpay_Magento" setup_version="4.1.9">
+    <module name="Razorpay_Magento" setup_version="4.2.0">
 	    <sequence>
 	        <module name="Magento_Sales" />
 	        <module name="Magento_Payment" />