Update refs to column name in usage component

Author: Andrew Farries

components/usage/pkg/controller/reconciler.go

@@ -243,7 +243,7 @@ func usageReportToUsageRecords(report UsageReport) []db.WorkspaceInstanceUsage {
 			}
 
 			usageRecords = append(usageRecords, db.WorkspaceInstanceUsage{
-				WorkspaceID:   instance.ID,
+				InstanceID:    instance.ID,
 				AttributionID: attributionId,
 				StartedAt:     instance.CreationTime.Time(),
 				StoppedAt:     stoppedAt,

components/usage/pkg/db/workspace_instance_usage.go

@@ -15,7 +15,7 @@ import (
 )
 
 type WorkspaceInstanceUsage struct {
-	WorkspaceID   uuid.UUID     `gorm:"primary_key;column:workspaceId;type:char;size:36;" json:"workspaceId"`
+	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"`
@@ -31,7 +31,7 @@ func (u *WorkspaceInstanceUsage) TableName() string {
 
 func CreateUsageRecords(ctx context.Context, conn *gorm.DB, records []WorkspaceInstanceUsage) error {
 	db := conn.WithContext(ctx).Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "workspaceId"}},
+		Columns:   []clause.Column{{Name: "instanceId"}},
 		UpdateAll: true,
 	})
 

components/usage/pkg/db/workspace_instance_usage_test.go

@@ -29,7 +29,7 @@ func TestCanCreateUsageRecords(t *testing.T) {
 		{
 			Name: "One workspace instance",
 			UsageRecords: []db.WorkspaceInstanceUsage{{
-				WorkspaceID:   instanceID,
+				InstanceID:    instanceID,
 				AttributionID: teamAttributionID,
 				StartedAt:     time.Now(),
 				StoppedAt:     sql.NullTime{},
@@ -67,7 +67,7 @@ func TestCanHandleDuplicateRecords(t *testing.T) {
 			Name: "The same instance twice",
 			UsageRecords: []db.WorkspaceInstanceUsage{
 				{
-					WorkspaceID:   instanceID,
+					InstanceID:    instanceID,
 					AttributionID: teamAttributionID,
 					StartedAt:     instanceStartTime,
 					StoppedAt:     sql.NullTime{},
@@ -76,7 +76,7 @@ func TestCanHandleDuplicateRecords(t *testing.T) {
 					Deleted:       false,
 				},
 				{
-					WorkspaceID:   instanceID,
+					InstanceID:    instanceID,
 					AttributionID: teamAttributionID,
 					StartedAt:     instanceStartTime,
 					StoppedAt:     sql.NullTime{},