VRFS-2320 include from user info in session comment emails

ruby/lib/jam_ruby/app/mailers/user_mailer.rb

@@ -412,22 +412,23 @@
         end
       end
 
-      def scheduled_session_comment(user, msg, comment, session)
-        return if !user.subscribe_email
+      def scheduled_session_comment(target_user, source_user, msg, comment, session)
+        return if !target_user.subscribe_email
 
-        email = user.email
+        email = target_user.email
         subject = "New Session Comment"
         unique_args = {:type => "scheduled_session_comment"}
         @body = msg
         @session_name = session.name
         @session_date = session.pretty_scheduled_start(true)
         @comment = comment
+        @source_user = source_user
         @session_url = "#{APP_CONFIG.external_root_url}/sessions/#{session.id}/details"
         sendgrid_category "Notification"
         sendgrid_unique_args :type => unique_args[:type]
 
         sendgrid_recipients([email])
-        sendgrid_substitute('@USERID', [user.id])
+        sendgrid_substitute('@USERID', [target_user.id])
 
         mail(:to => email, :subject => subject) do |format|
           format.text

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.html.erb

@@ -1,7 +1,7 @@
 <% provide(:title, 'Scheduled Session Comment') %>
 
-<p><%= @body %></p>
-
 <p><%= @comment %></p>
 
+<p>- <%= @source_user.name %> </p>
+
 <p><a style="color: #588C98;" href="<%= @session_url %>">View Session Details</a></p>

ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_comment.text.erb

@@ -5,4 +5,6 @@
 
 <%= @comment %>
 
+- <%= @source_user.name %>
+
 See session details at <%= @session_url %>.

ruby/lib/jam_ruby/models/notification.rb

@@ -930,14 +930,13 @@ module JamRuby
         rsvp_requests = RsvpRequest.index(music_session)
         target_users = send_to_cancelled ? rsvp_requests.map { |r| r.user } : rsvp_requests.where(:canceled => false).map { |r| r.user }
         target_users = target_users.concat([music_session.creator])
+        source_user = creator
         pending_invites = music_session.pending_invitations
 
         # remove the creator from the array
         target_users = target_users.concat(pending_invites).uniq - [creator]
 
         target_users.each do |target_user|
-          source_user = creator
-
           notification = Notification.new
           notification.description = NotificationTypes::SCHEDULED_SESSION_COMMENT
           notification.source_user_id = source_user.id
@@ -964,7 +963,7 @@ module JamRuby
           end
 
           begin
-            UserMailer.scheduled_session_comment(target_user, notification_msg, comment, music_session).deliver
+            UserMailer.scheduled_session_comment(target_user, source_user, notification_msg, comment, music_session).deliver
           rescue => e
             @@log.error("Unable to send SCHEDULED_SESSION_COMMENT email to user #{target_user.email} #{e}")
           end