REVAMP — backend tests work

coder · ammario · Sep 1, 2022 · Aug 29, 2022 · Aug 29, 2022 · Sep 1, 2022
commit 3f9901ec157daabeb812d995ae0cbe57f8828448
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -278,7 +278,7 @@ func New(options *Options) *API {
 				apiKeyMiddleware,
 				httpmw.ExtractTemplateParam(options.Database),
 			)
-
+			r.Get("/daus", api.templateDAUs)
 			r.Get("/", api.template)
 			r.Delete("/", api.deleteTemplate)
 			r.Patch("/", api.patchTemplateMeta)
@@ -374,12 +374,6 @@ func New(options *Options) *API {
 				r.Use(httpmw.ExtractWorkspaceAgent(options.Database))
 				r.Get("/report-agent-stats", api.workspaceAgentReportStats)
 			})
-			r.Group(func(r chi.Router) {
-				r.Use(
-					apiKeyMiddleware,
-				)
-				r.Get("/daus", api.metricsDAUs)
-			})
 		})
 		r.Route("/workspaceagents", func(r chi.Router) {
 			r.Post("/azure-instance-identity", api.postWorkspaceAuthAzureInstanceIdentity)

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -137,7 +137,7 @@ func (q *fakeQuerier) AcquireProvisionerJob(_ context.Context, arg database.Acqu
 	}
 	return database.ProvisionerJob{}, sql.ErrNoRows
 }
-func (_ *fakeQuerier) DeleteOldAgentStats(_ context.Context) error {
+func (*fakeQuerier) DeleteOldAgentStats(_ context.Context) error {
 	// no-op
 	return nil
 }
@@ -153,18 +153,23 @@ func (q *fakeQuerier) InsertAgentStat(_ context.Context, p database.InsertAgentS
 		AgentID:     p.AgentID,
 		UserID:      p.UserID,
 		Payload:     p.Payload,
+		TemplateID:  p.TemplateID,
 	}
 	q.agentStats = append(q.agentStats, stat)
 	return stat, nil
 }
 
-func (q *fakeQuerier) GetDAUsFromAgentStats(_ context.Context) ([]database.GetDAUsFromAgentStatsRow, error) {
+func (q *fakeQuerier) GetTemplateDAUs(_ context.Context, templateID uuid.UUID) ([]database.GetTemplateDAUsRow, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
 	counts := make(map[time.Time]map[string]struct{})
 
 	for _, as := range q.agentStats {
+		if as.TemplateID != templateID {
+			continue
+		}
+
 		date := as.CreatedAt.Truncate(time.Hour * 24)
 		dateEntry := counts[date]
 		if dateEntry == nil {
@@ -180,9 +185,9 @@ func (q *fakeQuerier) GetDAUsFromAgentStats(_ context.Context) ([]database.GetDA
 		return countKeys[i].Before(countKeys[j])
 	})
 
-	var rs []database.GetDAUsFromAgentStatsRow
+	var rs []database.GetTemplateDAUsRow
 	for _, key := range countKeys {
-		rs = append(rs, database.GetDAUsFromAgentStatsRow{
+		rs = append(rs, database.GetTemplateDAUsRow{
 			Date: key,
 			Daus: int64(len(counts[key])),
 		})

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000042_agent_stats.up.sql b/coderd/database/migrations/000042_agent_stats.up.sql
@@ -5,6 +5,7 @@ CREATE TABLE agent_stats (
     user_id uuid NOT NULL,
     agent_id uuid NOT NULL,
     workspace_id uuid NOT NULL,
+    template_id uuid NOT NULL,
 	payload jsonb NOT NULL
 );
 

diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/agentstats.sql b/coderd/database/queries/agentstats.sql
@@ -5,18 +5,20 @@ INSERT INTO
 		created_at,
 		user_id,
 		workspace_id,
+		template_id,
 		agent_id,
 		payload
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6) RETURNING *;
+	($1, $2, $3, $4, $5, $6, $7) RETURNING *;
 
--- name: GetDAUsFromAgentStats :many
+-- name: GetTemplateDAUs :many
 select
 	(created_at at TIME ZONE 'UTC')::date as date,
 	count(distinct(user_id)) as daus
 from
 	agent_stats
+where template_id = $1
 group by
 	date
 order by

diff --git a/coderd/metrics.go b/coderd/metrics.go
@@ -14,22 +14,9 @@ import (
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
-	"github.com/coder/coder/coderd/rbac"
 	"github.com/coder/coder/codersdk"
 )
 
-func (api *API) metricsDAUs(rw http.ResponseWriter, r *http.Request) {
-	if !api.Authorize(r, rbac.ActionRead, rbac.ResourceUser) {
-		httpapi.Forbidden(rw)
-		return
-	}
-	resp := api.metricsCache.DAUs()
-	if resp.Entries == nil {
-		resp.Entries = []codersdk.DAUEntry{}
-	}
-	httpapi.Write(rw, http.StatusOK, resp)
-}
-
 func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Request) {
 	api.websocketWaitMutex.Lock()
 	api.websocketWaitGroup.Add(1)
@@ -130,6 +117,7 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
 				AgentID:     workspaceAgent.ID,
 				WorkspaceID: build.WorkspaceID,
 				UserID:      workspace.OwnerID,
+				TemplateID:  workspace.TemplateID,
 				Payload:     json.RawMessage(repJSON),
 			})
 			if err != nil {

diff --git a/coderd/metrics_test.go b/coderd/metrics_test.go