Add API

ammario · ammario · commit eeebe0ca0bdf · 2022-09-01T21:01:19.000Z
diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -608,6 +608,10 @@ func TestTemplateDAUs(t *testing.T) {
 		Entries: []codersdk.DAUEntry{},
 	}, daus, "no DAUs when stats are empty")
 
+	workspaces, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{})
+	require.NoError(t, err)
+	assert.Zero(t, workspaces[0].LastUsedAt)
+
 	conn, err := client.DialWorkspaceAgent(ctx, resources[0].Agents[0].ID, opts)
 	require.NoError(t, err)
 	defer func() {
@@ -641,4 +645,10 @@ func TestTemplateDAUs(t *testing.T) {
 		testutil.WaitShort, testutil.IntervalFast,
 		"got %+v != %+v", daus, want,
 	)
+
+	workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
+	require.NoError(t, err)
+	assert.WithinDuration(t,
+		time.Now(), workspaces[0].LastUsedAt, time.Minute,
+	)
 }
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -830,18 +830,20 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
 		// We will see duplicate reports when on idle connections
 		// (e.g. web terminal left open) or when there are no connections at
 		// all.
-		var insert = !reflect.DeepEqual(lastReport, rep)
+		// We also don't want to update the workspace last used at on duplicate
+		// reports.
+		var updateDB = !reflect.DeepEqual(lastReport, rep)
 
 		api.Logger.Debug(ctx, "read stats report",
 			slog.F("interval", api.AgentStatsRefreshInterval),
 			slog.F("agent", workspaceAgent.ID),
 			slog.F("resource", resource.ID),
 			slog.F("workspace", workspace.ID),
-			slog.F("insert", insert),
+			slog.F("update_db", updateDB),
 			slog.F("payload", rep),
 		)
 
-		if insert {
+		if updateDB {
 			lastReport = rep
 
 			_, err = api.Database.InsertAgentStat(ctx, database.InsertAgentStatParams{
@@ -860,6 +862,18 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
 				})
 				return
 			}
+
+			err = api.Database.UpdateWorkspaceLastUsedAt(ctx, database.UpdateWorkspaceLastUsedAtParams{
+				ID:         build.WorkspaceID,
+				LastUsedAt: time.Now(),
+			})
+			if err != nil {
+				httpapi.Write(rw, http.StatusBadRequest, codersdk.Response{
+					Message: "Failed to update workspace last used at.",
+					Detail:  err.Error(),
+				})
+				return
+			}
 		}
 
 		select {
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -941,6 +941,7 @@ func convertWorkspace(
 		Name:              workspace.Name,
 		AutostartSchedule: autostartSchedule,
 		TTLMillis:         ttlMillis,
+		LastUsedAt:        workspace.LastUsedAt,
 	}
 }
 
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -30,6 +30,7 @@ type Workspace struct {
 	Name              string         `json:"name"`
 	AutostartSchedule *string        `json:"autostart_schedule,omitempty"`
 	TTLMillis         *int64         `json:"ttl_ms,omitempty"`
+	LastUsedAt        time.Time      `json:"last_used_at"`
 }
 
 // CreateWorkspaceBuildRequest provides options to update the latest workspace build.

Original file line number	Diff line number	Diff line change
`@@ -941,6 +941,7 @@ func convertWorkspace(`
`941`	`941`	`Name: workspace.Name,`
`942`	`942`	`AutostartSchedule: autostartSchedule,`
`943`	`943`	`TTLMillis: ttlMillis,`
	`944`	`+ LastUsedAt: workspace.LastUsedAt,`
`944`	`945`	`}`
`945`	`946`	`}`
`946`	`947`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ type Workspace struct {`
`30`	`30`	Name string `json:"name"`
`31`	`31`	AutostartSchedule *string `json:"autostart_schedule,omitempty"`
`32`	`32`	TTLMillis *int64 `json:"ttl_ms,omitempty"`
	`33`	+ LastUsedAt time.Time `json:"last_used_at"`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`// CreateWorkspaceBuildRequest provides options to update the latest workspace build.`