coder
diff --git a/‎coderd/database/dump.sql
Lines changed: 14 additions & 14 deletions b/‎coderd/database/dump.sql
Lines changed: 14 additions & 14 deletions
diff --git a/‎coderd/database/migrations/000284_allow_disabling_notification_templates_by_default.up.sql
Lines changed: 13 additions & 14 deletions b/‎coderd/database/migrations/000284_allow_disabling_notification_templates_by_default.up.sql
Lines changed: 13 additions & 14 deletions
@@ -8,20 +8,19 @@ BEGIN
 	--  * the user has disabled this notification.
 	--  * the notification template is disabled by default and hasn't
 	--    been explicitly enabled by the user.
-	IF EXISTS (SELECT 1
-			   FROM notification_preferences
-			   WHERE disabled = TRUE
-				 AND user_id = NEW.user_id
-				 AND notification_template_id = NEW.notification_template_id)
-		OR (NOT EXISTS (SELECT 1
-						   FROM notification_preferences
-						   WHERE disabled = FALSE
-							 AND user_id = NEW.user_id
-							 AND notification_template_id = NEW.notification_template_id))
-			AND (EXISTS (SELECT 1
-							 FROM notification_templates
-							 WHERE id = NEW.notification_template_id
-						        AND enabled_by_default = FALSE) ) THEN
+	IF EXISTS (
+		SELECT 1 FROM notification_templates
+		LEFT JOIN notification_preferences
+			ON  notification_preferences.notification_template_id = notification_templates.id
+			AND notification_preferences.user_id = NEW.user_id
+		WHERE notification_templates.id = NEW.notification_template_id AND (
+			-- Case 1: The user has explicitly disabled this template
+			notification_preferences.disabled = TRUE
+			OR
+			-- Case 2: The template is disabled by default AND the user hasn't enabled it
+			(notification_templates.enabled_by_default = FALSE AND notification_preferences.notification_template_id IS NULL)
+		)
+	) THEN
 		RAISE EXCEPTION 'cannot enqueue message: notification is not enabled';
 	END IF;