From 1ca6f56cce0851ceee28bc42d0cb1cfdaf436891 Mon Sep 17 00:00:00 2001 From: anks Date: Tue, 20 Oct 2020 15:28:07 +0200 Subject: [PATCH] Add notification aliases to user model #6892 (#10892) Co-authored-by: Anna Anks Nowak --- app/models/user.rb | 5 +++-- spec/requests/user/user_settings_spec.rb | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 6f0bfee35..178748089 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -206,6 +206,8 @@ class User < ApplicationRecord alias_attribute :public_reactions_count, :reactions_count alias_attribute :subscribed_to_welcome_notifications?, :welcome_notifications + alias_attribute :subscribed_to_mod_roundrobin_notifications?, :mod_roundrobin_notifications + alias_attribute :subscribed_to_email_follower_notifications?, :email_follower_notifications scope :eager_load_serialized_data, -> { includes(:roles) } scope :registered, -> { where(registered: true) } @@ -471,8 +473,7 @@ class User < ApplicationRecord end def receives_follower_email_notifications? - email.present? && - email_follower_notifications + email.present? && subscribed_to_email_follower_notifications? end def hotness_score diff --git a/spec/requests/user/user_settings_spec.rb b/spec/requests/user/user_settings_spec.rb index d210d889a..f3d6cfd77 100644 --- a/spec/requests/user/user_settings_spec.rb +++ b/spec/requests/user/user_settings_spec.rb @@ -172,7 +172,7 @@ RSpec.describe "UserSettings", type: :request do it "enables community-success notifications" do put "/users/#{user.id}", params: { user: { tab: "notifications", mod_roundrobin_notifications: 1 } } - expect(user.reload.mod_roundrobin_notifications).to be(true) + expect(user.reload.subscribed_to_mod_roundrobin_notifications?).to be(true) end it "updates the users announcement display preferences" do @@ -183,7 +183,7 @@ RSpec.describe "UserSettings", type: :request do it "disables community-success notifications" do put "/users/#{user.id}", params: { user: { tab: "notifications", mod_roundrobin_notifications: 0 } } - expect(user.reload.mod_roundrobin_notifications).to be(false) + expect(user.reload.subscribed_to_mod_roundrobin_notifications?).to be(false) end it "can toggle welcome notifications" do