refactor: Move submission url building to email builders

Author: GabrielCWT

lib/cadet/email.ex

@@ -9,6 +9,17 @@ defmodule Cadet.Email do
     if is_nil(avenger.email) do
       nil
     else
+      ungraded_submissions =
+        Enum.map(ungraded_submissions, fn submission ->
+          Map.put(
+            submission,
+            :submission_url,
+            build_submission_url(
+              submission[:student_course_id],
+              submission[:submission_id]
+            )
+          )
+        end)
       base_email()
       |> to(avenger.email)
       |> assign(:avenger_name, avenger.name)
@@ -22,12 +33,18 @@ defmodule Cadet.Email do
     if is_nil(avenger.email) do
       nil
     else
+      submission =
+        Map.put(
+          submission,
+          :submission_url,
+          build_submission_url(submission.assessment.course_id, submission.id)
+        )
+
       base_email()
       |> to(avenger.email)
       |> assign(:avenger_name, avenger.name)
       |> assign(:student_name, student.name)
-      |> assign(:assessment_title, submission.assessment.title)
-      |> assign(:submission_url, submission.submission_url)
+      |> assign(:submission, submission)
       |> subject("New submission for #{submission.assessment.title}")
       |> render("#{template_file_name}.html")
     end
@@ -38,4 +55,9 @@ defmodule Cadet.Email do
     |> from("[email protected]")
     |> put_html_layout({CadetWeb.LayoutView, "email.html"})
   end
+
+    # TODO update this to use frontend url
+    defp build_submission_url(course_id, submission_id) do
+      "https://sourceacademy.org/courses/#{course_id}/grading/#{submission_id}"
+    end
 end

lib/cadet/workers/NotificationWorker.ex

@@ -35,11 +35,6 @@ defmodule Cadet.Workers.NotificationWorker do
     end
   end
 
-  # TODO update this to use frontend url
-  defp build_submission_url(course_id, submission_id) do
-    "https://sourceacademy.org/courses/#{course_id}/grading/#{submission_id}"
-  end
-
   # Returns true if user preference matches the job's time option.
   # If user has made no preference, the default time option is used instead
   def is_user_time_option_matched(
@@ -86,18 +81,6 @@ defmodule Cadet.Workers.NotificationWorker do
             else
               IO.puts("[AVENGER_BACKLOG] SENDING_OUT")
 
-              ungraded_submissions =
-                Enum.map(ungraded_submissions, fn submission ->
-                  Map.put(
-                    submission,
-                    :submission_url,
-                    build_submission_url(
-                      submission[:student_course_id],
-                      submission[:submission_id]
-                    )
-                  )
-                end)
-
               email =
                 Email.avenger_backlog_email(
                   ntype.template_file_name,
@@ -152,13 +135,6 @@ defmodule Cadet.Workers.NotificationWorker do
         true ->
           IO.puts("[ASSESSMENT_SUBMISSION] SENDING_OUT")
 
-          submission =
-            Map.put(
-              submission,
-              :submission_url,
-              build_submission_url(course_id, submission_id)
-            )
-
           email =
             Email.assessment_submission_email(
               notification_type.template_file_name,