From f0be26199f2da44d96b526629261b95a00520b50 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Sat, 14 Sep 2024 14:06:55 +0800
Subject: [PATCH] .

---
 server/jobs/syncHeytripJobs.js | 54 ++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/server/jobs/syncHeytripJobs.js b/server/jobs/syncHeytripJobs.js
index 8789176..d2abe05 100644
--- a/server/jobs/syncHeytripJobs.js
+++ b/server/jobs/syncHeytripJobs.js
@@ -57,7 +57,7 @@ const AidsState = () => {
         }
       } else {
         console.log('pre job running! cancelNext[AidsState]');
-        jobAS.cancelNext();
+        jobAS.cancelNext(true);
       }
     });
   });
@@ -77,16 +77,19 @@ const newHotelDetails = () => {
 
       const isRunning = job1.pendingInvocations[0]?.job?.running == 1;
       if (!isRunning) {
-        const res = await heytripService.newHotels('1');
-
-        // job1.cancel(); // debug: 0
-        if (res.next !== true) {
-          job1.cancel(res.restart);
-          console.log('job completed! canceled job[newHotelDetails]!');
+        try {
+          const res = await heytripService.newHotels('1');
+          // job1.cancel(); // debug: 0
+          if (res.next !== true) {
+            job1.cancel(res.restart);
+            console.log('job completed! canceled job[newHotelDetails]!');
+          }
+        } catch (error) {
+          job1.cancelNext(true);
         }
       } else {
         console.log('pre job running! cancelNext[newHotelDetails]');
-        job1.cancelNext();
+        job1.cancelNext(true);
       }
     });
   });
@@ -105,16 +108,19 @@ const hotelLgcDetails = () => {
 
       const isRunning = job2.pendingInvocations[0]?.job?.running == 1;
       if (!isRunning) {
-        const res = await heytripService.newHotelsLgc('1');
-
-        // job2.cancel(); // debug: 0
-        if (res.next !== true) {
-          job2.cancel(res.restart);
-          console.log('job completed! canceled job[hotelLgcDetails]!');
+        try {
+          const res = await heytripService.newHotelsLgc('1');
+          // job2.cancel(); // debug: 0
+          if (res.next !== true) {
+            job2.cancel(res.restart);
+            console.log('job completed! canceled job[hotelLgcDetails]!');
+          }
+        } catch (error) {
+          job2.cancelNext(true);
         }
       } else {
         console.log('pre job running! cancelNext[hotelLgcDetails]');
-        job2.cancelNext();
+        job2.cancelNext(true);
       }
     });
   });
@@ -132,16 +138,20 @@ const chinaHotelDetails = () => {
       console.log('-------------------------syncing heytrip[chinaHotelDetails], get china accommodation details.-------------------------');
       const isRunning = job3.pendingInvocations[0]?.job?.running == 1;
       if (!isRunning) {
-        const res = await heytripService.chinaHotelsLgc2('2');
-        // job3.cancel(); // debug: 0
-        if (res.next !== true) {
-          job3.cancel(res.restart);
-          console.log('job completed! canceled job[chinaHotelDetails]!');
-          // job3.reschedule('0 0 0 * * *');
+        try {
+          const res = await heytripService.chinaHotelsLgc2('2');
+          // job3.cancel(); // debug: 0
+          if (res.next !== true) {
+            job3.cancel(res.restart);
+            console.log('job completed! canceled job[chinaHotelDetails]!');
+            // job3.reschedule('0 0 0 * * *');
+          }
+        } catch (error) {
+          job3.cancelNext(true);
         }
       } else {
         console.log('pre job running! cancelNext[chinaHotelDetails]');
-        job3.cancelNext();
+        job3.cancelNext(true);
       }
     });
   });