From 467b5ffdbe2fc0d053cd6efcca2e9fe72a429c9e Mon Sep 17 00:00:00 2001 From: Michelle Steele Date: Tue, 10 Mar 2026 18:04:44 +0000 Subject: [PATCH 1/2] Fix ThreeMonthEmailService query to check member selection for chaser emails and pass spec --- app/mailers/member_mailer.rb | 2 +- app/services/three_month_email_service.rb | 30 +++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/mailers/member_mailer.rb b/app/mailers/member_mailer.rb index eca12b3b4..fa1c8425f 100644 --- a/app/mailers/member_mailer.rb +++ b/app/mailers/member_mailer.rb @@ -2,7 +2,7 @@ class MemberMailer < ApplicationMailer include EmailHeaderHelper include EmailDelivery - after_deliver :log_sent_mail , only: [:chaser] + after_deliver :log_sent_email, only: [:chaser] def chaser @member = params[:member] diff --git a/app/services/three_month_email_service.rb b/app/services/three_month_email_service.rb index 50ee4ecba..66fe388aa 100644 --- a/app/services/three_month_email_service.rb +++ b/app/services/three_month_email_service.rb @@ -2,23 +2,23 @@ class ThreeMonthEmailService def self.send_chaser -recent_attendees = Member.joins(:workshop_invitations) - .merge( - WorkshopInvitation.attended.to_students - .joins(:workshop) - .where('workshops.date_and_time >= ?', 3.months.ago.beginning_of_day) - ) - .distinct + cutoff = 3.months.ago.beginning_of_day + recent_attendee_ids = WorkshopInvitation.to_students + .attended + .joins(:workshop) + .where('workshops.date_and_time >= ?', cutoff) + .select(:member_id) -members = Member.not_banned - .accepted_toc - .joins(:groups) - .merge(Group.students) - .left_joins(:member_email_deliveries) - .where(member_email_deliveries: { id: nil }) - .where.not(id: recent_attendees.select(:id)) - .distinct + members = Member.not_banned + .accepted_toc + .joins(:groups) + .merge(Group.students) + .left_joins(:member_email_deliveries) + .where(member_email_deliveries: { id: nil }) + .where.not(id: recent_attendee_ids) + .distinct return if members.empty? + members.find_each do |member| MemberMailer.with(member: member).chaser.deliver_later end From aa196370fa3c20761cfc95d0e3b771520867929e Mon Sep 17 00:00:00 2001 From: Michelle Steele Date: Tue, 10 Mar 2026 18:34:47 +0000 Subject: [PATCH 2/2] Add more chaser scenarios to the member selection --- .../three_month_email_service_spec.rb | 164 +++++++++++++++--- 1 file changed, 144 insertions(+), 20 deletions(-) diff --git a/spec/services/three_month_email_service_spec.rb b/spec/services/three_month_email_service_spec.rb index 3d2b9b6b7..7eb209cda 100644 --- a/spec/services/three_month_email_service_spec.rb +++ b/spec/services/three_month_email_service_spec.rb @@ -2,42 +2,166 @@ describe "#send_chaser" do subject(:call) { described_class.send_chaser } - let!(:eligible_member) { Fabricate(:member) } - let!(:emailed_member) { Fabricate(:member) } - let!(:old_invite_member) { Fabricate(:member) } + let(:chapter) { Fabricate(:chapter) } + let(:students_group) { Fabricate(:group, name: "Students", chapter: chapter) } + let(:coaches_group) { Fabricate(:group, name: "Coaches", chapter: chapter) } - before do - # Eligible: recent invite, no email delivery + let!(:eligible_student) do + member = Fabricate(:member) + Fabricate(:subscription, member: member, group: students_group) + member + end + + let!(:already_emailed_student) do + member = Fabricate(:member) + Fabricate(:subscription, member: member, group: students_group) + Fabricate(:member_email_delivery, member: member) + member + end + + let!(:student_with_recent_attendance) do + member = Fabricate(:member) + Fabricate(:subscription, member: member, group: students_group) Fabricate( :workshop_invitation, - member: eligible_member, - created_at: 3.months.ago, - attended: false + member: member, + workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 1.month.ago), + role: "Student", + attended: true ) + member + end - # Already emailed: recent invite, but has email delivery + let!(:student_with_old_attendance) do + member = Fabricate(:member) + Fabricate(:subscription, member: member, group: students_group) Fabricate( :workshop_invitation, - member: emailed_member, - created_at: 2.months.ago + member: member, + workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 4.months.ago), + role: "Student", + attended: true ) + member + end + + let!(:coach_member) do + member = Fabricate(:member) + Fabricate(:subscription, member: member, group: coaches_group) + member + end + + let!(:unsubscribed_member) { Fabricate(:member) } + let!(:banned_student) do + member = Fabricate(:banned_member) + Fabricate(:subscription, member: member, group: students_group) + member + end + let!(:student_without_toc) do + member = Fabricate(:member_without_toc) + Fabricate(:subscription, member: member, group: students_group) + member + end + + it "emails only students who have not attended in the last 3 months and were not emailed before" do + expect { perform_enqueued_jobs { call } }.to change(MemberEmailDelivery, :count).by(2) + + expect(MemberEmailDelivery.where(member: eligible_student)).to exist + expect(MemberEmailDelivery.where(member: student_with_old_attendance)).to exist + end + + it "does not email a member already present in member_email_deliveries" do + expect { perform_enqueued_jobs { call } } + .not_to change { MemberEmailDelivery.where(member: already_emailed_student).count } + end + + it "does not email students with a recent attended workshop" do + expect { perform_enqueued_jobs { call } } + .not_to change { MemberEmailDelivery.where(member: student_with_recent_attendance).count } + end + + it "does not email members without a student subscription" do + perform_enqueued_jobs { call } + + expect(MemberEmailDelivery.where(member: coach_member)).to be_empty + expect(MemberEmailDelivery.where(member: unsubscribed_member)).to be_empty + end + + it "does not email banned students or students without accepted terms" do + perform_enqueued_jobs { call } + + expect(MemberEmailDelivery.where(member: banned_student)).to be_empty + expect(MemberEmailDelivery.where(member: student_without_toc)).to be_empty + end + + it "sends only one chaser for a member with multiple student subscriptions" do + member = Fabricate(:member) + other_chapter = Fabricate(:chapter) + other_students_group = Fabricate(:group, name: "Students", chapter: other_chapter) + Fabricate(:subscription, member: member, group: students_group) + Fabricate(:subscription, member: member, group: other_students_group) + + perform_enqueued_jobs { call } + + expect(MemberEmailDelivery.where(member: member).count).to eq(1) + end + + it "sends only one chaser for a member with multiple qualifying old attendances" do + member = Fabricate(:member) + Fabricate(:subscription, member: member, group: students_group) Fabricate( - :member_email_delivery, - member: emailed_member + :workshop_invitation, + member: member, + workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 5.months.ago), + role: "Student", + attended: true ) + Fabricate( + :workshop_invitation, + member: member, + workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 4.months.ago), + role: "Student", + attended: true + ) + + perform_enqueued_jobs { call } - # Old invite: more than 3 months ago + expect(MemberEmailDelivery.where(member: member).count).to eq(1) + end + + it "does not send chasers when there are no eligible members" do + Fabricate( + :workshop_invitation, + member: eligible_student, + workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 1.month.ago), + role: "Student", + attended: true + ) Fabricate( :workshop_invitation, - member: old_invite_member, - created_at: 4.months.ago + member: student_with_old_attendance, + workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 1.month.ago), + role: "Student", + attended: true ) + + expect { perform_enqueued_jobs { call } }.not_to change(MemberEmailDelivery, :count) end - it "enqueues chaser emails only for eligible members" do - expect { - call - }.to have_enqueued_mail(MemberMailer, :chaser).once + it "emails a student member who has recent attendance only as a coach" do + member = Fabricate(:member) + Fabricate(:subscription, member: member, group: students_group) + Fabricate( + :workshop_invitation, + member: member, + workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 1.month.ago), + role: "Coach", + attended: true + ) + + perform_enqueued_jobs { call } + + expect(MemberEmailDelivery.where(member: member)).to exist end end end