[usage] Extend go model with extra fields for WorkspaceInstanceUsage

Author: easyCZ

components/usage/pkg/apiv1/usage_test.go

@@ -47,8 +47,7 @@ func TestUsageService_ListBilledUsage(t *testing.T) {
 			StartedAt:     startedAt.AsTime(),
 			StoppedAt:     sql.NullTime{},
 			CreditsUsed:   0,
-			GenerationId:  0,
-			Deleted:       false,
+			GenerationID:  0,
 		},
 	}
 	dbtest.CreateWorkspaceInstanceUsageRecords(t, dbconn, instanceUsages...)

components/usage/pkg/controller/reconciler.go

@@ -250,8 +250,7 @@ func usageReportToUsageRecords(report UsageReport, pricer *WorkspacePricer, now
 				StartedAt:     instance.CreationTime.Time(),
 				StoppedAt:     stoppedAt,
 				CreditsUsed:   pricer.CreditsUsedByInstance(&instance, now),
-				GenerationId:  0,
-				Deleted:       false,
+				GenerationID:  0,
 			})
 		}
 	}

components/usage/pkg/controller/reconciler_test.go

@@ -180,7 +180,6 @@ func TestUsageReportConversionToDBUsageRecords(t *testing.T) {
 				StartedAt:     creationTime.Time(),
 				StoppedAt:     sql.NullTime{Time: stoppedTime.Time(), Valid: true},
 				CreditsUsed:   470,
-				GenerationId:  0,
 			}},
 		},
 		{
@@ -202,7 +201,6 @@ func TestUsageReportConversionToDBUsageRecords(t *testing.T) {
 				StartedAt:     creationTime.Time(),
 				StoppedAt:     sql.NullTime{},
 				CreditsUsed:   470,
-				GenerationId:  0,
 			}},
 		},
 	}

components/usage/pkg/db/workspace_instance_usage.go

@@ -18,11 +18,22 @@ import (
 type WorkspaceInstanceUsage struct {
 	InstanceID    uuid.UUID     `gorm:"primary_key;column:instanceId;type:char;size:36;" json:"instanceId"`
 	AttributionID AttributionID `gorm:"column:attributionId;type:varchar;size:255;" json:"attributionId"`
-	StartedAt     time.Time     `gorm:"column:startedAt;type:timestamp;default:CURRENT_TIMESTAMP(6);" json:"startedAt"`
-	StoppedAt     sql.NullTime  `gorm:"column:stoppedAt;type:timestamp;" json:"stoppedAt"`
-	CreditsUsed   float64       `gorm:"column:creditsUsed;type:double;" json:"creditsUsed"`
-	GenerationId  int           `gorm:"column:generationId;type:int;" json:"generationId"`
-	Deleted       bool          `gorm:"column:deleted;type:tinyint;default:0;" json:"deleted"`
+
+	UserID         string        `gorm:"column:userId;type:varchar;size:255;" json:"userId"`
+	WorkspaceID    string        `gorm:"column:workspaceId;type:varchar;size:255;" json:"workspaceId"`
+	ProjectID      string        `gorm:"column:projectId;type:varchar;size:255;" json:"projectId"`
+	WorkspaceType  WorkspaceType `gorm:"column:workspaceType;type:varchar;size:255;" json:"workspaceType"`
+	WorkspaceClass string        `gorm:"column:workspaceClass;type:varchar;size:255;" json:"workspaceClass"`
+
+	CreditsUsed float64 `gorm:"column:creditsUsed;type:double;" json:"creditsUsed"`
+
+	StartedAt time.Time    `gorm:"column:startedAt;type:timestamp;default:CURRENT_TIMESTAMP(6);" json:"startedAt"`
+	StoppedAt sql.NullTime `gorm:"column:stoppedAt;type:timestamp;" json:"stoppedAt"`
+
+	GenerationID int `gorm:"column:generationId;type:int;" json:"generationId"`
+
+	// deleted is used by db-sync
+	Deleted bool `gorm:"column:deleted;type:tinyint;default:0;" json:"deleted"`
 }
 
 // TableName sets the insert table name for this struct type

components/usage/pkg/db/workspace_instance_usage_test.go

@@ -34,8 +34,7 @@ func TestCanCreateUsageRecords(t *testing.T) {
 				StartedAt:     time.Now(),
 				StoppedAt:     sql.NullTime{},
 				CreditsUsed:   0,
-				GenerationId:  0,
-				Deleted:       false,
+				GenerationID:  0,
 			}},
 		},
 	}
@@ -72,17 +71,15 @@ func TestNoErrorOnCreatingDuplicateRecords(t *testing.T) {
 					StartedAt:     instanceStartTime,
 					StoppedAt:     sql.NullTime{},
 					CreditsUsed:   0,
-					GenerationId:  0,
-					Deleted:       false,
+					GenerationID:  0,
 				},
 				{
 					InstanceID:    instanceID,
 					AttributionID: teamAttributionID,
 					StartedAt:     instanceStartTime,
 					StoppedAt:     sql.NullTime{},
 					CreditsUsed:   0,
-					GenerationId:  0,
-					Deleted:       false,
+					GenerationID:  0,
 				},
 			},
 		},