[usage] Store user, project, workspace, type & class

Author: easyCZ

1658144661198-WorkspaceInstanceUsageAddExtraFields.ts

@@ -0,0 +1,26 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+import {columnExists} from "@gitpod/gitpod-db/lib/typeorm/migration/helper/helper";
+
+export class WorkspaceInstanceUsageAddExtraFields1658144661198 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+
+        const columns = ['userId', 'workspaceId', 'projectId', 'workspaceType', 'workspaceClass'];
+
+        const statements = columns
+            .filter(async col => {
+                const exists = await columnExists(queryRunner, "d_b_workspace_instance_usage", col)
+                return !exists;
+            })
+            .map(col => {
+                return `ADD COLUMN ${col} varchar(255) NOT NULL DEFAULT ''`;
+            });
+
+        if (statements.length > 0) {
+            await queryRunner.query(`ALTER TABLE \`d_b_workspace_instance_usage\` ${statements.join(", ")}`);
+        }
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {}
+
+}

components/gitpod-db/src/typeorm/entity/db-workspace-instance-usage.ts

@@ -7,6 +7,7 @@
 import { Entity, Column, PrimaryColumn, Index } from "typeorm";
 import { TypeORM } from "../typeorm";
 import { Transformer } from "../transformer";
+import { WorkspaceType } from "@gitpod/gitpod-protocol";
 
 @Entity()
 export class DBWorkspaceInstanceUsage {
@@ -17,6 +18,21 @@ export class DBWorkspaceInstanceUsage {
     @Index("ind_attributionId")
     attributionId: string;
 
+    @Column("varchar")
+    userId: string;
+
+    @Column("varchar")
+    workspaceId: string;
+
+    @Column("varchar")
+    projectId: string;
+
+    @Column("varchar")
+    workspaceType: WorkspaceType;
+
+    @Column("varchar")
+    workspaceClass: string;
+
     @Column({
         type: "timestamp",
         precision: 6,