fix(server): billing error with old apps (#1797)

labring · Jan 10, 2024 · fadd735 · fadd735
1 parent cea1c88
commit fadd735
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/server/src/application/application.controller.ts b/server/src/application/application.controller.ts
@@ -386,22 +386,23 @@ export class ApplicationController {
     const isAutoscalingCanceled =
       !doc.autoscaling.enable && origin.autoscaling.enable
     const isDedicatedDatabaseChanged =
-      !isEqual(
+      !!origin.resource.dedicatedDatabase &&
+      (!isEqual(
         origin.resource.dedicatedDatabase.limitCPU,
         doc.resource.dedicatedDatabase.limitCPU,
       ) ||
-      !isEqual(
-        origin.resource.dedicatedDatabase.limitMemory,
-        doc.resource.dedicatedDatabase.limitMemory,
-      ) ||
-      !isEqual(
-        origin.resource.dedicatedDatabase.replicas,
-        doc.resource.dedicatedDatabase.replicas,
-      ) ||
-      !isEqual(
-        origin.resource.dedicatedDatabase.capacity,
-        doc.resource.dedicatedDatabase.capacity,
-      )
+        !isEqual(
+          origin.resource.dedicatedDatabase.limitMemory,
+          doc.resource.dedicatedDatabase.limitMemory,
+        ) ||
+        !isEqual(
+          origin.resource.dedicatedDatabase.replicas,
+          doc.resource.dedicatedDatabase.replicas,
+        ) ||
+        !isEqual(
+          origin.resource.dedicatedDatabase.capacity,
+          doc.resource.dedicatedDatabase.capacity,
+        ))
 
     if (!isEqual(doc.autoscaling, origin.autoscaling)) {
       const { hpa, app } = await this.instance.get(appid)

diff --git a/server/src/billing/billing-creation-task.service.ts b/server/src/billing/billing-creation-task.service.ts
@@ -237,10 +237,10 @@ export class BillingCreationTaskService {
     dto.databaseCapacity = bundle.resource.databaseCapacity
 
     dto.dedicatedDatabase = {
-      cpu: bundle.resource.dedicatedDatabase.limitCPU,
-      memory: bundle.resource.dedicatedDatabase.limitMemory,
-      capacity: bundle.resource.dedicatedDatabase.capacity,
-      replicas: bundle.resource.dedicatedDatabase.replicas,
+      cpu: bundle.resource.dedicatedDatabase?.limitCPU || 0,
+      memory: bundle.resource.dedicatedDatabase?.limitMemory || 0,
+      capacity: bundle.resource.dedicatedDatabase?.capacity || 0,
+      replicas: bundle.resource.dedicatedDatabase?.replicas || 0,
     }
 
     return dto