feat: BillingRecordQueryStatus add TotalCount (#3686)

* recordquery return TotalCount * fix controller ci lint
labring · Aug 16, 2023 · a17d932 · a17d932
1 parent 7dbf9ed
commit a17d932
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/controllers/account/api/v1/billingrecordquery_types.go b/controllers/account/api/v1/billingrecordquery_types.go
@@ -39,6 +39,7 @@ type BillingRecordQuerySpec struct {
 type BillingRecordQueryStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+	TotalCount      int                  `json:"totalCount"`
 	PageLength      int                  `json:"pageLength"`
 	RechargeAmount  int64                `json:"rechargeAmount"`
 	DeductionAmount Costs                `json:"deductionAmount,omitempty"`

diff --git a/controllers/account/config/crd/bases/account.sealos.io_billingrecordqueries.yaml b/controllers/account/config/crd/bases/account.sealos.io_billingrecordqueries.yaml
@@ -100,16 +100,19 @@ spec:
                   type: object
                 type: array
               pageLength:
-                description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
-                  of cluster Important: Run "make" to regenerate code after modifying
-                  this file'
                 type: integer
               rechargeAmount:
                 format: int64
                 type: integer
+              totalCount:
+                description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
+                  of cluster Important: Run "make" to regenerate code after modifying
+                  this file'
+                type: integer
             required:
             - pageLength
             - rechargeAmount
+            - totalCount
             type: object
         type: object
     served: true

diff --git a/controllers/account/config/crd/bases/account.sealos.io_payments.yaml b/controllers/account/config/crd/bases/account.sealos.io_payments.yaml
@@ -40,6 +40,7 @@ spec:
                 format: int64
                 type: integer
               paymentMethod:
+                default: wechat
                 description: e.g. wechat, alipay, creditcard, etc.
                 type: string
               userID:

diff --git a/controllers/account/controllers/account_controller.go b/controllers/account/controllers/account_controller.go
@@ -281,7 +281,7 @@ func (r *AccountReconciler) syncAccount(ctx context.Context, name, accountNamesp
 	if err != nil {
 		return nil, fmt.Errorf("sync init balance failed: %v", err)
 	}
-	err = crypto.RechargeBalance(account.Status.EncryptBalance, int64(amount))
+	err = crypto.RechargeBalance(account.Status.EncryptBalance, amount)
 	if err != nil {
 		return nil, fmt.Errorf("recharge balance failed: %v", err)
 	}

diff --git a/controllers/account/deploy/manifests/deploy.yaml.tmpl b/controllers/account/deploy/manifests/deploy.yaml.tmpl
@@ -280,16 +280,19 @@ spec:
                   type: object
                 type: array
               pageLength:
-                description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
-                  of cluster Important: Run "make" to regenerate code after modifying
-                  this file'
                 type: integer
               rechargeAmount:
                 format: int64
                 type: integer
+              totalCount:
+                description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
+                  of cluster Important: Run "make" to regenerate code after modifying
+                  this file'
+                type: integer
             required:
             - pageLength
             - rechargeAmount
+            - totalCount
             type: object
         type: object
     served: true
@@ -418,6 +421,7 @@ spec:
                 format: int64
                 type: integer
               paymentMethod:
+                default: wechat
                 description: e.g. wechat, alipay, creditcard, etc.
                 type: string
               userID:

diff --git a/controllers/pkg/database/mongodb.go b/controllers/pkg/database/mongodb.go
@@ -516,8 +516,8 @@ func (m *MongoDB) QueryBillingRecords(billingRecordQuery *accountv1.BillingRecor
 	}
 
 	totalPages := (totalCount + billingRecordQuery.Spec.PageSize - 1) / billingRecordQuery.Spec.PageSize
-	billingRecordQuery.Status.Items, billingRecordQuery.Status.PageLength,
-		billingRecordQuery.Status.RechargeAmount, billingRecordQuery.Status.DeductionAmount = billingRecords, totalPages, totalRechargeAmount, totalDeductionAmount
+	billingRecordQuery.Status.Items, billingRecordQuery.Status.PageLength, billingRecordQuery.Status.TotalCount,
+		billingRecordQuery.Status.RechargeAmount, billingRecordQuery.Status.DeductionAmount = billingRecords, totalPages, totalCount, totalRechargeAmount, totalDeductionAmount
 	return nil
 }