Self-review

dannykopping · dannykopping · commit 76d4ca539d35 · 2024-08-02T11:48:51.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -3034,7 +3034,6 @@ func (q *querier) UpdateMemberRoles(ctx context.Context, arg database.UpdateMemb
 }
 
 func (q *querier) UpdateNotificationTemplateMethodByID(ctx context.Context, arg database.UpdateNotificationTemplateMethodByIDParams) (database.NotificationTemplate, error) {
-	// TODO: how to restrict this to admins?
 	if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceNotificationTemplate); err != nil {
 		return database.NotificationTemplate{}, err
 	}
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/notifications.sql b/coderd/database/queries/notifications.sql
@@ -146,13 +146,11 @@ FROM notification_preferences
 WHERE user_id = @user_id::uuid;
 
 -- name: UpdateUserNotificationPreferences :execrows
-WITH new_values AS
-         (SELECT UNNEST(@notification_template_ids::uuid[]) AS notification_template_id,
-                 UNNEST(@disableds::bool[])                 AS disabled)
 INSERT
 INTO notification_preferences (user_id, notification_template_id, disabled)
 SELECT @user_id::uuid, new_values.notification_template_id, new_values.disabled
-FROM new_values
+FROM (SELECT UNNEST(@notification_template_ids::uuid[]) AS notification_template_id,
+             UNNEST(@disableds::bool[])                 AS disabled) AS new_values
 ON CONFLICT (user_id, notification_template_id) DO UPDATE
     SET disabled   = EXCLUDED.disabled,
         updated_at = CURRENT_TIMESTAMP;

Original file line number	Diff line number	Diff line change
`@@ -3034,7 +3034,6 @@ func (q *querier) UpdateMemberRoles(ctx context.Context, arg database.UpdateMemb`
`3034`	`3034`	`}`
`3035`	`3035`
`3036`	`3036`	`func (q *querier) UpdateNotificationTemplateMethodByID(ctx context.Context, arg database.UpdateNotificationTemplateMethodByIDParams) (database.NotificationTemplate, error) {`
`3037`		`- // TODO: how to restrict this to admins?`
`3038`	`3037`	`if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceNotificationTemplate); err != nil {`
`3039`	`3038`	`return database.NotificationTemplate{}, err`
`3040`	`3039`	`}`