chore(server): enhance billing loop when app stop -> start (#1667)

labring · Nov 9, 2023 · 0f1b0e3 · 0f1b0e3
1 parent 943ad92
commit 0f1b0e3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/server/src/application/application.service.ts b/server/src/application/application.service.ts
@@ -94,7 +94,6 @@ export class ApplicationService {
           regionId: new ObjectId(dto.regionId),
           runtimeId: new ObjectId(dto.runtimeId),
           billingLockedAt: TASK_LOCK_INIT_TIME,
-          latestBillingTime: TASK_LOCK_INIT_TIME,
           createdAt: new Date(),
           updatedAt: new Date(),
         },

diff --git a/server/src/application/entities/application.ts b/server/src/application/entities/application.ts
@@ -62,7 +62,7 @@ export class Application {
 
   billingLockedAt: Date
 
-  latestBillingTime: Date
+  latestBillingTime?: Date
 
   constructor(partial: Partial<Application>) {
     Object.assign(this, partial)

diff --git a/server/src/instance/instance-task.service.ts b/server/src/instance/instance-task.service.ts
@@ -194,6 +194,7 @@ export class InstanceTaskService {
           state: toState,
           phase: ApplicationPhase.Started,
           lockedAt: TASK_LOCK_INIT_TIME,
+          latestBillingTime: this.getHourTime(),
           updatedAt: new Date(),
         },
       },
@@ -375,4 +376,13 @@ export class InstanceTaskService {
       .collection<Application>('Application')
       .updateOne({ appid: appid }, { $set: { lockedAt } })
   }
+
+  private getHourTime() {
+    const latestTime = new Date()
+    latestTime.setMinutes(0)
+    latestTime.setSeconds(0)
+    latestTime.setMilliseconds(0)
+    latestTime.setHours(latestTime.getHours())
+    return latestTime
+  }
 }