fixes

mtojek · mtojek · commit 8bff641d625a · 2023-09-21T15:22:49.000+02:00
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/insights.sql b/coderd/database/queries/insights.sql
@@ -53,7 +53,7 @@ WITH app_stats_by_user_and_agent AS (
 )
 
 SELECT
-	users.id,
+	users.id as user_id,
 	users.username,
 	users.avatar_url,
 	array_agg(DISTINCT template_id)::uuid[] AS template_ids,
diff --git a/coderd/insights.go b/coderd/insights.go
@@ -94,16 +94,53 @@ func (api *API) insightsUserActivity(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// TODO
+	rows, err := api.Database.GetUserActivityInsights(ctx, database.GetUserActivityInsightsParams{
+		StartTime:   startTime,
+		EndTime:     endTime,
+		TemplateIDs: templateIDs,
+	})
+	if err != nil {
+		if httpapi.Is404Error(err) {
+			httpapi.ResourceNotFound(rw)
+			return
+		}
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error fetching user activity.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	templateIDSet := make(map[uuid.UUID]struct{})
+	userActivities := make([]codersdk.UserActivity, 0, len(rows))
+	for _, row := range rows {
+		for _, templateID := range row.TemplateIDs {
+			templateIDSet[templateID] = struct{}{}
+		}
+		userActivities = append(userActivities, codersdk.UserActivity{
+			TemplateIDs: row.TemplateIDs,
+			UserID:      row.UserID,
+			Username:    row.Username,
+			AvatarURL:   row.AvatarURL.String,
+			Seconds:     row.UsageSeconds,
+		})
+	}
 
-	seenTemplateIDs := templateIDs // FIXME
+	// TemplateIDs that contributed to the data.
+	seenTemplateIDs := make([]uuid.UUID, 0, len(templateIDSet))
+	for templateID := range templateIDSet {
+		seenTemplateIDs = append(seenTemplateIDs, templateID)
+	}
+	slices.SortFunc(seenTemplateIDs, func(a, b uuid.UUID) int {
+		return slice.Ascending(a.String(), b.String())
+	})
 
 	resp := codersdk.UserActivityInsightsResponse{
 		Report: codersdk.UserActivityInsightsReport{
 			StartTime:   startTime,
 			EndTime:     endTime,
 			TemplateIDs: seenTemplateIDs,
-			Users:       nil, // FIXME
+			Users:       userActivities,
 		},
 	}
 	httpapi.Write(ctx, rw, http.StatusOK, resp)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ WITH app_stats_by_user_and_agent AS (`
`53`	`53`	`)`
`54`	`54`
`55`	`55`	`SELECT`
`56`		`- users.id,`
	`56`	`+ users.id as user_id,`
`57`	`57`	`users.username,`
`58`	`58`	`users.avatar_url,`
`59`	`59`	`array_agg(DISTINCT template_id)::uuid[] AS template_ids,`