Combining achievement mailer to single course email and updating trigger

Author: msquance-stem

app/jobs/cs_accelerator/check_next_steps_job.rb

@@ -10,12 +10,7 @@ def perform(achievement_id)
       return unless enrolment
       return if enrolment.current_state == "complete"
 
-      case achievement.activity.category
-      when "online"
-        AchievementMailer.with(user_id: user.id).completed_online_course.deliver_now
-      when "face-to-face"
-        AchievementMailer.with(user_id: user.id).completed_face_to_face_course.deliver_now
-      end
+      AchievementMailer.with(user_id: user.id).completed_course.deliver_now
     end
   end
 end

app/mailers/achievement_mailer.rb

@@ -7,17 +7,10 @@ def complete
     mail(to: @user, subject: @subject)
   end
 
-  def completed_face_to_face_course
+  def completed_course
     @user = User.find(params[:user_id])
     @subject = "Take the next step on your subject knowledge certificate"
 
     mail(to: @user, subject: @subject)
   end
-
-  def completed_online_course
-    @user = User.find(params[:user_id])
-    @subject = "Keep going with your subject knowledge certificate"
-
-    mail(to: @user, subject: @subject)
-  end
 end

app/views/achievement_mailer/completed_online_course.html.erb renamed to app/views/achievement_mailer/completed_course.html.erb

@@ -4,7 +4,7 @@
   <p class='govuk-body'>Thanks for engaging with the KS3 and GCSE Computer Science subject knowledge certificate. You're making great progress towards achieving your subject knowledge certificate.</p>
   <p class='govuk-body'>Once you have completed your next face to face or remote course, you will have reached ten hours of CPD and become <b>eligible to take the test and achieve your qualification.</b></p>
   <h3 class="govuk-heading-s">Next steps</h3>
-  <p class='govuk-body'>Choose from any of our face to face or remote Computer Science Accelerator courses.</p>
+  <p class='govuk-body'>Choose from any of our computer science subject knowledge courses.</p>
   <%= link_to 'Browse all courses', courses_url(certificate: 'subject-knowledge', emailTrigger: 'CSA4'), class: 'govuk-button button' %>
   <p class='govuk-body'>To check your progress or access further support, explore your <%= link_to 'personalised dashboard', cs_accelerator_certificate_url, class: 'ncce-link' %> which shows you the learning pathway and courses we recommend you take.</p>
 </div>

app/views/achievement_mailer/completed_face_to_face_course.text.erb renamed to app/views/achievement_mailer/completed_course.text.erb

@@ -4,7 +4,7 @@ Thanks for engaging with the KS3 and GCSE Computer Science subject knowledge cer
 
 Next steps
 
-Choose from any of our Computer Science Accelerator courses.
+Choose from any of our computer science subject knowledge courses.
 
 Browse all courses (<%= courses_url(certificate: 'subject-knowledge', emailTrigger: 'CSA4') %>)
 

app/views/achievement_mailer/completed_face_to_face_course.html.erb

@@ -3,11 +3,7 @@ def complete__disabled
     AchievementMailer.with(user_id: User.first.id, activity_id: Activity.first.id, preview: true).complete
   end
 
-  def completed_face_to_face_course
-    AchievementMailer.with(user_id: User.first.id, preview: true).completed_face_to_face_course
-  end
-
-  def completed_online_course
-    AchievementMailer.with(user_id: User.first.id, preview: true).completed_online_course
+  def completed_course
+    AchievementMailer.with(user_id: User.first.id, preview: true).completed_course
   end
 end

app/views/achievement_mailer/completed_online_course.text.erb

@@ -4,11 +4,9 @@
   let(:user) { create(:user) }
   let(:activity) { create(:activity) }
   let(:mail) { described_class.with(user_id: user.id, activity_id: activity.id).complete }
-  let(:face_to_face_mail) { described_class.with(user_id: user.id).completed_face_to_face_course }
-  let(:online_mail) { described_class.with(user_id: user.id).completed_online_course }
+  let(:course_mail) { described_class.with(user_id: user.id).completed_course }
   let(:subject) { "Congratulations on completing an activity" }
-  let(:face_to_face_subject) { "Take the next step on your subject knowledge certificate" }
-  let(:online_subject) { "Keep going with your subject knowledge certificate" }
+  let(:course_subject) { "Take the next step on your subject knowledge certificate" }
 
   describe "email" do
     it "renders the headers" do
@@ -30,35 +28,19 @@
     end
   end
 
-  describe "completed face to face course email" do
-    it "renders the headers" do
-      expect(face_to_face_mail.subject).to include(face_to_face_subject)
-      expect(face_to_face_mail.to).to eq([user.email])
-      expect(face_to_face_mail.from).to eq(["noreply@teachcomputing.org"])
-    end
-
-    it "renders the body" do
-      expect(face_to_face_mail.body.encoded).to include(user.first_name.to_s)
-    end
-
-    it "includes the subject in the email" do
-      expect(face_to_face_mail.body.encoded).to include("<title>#{face_to_face_subject}</title>")
-    end
-  end
-
   describe "completed online course email" do
     it "renders the headers" do
-      expect(online_mail.subject).to include(online_subject)
-      expect(online_mail.to).to eq([user.email])
-      expect(online_mail.from).to eq(["noreply@teachcomputing.org"])
+      expect(course_mail.subject).to include(course_subject)
+      expect(course_mail.to).to eq([user.email])
+      expect(course_mail.from).to eq(["noreply@teachcomputing.org"])
     end
 
     it "renders the body" do
-      expect(online_mail.body.encoded).to include(user.first_name.to_s)
+      expect(course_mail.body.encoded).to include(user.first_name.to_s)
     end
 
     it "includes the subject in the email" do
-      expect(online_mail.body.encoded).to include("<title>#{online_subject}</title>")
+      expect(course_mail.body.encoded).to include("<title>#{course_subject}</title>")
     end
   end
 end