-
-
Notifications
You must be signed in to change notification settings - Fork 199
Email users code #2449
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Email users code #2449
Changes from all commits
97ca9b5
25a4d3b
8e843c9
ee512b6
305a6e6
7199630
086133b
da53ef9
93cca4e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class SendThreeMonthEmailJob < ApplicationJob | ||
| queue_as :default | ||
|
|
||
| def perform | ||
| ThreeMonthEmailService.send_chaser | ||
| end | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| module EmailDelivery | ||
| extend ActiveSupport::Concern | ||
|
|
||
| private | ||
|
|
||
| def log_sent_email | ||
| member = params[:member] | ||
| return unless member | ||
|
|
||
| MemberEmailDelivery.create!( | ||
| member: member, | ||
| subject: mail.subject, | ||
| body: mail.body.to_s, | ||
| to: Array(mail.to), | ||
| cc: Array(mail.cc), | ||
| bcc: Array(mail.bcc) | ||
| ) | ||
| end | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| class MemberEmailDelivery < ApplicationRecord | ||
| belongs_to :member | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| class ThreeMonthEmailService | ||
| def self.send_chaser | ||
| three_month_cutoff = 3.months.ago.beginning_of_day | ||
| one_year_cutoff = 1.year.ago.beginning_of_day | ||
|
|
||
| recent_attendee_ids = WorkshopInvitation.to_students | ||
| .attended | ||
| .joins(:workshop) | ||
| .where('workshops.date_and_time >= ?', three_month_cutoff) | ||
| .select(:member_id) | ||
|
|
||
| past_year_attendee_ids = WorkshopInvitation.to_students | ||
| .attended | ||
| .joins(:workshop) | ||
| .where('workshops.date_and_time >= ?', one_year_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_attendee_ids) | ||
| .where(id: past_year_attendee_ids) | ||
| .distinct | ||
|
|
||
| members.find_each do |member| | ||
| MemberMailer.with(member: member).chaser.deliver_later | ||
| end | ||
| end | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| %h1 Hi #{@member.name}, | ||
|
|
||
| %p | ||
| We’ve noticed you haven’t been to a codebar workshop in a little while, and we just wanted to check in. We know life gets busy, but we’d love to understand how things are going for you and whether there’s anything we can do to make it easier or more valuable for you to join again. | ||
| %p | ||
| If you have a minute, could you please share your thoughts in this short form? 👉 https://forms.gle/tEETvC3zYP9mcLar7 | ||
|
|
||
| %p | ||
| Or, if you’re thinking about coming back soon, we’ve got some great upcoming workshops and events you might like to join 👉https://codebar.io/events/ | ||
|
|
||
| %p | ||
| Your feedback really helps us make codebar more welcoming and useful for everyone in our community 💜 | ||
|
|
||
| %p | ||
| We’d love to see you again soon! | ||
|
|
||
| %p | ||
| #{"-- "} | ||
| %br | ||
| Warmly, | ||
| The Codebar Team | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| namespace :chaser do | ||
| desc "Send emails to users who've not attended in a while" | ||
|
|
||
| task three_months: :environment do | ||
| SendThreeMonthEmailJob.perform_later | ||
| end | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| Fabricator(:member_email_delivery) do | ||
| member(fabricator: :member) | ||
| subject("Chaser") | ||
| body("Lorem ipsum") | ||
| to(["test_email@address"]) | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,4 +115,21 @@ | |
| end.to change { ActionMailer::Base.deliveries.count }.by 1 | ||
| end | ||
| end | ||
|
|
||
| describe "#chaser" do | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice spec. |
||
| it "logs the sent email" do | ||
| expect do | ||
| MemberMailer | ||
| .with(member: member) | ||
| .chaser | ||
| .deliver_now | ||
| end.to change(MemberEmailDelivery, :count).by(1) | ||
|
|
||
| log = MemberEmailDelivery.last! | ||
|
|
||
| expect(log.member).to eq(member) | ||
| expect(log.subject).to eq("It’s been a while, how are you doing? ♥️") | ||
| expect(log.to).to eq([member.email]) | ||
| end | ||
| end | ||
| end | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,215 @@ | ||
| RSpec.describe ThreeMonthEmailService, type: :service do | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe we could add a few scenarios around different types of attendance - like people who had not attended one workshop but then attended the next one in a previous 3 months. Also check we don't send out for banned, or unsubscribed members. |
||
| describe "#send_chaser" do | ||
| subject(:call) { described_class.send_chaser } | ||
|
|
||
| around do |example| | ||
| original_adapter = ActiveJob::Base.queue_adapter | ||
| ActiveJob::Base.queue_adapter = :test | ||
| example.run | ||
| ensure | ||
| ActiveJob::Base.queue_adapter = original_adapter | ||
| end | ||
|
|
||
| let(:chapter) { Fabricate(:chapter) } | ||
| let(:students_group) { Fabricate(:group, name: "Students", chapter: chapter) } | ||
| let(:coaches_group) { Fabricate(:group, name: "Coaches", chapter: chapter) } | ||
|
|
||
| let!(:eligible_student) do | ||
| member = Fabricate(:member) | ||
| Fabricate(:subscription, member: member, group: students_group) | ||
| Fabricate( | ||
| :workshop_invitation, | ||
| member: member, | ||
| workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 6.months.ago), | ||
| role: "Student", | ||
| attended: true | ||
| ) | ||
| 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: member, | ||
| workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 1.month.ago), | ||
| role: "Student", | ||
| attended: true | ||
| ) | ||
| member | ||
| end | ||
|
|
||
| let!(:student_with_old_attendance) do | ||
| member = Fabricate(:member) | ||
| Fabricate(:subscription, member: member, group: students_group) | ||
| Fabricate( | ||
| :workshop_invitation, | ||
| 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 | ||
|
|
||
| let!(:student_with_very_old_attendance) do | ||
| member = Fabricate(:member) | ||
| Fabricate(:subscription, member: member, group: students_group) | ||
| Fabricate( | ||
| :workshop_invitation, | ||
| member: member, | ||
| workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 14.months.ago), | ||
| role: "Student", | ||
| attended: true | ||
| ) | ||
| 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 "does not email students who have not attended in the past year" do | ||
| perform_enqueued_jobs { call } | ||
|
|
||
| expect(MemberEmailDelivery.where(member: student_with_very_old_attendance)).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) | ||
| Fabricate( | ||
| :workshop_invitation, | ||
| member: member, | ||
| workshop: Fabricate(:workshop, chapter: chapter, date_and_time: 6.months.ago), | ||
| role: "Student", | ||
| attended: true | ||
| ) | ||
|
|
||
| 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( | ||
| :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 } | ||
|
|
||
| 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: 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 "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: 6.months.ago), | ||
| role: "Student", | ||
| attended: true | ||
| ) | ||
| 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 | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks as if the multiline text under each
%psection needs indenting for it to display. At least this is how.slimfiles work and I'm assuming.hamlworks the same.As an aside, would be better to move everything to
.html.erbeventually? Much better format, although it's beyond this issue, might be worth discussing in future?