[usage] fix endTime not align to draft stop condition (#18617)

mustard-mh · web-flow · commit ba9541d68c32 · 2023-08-30T11:59:56.000+02:00
diff --git a/components/usage/pkg/apiv1/usage.go b/components/usage/pkg/apiv1/usage.go
@@ -414,8 +414,8 @@ func newUsageFromInstance(instance db.WorkspaceInstanceForUsage, pricer *Workspa
 		startedTime = db.TimeToISO8601(instance.StartedTime.Time())
 	}
 	endTime := ""
-	if instance.StoppingTime.IsSet() {
-		endTime = db.TimeToISO8601(instance.StoppingTime.Time())
+	if stopTime.IsSet() {
+		endTime = db.TimeToISO8601(stopTime.Time())
 	}
 	err := usage.SetMetadataWithWorkspaceInstance(db.WorkspaceInstanceUsageData{
 		WorkspaceId:    instance.WorkspaceID,

Original file line number	Diff line number	Diff line change
`@@ -414,8 +414,8 @@ func newUsageFromInstance(instance db.WorkspaceInstanceForUsage, pricer *Workspa`
`414`	`414`	`startedTime = db.TimeToISO8601(instance.StartedTime.Time())`
`415`	`415`	`}`
`416`	`416`	`endTime := ""`
`417`		`- if instance.StoppingTime.IsSet() {`
`418`		`- endTime = db.TimeToISO8601(instance.StoppingTime.Time())`
	`417`	`+ if stopTime.IsSet() {`
	`418`	`+ endTime = db.TimeToISO8601(stopTime.Time())`
`419`	`419`	`}`
`420`	`420`	`err := usage.SetMetadataWithWorkspaceInstance(db.WorkspaceInstanceUsageData{`
`421`	`421`	`WorkspaceId: instance.WorkspaceID,`