Merge pull request #398 from af83/6259-calendar-mailer

Refs #6259 Only send mails to users from same workgroup after create/…

3 files changed, 24 insertions, 10 deletions

diff --git a/app/models/calendar_observer.rb b/app/models/calendar_observer.rb
index c81addff4..0414d01d2 100644
--- a/app/models/calendar_observer.rb
+++ b/app/models/calendar_observer.rb
@@ -3,7 +3,7 @@ class CalendarObserver < ActiveRecord::Observer
   def after_update calendar
     return unless calendar.shared
 
-    User.with_organisation.each do |user|
+    User.from_workgroup(calendar.workgroup_id).each do |user|
       MailerJob.perform_later('CalendarMailer', 'updated', [calendar.id, user.id])
     end
   end
@@ -11,7 +11,7 @@ class CalendarObserver < ActiveRecord::Observer
   def after_create calendar
     return unless calendar.shared
 
-    User.with_organisation.each do |user|
+    User.from_workgroup(calendar.workgroup_id).each do |user|
       MailerJob.perform_later('CalendarMailer', 'created', [calendar.id, user.id])
     end
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index d2fdf8f05..eca7ede0c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -30,6 +30,8 @@ class User < ActiveRecord::Base
 
   scope :with_organisation, -> { where.not(organisation_id: nil) }
 
+  scope :from_workgroup, ->(workgroup_id) { joins(:workbenches).where(workbenches: {workgroup_id: workgroup_id}) }
+
 
   # Callback invoked by DeviseCasAuthenticable::Model#authernticate_with_cas_ticket
   def cas_extra_attributes=(extra_attributes)
diff --git a/spec/models/calendar_observer_spec.rb b/spec/models/calendar_observer_spec.rb
index 4fba02bef..dd7034af4 100644
--- a/spec/models/calendar_observer_spec.rb
+++ b/spec/models/calendar_observer_spec.rb
@@ -1,8 +1,13 @@
 require 'rails_helper'
 
 RSpec.describe CalendarObserver, type: :observer do
-  let(:calendar) { create(:calendar, shared: true) }
-  let(:user)     { create(:user, organisation: create(:organisation)) }
+  let(:workgroup_1) { create :workgroup }
+  let(:workgroup_2) { create :workgroup }
+
+  let(:calendar) { create(:calendar, shared: true, workgroup_id: workgroup_1.id) }
+  
+  let(:user_1)     { create(:user, organisation: create(:organisation, workbenches: [create(:workbench, workgroup_id: workgroup_1.id)] )) }
+  let(:user_2)     { create(:user, organisation: create(:organisation, workbenches: [create(:workbench, workgroup_id: workgroup_2.id)] )) }
 
   context 'after_update' do
     it 'should observe calendar updates' do
@@ -12,14 +17,21 @@ RSpec.describe CalendarObserver, type: :observer do
 
     it 'should schedule mailer on calendar update' do
       calendar.name = 'edited_name'
-      expect(MailerJob).to receive(:perform_later).with 'CalendarMailer', 'updated', [calendar.id, user.id]
+      expect(MailerJob).to receive(:perform_later).with 'CalendarMailer', 'updated', [calendar.id, user_1.id]
       calendar.save
     end
 
     it 'should not schedule mailer for none shared calendar on update' do
       calendar = create(:calendar, shared: false)
       calendar.name = 'edited_name'
-      expect(MailerJob).to_not receive(:perform_later).with 'CalendarMailer', 'updated', [calendar.id, user.id]
+      expect(MailerJob).to_not receive(:perform_later).with 'CalendarMailer', 'updated', [calendar.id, user_1.id]
+      calendar.save
+    end
+
+    it "should only send mail to user from the same workgroup" do
+      calendar.name = 'edited_name'
+      expect(MailerJob).to receive(:perform_later).with 'CalendarMailer', 'updated', [calendar.id, user_1.id]
+      expect(MailerJob).to_not receive(:perform_later).with 'CalendarMailer', 'updated', [calendar.id, user_2.id]
       calendar.save
     end
   end
@@ -31,13 +43,13 @@ RSpec.describe CalendarObserver, type: :observer do
     end
 
     it 'should schedule mailer on calendar create' do
-      expect(MailerJob).to receive(:perform_later).with 'CalendarMailer', 'created', [anything, user.id]
-      build(:calendar, shared: true).save
+      expect(MailerJob).to receive(:perform_later).with 'CalendarMailer', 'created', [anything, user_1.id]
+      build(:calendar, shared: true, workgroup_id: workgroup_1.id).save
     end
 
     it 'should not schedule mailer for none shared calendar on create' do
-      expect(MailerJob).to_not receive(:perform_later).with 'CalendarMailer', 'created', [anything, user.id]
-      build(:calendar, shared: false).save
+      expect(MailerJob).to_not receive(:perform_later).with 'CalendarMailer', 'created', [anything, user_1.id]
+      build(:calendar, shared: false, workgroup_id: workgroup_1.id).save
     end
   end
 end