From 2424fa021fcd98a14ed593121fd476e1dbacffc2 Mon Sep 17 00:00:00 2001
From: Mark Moser <mark.moser@perficient.com>
Date: Tue, 14 Feb 2017 11:32:39 -0600
Subject: [PATCH] sends emails to all reviewers on new comment

---
 app/controllers/admin/comment_controller.rb       |  2 ++
 app/mailers/reviewer_mailer.rb                    |  7 +++++++
 app/views/layouts/mailer.html.inky                |  2 +-
 app/views/reviewer_mailer/new_comment.html.inky   | 13 +++++++++++++
 app/views/reviewer_mailer/new_comment.text.erb    |  9 +++++++++
 test/controllers/admin/comment_controller_test.rb | 14 ++++++++++++++
 test/mailers/previews/reviewer_mailer_preview.rb  |  4 ++++
 test/mailers/reviewer_mailer_test.rb              | 10 ++++++++++
 8 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 app/views/reviewer_mailer/new_comment.html.inky
 create mode 100644 app/views/reviewer_mailer/new_comment.text.erb

diff --git a/app/controllers/admin/comment_controller.rb b/app/controllers/admin/comment_controller.rb
index 9a12d50..6da6843 100644
--- a/app/controllers/admin/comment_controller.rb
+++ b/app/controllers/admin/comment_controller.rb
@@ -23,6 +23,8 @@ module Admin
                       else
                         { error: "Failed to save comment" }
                       end
+
+      ReviewerMailer.new_comment(comment).deliver_later if comment.persisted?
       redirect_to admin_result_path(params[:test_hash]), flash: flash_message
     end
 
diff --git a/app/mailers/reviewer_mailer.rb b/app/mailers/reviewer_mailer.rb
index 3955ef9..b640169 100644
--- a/app/mailers/reviewer_mailer.rb
+++ b/app/mailers/reviewer_mailer.rb
@@ -19,4 +19,11 @@ class ReviewerMailer < ApplicationMailer
 
     mail to: @manager.email, subject: "Voting Complete"
   end
+
+  def new_comment comment
+    @comment = comment
+    recipients = comment.candidate.reviewers.map(&:email)
+
+    mail to: recipients, subject: "Skills Assessment Review Comment - #{@comment.test_hash}"
+  end
 end
diff --git a/app/views/layouts/mailer.html.inky b/app/views/layouts/mailer.html.inky
index 12f03c3..9761da3 100644
--- a/app/views/layouts/mailer.html.inky
+++ b/app/views/layouts/mailer.html.inky
@@ -23,7 +23,7 @@
                   <table>
                     <tr>
                       <td class="email-copyright">
-                        &copy;2016 All Rights Reserved - Perficient Digital
+                        &copy;2016-<%= Time.now.year %> All Rights Reserved - Perficient Digital
                       </td>
                       <td class="email-logo">
                         <%= image_tag(attachments["perficientdigital-logo.jpg"].url,  alt:"Perficient Digital") %>
diff --git a/app/views/reviewer_mailer/new_comment.html.inky b/app/views/reviewer_mailer/new_comment.html.inky
new file mode 100644
index 0000000..b37e27b
--- /dev/null
+++ b/app/views/reviewer_mailer/new_comment.html.inky
@@ -0,0 +1,13 @@
+<row>
+  <columns class="email-body">
+    <p>
+      <%= @comment.user.name %> wrote a comment for quiz <%= @comment.test_hash %>
+    </p>
+
+    <p style="border-top: 1px solid; border-bottom: 1px solid;">
+      <%= @comment.message %>
+    </p>
+
+    <p>You can view and reply here: <%= link_to nil, admin_result_url(@comment.test_hash) %>.</p>
+  </columns>
+</row>
diff --git a/app/views/reviewer_mailer/new_comment.text.erb b/app/views/reviewer_mailer/new_comment.text.erb
new file mode 100644
index 0000000..c109f9e
--- /dev/null
+++ b/app/views/reviewer_mailer/new_comment.text.erb
@@ -0,0 +1,9 @@
+SKILLS ASSESSMENT RESULT COMMENT
+
+<%= @comment.user.name %> wrote a comment for quiz <%= @comment.test_hash %>
+
+--- --- --- ---
+<%= @comment.message %>
+--- --- --- ---
+
+You can view and reply here: <%= admin_result_url(@comment.test_hash) %>.
diff --git a/test/controllers/admin/comment_controller_test.rb b/test/controllers/admin/comment_controller_test.rb
index 0c2bf00..9b9a8fb 100644
--- a/test/controllers/admin/comment_controller_test.rb
+++ b/test/controllers/admin/comment_controller_test.rb
@@ -3,6 +3,8 @@ require 'test_helper'
 
 module Admin
   class CommentControllerTest < ActionDispatch::IntegrationTest
+    include ActiveJob::TestHelper
+
     test "should post update" do
       auth_manager
       comment = quiz_comments(:com5)
@@ -38,6 +40,18 @@ module Admin
       assert flash[:success]
     end
 
+    test "should queue emails on create" do
+      auth_reviewer
+      candidate = candidates(:stacy)
+
+      assert_enqueued_jobs 1 do
+        assert_difference("QuizComment.count", 1) do
+          post admin_create_comment_url(test_hash: candidate.test_hash),
+               params: { quiz_comment: { message: 'this is a test comment' } }
+        end
+      end
+    end
+
     test "should require comment to create" do
       auth_reviewer
       candidate = candidates(:stacy)
diff --git a/test/mailers/previews/reviewer_mailer_preview.rb b/test/mailers/previews/reviewer_mailer_preview.rb
index 1f67524..9a95c1c 100644
--- a/test/mailers/previews/reviewer_mailer_preview.rb
+++ b/test/mailers/previews/reviewer_mailer_preview.rb
@@ -14,4 +14,8 @@ class ReviewerMailerPreview < ActionMailer::Preview
   def notify_manager
     ReviewerMailer.notify_manager Candidate.find_by(test_hash: 'OvP0ZqGKwJ0').id # Dawn
   end
+
+  def new_comment
+    ReviewerMailer.new_comment QuizComment.first
+  end
 end
diff --git a/test/mailers/reviewer_mailer_test.rb b/test/mailers/reviewer_mailer_test.rb
index aa2e04f..c656806 100644
--- a/test/mailers/reviewer_mailer_test.rb
+++ b/test/mailers/reviewer_mailer_test.rb
@@ -30,4 +30,14 @@ class ReviewerMailerTest < ActionMailer::TestCase
     assert_equal [ENV["default_mail_from"]], mail.from
     assert_match candidate.test_hash, mail.body.encoded
   end
+
+  test "comment notification" do
+    comment = quiz_comments(:com5)
+    mail = ReviewerMailer.new_comment comment
+    assert_match "Comment", mail.subject
+    assert_match comment.test_hash, mail.subject
+    assert_equal comment.candidate.reviewers.map(&:email), mail.to
+    assert_equal [ENV["default_mail_from"]], mail.from
+    assert_match comment.test_hash, mail.body.encoded
+  end
 end