Fix deliver_later and removed mc dependence in availabilities controller

Author: sreycodes

app/controllers/availabilities_controller.rb

@@ -43,7 +43,7 @@ def load_all_availabilities
 
   def load_all_users
     User.all.map do |u|
-      [u.id, { username: u.username, mc: u.mc }]
+      [u.id, { username: u.username}]
     end.to_h
   end
 

app/controllers/duties_controller.rb

@@ -58,9 +58,7 @@ def drop
         swap_user(params[:user_id].to_i, duty)
       end
 
-      group_duties(duty_ids).each do |grouped_duty|
-        drop_mail(params[:user_id].to_i, grouped_duty)
-      end
+      drop_mail(params[:user_id].to_i, duty_ids)
 
       redirect_to duties_path, notice: 'Duty successfully dropped!'
     else
@@ -69,20 +67,6 @@ def drop
     end
   end
 
-  def group_duties(duty_id_list)
-    duty_list = Duty.find(duty_id_list).map{ |duty| {start_time: duty.time_range.start_time, 
-      :end_time => duty.time_range.end_time, date: duty.date, place: duty.place.name}}
-    result = [duty_list[0]]
-    (1..duty_list.length - 1).each do |i|
-      if (result[result.length - 1][:end_time] <=> duty_list[i][:start_time]) == 0
-        result[result.length - 1][:end_time] = duty_list[i][:end_time]
-      else
-        result.push(duty_list[i])
-      end
-    end
-    result
-  end
-
   private
 
   def owned_duties?(duty_id_params, supposed_user)
@@ -99,11 +83,11 @@ def grabable?(duty_id_params)
     end
   end
 
-  def drop_mail(user_id, drop_duty)
+  def drop_mail(user_id, drop_duty_ids)
     if user_id.zero?
-      GenericMailer.drop_duty(drop_duty, User.pluck(:id))
+      GenericMailer.drop_duty(drop_duty_ids, User.pluck(:id))
     else
-      GenericMailer.drop_duty(drop_duty, user_id)
+      GenericMailer.drop_duty(drop_duty_ids, user_id)
                    .deliver_later
     end
   end

app/mailers/generic_mailer.rb

@@ -3,10 +3,25 @@
 class GenericMailer < ApplicationMailer
   default from: %("NUSSU commIT" <duty@#{ENV['MAILGUN_DOMAIN']}>)
 
-  def drop_duty(duty, user_ids)
-    @duty = duty
-    mail(to: users_with_name(user_ids),
-         subject: generate_drop_duty_subject(duty))
+  def drop_duty(duty_ids, user_ids)
+    group_duties(duty_ids).each do |duty|
+      mail(to: users_with_name(user_ids),
+           subject: generate_drop_duty_subject(duty))
+    end
+  end
+
+  def group_duties(duty_id_list)
+    duty_list = Duty.find(duty_id_list).map{ |duty| {start_time: duty.time_range.start_time, 
+      :end_time => duty.time_range.end_time, date: duty.date, place: duty.place.name}}
+    result = [duty_list[0]]
+    (1..duty_list.length - 1).each do |i|
+      if (result[result.length - 1][:end_time] <=> duty_list[i][:start_time]) == 0
+        result[result.length - 1][:end_time] = duty_list[i][:end_time]
+      else
+        result.push(duty_list[i])
+      end
+    end
+    result
   end
 
   def problem_report(problem)