Skip to content

Commit 8ac979f

Browse files
committed
[fix] Include admins in everyone message recipient
Fixes #145
1 parent a869445 commit 8ac979f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

app/workers/bulk_message_worker.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ class BulkMessageWorker
44
def perform(message_id)
55
message = Message.find(message_id)
66
return unless message.present? && message.status == "queued"
7+
78
message.update_attribute(:started_at, Time.now)
89

910
recipients = self.class.build_recipients(message.recipients)
@@ -27,8 +28,10 @@ def self.build_recipients(recipient_types)
2728
def self.user_ids(type)
2829
case type
2930
when "all"
30-
User.non_admins.pluck(:id)
31+
# Everyone, including admins that completed a questionnaire
32+
User.non_admins.pluck(:id) + Questionnaire.pluck(:user_id)
3133
when "incomplete"
34+
# Incomplete applications, excluding admins that don't have a questionnaire
3235
User.non_admins.pluck(:id) - Questionnaire.pluck(:user_id)
3336
when "complete"
3437
Questionnaire.pluck(:user_id)
@@ -74,6 +77,7 @@ def self.user_ids_from_query(type)
7477
result = Blazer::RunStatement.new.perform(Blazer.data_sources[model.data_source], model.statement)
7578
user_id_column = result.columns.index("user_id")
7679
raise "Blazer query is missing required \"user_id\" column" unless user_id_column.present?
80+
7781
result.rows.map { |row| row[user_id_column] }
7882
else
7983
raise "Unknown recipient query type: #{recipient_query.type.inspect} (in message recipient query: #{type.inspect}"

0 commit comments

Comments
 (0)