Self-review

Signed-off-by: Danny Kopping <[email protected]>
coder · dannykopping · Aug 5, 2024 · Jul 25, 2024 · Jul 23, 2024 · Jul 23, 2024
commit 52d3108485f97c86de96bf5ca6142ce5098be03c
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;