[usage] added costcenter nextBillingTime

Author: svenefftinge

components/gitpod-db/src/typeorm/migration/1663055856941-CostCenterNextBillingTime.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { columnExists } from "./helper/helper";
+
+const D_B_COST_CENTER = "d_b_cost_center";
+const COL_NEXT_BILLING_TIME = "nextBillingTime";
+
+export class CostCenterNextBillingTime1663055856941 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        if (!(await columnExists(queryRunner, D_B_COST_CENTER, COL_NEXT_BILLING_TIME))) {
+            await queryRunner.query(
+                `ALTER TABLE ${D_B_COST_CENTER} ADD COLUMN ${COL_NEXT_BILLING_TIME} varchar(30) NOT NULL, ALGORITHM=INPLACE, LOCK=NONE `,
+            );
+            await queryRunner.query(
+                `ALTER TABLE ${D_B_COST_CENTER} ADD INDEX(${COL_NEXT_BILLING_TIME}), ALGORITHM=INPLACE, LOCK=NONE `,
+            );
+        }
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {}
+}

components/usage-api/go/v1/usage.pb.go

@@ -186,6 +186,7 @@ export interface CostCenter {
   attributionId: string;
   spendingLimit: number;
   billingStrategy: CostCenter_BillingStrategy;
+  nextBillingTime: Date | undefined;
 }
 
 export enum CostCenter_BillingStrategy {
@@ -961,7 +962,12 @@ export const GetCostCenterResponse = {
 };
 
 function createBaseCostCenter(): CostCenter {
-  return { attributionId: "", spendingLimit: 0, billingStrategy: CostCenter_BillingStrategy.BILLING_STRATEGY_STRIPE };
+  return {
+    attributionId: "",
+    spendingLimit: 0,
+    billingStrategy: CostCenter_BillingStrategy.BILLING_STRATEGY_STRIPE,
+    nextBillingTime: undefined,
+  };
 }
 
 export const CostCenter = {
@@ -975,6 +981,9 @@ export const CostCenter = {
     if (message.billingStrategy !== CostCenter_BillingStrategy.BILLING_STRATEGY_STRIPE) {
       writer.uint32(24).int32(costCenter_BillingStrategyToNumber(message.billingStrategy));
     }
+    if (message.nextBillingTime !== undefined) {
+      Timestamp.encode(toTimestamp(message.nextBillingTime), writer.uint32(34).fork()).ldelim();
+    }
     return writer;
   },
 
@@ -994,6 +1003,9 @@ export const CostCenter = {
         case 3:
           message.billingStrategy = costCenter_BillingStrategyFromJSON(reader.int32());
           break;
+        case 4:
+          message.nextBillingTime = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
+          break;
         default:
           reader.skipType(tag & 7);
           break;
@@ -1009,6 +1021,7 @@ export const CostCenter = {
       billingStrategy: isSet(object.billingStrategy)
         ? costCenter_BillingStrategyFromJSON(object.billingStrategy)
         : CostCenter_BillingStrategy.BILLING_STRATEGY_STRIPE,
+      nextBillingTime: isSet(object.nextBillingTime) ? fromJsonTimestamp(object.nextBillingTime) : undefined,
     };
   },
 
@@ -1018,6 +1031,7 @@ export const CostCenter = {
     message.spendingLimit !== undefined && (obj.spendingLimit = Math.round(message.spendingLimit));
     message.billingStrategy !== undefined &&
       (obj.billingStrategy = costCenter_BillingStrategyToJSON(message.billingStrategy));
+    message.nextBillingTime !== undefined && (obj.nextBillingTime = message.nextBillingTime.toISOString());
     return obj;
   },
 
@@ -1026,6 +1040,7 @@ export const CostCenter = {
     message.attributionId = object.attributionId ?? "";
     message.spendingLimit = object.spendingLimit ?? 0;
     message.billingStrategy = object.billingStrategy ?? CostCenter_BillingStrategy.BILLING_STRATEGY_STRIPE;
+    message.nextBillingTime = object.nextBillingTime ?? undefined;
     return message;
   },
 };

components/usage-api/typescript/src/usage/v1/usage.pb.ts

@@ -114,4 +114,5 @@ message CostCenter {
         BILLING_STRATEGY_OTHER = 1;
     }
     BillingStrategy billing_strategy = 3;
+    google.protobuf.Timestamp next_billing_time = 4;
 }

components/usage-api/usage/v1/usage.proto

@@ -201,10 +201,22 @@ func (s *UsageService) SetCostCenter(ctx context.Context, in *v1.SetCostCenterRe
 		billingStrategy = db.CostCenter_Stripe
 	}
 
+	costCenter, err := s.GetCostCenter(ctx, &v1.GetCostCenterRequest{
+		AttributionId: string(attributionID),
+	})
+	if err != nil {
+		return nil, status.Errorf(codes.InvalidArgument, "Couldn't obtain cost center: %s", err.Error())
+	}
+	var nextBillingTime db.VarcharTime
+	if costCenter.GetCostCenter().GetNextBillingTime() != nil {
+		nextBillingTime = db.NewVarcharTime(costCenter.GetCostCenter().GetNextBillingTime().AsTime())
+	}
+
 	_, err = db.SaveCostCenter(ctx, s.conn, &db.CostCenter{
 		ID:              attributionID,
 		SpendingLimit:   in.CostCenter.SpendingLimit,
 		BillingStrategy: billingStrategy,
+		NextBillingTime: nextBillingTime,
 	})
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "Failed to save cost center %s: %s", attributionID, err.Error())

components/usage/pkg/apiv1/usage.go

@@ -27,6 +27,7 @@ type CostCenter struct {
 	CreationTime    VarcharTime     `gorm:"primary_key;column:creationTime;type:varchar;size:255;" json:"creationTime"`
 	SpendingLimit   int32           `gorm:"column:spendingLimit;type:int;default:0;" json:"spendingLimit"`
 	BillingStrategy BillingStrategy `gorm:"column:billingStrategy;type:varchar;size:255;" json:"billingStrategy"`
+	NextBillingTime VarcharTime     `gorm:"column:nextBillingTime;type:varchar;size:255;" json:"nextBillingTime"`
 
 	LastModified time.Time `gorm:"->:column:_lastModified;type:timestamp;default:CURRENT_TIMESTAMP(6);" json:"_lastModified"`
 }