Skip to content

Commit dfc510f

Browse files
committed
Use study group external_id
1 parent 5bd2248 commit dfc510f

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

app/mailers/report_mailer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class ReportMailer < ApplicationMailer
66

77
def report_content
88
@reported_content = params.fetch(:reported_content)
9-
exercise_id = @reported_content.exercise.uuid
9+
exercise_id = @reported_content.submission.study_group&.external_id
1010
base_url = SETTINGS[:exercises_base_url]
1111
@exercise_url = "#{base_url}/#{exercise_id}" if exercise_id && base_url
1212

spec/mailers/report_mailer_spec.rb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
subject(:mail) { described_class.with(reported_content:).report_content }
88

99
context 'when an RfC is reported' do
10-
let(:exercise) { create(:fibonacci, uuid: SecureRandom.uuid) }
10+
let(:external_id) { '11111111-aaaa-1111-aaaa-111111111111' }
1111
let(:question) { 'Inappropriate content for RfC.' }
12-
let(:reported_content) { create(:rfc, question:, exercise:) }
12+
let(:submission) { create(:submission, study_group: create(:study_group, external_id:)) }
13+
let(:reported_content) { create(:rfc, question:, submission:) }
1314

1415
it 'sets the correct sender' do
1516
expect(mail.from).to include('[email protected]')
@@ -27,8 +28,8 @@
2728
it 'includes the exersice url for the LTI consumer' do
2829
stub_const('ReportMailer::SETTINGS', {exercises_base_url: 'https://a.com/exersices'})
2930

30-
expect(mail.text_part.body).to include("https://a.com/exersices/#{exercise.uuid}")
31-
expect(mail.html_part.body).to include("https://a.com/exersices/#{exercise.uuid}")
31+
expect(mail.text_part.body).to include("https://a.com/exersices/#{external_id}")
32+
expect(mail.html_part.body).to include("https://a.com/exersices/#{external_id}")
3233
end
3334

3435
it 'dose not include the exersice URL when not configured' do

0 commit comments

Comments
 (0)