Apply suggestions from code review

johnstcn · Emyrk · web-flow · commit a0b9ec1b8176 · 2024-09-09T08:23:22.000+01:00
Co-authored-by: Steven Masley &lt;Emyrk@users.noreply.github.com&gt;
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1477,10 +1477,7 @@ func (q *querier) GetFileTemplates(ctx context.Context, fileID uuid.UUID) ([]dat
 }
 
 func (q *querier) GetFrobulators(ctx context.Context, arg database.GetFrobulatorsParams) ([]database.Frobulator, error) {
-	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceFrobulator.WithOwner(arg.UserID.String()).InOrg(arg.OrgID)); err != nil {
-		return nil, err
-	}
-	return q.db.GetFrobulators(ctx, arg)
+return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetFrobulators)(ctx, arg)
 }
 
 func (q *querier) GetGitSSHKey(ctx context.Context, userID uuid.UUID) (database.GitSSHKey, error) {
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -894,9 +894,9 @@ func CustomRole(t testing.TB, db database.Store, seed database.CustomRole) datab
 
 func Frobulator(t testing.TB, db database.Store, orig database.Frobulator) database.Frobulator {
 	frob, err := db.InsertFrobulator(genCtx, database.InsertFrobulatorParams{
-		UserID:      orig.UserID,
-		OrgID:       orig.OrgID,
-		ModelNumber: orig.ModelNumber,
+		UserID:      takeFirst(orig.UserID, uuid.New()),
+		OrgID:       takeFirst(orig.OrgID, uuid.New()),
+		ModelNumber: takeFirst(orig.ModelNumber, testutil.GetRandomName(t)),
 	})
 	require.NoError(t, err, "insert frobulator")
 	return frob
diff --git a/coderd/database/queries/frobulators.sql b/coderd/database/queries/frobulators.sql
@@ -5,7 +5,7 @@ WHERE user_id = $1 AND org_id = $2;
 
 -- name: InsertFrobulator :one
 INSERT INTO frobulators (id, user_id, org_id, model_number)
-VALUES (gen_random_uuid(), $1, $2, $3)
+VALUES ($1, $2, $3, $4)
 RETURNING *;
 
 -- name: DeleteFrobulator :exec
diff --git a/coderd/frobulators.go b/coderd/frobulators.go
@@ -75,6 +75,10 @@ func (api *API) createFrobulator(rw http.ResponseWriter, r *http.Request) {
 		OrgID:       org.ID,
 		ModelNumber: req.ModelNumber,
 	})
+	if httpapi.Is404Error(err) { // Catches forbidden errors as well
+		httpapi.ResourceNotFound(rw)
+		return
+	}
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
 		return
@@ -113,6 +117,10 @@ func (api *API) deleteFrobulator(rw http.ResponseWriter, r *http.Request) {
 		UserID: member.UserID,
 		OrgID:  org.ID,
 	})
+	if httpapi.Is404Error(err) { // Catches forbidden errors as well
+		httpapi.ResourceNotFound(rw)
+		return
+	}
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
 		return

Original file line number	Diff line number	Diff line change
`@@ -1477,10 +1477,7 @@ func (q *querier) GetFileTemplates(ctx context.Context, fileID uuid.UUID) ([]dat`
`1477`	`1477`	`}`
`1478`	`1478`
`1479`	`1479`	`func (q *querier) GetFrobulators(ctx context.Context, arg database.GetFrobulatorsParams) ([]database.Frobulator, error) {`
`1480`		`- if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceFrobulator.WithOwner(arg.UserID.String()).InOrg(arg.OrgID)); err != nil {`
`1481`		`- return nil, err`
`1482`		`- }`
`1483`		`- return q.db.GetFrobulators(ctx, arg)`
	`1480`	`+return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetFrobulators)(ctx, arg)`
`1484`	`1481`	`}`
`1485`	`1482`
`1486`	`1483`	`func (q *querier) GetGitSSHKey(ctx context.Context, userID uuid.UUID) (database.GitSSHKey, error) {`