fix: dbmem.go impl

DanielleMaywood · DanielleMaywood · commit ab1ab0ffb1b3 · 2024-11-20T08:53:55.000Z
diff --git a/coderd/autobuild/lifecycle_executor_test.go b/coderd/autobuild/lifecycle_executor_test.go
@@ -132,6 +132,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {
 					cwr.AutomaticUpdates = tc.automaticUpdates
 				})
 			)
+
 			// Given: workspace is stopped
 			workspace = coderdtest.MustTransitionWorkspace(
 				t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -6952,7 +6952,10 @@ func (q *FakeQuerier) GetWorkspacesEligibleForTransition(ctx context.Context, no
 		if user.Status == database.UserStatusActive &&
 			job.JobStatus != database.ProvisionerJobStatusFailed &&
 			build.Transition == database.WorkspaceTransitionStop &&
-			workspace.AutostartSchedule.Valid {
+			workspace.AutostartSchedule.Valid &&
+			(workspace.NextStartAt.Time.IsZero() ||
+				now.After(workspace.NextStartAt.Time) ||
+				now.Equal(workspace.NextStartAt.Time)) {
 			workspaces = append(workspaces, database.GetWorkspacesEligibleForTransitionRow{
 				ID:   workspace.ID,
 				Name: workspace.Name,
@@ -7926,6 +7929,7 @@ func (q *FakeQuerier) InsertWorkspace(_ context.Context, arg database.InsertWork
 		Ttl:               arg.Ttl,
 		LastUsedAt:        arg.LastUsedAt,
 		AutomaticUpdates:  arg.AutomaticUpdates,
+		NextStartAt:       arg.NextStartAt,
 	}
 	q.workspaces = append(q.workspaces, workspace)
 	return workspace, nil
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -1910,6 +1910,11 @@ func convertWorkspace(
 		deletingAt = &workspace.DeletingAt.Time
 	}
 
+	var nextStartAt *time.Time
+	if workspace.NextStartAt.Valid {
+		nextStartAt = &workspace.NextStartAt.Time
+	}
+
 	failingAgents := []uuid.UUID{}
 	for _, resource := range workspaceBuild.Resources {
 		for _, agent := range resource.Agents {
@@ -1960,6 +1965,7 @@ func convertWorkspace(
 		AutomaticUpdates: codersdk.AutomaticUpdates(workspace.AutomaticUpdates),
 		AllowRenames:     allowRenames,
 		Favorite:         requesterFavorite,
+		NextStartAt:      nextStartAt,
 	}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {`
`132`	`132`	`cwr.AutomaticUpdates = tc.automaticUpdates`
`133`	`133`	`})`
`134`	`134`	`)`
	`135`	`+`
`135`	`136`	`// Given: workspace is stopped`
`136`	`137`	`workspace = coderdtest.MustTransitionWorkspace(`
`137`	`138`	`t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)`