From baf3151bb0c00680c2f5315e67b3ed6e9396413e Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Wed, 13 Dec 2017 11:59:53 +0100
Subject: [PATCH] Fix notification settings accessors [SCI-1864]

---
 .../users/settings/account/preferences_controller.rb   | 10 +++++-----
 app/services/client_api/invitations_service.rb         |  2 +-
 .../users/settings/account/preferences/index.html.erb  | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/users/settings/account/preferences_controller.rb b/app/controllers/users/settings/account/preferences_controller.rb
index 4cfc94463..2f951fff2 100644
--- a/app/controllers/users/settings/account/preferences_controller.rb
+++ b/app/controllers/users/settings/account/preferences_controller.rb
@@ -77,15 +77,15 @@ module Users
         end
 
         def notifications_settings
-          @user.settings[:notifications][:assignments] =
+          @user.assignments_notification =
             params[:assignments_notification] ? true : false
-          @user.settings[:notifications][:recent] =
+          @user.recent_notification =
             params[:recent_notification] ? true : false
-          @user.settings[:notifications][:recent_email] =
+          @user.recent_email_notification =
             params[:recent_notification_email] ? true : false
-          @user.settings[:notifications][:assignments_email] =
+          @user.assignments_email_notification =
             params[:assignments_notification_email] ? true : false
-          @user.settings[:notifications][:system_message_email] =
+          @user.system_message_email_notification =
             params[:system_message_notification_email] ? true : false
 
           if @user.save
diff --git a/app/services/client_api/invitations_service.rb b/app/services/client_api/invitations_service.rb
index 5e08b6623..63380c239 100644
--- a/app/services/client_api/invitations_service.rb
+++ b/app/services/client_api/invitations_service.rb
@@ -151,7 +151,7 @@ module ClientApi
         message: sanitize_input(message)
       )
 
-      if target_user.settings[:notifications][:assignments]
+      if target_user.assignments_notification
         UserNotification.create(notification: notification, user: target_user)
       end
     end
diff --git a/app/views/users/settings/account/preferences/index.html.erb b/app/views/users/settings/account/preferences/index.html.erb
index 1ca883a3c..4aff9877b 100644
--- a/app/views/users/settings/account/preferences/index.html.erb
+++ b/app/views/users/settings/account/preferences/index.html.erb
@@ -79,7 +79,7 @@
                   <%=t 'notifications.form.notification_scinote' %>
                 </div>
                 <div class="col-sm-8">
-                  <%= check_box_tag :assignments_notification, @user.settings[:notifications][:assignments] %>
+                  <%= check_box_tag :assignments_notification, @user.assignments_notification %>
                 </div>
               </div>
               <div class="row">
@@ -87,7 +87,7 @@
                   <%=t 'notifications.form.notification_email' %>
                 </div>
                 <div class="col-sm-8">
-                  <%= check_box_tag :assignments_notification_email, @user.settings[:notifications][:assignments_email] %>
+                  <%= check_box_tag :assignments_notification_email, @user.assignments_email_notification %>
                 </div>
               </div>
             </div>
@@ -104,7 +104,7 @@
                     <%=t 'notifications.form.notification_scinote' %>
                   </div>
                   <div class="col-sm-8">
-                    <%= check_box_tag :recent_notification, @user.settings[:notifications][:recent] %>
+                    <%= check_box_tag :recent_notification, @user.recent_notification %>
                   </div>
                 </div>
                 <div class="row">
@@ -112,7 +112,7 @@
                     <%=t 'notifications.form.notification_email' %>
                   </div>
                   <div class="col-sm-8">
-                    <%= check_box_tag :recent_notification_email, @user.settings[:notifications][:recent_email] %>
+                    <%= check_box_tag :recent_notification_email, @user.recent_email_notification %>
                   </div>
                 </div>
             </div>
@@ -137,7 +137,7 @@
                   <%=t 'notifications.form.notification_email' %>
                 </div>
                 <div class="col-sm-8">
-                  <%= check_box_tag :system_message_notification_email, @user.settings[:notifications][:system_message_email] %>
+                  <%= check_box_tag :system_message_notification_email, @user.system_message_email_notification %>
                 </div>
               </div>
             </div>