Enhancement: Include assessment with answers in submission

lib/cadet/assessments/assessments.ex

@@ -1345,7 +1345,8 @@ defmodule Cadet.Assessments do
   end
 
   @spec get_answers_in_submission(integer() | String.t()) ::
-          {:ok, [Answer.t()]} | {:error, {:bad_request, String.t()}}
+          {:ok, {[Answer.t()], Assessment.t()}}
+          | {:error, {:bad_request, String.t()}}
   def get_answers_in_submission(id) when is_ecto_id(id) do
     answer_query =
       Answer
@@ -1382,7 +1383,9 @@ defmodule Cadet.Assessments do
     if answers == [] do
       {:error, {:bad_request, "Submission is not found."}}
     else
-      {:ok, answers}
+      assessment_id = Submission |> where(id: ^id) |> select([s], s.assessment_id) |> Repo.one()
+      assessment = Assessment |> where(id: ^assessment_id) |> Repo.one()
+      {:ok, {answers, assessment}}
     end
   end
 

lib/cadet_web/admin_controllers/admin_grading_controller.ex

@@ -24,8 +24,8 @@ defmodule CadetWeb.AdminGradingController do
 
   def show(conn, %{"submissionid" => submission_id}) when is_ecto_id(submission_id) do
     case Assessments.get_answers_in_submission(submission_id) do
-      {:ok, answers} ->
-        render(conn, "show.json", answers: answers)
+      {:ok, {answers, assessment}} ->
+        render(conn, "show.json", answers: answers, assessment: assessment)
 
       {:error, {status, message}} ->
         conn

lib/cadet_web/admin_views/admin_grading_view.ex

@@ -3,8 +3,25 @@ defmodule CadetWeb.AdminGradingView do
 
   import CadetWeb.AssessmentsHelpers
 
-  def render("show.json", %{answers: answers}) do
-    render_many(answers, CadetWeb.AdminGradingView, "grading_info.json", as: :answer)
+  def render("show.json", %{answers: answers, assessment: assessment}) do
+    %{
+      assessment:
+        render_one(assessment, CadetWeb.AdminGradingView, "assessment.json", as: :assessment),
+      answers: render_many(answers, CadetWeb.AdminGradingView, "grading_info.json", as: :answer)
+    }
+  end
+
+  def render("assessment.json", %{assessment: assessment}) do
+    %{
+      id: assessment.id,
+      title: assessment.title,
+      summaryShort: assessment.summary_short,
+      summaryLong: assessment.summary_long,
+      coverPicture: assessment.cover_picture,
+      number: assessment.number,
+      story: assessment.story,
+      reading: assessment.reading
+    }
   end
 
   def render("gradingsummaries.json", %{