From 48eff1260ee053868ac4d01c962e454fdd1892ab Mon Sep 17 00:00:00 2001
From: Ron Mercado <ronmercadoaa.dev@gmail.com>
Date: Wed, 7 May 2025 23:25:18 +0800
Subject: [PATCH 1/3] fix: add additional dupekey to prevent overriding queue

- jira issues: RES-5227
---
 Model/QueuedTask.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Model/QueuedTask.php b/Model/QueuedTask.php
index c303c05f..51eb0f38 100644
--- a/Model/QueuedTask.php
+++ b/Model/QueuedTask.php
@@ -114,10 +114,12 @@ public function createJob($jobName, $data = null, $notBefore = null, $group = nu
                 $dupeKey = $data['company_id'] . '.' . $data['sub_service_id'];
                 break;
             case 'SaveConnection':
-                $dupeKey = $data['bidId'];
+				$additionalKey = isset($data['isStatusChanged']) ? (int) $data['isStatusChanged'] : 0;
+                $dupeKey = $data['bidId'] . '.' . $additionalKey;
                 break;
             case 'SaveSingleConnection':
-                $dupeKey = $data['provider'] . '.' . $data['bidId'];
+				$additionalKey = isset($data['isStatusChanged']) ? (int) $data['isStatusChanged'] : 0;
+                $dupeKey = $data['provider'] . '.' . $data['bidId'] . '.' . $additionalKey;
                 break;
             case 'SyncIntercomCompany':
                 $dupeKey = $data['company_id'];
@@ -195,8 +197,6 @@ public function findAndRescheduleTasks() {
             'conditions' => [
                 'created < ' => $backDate,
                 'fetched IS NULL',
-                'notbefore IS NULL',
-
             ],
             'contain' => false
         ]) as $queuedTask) {

From 86c460cbda057aa112d9274f90d0987354b9aa57 Mon Sep 17 00:00:00 2001
From: Ron Mercado <ronmercadoaa.dev@gmail.com>
Date: Thu, 8 May 2025 00:10:23 +0800
Subject: [PATCH 2/3] fix: revert changes on findAndReschedule

---
 Model/QueuedTask.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Model/QueuedTask.php b/Model/QueuedTask.php
index 51eb0f38..d26d21e7 100644
--- a/Model/QueuedTask.php
+++ b/Model/QueuedTask.php
@@ -119,7 +119,7 @@ public function createJob($jobName, $data = null, $notBefore = null, $group = nu
                 break;
             case 'SaveSingleConnection':
 				$additionalKey = isset($data['isStatusChanged']) ? (int) $data['isStatusChanged'] : 0;
-                $dupeKey = $data['provider'] . '.' . $data['bidId'] . '.' . $additionalKey;
+                $dupeKey = $data['provider'] . '.' . $data['bidId'];
                 break;
             case 'SyncIntercomCompany':
                 $dupeKey = $data['company_id'];
@@ -197,6 +197,7 @@ public function findAndRescheduleTasks() {
             'conditions' => [
                 'created < ' => $backDate,
                 'fetched IS NULL',
+				'notbefore IS NULL',
             ],
             'contain' => false
         ]) as $queuedTask) {

From ec4dba95212b693a1d968f6e8628c4a5738b36ff Mon Sep 17 00:00:00 2001
From: Ron Mercado <ronmercadoaa.dev@gmail.com>
Date: Thu, 8 May 2025 00:10:59 +0800
Subject: [PATCH 3/3] fix: spacing

---
 Model/QueuedTask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Model/QueuedTask.php b/Model/QueuedTask.php
index d26d21e7..98a21d2c 100644
--- a/Model/QueuedTask.php
+++ b/Model/QueuedTask.php
@@ -197,7 +197,7 @@ public function findAndRescheduleTasks() {
             'conditions' => [
                 'created < ' => $backDate,
                 'fetched IS NULL',
-				'notbefore IS NULL',
+                'notbefore IS NULL',
             ],
             'contain' => false
         ]) as $queuedTask) {