hackathon_manager 0.5.11 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec278de1d0233b9b79cc1eae32b6b77bbcbde698
-  data.tar.gz: e28e82e40163c942d4c876647fcee18ffa54b0d7
+  metadata.gz: 7b2b4e0940990bd9d79779dc11df2261481e953a
+  data.tar.gz: 231e89a71e42dd25ed692d41c2bf285dbee54962
 SHA512:
-  metadata.gz: 698c9f2095e0148ab36d8d2c0e93888c4318e252d2529e5c077d5342e11b64503faa5d64ec2a782dfa4725ffa6af249f9e31b2da3e15a7e3304b1493aabcd840
-  data.tar.gz: c58b013667063273e696bee1cad99f8d7f75c205ac814b2ac55564b82849066b79d25b9f586252fd5f39f0c18696082e24c5d8db304142f38a0308764a935765
+  metadata.gz: eeb9342f9cd545f46932c0330154888d8cc549f26199b19d5c96f31a47d4503ba801aadf4913d6e2908ff947841ddb39158306aa0eda9b3dca2bdb572774542a
+  data.tar.gz: c17ae7672d988fe083cce647d3c1e4e0edb4005961a433ab803d0d7f9af8f6adfdca2a260a7390a2b432e19a9f6b7d8d6243cc81666180c35425acd999f40bea

data/app/assets/javascripts/hackathon_manager/manage/lib/setupDataTables.js

@@ -72,6 +72,7 @@ var setupDataTables = function() {
       { orderable: true, data: 'id'},
       { orderable: true, data: 'name'},
       { orderable: true, data: 'subject'},
+      { orderable: true, data: 'trigger'},
       { orderable: false, data: 'status'},
       { orderable: true, data: 'delivered_at'}
     ]

data/app/assets/stylesheets/hackathon_manager/general/_main.sass

@@ -4,3 +4,6 @@
 .session-link
   font-weight: bold
   text-transform: uppercase
+
+.no-margin
+  margin: 0

data/app/controllers/manage/messages_controller.rb

@@ -71,7 +71,7 @@ class Manage::MessagesController < Manage::ApplicationController
 
   def message_params
     params.require(:message).permit(
-      :name, :subject, :template, :body, recipients: []
+      :name, :subject, :template, :body, :trigger, recipients: []
     )
   end
 

data/app/datatables/message_datatable.rb

@@ -6,6 +6,7 @@ class MessageDatatable < AjaxDatatablesRails::Base
       id: { source: "Message.id" },
       name: { source: "Message.name" },
       subject: { source: "Message.subject" },
+      trigger: { source: "Message.trigger" },
       delivered_at: { source: "Message.delivered_at", searchable: false }
     }
   end
@@ -19,6 +20,7 @@ class MessageDatatable < AjaxDatatablesRails::Base
         id: record.id,
         name: record.name,
         subject: record.subject,
+        trigger: Message::POSSIBLE_TRIGGERS[record.trigger],
         status: record.status.titleize,
         delivered_at: record.delivered_at.present? ? record.delivered_at.strftime("%B %d, %Y at %I:%M %p") : ''
       }

data/app/models/message.rb

@@ -1,12 +1,12 @@
 class Message < ApplicationRecord
-  validates_presence_of :name, :subject, :recipients, :template
+  validates_presence_of :name, :subject, :template
   validates_presence_of :body, if: :using_default_template?
 
   strip_attributes
 
   POSSIBLE_TEMPLATES = ["default"].freeze
 
-  POSSIBLE_RECIPIENTS = {
+  POSSIBLE_SIMPLE_RECIPIENTS = {
     "all"                              => "Everyone",
     "incomplete"                       => "Incomplete Applications",
     "complete"                         => "Complete Applications",
@@ -19,23 +19,18 @@ class Message < ApplicationRecord
     "checked-in"                       => "Checked-In Attendees",
     "non-checked-in"                   => "Non-Checked-In, Accepted & RSVP'd Applications",
     "non-checked-in-excluding"         => "Non-Checked-In Applications, Excluding Accepted & RSVP'd",
-    "bus-list-cornell-bing"            => "Bus List: Cornell + Binghamton (Confirmed)",
-    "bus-list-buffalo"                 => "Bus List: Buffalo (Confirmed)",
-    "bus-list-albany"                  => "Bus List: Albany (Confirmed)",
-    "bus-list-cornell-bing-eligible"   => "Bus List: Cornell + Binghamton (eligible, not signed up)",
-    "bus-list-buffalo-eligible"        => "Bus List: Buffalo (eligible, not signed up)",
-    "bus-list-albany-eligible"         => "Bus List: Albany (eligible, not signed up)",
-    "bus-list-cornell-bing-applied"    => "Bus List: Cornell + Binghamton (applied/not accepted)",
-    "bus-list-buffalo-applied"         => "Bus List: Buffalo (applied/not accepted)",
-    "bus-list-albany-applied"          => "Bus List: Albany (applied/not accepted)",
-    "school-rit"                       => "Confirmed or accepted: RIT",
-    "school-cornell"                   => "Confirmed or accepted: Cornell",
-    "school-binghamton"                => "Confirmed or accepted: Binghamton",
-    "school-buffalo"                   => "Confirmed or accepted: Buffalo",
-    "school-waterloo"                  => "Confirmed or accepted: Waterloo",
-    "school-toronto"                   => "Confirmed or accepted: Toronto",
-    "school-umd-collegepark"           => "Confirmed or accepted: UMD College Park"
   }.freeze
+
+  POSSIBLE_TRIGGERS = {
+    "questionnaire.pending"        => "Questionnaire Status: Pending Review (new application)",
+    "questionnaire.accepted"       => "Questionnaire Status: Accepted",
+    "questionnaire.waitlist"       => "Questionnaire Status: Waitlisted",
+    "questionnaire.denied"         => "Questionnaire Status: Denied",
+    "questionnaire.late_waitlist"  => "Questionnaire Status: Waitlisted, Late",
+    "questionnaire.rsvp_confirmed" => "Questionnaire Status: RSVP Confirmed",
+    "questionnaire.rsvp_denied"    => "Questionnaire Status: RSVP Denied"
+  }.freeze
+
   serialize :recipients, Array
 
   validates_inclusion_of :template, in: POSSIBLE_TEMPLATES
@@ -45,7 +40,16 @@ class Message < ApplicationRecord
   end
 
   def recipients_list
-    recipients.map { |r| POSSIBLE_RECIPIENTS[r] }.join(', ')
+    labels = recipients.map do |r|
+      if POSSIBLE_SIMPLE_RECIPIENTS.include?(r)
+        POSSIBLE_SIMPLE_RECIPIENTS[r]
+      elsif r =~ /(.*)::(\d*)/
+        MessageRecipientQuery.friendly_name(r)
+      else
+        "(unknown)"
+      end
+    end
+    labels.join(', ')
   end
 
   def delivered?
@@ -68,10 +72,41 @@ class Message < ApplicationRecord
   end
 
   def can_edit?
-    status == "drafted"
+    status == "drafted" || trigger.present?
   end
 
   def using_default_template?
     template == "default"
   end
+
+  def self.possible_recipients
+    # Produce an array like:
+    # ["School: My University", "school::123"]
+    option = ->(query, model) { [MessageRecipientQuery.friendly_name(query, model), query] }
+    bus_list_recipients = BusList.select(:id, :name).map do |bus_list|
+      [
+        option.call("bus-list::#{bus_list.id}", bus_list),
+        option.call("bus-list--eligible::#{bus_list.id}", bus_list),
+        option.call("bus-list--applied::#{bus_list.id}", bus_list)
+      ]
+    end
+    bus_list_recipients.flatten!(1) # Required since we have multiple options for each bus list
+
+    school_recipients = School.select(:id, :name).map do |school|
+      option.call("school::#{school.id}", school)
+    end
+    # No flatten needed here since each map returns a single option
+
+    # Combine all recipients. push(*recipients) is the most efficient,
+    # as it doesn't create a new array each time (concat() does)
+    recipients = POSSIBLE_SIMPLE_RECIPIENTS.invert.to_a
+    recipients.push(*bus_list_recipients)
+    recipients.push(*school_recipients)
+    recipients
+  end
+
+  def self.queue_for_trigger(trigger, user_id)
+    messages_to_queue = Message.where(trigger: trigger)
+    messages_to_queue.map { |message| Mailer.delay.bulk_message_email(message.id, user_id) }
+  end
 end

data/app/models/message_recipient_query.rb

@@ -0,0 +1,61 @@
+class MessageRecipientQuery
+  attr_accessor :query
+  attr_accessor :type
+  attr_accessor :id
+  attr_accessor :model
+
+  def initialize(query, type, id, model)
+    @query = query
+    @type = type
+    @id = id
+    @model = model
+  end
+
+  def self.parse(query, model = nil)
+    # Format:
+    # model::ID
+    # model--modifier::ID
+    match = query.match(/(.*)::(\d*)/)
+    type = match[1]
+    id = match[2]
+
+    # Find the backing database model, ensuring the given ID exists for that model.
+    model_name = nil
+    case type
+    when "bus-list", "bus-list--applied", "bus-list--eligible"
+      model ||= BusList.find_by_id(id)
+      model_name = "Bus List"
+    when "school"
+      model ||= School.find_by_id(id)
+      model_name = "School"
+    else
+      raise "Unknown recipient query type: #{type.inspect} (in message recipient query: #{query.inspect}"
+    end
+    raise "Could not find #{model_name} with ID #{id.inspect} (in message recipient query: #{query.inspect}" if model.blank?
+
+    MessageRecipientQuery.new(
+      query,
+      type,
+      id,
+      model
+    )
+  end
+
+  def self.friendly_name(query, model = nil)
+    recipient_query = parse(query, model)
+    model = recipient_query.model
+
+    case recipient_query.type
+    when "bus-list"
+      "Bus List: #{model.name} (signed up for bus)"
+    when "bus-list--eligible"
+      "Bus List: #{model.name} (eligible, not signed up for bus)"
+    when "bus-list--applied"
+      "Bus List: #{model.name} (applied/not accepted)"
+    when "school"
+      "Confirmed or Accepted: #{model.name}"
+    else
+      raise "Unknown recipient query type: #{recipient_query.type.inspect} (in message recipient query: #{r.inspect}"
+    end
+  end
+end

data/app/models/questionnaire.rb

@@ -2,6 +2,8 @@ class Questionnaire < ApplicationRecord
   include ActiveModel::Dirty
 
   before_validation :consolidate_school_names
+  after_create :queue_triggered_email_create
+  after_update :queue_triggered_email_update
   after_save :update_school_questionnaire_count
   after_destroy :update_school_questionnaire_count
 
@@ -181,4 +183,12 @@ class Questionnaire < ApplicationRecord
       School.increment_counter(:questionnaire_count, school_id)
     end
   end
+
+  def queue_triggered_email_update
+    Message.queue_for_trigger("questionnaire.#{acc_status}", id) if saved_change_to_acc_status?
+  end
+
+  def queue_triggered_email_create
+    Message.queue_for_trigger("questionnaire.#{acc_status}", id)
+  end
 end

data/app/views/application/_triggered_email_summary.html.haml

@@ -0,0 +1,27 @@
+%h3.no-margin Triggered Email Overview
+%p
+  Recipient updates that match a given event will be sent the corresponding email(s) automatically.
+  %br
+  For example, when a user moves from the "Accepted" to "RSVP Confirmed" state, the user will be sent an email for the "RSVP Confirmed" event.
+%p Hard-coded emails are those managed in the source code repository, and cannot be disabled.
+
+%table.table
+  %thead
+    %tr
+      %th Trigger Event
+      %th Hard-coded Email
+      %th Triggered Emails
+  %tbody
+    - Message::POSSIBLE_TRIGGERS.keys.each do |trigger|
+      %tr
+        %td= Message::POSSIBLE_TRIGGERS[trigger]
+        - messages = Message.where(trigger: trigger).all
+        %td
+          = ['questionnaire.pending', 'questionnaire.accepted', 'questionnaire.denied', 'questionnaire.rsvp_confirmed'].include?(trigger) ? '<strong>Yes</strong>'.html_safe : 'No'
+        %td
+          - if messages.present?
+            %ul.no-margin
+              - messages.each do |message|
+                %li= link_to(message.name, manage_message_path(message))
+          - else
+            None

data/app/views/manage/bus_lists/_form.html.haml

@@ -1,14 +1,15 @@
-= simple_form_for(@bus_list, url: url_for(action: @bus_list.new_record? ? "create" : "update", controller: "bus_lists")) do |f|
-  = f.error_notification
+.form-container
+  = simple_form_for(@bus_list, url: url_for(action: @bus_list.new_record? ? "create" : "update", controller: "bus_lists")) do |f|
+    = f.error_notification
 
-  .form-inputs
-    = f.input :name
-    = f.input :capacity
-    = f.input :needs_bus_captain
-    = f.input :notes, input_html: { rows: 10 }
-    %p
-      %small
-        %em Notes support Markdown and HTML.
+    .form-inputs
+      = f.input :name
+      = f.input :capacity
+      = f.input :needs_bus_captain
+      = f.input :notes, input_html: { rows: 10 }
+      %p
+        %small
+          %em Notes support Markdown and HTML.
 
-  .form-actions
-    = f.button :submit
+    .form-actions
+      = f.button :submit

data/app/views/manage/messages/_form.html.haml

@@ -1,15 +1,17 @@
-= simple_form_for @message, url: url_for(action: @message.new_record? ? "create" : "update", controller: "messages") do |f|
-  = f.error_notification
+.form-container
+  = simple_form_for @message, url: url_for(action: @message.new_record? ? "create" : "update", controller: "messages") do |f|
+    = f.error_notification
 
-  .form-inputs
-    = f.input :name
-    = f.input :subject, hint: "All emails are from <pre>#{html_escape(Rails.configuration.hackathon['email_from'])}</pre>".html_safe
-    = f.input :template, as: :select, collection: Message::POSSIBLE_TEMPLATES.map { |x| [x.titleize, x] }, include_blank: false
-    = f.input :recipients, as: :select, collection: Message::POSSIBLE_RECIPIENTS.invert, input_html: { class: "selectize", multiple: true }
-    = f.input :body, input_html: { rows: 10 }
-    %p
-      %small
-        %em Markdown and HTML supported.
+    .form-inputs
+      = f.input :name
+      = f.input :subject, hint: "All emails are from <pre>#{html_escape(Rails.configuration.hackathon['email_from'])}</pre>".html_safe
+      = f.input :template, as: :select, collection: Message::POSSIBLE_TEMPLATES.map { |x| [x.titleize, x] }, include_blank: false
+      - if @message.status == "drafted"
+        = f.input :recipients, as: :select, collection: Message.possible_recipients, input_html: { class: "selectize", multiple: true,  }, hint: "Sent manually, in bulk", placeholder: "Type to search by school or type..."
+      - else
+        = f.input :recipients, as: :select, collection: Message.possible_recipients, input_html: { class: "selectize", multiple: true }, hint: "Cannot be edited once a message has been delivered", disabled: true
+      = f.input :trigger, as: :select, collection: Message::POSSIBLE_TRIGGERS.invert, include_blank: "(no automatic trigger)", hint: "Sent automatically, to an individual applicant"
+      = f.input :body, input_html: { rows: 10 }, hint: "Supports markdown and HTML"
 
-  .form-actions
-    = f.button :submit
+    .form-actions
+      = f.button :submit

data/app/views/manage/messages/edit.html.haml

@@ -1,5 +1,6 @@
 %section.section.manage
-  %h1.section-title= title "Editing Message"
+  .form-container
+    %h1.section-title= title "Editing Message"
 
   = render 'form'
 

data/app/views/manage/messages/index.html.haml

@@ -8,11 +8,16 @@
         %th ID
         %th Name
         %th Subject
-        %th Status
-        %th Delivered
+        %th Trigger
+        %th Bulk Status
+        %th Bulk Delivered
     %tbody
 
   %br
 
   - unless current_user.admin_limited_access
-    = btn_link_to 'New Message', new_manage_message_path
+    %p= btn_link_to 'New Message', new_manage_message_path
+
+  %br
+
+  = render 'triggered_email_summary'

data/app/views/manage/messages/show.html.haml

@@ -14,34 +14,47 @@
     = @message.template.titleize
   %p
     %b Recipients:
-    = @message.recipients_list
+    = @message.recipients_list.presence || "(none)"
     %br
     %small
-      %em #{recipient_count} currently match this query.
+      %em Sent manually, in bulk
+    - if @message.recipients.present?
+      %br
+      %small
+        %em #{recipient_count} currently match this query
+  %p
+    %b Trigger:
+    = Message::POSSIBLE_TRIGGERS[@message.trigger] || "(no automatic trigger)"
+    %br
+    %small
+      %em Sent automatically, to an individual applicant
   %p
     %b Preview:
     = link_to "Open full preview »".html_safe, preview_manage_message_path
 
   %iframe.email-preview{src: preview_manage_message_path(@message)}
 
-  %p
-    %b
-      Status:
-      = @message.status.titleize
-  %p
-    %b Queued At:
-    = @message.queued_at || "(n/a)"
-  %p
-    %b Started At:
-    = @message.started_at || "(n/a)"
-  %p
-    %b Delivered At:
-    = @message.delivered_at || "(n/a)"
+  - if @message.recipients_list.present?
+    %fieldset
+      %legend Bulk delivery details
+      %p
+        %b
+          Status:
+          = @message.status.titleize
+      %p
+        %b Queued At:
+        = @message.queued_at || "(n/a)"
+      %p
+        %b Started At:
+        = @message.started_at || "(n/a)"
+      %p
+        %b Delivered At:
+        = @message.delivered_at || "(n/a)"
 
   %hr
 
   - unless current_user.admin_limited_access
-    - if @message.status == "drafted"
+    - if @message.status == "drafted" && @message.recipients_list.present?
       = btn_link_to 'Deliver', deliver_manage_message_path(@message), method: :patch, data: { confirm: "Are you sure? The message \"#{@message.name}\" will be sent to #{recipient_count}." }
       \|
     - if @message.can_edit?

data/app/views/manage/questionnaires/index.html.haml

@@ -25,9 +25,20 @@
 
   - unless current_user.admin_limited_access?
     %br
-    = btn_link_to 'New Questionnaire', new_manage_questionnaire_path
+    .container.container-half
+      = btn_link_to 'New Questionnaire', new_manage_questionnaire_path
 
-    %h4 Bulk Action:
-    = simple_form_for Questionnaire.new, url: bulk_apply_manage_questionnaires_path, html: { data: { bulk_row_edit: true } } do |f|
-      = f.input :acc_status, as: :select, collection: Questionnaire::POSSIBLE_ACC_STATUS.invert, include_blank: false, label: "Acceptance Status:", input_html: { data: { bulk_row_edit: true } }
-      = f.button :submit, value: "Update Status", data: { bulk_row_edit: true }
+    .container.container-half
+
+    .container.container-half
+      %fieldset
+        %legend Bulk Action
+        = simple_form_for Questionnaire.new, url: bulk_apply_manage_questionnaires_path, html: { data: { bulk_row_edit: true } } do |f|
+          = f.input :acc_status, as: :select, collection: Questionnaire::POSSIBLE_ACC_STATUS.invert, include_blank: false, label: "Acceptance Status:", input_html: { data: { bulk_row_edit: true } }, hint: "Updating this status may trigger an automatic email to each applicant - see below for details."
+          = f.button :submit, value: "Update Status", data: { bulk_row_edit: true }
+
+  %br
+  %br
+  %br
+
+  = render 'triggered_email_summary'

data/app/views/manage/questionnaires/show.html.haml

@@ -51,7 +51,7 @@
     - unless current_user.admin_limited_access?
       %hr
       = simple_form_for @questionnaire, url: url_for(action: "update_acc_status", controller: "questionnaires") do |f|
-        = f.input :acc_status, as: :select, collection: Questionnaire::POSSIBLE_ACC_STATUS.invert, include_blank: false, label: "Acceptance Status:"
+        = f.input :acc_status, as: :select, collection: Questionnaire::POSSIBLE_ACC_STATUS.invert, include_blank: false, label: "Acceptance Status:", hint: "Updating this status may trigger an automatic email to the applicant - see #{link_to('messages', manage_messages_path)} for details.".html_safe
         = f.button :submit, value: "Update Status"
 
     %hr

data/app/workers/bulk_message_worker.rb

@@ -18,13 +18,13 @@ class BulkMessageWorker
   def self.build_recipients(recipient_types)
     recipients = Set.new
     recipient_types.each do |type|
-      recipients += recipients_query(type)
+      recipients += user_ids(type)
     end
     recipients
   end
 
   # rubocop:disable CyclomaticComplexity
-  def self.recipients_query(type)
+  def self.user_ids(type)
     case type
     when "all"
       User.where(admin: false).pluck(:id)
@@ -50,38 +50,32 @@ class BulkMessageWorker
       Questionnaire.where("(acc_status = 'accepted' OR acc_status = 'rsvp_confirmed' OR acc_status = 'rsvp_denied') AND checked_in_at IS NULL").pluck(:user_id)
     when "non-checked-in-excluding"
       Questionnaire.where("acc_status != 'accepted' AND acc_status != 'rsvp_confirmed' AND acc_status != 'rsvp_denied' AND checked_in_at IS NULL").pluck(:user_id)
-    when "bus-list-cornell-bing"
-      BusList.find(1).passengers.pluck(:user_id)
-    when "bus-list-buffalo"
-      BusList.find(2).passengers.pluck(:user_id)
-    when "bus-list-albany"
-      BusList.find(3).passengers.pluck(:user_id)
-    when "bus-list-cornell-bing-eligible"
-      Questionnaire.joins(:school).where("(schools.bus_list_id = 1 AND riding_bus != 1) AND (acc_status = 'accepted' OR acc_status = 'rsvp_confirmed')").pluck(:user_id)
-    when "bus-list-buffalo-eligible"
-      Questionnaire.joins(:school).where("(schools.bus_list_id = 2 AND riding_bus != 1) AND (acc_status = 'accepted' OR acc_status = 'rsvp_confirmed')").pluck(:user_id)
-    when "bus-list-albany-eligible"
-      Questionnaire.joins(:school).where("(schools.bus_list_id = 3 AND riding_bus != 1) AND (acc_status = 'accepted' OR acc_status = 'rsvp_confirmed')").pluck(:user_id)
-    when "bus-list-cornell-bing-applied"
-      Questionnaire.joins(:school).where("(schools.bus_list_id = 1) AND (acc_status != 'accepted' AND acc_status != 'rsvp_confirmed' AND acc_status != 'rsvp_denied')").pluck(:user_id)
-    when "bus-list-buffalo-applied"
-      Questionnaire.joins(:school).where("(schools.bus_list_id = 2) AND (acc_status != 'accepted' AND acc_status != 'rsvp_confirmed' AND acc_status != 'rsvp_denied')").pluck(:user_id)
-    when "bus-list-albany-applied"
-      Questionnaire.joins(:school).where("(schools.bus_list_id = 3) AND (acc_status != 'accepted' AND acc_status != 'rsvp_confirmed' AND acc_status != 'rsvp_denied')").pluck(:user_id)
-    when "school-rit"
-      Questionnaire.where("school_id = 2304 AND (acc_status = \"rsvp_confirmed\" OR acc_status = \"accepted\")").pluck(:user_id)
-    when "school-cornell"
-      Questionnaire.where("school_id = 2164 AND (acc_status = \"rsvp_confirmed\" OR acc_status = \"accepted\")").pluck(:user_id)
-    when "school-binghamton"
-      Questionnaire.where("school_id = 5526 AND (acc_status = \"rsvp_confirmed\" OR acc_status = \"accepted\")").pluck(:user_id)
-    when "school-buffalo"
-      Questionnaire.where("school_id = 2345 AND (acc_status = \"rsvp_confirmed\" OR acc_status = \"accepted\")").pluck(:user_id)
-    when "school-waterloo"
-      Questionnaire.where("school_id = 5580 AND (acc_status = \"rsvp_confirmed\" OR acc_status = \"accepted\")").pluck(:user_id)
-    when "school-toronto"
-      Questionnaire.where("school_id = 5539 AND (acc_status = \"rsvp_confirmed\" OR acc_status = \"accepted\")").pluck(:user_id)
-    when "school-umd-collegepark"
-      Questionnaire.where("school_id = 5543 AND (acc_status = \"rsvp_confirmed\" OR acc_status = \"accepted\")").pluck(:user_id)
+    when /(.*)::(\d*)/
+      user_ids_from_query(type)
+    else
+      raise "Unknown recipient type: #{type.inspect}"
+    end
+  end
+  # rubocop:enable CyclomaticComplexity
+
+  def self.user_ids_from_query(type)
+    # Parse the query
+    # See app/models/message_recipient_query.rb for how this works
+    recipient_query = MessageRecipientQuery.parse(type)
+    model = recipient_query.model
+
+    # Build the recipients query
+    case recipient_query.type
+    when "bus-list"
+      model.passengers.pluck(:user_id)
+    when "bus-list--eligible"
+      Questionnaire.joins(:school).where("schools.bus_list_id = ? AND riding_bus != 1 AND (acc_status = 'accepted' OR acc_status = 'rsvp_confirmed')", model.id).pluck(:user_id)
+    when "bus-list--applied"
+      Questionnaire.joins(:school).where("schools.bus_list_id = ? AND (acc_status != 'accepted' AND acc_status != 'rsvp_confirmed' AND acc_status != 'rsvp_denied')", model.id).pluck(:user_id)
+    when "school"
+      Questionnaire.where("school_id = ? AND (acc_status = 'rsvp_confirmed' OR acc_status = 'accepted')", model.id).pluck(:user_id)
+    else
+      raise "Unknown recipient query type: #{recipient_query.type.inspect} (in message recipient query: #{type.inspect}"
     end
   end
 end

data/db/migrate/20180108231420_add_trigger_to_message.rb

@@ -0,0 +1,5 @@
+class AddTriggerToMessage < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :trigger, :string
+  end
+end

data/db/migrate/20180118035548_convert_message_recipients_to_recipient_queries.rb

@@ -0,0 +1,36 @@
+class ConvertMessageRecipientsToRecipientQueries < ActiveRecord::Migration[5.1]
+  CONVERSION_MAPPING = {
+    "bus-list-cornell-bing"            => ["bus-list", 1],
+    "bus-list-buffalo"                 => ["bus-list", 2],
+    "bus-list-albany"                  => ["bus-list", 3],
+    "bus-list-cornell-bing-eligible"   => ["bus-list--eligible", 1],
+    "bus-list-buffalo-eligible"        => ["bus-list--eligible", 2],
+    "bus-list-albany-eligible"         => ["bus-list--eligible", 3],
+    "bus-list-cornell-bing-applied"    => ["bus-list--applied", 1],
+    "bus-list-buffalo-applied"         => ["bus-list--applied", 2],
+    "bus-list-albany-applied"          => ["bus-list--applied", 3],
+    "school-rit"                       => ["school", 2304],
+    "school-cornell"                   => ["school", 2164],
+    "school-binghamton"                => ["school", 5526],
+    "school-buffalo"                   => ["school", 2345],
+    "school-waterloo"                  => ["school", 5580],
+    "school-toronto"                   => ["school", 5539],
+    "school-umd-collegepark"           => ["school", 5543]
+  }.freeze
+
+  def up
+    Message.all.each do |message|
+      CONVERSION_MAPPING.to_a.each do |mapping|
+        old = mapping[0]
+        new_type = mapping[1][0]
+        new_id = mapping[1][1]
+
+        index = message.recipients.index(old)
+        next if index.nil?
+
+        message.recipients[index] = "#{new_type}::#{new_id}"
+        message.save!
+      end
+    end
+  end
+end

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.5.11'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -517,6 +517,7 @@ files:
 - app/models/deletable_attachment.rb
 - app/models/fips.rb
 - app/models/message.rb
+- app/models/message_recipient_query.rb
 - app/models/questionnaire.rb
 - app/models/school.rb
 - app/models/school_name_duplicate.rb
@@ -524,6 +525,7 @@ files:
 - app/views/application/_bus_list_info.html.haml
 - app/views/application/_bus_list_stats.html.haml
 - app/views/application/_questionnaire_summary.html.haml
+- app/views/application/_triggered_email_summary.html.haml
 - app/views/bus_lists/show.html.haml
 - app/views/devise/passwords/_form.html.haml
 - app/views/devise/passwords/edit.html.haml
@@ -638,7 +640,9 @@ files:
 - db/migrate/20170107210122_create_school_name_duplicates.rb
 - db/migrate/20170128063020_install_blazer.rb
 - db/migrate/20171220042158_add_why_attend_to_questionnaires.rb
+- db/migrate/20180108231420_add_trigger_to_message.rb
 - db/migrate/20180116022530_set_default_count_on_schools.rb
+- db/migrate/20180118035548_convert_message_recipients_to_recipient_queries.rb
 - db/schools.csv
 - db/seeds.rb
 - lib/hackathon_manager.rb