fix issues

mafredri · mafredri · commit 6ec178bec7f1 · 2023-08-14T14:42:39.000Z
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -4309,7 +4309,7 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 	return workspaceApp, nil
 }
 
-func (q *FakeQuerier) InsertWorkspaceAppStats(ctx context.Context, arg database.InsertWorkspaceAppStatsParams) error {
+func (q *FakeQuerier) InsertWorkspaceAppStats(_ context.Context, arg database.InsertWorkspaceAppStatsParams) error {
 	err := validateDatabaseType(arg)
 	if err != nil {
 		return err
diff --git a/coderd/workspaceapps/stats_test.go b/coderd/workspaceapps/stats_test.go
@@ -320,17 +320,14 @@ func TestStatsCollector(t *testing.T) {
 			}, testutil.WaitMedium, testutil.IntervalFast)
 
 			// Order is not guaranteed.
-			sortBySessionID := func(a, b workspaceapps.StatsReport) bool {
+			sortBySessionID := func(a, b workspaceapps.StatsReport) int {
 				if a.SessionID == b.SessionID {
-					if !a.SessionEndedAt.IsZero() && !b.SessionEndedAt.IsZero() {
-						return a.SessionEndedAt.Before(b.SessionEndedAt)
-					}
-					if a.SessionEndedAt.IsZero() {
-						return true
-					}
-					return false
+					return int(a.SessionEndedAt.Sub(b.SessionEndedAt))
 				}
-				return a.SessionID.String() < b.SessionID.String()
+				if a.SessionID.String() < b.SessionID.String() {
+					return -1
+				}
+				return 1
 			}
 			slices.SortFunc(tt.want, sortBySessionID)
 			slices.SortFunc(gotStats, sortBySessionID)
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -275,7 +275,7 @@ func TestWorkspaceApps(t *testing.T) {
 					"CF-Connecting-IP",
 				},
 			},
-			WorkspaceAppsStatsCollector: opts.StatsCollector,
+			WorkspaceAppsStatsCollectorOptions: opts.StatsCollectorOptions,
 		})
 
 		user := coderdtest.CreateFirstUser(t, client)
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -501,7 +501,6 @@ func (api *API) workspaceProxyIssueSignedAppToken(rw http.ResponseWriter, r *htt
 // @ID report-workspace-app-stats
 // @Security CoderSessionToken
 // @Accept json
-// @Produce json
 // @Tags Enterprise
 // @Param request body wsproxysdk.ReportAppStatsRequest true "Report app stats request"
 // @Success 204

Original file line number	Diff line number	Diff line change
`@@ -4309,7 +4309,7 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW`
`4309`	`4309`	`return workspaceApp, nil`
`4310`	`4310`	`}`
`4311`	`4311`
`4312`		`-func (q *FakeQuerier) InsertWorkspaceAppStats(ctx context.Context, arg database.InsertWorkspaceAppStatsParams) error {`
	`4312`	`+func (q *FakeQuerier) InsertWorkspaceAppStats(_ context.Context, arg database.InsertWorkspaceAppStatsParams) error {`
`4313`	`4313`	`err := validateDatabaseType(arg)`
`4314`	`4314`	`if err != nil {`
`4315`	`4315`	`return err`