From ad9a73328828648bc927f711060f5ed90bfcf947 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 21 Mar 2018 06:32:03 -0700
Subject: Refs #6259 Only send mails to users from same workgroup after
 create/update of shared calendars

---
 app/models/calendar_observer.rb | 4 ++--
 app/models/user.rb              | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/models')

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 31e634415..88c06ba55 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)
-- 
cgit v1.2.3