Skip to content
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

ER-891 New module mailer update #986

Merged
merged 3 commits into from
Dec 4, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Test NewModuleMailJob.enqueue with empty ModuleRelease table
peterdavidhamilton committed Dec 1, 2023
commit 56f42e6e9470fe7c001618809a962667c72cb566
2 changes: 1 addition & 1 deletion app/jobs/new_module_mail_job.rb
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ def latest_module
def new_module_published?
return false unless ModuleRelease.exists?

ModuleRelease.ordered.last.module_position < latest_module.position
ModuleRelease.ordered.last&.module_position.to_i < latest_module.position
end

# @param mod [Training::Module]
41 changes: 23 additions & 18 deletions spec/models/data_analysis/user_overview_spec.rb
Original file line number Diff line number Diff line change
@@ -57,40 +57,45 @@
complete_registration_mail_recipients: 1,
start_training_mail_recipients: 1,
continue_training_mail_recipients: 0,
new_module_mail_recipients: 1,
new_module_mail_recipients: 5,
},
]
end

let(:user_1) do
create :user, :registered, module_time_to_completion: { alpha: 1, bravo: 1, charlie: 0 }
let(:user) do
create :user, :registered
end

let(:user_2) do
create :user, :registered, module_time_to_completion: { alpha: 2, bravo: 0, charlie: 1 }
create :user, :registered,
module_time_to_completion: { alpha: 1, bravo: 1, charlie: 0 }
end

let(:release_1) { create(:release) }
let(:user_3) do
create :user, :registered,
module_time_to_completion: { alpha: 2, bravo: 0, charlie: 1 }
end

let(:release) { create(:release) }

before do
# create records for the previously released modules completed by the `new_module_mail_recipients`
create(:module_release, release_id: release_1.id, module_position: 1, name: 'alpha')
create(:module_release, release_id: release_1.id, module_position: 2, name: 'bravo')
create(:module_release, release_id: release_1.id, module_position: 3, name: 'charlie')
create(:module_release, release_id: release.id, module_position: 1, name: 'alpha')
create(:module_release, release_id: release.id, module_position: 2, name: 'bravo')
create(:module_release, release_id: release.id, module_position: 3, name: 'charlie')

# user#1
complete_module(alpha, 1.minute)
complete_module(bravo, 1.minute)
complete_module(charlie, 1.minute)

# create notes for the `with_notes` and `without_notes` users
create(:note, user: user_1)
# user#2 user#3 with notes
create(:note, user: user_2)
create(:note, user: user_3)

# A user who confirmed their email 4 weeks ago will receive the complete registration mail
# user#4 complete registration notification
create(:user, :confirmed, confirmed_at: 4.weeks.ago)
# A registered user who will receive the start training mail
# user#5 start training notification
create(:user, :registered, confirmed_at: 4.weeks.ago)

# This will complete the alpha, bravo and charlie modules for `user`
complete_module(alpha, 1.minute)
complete_module(bravo, 1.minute)
complete_module(charlie, 1.minute)
end

it_behaves_like 'a data export model'