Hi {{ user_con_profile.name_without_nickname }},
+ ++ You have {{ queue_items.size }} event{% if queue_items.size != 1 %}s{% endif %} + in your signup queue for {{ convention.name }}, but you don't have a {{ ticket_name }} yet. + To be eligible for signup when your queue processes, you'll need to purchase a {{ ticket_name }}. +
+ +...and {{ queue_items.size | minus: 10 }} more
+{% endif %} + ++ + Get your {{ ticket_name }} now + +
+ +We hope to see you at {{ convention.name }}!
diff --git a/config/notifications.json b/config/notifications.json index cc958fd892f..7dad682fce7 100644 --- a/config/notifications.json +++ b/config/notifications.json @@ -70,6 +70,17 @@ } ] }, + { + "key": "signup_queue", + "name": "Signup queue", + "events": [ + { + "key": "no_ticket_reminder", + "name": "Reminder: queue items without ticket", + "destination_description": "Attendee with queue items" + } + ] + }, { "key": "signup_requests", "name": "Event signup requests", diff --git a/db/migrate/20260214190735_add_queue_no_ticket_reminded_at_to_user_con_profiles.rb b/db/migrate/20260214190735_add_queue_no_ticket_reminded_at_to_user_con_profiles.rb new file mode 100644 index 00000000000..b7c6702ed77 --- /dev/null +++ b/db/migrate/20260214190735_add_queue_no_ticket_reminded_at_to_user_con_profiles.rb @@ -0,0 +1,5 @@ +class AddQueueNoTicketRemindedAtToUserConProfiles < ActiveRecord::Migration[8.1] + def change + add_column :user_con_profiles, :queue_no_ticket_reminded_at, :datetime + end +end diff --git a/db/migrate/20260214191626_load_signup_queue_no_ticket_reminder_template.rb b/db/migrate/20260214191626_load_signup_queue_no_ticket_reminder_template.rb new file mode 100644 index 00000000000..53cf8c05a75 --- /dev/null +++ b/db/migrate/20260214191626_load_signup_queue_no_ticket_reminder_template.rb @@ -0,0 +1,25 @@ +class LoadSignupQueueNoTicketReminderTemplate < ActiveRecord::Migration[7.2] + def up + Convention.find_each do |convention| + say "Loading signup_queue/no_ticket_reminder notification template for #{convention.name}" + adapter = CmsContentStorageAdapters::NotificationTemplates.new(convention, CmsContentSet.new(name: "base")) + + item = adapter.all_items_from_disk.find { |i| i.identifier == "signup_queue/no_ticket_reminder" } + next unless item + + attrs = adapter.read_item_attrs(item) + template = convention.notification_templates.find_or_initialize_by(event_key: "signup_queue/no_ticket_reminder") + template.assign_attributes(**attrs) + template.save! + + # Build default destinations if this is a new template + if template.notification_destinations.empty? + SignupQueue::NoTicketReminderNotifier.build_default_destinations(notification_template: template).each(&:save!) + end + end + end + + def down + NotificationTemplate.where(event_key: "signup_queue/no_ticket_reminder").find_each(&:destroy!) + end +end diff --git a/db/structure.sql b/db/structure.sql index 376692c73d0..aa1a5be2942 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2955,7 +2955,8 @@ CREATE TABLE public.user_con_profiles ( allow_sms boolean DEFAULT true NOT NULL, lottery_number integer NOT NULL, ranked_choice_ordering_boost integer, - ranked_choice_fallback_action text DEFAULT 'waitlist'::text NOT NULL + ranked_choice_fallback_action text DEFAULT 'waitlist'::text NOT NULL, + queue_no_ticket_reminded_at timestamp(6) without time zone ); @@ -6135,6 +6136,8 @@ ALTER TABLE ONLY public.cms_files_pages SET search_path TO "$user", public; INSERT INTO "schema_migrations" (version) VALUES +('20260214191626'), +('20260214190735'), ('20251210230514'), ('20251109200750'), ('20251001173716'), diff --git a/test/factories/user_con_profiles.rb b/test/factories/user_con_profiles.rb index 9f58b0ca46c..70189a90db9 100644 --- a/test/factories/user_con_profiles.rb +++ b/test/factories/user_con_profiles.rb @@ -25,6 +25,7 @@ # needs_update :boolean default(FALSE), not null # nickname :string # preferred_contact :string +# queue_no_ticket_reminded_at :datetime # ranked_choice_fallback_action :text default("waitlist"), not null # ranked_choice_ordering_boost :integer # receive_whos_free_emails :boolean default(TRUE), not null diff --git a/test/models/user_con_profile_test.rb b/test/models/user_con_profile_test.rb index 4da15007424..8c07ace1c08 100644 --- a/test/models/user_con_profile_test.rb +++ b/test/models/user_con_profile_test.rb @@ -25,6 +25,7 @@ # needs_update :boolean default(FALSE), not null # nickname :string # preferred_contact :string +# queue_no_ticket_reminded_at :datetime # ranked_choice_fallback_action :text default("waitlist"), not null # ranked_choice_ordering_boost :integer # receive_whos_free_emails :boolean default(TRUE), not null @@ -47,11 +48,11 @@ # fk_rails_... (user_id => users.id) # # rubocop:enable Layout/LineLength, Lint/RedundantCopDisableDirective -require 'test_helper' +require "test_helper" class UserConProfileTest < ActiveSupport::TestCase - describe 'is_team_member' do - it 'finds a user who is a team member for an event' do + describe "is_team_member" do + it "finds a user who is a team member for an event" do team_member = create(:team_member) assert UserConProfile.is_team_member.to_a.include?(team_member.user_con_profile) end @@ -61,7 +62,7 @@ class UserConProfileTest < ActiveSupport::TestCase refute UserConProfile.is_team_member.to_a.include?(user_con_profile) end - it 'scopes correctly by convention' do + it "scopes correctly by convention" do team_member = create(:team_member) other_convention = create(:convention) diff --git a/test/services/remind_queue_without_ticket_test.rb b/test/services/remind_queue_without_ticket_test.rb new file mode 100644 index 00000000000..508dc7c892f --- /dev/null +++ b/test/services/remind_queue_without_ticket_test.rb @@ -0,0 +1,175 @@ +require "test_helper" + +class RemindQueueWithoutTicketTest < ActiveSupport::TestCase + include ActiveJob::TestHelper + let(:convention) do + create( + :convention, + ticket_mode: "required_for_signup", + signup_automation_mode: "ranked_choice", + starts_at: 2.weeks.from_now + ) + end + let(:user_con_profile) { create(:user_con_profile, convention: convention) } + let(:event) { create(:event, convention: convention) } + let(:event_run) { create(:run, event: event) } + let(:signup_round) do + create( + :signup_round, + convention: convention, + automation_action: "execute_ranked_choice", + ranked_choice_order: "asc", + start: 1.week.from_now + ) + end + + before do + # Load CMS content including notification templates + ClearCmsContentService.new(convention: convention).call! + LoadCmsContentSetService.new(convention: convention, content_set_name: "standard").call! + # Ensure signup round exists + signup_round + end + + describe "when user has queue items but no ticket" do + before do + create(:signup_ranked_choice, user_con_profile: user_con_profile, target_run: event_run, state: "pending") + end + + it "sends a reminder" do + assert_difference "ActionMailer::Base.deliveries.size", 1 do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + + it "updates queue_no_ticket_reminded_at timestamp" do + RemindQueueWithoutTicket.new.call! + user_con_profile.reload + assert_not_nil user_con_profile.queue_no_ticket_reminded_at + end + end + + describe "when user has a ticket" do + before do + ticket_type = create(:free_ticket_type, convention: convention) + create(:ticket, user_con_profile: user_con_profile, ticket_type: ticket_type) + create(:signup_ranked_choice, user_con_profile: user_con_profile, target_run: event_run, state: "pending") + end + + it "does not send a reminder" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + end + + describe "when user has no queue items" do + it "does not send a reminder" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + end + + describe "when user was recently reminded" do + before do + user_con_profile.update!(queue_no_ticket_reminded_at: 3.days.ago) + create(:signup_ranked_choice, user_con_profile: user_con_profile, target_run: event_run, state: "pending") + end + + it "does not send a duplicate reminder" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + end + + describe "when user was already reminded" do + before do + user_con_profile.update!(queue_no_ticket_reminded_at: 8.days.ago) + create(:signup_ranked_choice, user_con_profile: user_con_profile, target_run: event_run, state: "pending") + end + + it "does not send another reminder" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + end + + describe "when convention is badgeless" do + let(:badgeless_convention) { create(:convention, ticket_mode: "disabled", starts_at: 1.week.from_now) } + let(:badgeless_user) { create(:user_con_profile, convention: badgeless_convention) } + let(:badgeless_event) { create(:event, convention: badgeless_convention) } + let(:badgeless_run) { create(:run, event: badgeless_event) } + + before do + create(:signup_ranked_choice, user_con_profile: badgeless_user, target_run: badgeless_run, state: "pending") + end + + it "does not send a reminder" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + end + + describe "when convention has already started" do + let(:started_convention) { create(:convention, ticket_mode: "required_for_signup", starts_at: 1.day.ago) } + let(:started_user) { create(:user_con_profile, convention: started_convention) } + let(:started_event) { create(:event, convention: started_convention) } + let(:started_run) { create(:run, event: started_event) } + + before { create(:signup_ranked_choice, user_con_profile: started_user, target_run: started_run, state: "pending") } + + it "does not send a reminder" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + end + + describe "when queue items are waitlisted" do + before do + signup = create(:signup, user_con_profile: user_con_profile, run: event_run, state: "waitlisted") + create( + :signup_ranked_choice, + user_con_profile: user_con_profile, + target_run: event_run, + state: "waitlisted", + result_signup: signup + ) + end + + it "does not send a reminder" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + end + + describe "when signup round is not one week away" do + let(:far_signup_round) do + create( + :signup_round, + convention: convention, + automation_action: "execute_ranked_choice", + ranked_choice_order: "asc", + start: 2.weeks.from_now + ) + end + + before do + # Override the default signup round with one that's 2 weeks away + SignupRound.where(id: signup_round.id).delete_all + far_signup_round + create(:signup_ranked_choice, user_con_profile: user_con_profile, target_run: event_run, state: "pending") + end + + it "does not send a reminder" do + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs { RemindQueueWithoutTicket.new.call! } + end + end + end +end