Merge pull request #26 from TechforgoodCAST/dev

v0.2.9

Author: ianedwards

app/controllers/comments_controller.rb

@@ -9,7 +9,10 @@ def create
     @comment = @commentable.comments.new(comment_params)
 
     if @comment.save
-      CommentsMailer.new_comment(@comment, @commentable.playback).deliver_now
+      if user_signed_in?
+        CommentsMailer.new_comment(@comment, @commentable.playback).deliver_now
+      end
+
       redirect_to(
         playback_path(@commentable.playback, anchor: @commentable.anchor),
         notice: 'Comment was successfully created.'
@@ -19,6 +22,18 @@ def create
     end
   end
 
+  def set_helpful
+    @playback = Playback.find(params[:commentable_id])
+
+    @comment = Comment.find(params[:comment])
+    @comment.update(helpful: params[:help])
+
+    redirect_to(
+      playback_path(@playback),
+      notice: 'Thanks for your feedback!'
+    )
+  end
+
   private
 
     def set_commentable
@@ -28,6 +43,6 @@ def set_commentable
     end
 
     def comment_params
-      params.require(:comment).permit(:author, :body, :done, :step_id)
+      params.require(:comment).permit(:author, :body, :done, :step_id, :helpful)
     end
 end

app/controllers/playbacks_controller.rb

@@ -1,5 +1,5 @@
 class PlaybacksController < ApplicationController
-  before_action :authenticate_user!, except: %i[show pending]
+  before_action :authenticate_user!, except: %i[show]
   before_action :set_playback, only: %i[show edit update destroy]
 
   def pending

app/models/comment.rb

@@ -1,7 +1,14 @@
 class Comment < ApplicationRecord
+  HELPFUL = {
+    'No' => -1,
+    'Kind of' => 0,
+    'Yes' => 1
+  }.freeze
+
   belongs_to :commentable, polymorphic: true, touch: true
 
   validates :author, :body, presence: true
+  validates :helpful, inclusion: { in: HELPFUL }, on: :update
 
   before_validation :mark_step_as_done!
   after_create :update_comments_count!

app/views/comments/new.html.erb

@@ -31,7 +31,7 @@
   </div>
 
   <div class="notice mb30">
-    <strong>Please note:</strong> Subject to availability, advisors aim to respond to support requests within 1-2 working days, and that messages posted here are only visible to CAST and anyone who has been given it's unique link. If you have additional questions please contact <%= mail_to 'hello@wearecast.org.uk', 'hello@wearecast.org.uk'%>.
+    <strong>Please note:</strong> Subject to availability, advisors aim to respond to support requests within 1-2 weeks, and that messages posted here are only visible to CAST and anyone who has been given it's unique link. If you have additional questions please contact <%= mail_to 'hello@wearecast.org.uk', 'hello@wearecast.org.uk'%>.
   </div>
 
   <%= simple_form_for @comment, url: new_comment_path(@commentable) do |f| %>

app/views/comments_mailer/new_comment.html.erb

@@ -10,4 +10,11 @@
 
 <h3><%= link_to 'Reply here', new_comment_url(@comment.commentable) %></h3>
 
+<div style="margin-bottom: 20px;">
+  <p style="margin: 5px 0 20px; display: inline;">Was this helpful?</p>
+  <%= link_to 'Yes', set_helpful_url(@comment.commentable, @comment.id, Comment::HELPFUL['Yes']) %> |
+  <%= link_to 'No', set_helpful_url(@comment.commentable, @comment.id, Comment::HELPFUL['No']) %> |
+  <%= link_to 'Kind of', set_helpful_url(@comment.commentable, @comment.id, Comment::HELPFUL['Kind of']) %>
+</div>
+
 <small>This is an automated email for your records.</small>

config/routes.rb

@@ -10,5 +10,7 @@
 
   post '/webhook/new-response/:id', to: 'webhook#new_response', as: 'webhooks_new_response'
 
+  get '/support/:commentable_id/comments/:comment/:help', to: 'comments#set_helpful', as: 'set_helpful'
+
   root to: 'playbacks#index'
 end

db/migrate/20190218144231_add_helpful_to_comments.rb

@@ -0,0 +1,5 @@
+class AddHelpfulToComments < ActiveRecord::Migration[5.2]
+  def change
+    add_column :comments, :helpful, :integer
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_02_06_170022) do
+ActiveRecord::Schema.define(version: 2019_02_18_144231) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -23,6 +23,7 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "commentable_type"
+    t.integer "helpful"
     t.index ["commentable_id"], name: "index_comments_on_commentable_id"
   end
 

test/factories/comments.rb

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :comment do
+    id { 1 }
     commentable { Section.new(id: 1, name: 'State your problem') }
     author { 'John Doe' }
     body { 'What should I work on next?' }

test/factories/playbacks.rb

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :playback do
+    id { 1 }
     organisation_name { 'ACME' }
     email { 'test@wearecast.co.uk' }
   end

test/factories/sections.rb

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :section do
     name { 'Discover' }
+    playback_id { 1 }
   end
 end

test/mailers/previews/comments_mailer_preview.rb

@@ -2,6 +2,7 @@
 class CommentsMailerPreview < ActionMailer::Preview
   def new_comment
     comment = Comment.new(
+      id: 1,
       author: 'John Doe',
       body: '<div>Is <a href="#">this</a> a good resource</div>',
       commentable: Step.new(id: 1, name: 'State your problem')

test/system/comments_test.rb

@@ -4,14 +4,16 @@ class CommentsTest < ApplicationSystemTestCase
 
   setup do
     @user = create(:user)
-    
+    @playback = create(:playback)
+    @section = create(:section)
   end
 
-  test 'send email when comment created' do 
+  test 'send email when comment created if signed in' do 
     visit new_playback_path
     sign_in
 
     fill_in(:playback_organisation_name, with: 'ACME')
+    fill_in(:playback_email, with: 'test@wearecast.co.uk')
 
     click_link('Add Section')
     fill_in('Section name', with: 'Discover')
@@ -29,5 +31,18 @@ class CommentsTest < ApplicationSystemTestCase
 
   end
 
+  test 'no email when comment created if not signed in' do
+    visit playback_path(@playback)
+
+    click_on 'Ask for help'
+
+    fill_in('Author', with: 'Author')
+    find('trix-editor').click.set('Test')
+
+    click_on 'Comment'
+
+    assert(ActionMailer::Base.deliveries.count == 0)
+  end 
+
 
 end

test/system/create_playback_test.rb

@@ -10,6 +10,7 @@ class CreatePlaybackTest < ApplicationSystemTestCase
     sign_in
 
     fill_in(:playback_organisation_name, with: 'ACME')
+    fill_in(:playback_email, with: 'test@wearecast.co.uk')
 
     click_link('Add Section')
     fill_in('Section name', with: 'Discover')