AO3-6268 Fix All challenge owners/moderators get CCed in "Assignments sent" notification

app/mailers/user_mailer.rb

@@ -178,32 +178,30 @@ def invite_request_declined(user_id, total, reason)
     end
   end
 
-  # TODO: This may be sent to multiple users simultaneously. We need to ensure
-  # each user gets the email for their preferred locale.
-  def collection_notification(collection_id, subject, message)
+  def collection_notification(collection_id, subject, message, email)
     @message = message
     @collection = Collection.find(collection_id)
     mail(
-      to: @collection.get_maintainers_email,
+      to: email,
       subject: "[#{ArchiveConfig.APP_SHORT_NAME}][#{@collection.title}] #{subject}"
     )
   end
 
-  def invalid_signup_notification(collection_id, invalid_signup_ids)
+  def invalid_signup_notification(collection_id, invalid_signup_ids, email)
     @collection = Collection.find(collection_id)
     @invalid_signups = invalid_signup_ids
     mail(
-      to: @collection.get_maintainers_email,
+      to: email,
       subject: "[#{ArchiveConfig.APP_SHORT_NAME}][#{@collection.title}] Invalid sign-ups found"
     )
   end
 
   # This is sent at the end of matching, i.e., after assignments are generated.
   # It is also sent when assignments are regenerated.
-  def potential_match_generation_notification(collection_id)
+  def potential_match_generation_notification(collection_id, email)
     @collection = Collection.find(collection_id)
     mail(
-      to: @collection.get_maintainers_email,
+      to: email,
       subject: "[#{ArchiveConfig.APP_SHORT_NAME}][#{@collection.title}] Potential assignment generation complete"
     )
   end

app/models/challenge_assignment.rb

@@ -374,7 +374,10 @@ def self.delayed_generate(collection_id)
       end
     end
     REDIS_GENERAL.del(progress_key(collection))
-    UserMailer.potential_match_generation_notification(collection.id).deliver_later
+    @maintainers = collection.maintainers_list
+    @maintainers.each do |i|
+      UserMailer.potential_match_generation_notification(collection.id, i.email).deliver_later
+    end 
   end
 
   # go through the request's potential matches in order from best to worst and try and assign

app/models/collection.rb

@@ -334,15 +334,16 @@ def prompt_meme?
     return self.challenge_type == "PromptMeme"
   end
 
-  def get_maintainers_email
-    return self.email if !self.email.blank?
-    return parent.email if parent && !parent.email.blank?
-    "#{self.maintainers.collect(&:user).flatten.uniq.collect(&:email).join(',')}"
+  def maintainers_list
+    @maintainers_list = self.maintainers.collect(&:user).flatten.uniq
   end
 
   def notify_maintainers(subject, message)
-    # send maintainers a notice via email
-    UserMailer.collection_notification(self.id, subject, message).deliver_later
+    @maintainers = self.maintainers_list
+    # loop through maintainers and send each a notice via email
+    @maintainers.each do |i|
+      UserMailer.collection_notification(self.id, subject, message, i.email).deliver_later
+    end
   end
 
   include AsyncWithResque

app/models/potential_match.rb

@@ -90,9 +90,12 @@ def self.generate_in_background(collection_id)
     # check for invalid signups
     PotentialMatch.clear_invalid_signups(collection)
     invalid_signup_ids = collection.signups.select {|s| !s.valid?}.collect(&:id)
-    unless invalid_signup_ids.empty?
+    if invalid_signup_ids.present?
       invalid_signup_ids.each {|sid| REDIS_GENERAL.sadd invalid_signup_key(collection), sid}
-      UserMailer.invalid_signup_notification(collection.id, invalid_signup_ids).deliver_later
+      @maintainers = collection.maintainers_list
+      @maintainers.each do |i|
+        UserMailer.invalid_signup_notification(collection.id, invalid_signup_ids, i.email).deliver_later
+      end
       PotentialMatch.cancel_generation(collection)
     else
 

spec/mailers/user_mailer_spec.rb

@@ -933,7 +933,7 @@
   end
 
   describe "potential_match_generation_notification" do
-    subject(:email) { UserMailer.potential_match_generation_notification(collection.id) }
+    subject(:email) { UserMailer.potential_match_generation_notification(collection.id, "[email protected]") }
 
     let(:collection) { create(:collection) }
 
@@ -966,7 +966,7 @@
   end
 
   describe "invalid_signup_notification" do
-    subject(:email) { UserMailer.invalid_signup_notification(collection.id, [signup.id]) }
+    subject(:email) { UserMailer.invalid_signup_notification(collection.id, [signup.id], "[email protected]") }
 
     let(:collection) { create(:collection) }
     let(:signup) { create(:challenge_signup) }
@@ -998,7 +998,7 @@
   end
 
   describe "collection_notification" do
-    subject(:email) { UserMailer.collection_notification(collection.id, subject_text, message_text) }
+    subject(:email) { UserMailer.collection_notification(collection.id, subject_text, message_text, "[email protected]") }
 
     let(:collection) { create(:collection) }
     let(:subject_text) { Faker::Hipster.sentence }