fix(server): some pending billing tasks not processed on time

labring · May 31, 2023 · ce225d3 · ce225d3
1 parent 87d482a
commit ce225d3
Showing 1 changed file with 27 additions and 7 deletions.
diff --git a/server/src/billing/billing-task.service.ts b/server/src/billing/billing-task.service.ts
@@ -28,7 +28,7 @@ export class BillingTaskService {
   constructor(private readonly billing: BillingService) {}
 
   @Cron(CronExpression.EVERY_5_MINUTES)
-  async tick() {
+  async createBillingScheduler() {
     const db = SystemDatabase.db
     if (ServerConfig.DISABLED_BILLING_TASK) {
       return
@@ -42,22 +42,42 @@ export class BillingTaskService {
         },
       })
 
-    if (total === 0) {
-      return
-    }
-
     const concurrency = total > 30 ? 30 : total
     if (total > 30) {
       setTimeout(() => {
-        this.tick()
+        this.createBillingScheduler()
       }, 3000)
     }
 
     times(concurrency, () => {
       this.handleApplicationBillingCreating().catch((err) => {
         this.logger.error('handleApplicationBillingCreating error', err)
       })
+    })
+  }
+
+  @Cron(CronExpression.EVERY_SECOND)
+  async payBillingScheduler() {
+    const db = SystemDatabase.db
+    if (ServerConfig.DISABLED_BILLING_TASK) {
+      return
+    }
 
+    const total = await db
+      .collection<ApplicationBilling>('ApplicationBilling')
+      .countDocuments({
+        state: ApplicationBillingState.Pending,
+        lockedAt: { $lt: new Date(Date.now() - 1000 * 60) },
+      })
+
+    const concurrency = total > 30 ? 30 : total
+    if (total > 30) {
+      setTimeout(() => {
+        this.payBillingScheduler()
+      }, 3000)
+    }
+
+    times(concurrency, () => {
       this.handlePendingApplicationBilling().catch((err) => {
         this.logger.error('handlePendingApplicationBilling error', err)
       })
@@ -73,7 +93,7 @@ export class BillingTaskService {
         {
           state: ApplicationBillingState.Pending,
           lockedAt: {
-            $lt: new Date(Date.now() - 1000 * this.lockTimeout),
+            $lt: new Date(Date.now() - 1000 * 60),
           },
         },
         { $set: { lockedAt: new Date() } },