added impending_deletion workspace field

Kira-Pilot · Kira-Pilot · commit 4baf40aef8ca · 2023-05-09T17:50:04.000Z
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -1169,7 +1169,10 @@ func convertWorkspace(
 		autostartSchedule = &workspace.AutostartSchedule.String
 	}
 
-	ttlMillis := convertWorkspaceTTLMillis(workspace.Ttl)
+	var (
+		ttlMillis         = convertWorkspaceTTLMillis(workspace.Ttl)
+		impendingDeletion = calculateImpendingDeletion(workspace, template)
+	)
 	return codersdk.Workspace{
 		ID:                                   workspace.ID,
 		CreatedAt:                            workspace.CreatedAt,
@@ -1188,6 +1191,7 @@ func convertWorkspace(
 		AutostartSchedule:                    autostartSchedule,
 		TTLMillis:                            ttlMillis,
 		LastUsedAt:                           workspace.LastUsedAt,
+		ImpendingDeletion:                    impendingDeletion,
 	}
 }
 
@@ -1200,6 +1204,22 @@ func convertWorkspaceTTLMillis(i sql.NullInt64) *int64 {
 	return &millis
 }
 
+// Calculate the time of the upcoming working deletion, if applicable; otherwise, return an empty time.Time struct.
+// Workspaces may have impending deletions if InactivityTTL feature is turned on and the workspace is inactive.
+func calculateImpendingDeletion(workspace database.Workspace, template database.Template) time.Time {
+	var (
+		year, month, day = time.Now().Date()
+		beginningOfToday = time.Date(year, month, day, 0, 0, 0, 0, time.Now().Location())
+	)
+	// If InactivityTTL is turned off (set to 0), if the workspace has already been deleted,
+	// or if the workspace was used sometime within the last day, there is no impending deletion
+	if template.InactivityTTL == 0 || workspace.Deleted || workspace.LastUsedAt.After(beginningOfToday) {
+		return time.Time{}
+	}
+
+	return workspace.LastUsedAt.Add(time.Duration(template.InactivityTTL) * time.Nanosecond)
+}
+
 func validWorkspaceTTLMillis(millis *int64, templateDefault, templateMax time.Duration) (sql.NullInt64, error) {
 	if templateDefault == 0 && templateMax != 0 || (templateMax > 0 && templateDefault > templateMax) {
 		templateDefault = templateMax
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -34,6 +34,7 @@ type Workspace struct {
 	AutostartSchedule                    *string        `json:"autostart_schedule,omitempty"`
 	TTLMillis                            *int64         `json:"ttl_ms,omitempty"`
 	LastUsedAt                           time.Time      `json:"last_used_at" format:"date-time"`
+	ImpendingDeletion                    time.Time      `json:"impending_deletion" format:"date-time"`
 }
 
 type WorkspacesRequest struct {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -1104,6 +1104,7 @@ export interface Workspace {
   readonly autostart_schedule?: string
   readonly ttl_ms?: number
   readonly last_used_at: string
+  readonly impending_deletion: string
 }
 
 // From codersdk/workspaceagents.go
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -719,6 +719,7 @@ export const MockWorkspace: TypesGen.Workspace = {
   ttl_ms: 2 * 60 * 60 * 1000,
   latest_build: MockWorkspaceBuild,
   last_used_at: "2022-05-16T15:29:10.302441433Z",
+  impending_deletion: "0001-01-01T00:00:00Z",
 }
 
 export const MockStoppedWorkspace: TypesGen.Workspace = {

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ type Workspace struct {`
`34`	`34`	AutostartSchedule *string `json:"autostart_schedule,omitempty"`
`35`	`35`	TTLMillis *int64 `json:"ttl_ms,omitempty"`
`36`	`36`	LastUsedAt time.Time `json:"last_used_at" format:"date-time"`
	`37`	+ ImpendingDeletion time.Time `json:"impending_deletion" format:"date-time"`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`type WorkspacesRequest struct {`
Original file line number	Diff line number	Diff line change
`@@ -1104,6 +1104,7 @@ export interface Workspace {`
`1104`	`1104`	`readonly autostart_schedule?: string`
`1105`	`1105`	`readonly ttl_ms?: number`
`1106`	`1106`	`readonly last_used_at: string`
	`1107`	`+ readonly impending_deletion: string`
`1107`	`1108`	`}`
`1108`	`1109`
`1109`	`1110`	`// From codersdk/workspaceagents.go`
Original file line number	Diff line number	Diff line change
`@@ -719,6 +719,7 @@ export const MockWorkspace: TypesGen.Workspace = {`
`719`	`719`	`ttl_ms: 2 * 60 * 60 * 1000,`
`720`	`720`	`latest_build: MockWorkspaceBuild,`
`721`	`721`	`last_used_at: "2022-05-16T15:29:10.302441433Z",`
	`722`	`+ impending_deletion: "0001-01-01T00:00:00Z",`
`722`	`723`	`}`
`723`	`724`
`724`	`725`	`export const MockStoppedWorkspace: TypesGen.Workspace = {`