Re-format ai_comments to reference answer_id instead

Author: Tkaixiang

lib/cadet/ai_comments.ex

@@ -26,26 +26,14 @@ defmodule Cadet.AIComments do
     end
   end
 
-  @doc """
-  Retrieves an AI comment for a specific submission and question.
-  Returns `nil` if no comment exists.
-  """
-  def get_ai_comments_for_submission(submission_id, question_id) do
-    Repo.one(
-      from(c in AIComment,
-        where: c.submission_id == ^submission_id and c.question_id == ^question_id
-      )
-    )
-  end
-
   @doc """
   Retrieves the latest AI comment for a specific submission and question.
   Returns `nil` if no comment exists.
   """
-  def get_latest_ai_comment(submission_id, question_id) do
+  def get_latest_ai_comment(answer_id) do
     Repo.one(
       from(c in AIComment,
-        where: c.submission_id == ^submission_id and c.question_id == ^question_id,
+        where: c.answer_id == ^answer_id,
         order_by: [desc: c.inserted_at],
         limit: 1
       )
@@ -56,8 +44,8 @@ defmodule Cadet.AIComments do
   Updates the final comment for a specific submission and question.
   Returns the most recent comment entry for that submission/question.
   """
-  def update_final_comment(submission_id, question_id, final_comment) do
-    comment = get_latest_ai_comment(submission_id, question_id)
+  def update_final_comment(answer_id, final_comment) do
+    comment = get_latest_ai_comment(answer_id)
 
     case comment do
       nil ->
@@ -86,22 +74,4 @@ defmodule Cadet.AIComments do
         |> Repo.update()
     end
   end
-
-  @doc """
-  Updates the chosen comments for a specific submission and question.
-  Accepts an array of comments and replaces the existing array in the database.
-  """
-  def update_chosen_comments(submission_id, question_id, new_comments) do
-    comment = get_latest_ai_comment(submission_id, question_id)
-
-    case comment do
-      nil ->
-        {:error, :not_found}
-
-      _ ->
-        comment
-        |> AIComment.changeset(%{comment_chosen: new_comments})
-        |> Repo.update()
-    end
-  end
 end

lib/cadet/ai_comments/ai_comment.ex

@@ -14,26 +14,23 @@ defmodule Cadet.AIComments.AIComment do
     field(:comment_chosen, {:array, :string})
     field(:final_comment, :string)
 
-    belongs_to(:submission, Cadet.Assessments.Submission)
-    belongs_to(:question, Cadet.Assessments.Question)
+    belongs_to(:answer, Cadet.Assessments.Answer)
 
     timestamps()
   end
 
   def changeset(ai_comment, attrs) do
     ai_comment
     |> cast(attrs, [
-      :submission_id,
-      :question_id,
+      :answer_id,
       :raw_prompt,
       :answers_json,
       :response,
       :error,
       :comment_chosen,
       :final_comment
     ])
-    |> validate_required([:submission_id, :question_id, :raw_prompt, :answers_json])
-    |> foreign_key_constraint(:submission_id)
-    |> foreign_key_constraint(:question_id)
+    |> validate_required([:answer_id, :raw_prompt, :answers_json])
+    |> foreign_key_constraint(:answer_id)
   end
 end

lib/cadet/assessments/answer.ex

@@ -10,6 +10,7 @@ defmodule Cadet.Assessments.Answer do
   alias Cadet.Assessments.Answer.AutogradingStatus
   alias Cadet.Assessments.AnswerTypes.{MCQAnswer, ProgrammingAnswer, VotingAnswer}
   alias Cadet.Assessments.{Question, QuestionType, Submission}
+  alias Cadet.AIComments.AIComment
 
   @type t :: %__MODULE__{}
 
@@ -29,7 +30,7 @@ defmodule Cadet.Assessments.Answer do
     belongs_to(:grader, CourseRegistration)
     belongs_to(:submission, Submission)
     belongs_to(:question, Question)
-    has_many(:ai_comments, through: [:submission, :ai_comments])
+    has_many(:ai_comments, AIComment, on_delete: :delete_all)
 
     timestamps()
   end

lib/cadet/assessments/assessments.ex

@@ -3043,10 +3043,60 @@ defmodule Cadet.Assessments do
     }
   end
 
+@spec get_answer(integer() | String.t()) ::
+        {:ok, Answer.t()} | {:error, {:bad_request, String.t()}}
+def get_answer(id) when is_ecto_id(id) do
+  answer =
+      Answer
+      |> where(id: ^id)
+      # [a] are bindings (in SQL it is similar to FROM answers "AS a"),
+      # this line's alias is INNER JOIN ... "AS q"
+      |> join(:inner, [a], q in assoc(a, :question))
+      |> join(:inner, [_, q], ast in assoc(q, :assessment))
+      |> join(:inner, [..., ast], ac in assoc(ast, :config))
+      |> join(:left, [a, ...], g in assoc(a, :grader))
+      |> join(:left, [_, ..., g], gu in assoc(g, :user))
+      |> join(:inner, [a, ...], s in assoc(a, :submission))
+      |> join(:left, [_, ..., s], st in assoc(s, :student))
+      |> join(:left, [..., st], u in assoc(st, :user))
+      |> join(:left, [..., s, _, _], t in assoc(s, :team))
+      |> join(:left, [..., t], tm in assoc(t, :team_members))
+      |> join(:left, [..., tm], tms in assoc(tm, :student))
+      |> join(:left, [..., tms], tmu in assoc(tms, :user))
+      |> join(:left, [a, ...], ai in assoc(a, :ai_comments))
+      |> preload([_, q, ast, ac, g, gu, s, st, u, t, tm, tms, tmu, ai],
+        ai_comments: ai,
+        question: {q, assessment: {ast, config: ac}},
+        grader: {g, user: gu},
+        submission:
+          {s, student: {st, user: u}, team: {t, team_members: {tm, student: {tms, user: tmu}}}}
+      )
+      |> Repo.one()
+
+    if is_nil(answer) do
+      {:error, {:bad_request, "Answer not found."}}
+    else
+
+
+      if answer.question.type == :voting do
+        empty_contest_entries = Map.put(answer.question.question, :contest_entries, [])
+        empty_popular_leaderboard = Map.put(empty_contest_entries, :popular_leaderboard, [])
+        empty_contest_leaderboard = Map.put(empty_popular_leaderboard, :contest_leaderboard, [])
+        question = Map.put(answer.question, :question, empty_contest_leaderboard)
+        Map.put(answer, :question, question)
+      end
+
+      {:ok, answer}
+    end
+
+
+
+end
+
   @spec get_answers_in_submission(integer() | String.t()) ::
           {:ok, {[Answer.t()], Assessment.t()}}
           | {:error, {:bad_request, String.t()}}
-  def get_answers_in_submission(id, question_id \\ nil) when is_ecto_id(id) do
+  def get_answers_in_submission(id) when is_ecto_id(id) do
     base_query =
       Answer
       |> where(submission_id: ^id)
@@ -3058,29 +3108,23 @@ defmodule Cadet.Assessments do
       |> join(:left, [a, ...], g in assoc(a, :grader))
       |> join(:left, [_, ..., g], gu in assoc(g, :user))
       |> join(:inner, [a, ...], s in assoc(a, :submission))
-      |> join(:left, [..., s], ai in assoc(s, :ai_comments))
-      |> join(:left, [_, ..., s, _], st in assoc(s, :student))
+      |> join(:left, [_, ..., s], st in assoc(s, :student))
       |> join(:left, [..., st], u in assoc(st, :user))
-      |> join(:left, [..., s, _, _, _], t in assoc(s, :team))
+      |> join(:left, [..., s, _, _], t in assoc(s, :team))
       |> join(:left, [..., t], tm in assoc(t, :team_members))
       |> join(:left, [..., tm], tms in assoc(tm, :student))
       |> join(:left, [..., tms], tmu in assoc(tms, :user))
-      |> preload([_, q, ast, ac, g, gu, s, ai, st, u, t, tm, tms, tmu],
-        ai_comments: ai,
+      |> join(:left, [a, ...], ai in assoc(a, :ai_comments))
+      |> preload([_, q, ast, ac, g, gu, s, st, u, t, tm, tms, tmu, ai],
         question: {q, assessment: {ast, config: ac}},
         grader: {g, user: gu},
         submission:
-          {s, student: {st, user: u}, team: {t, team_members: {tm, student: {tms, user: tmu}}}}
+          {s, student: {st, user: u}, team: {t, team_members: {tm, student: {tms, user: tmu}}}},
+        ai_comments: ai
       )
 
-    answer_query =
-      case question_id do
-        nil -> base_query
-        _ -> base_query |> where(question_id: ^question_id)
-      end
-
     answers =
-      answer_query
+      base_query
       |> Repo.all()
       |> Enum.sort_by(& &1.question.display_order)
       |> Enum.map(fn ans ->
@@ -3091,6 +3135,7 @@ defmodule Cadet.Assessments do
           question = Map.put(ans.question, :question, empty_contest_leaderboard)
           Map.put(ans, :question, question)
         else
+
           ans
         end
       end)

lib/cadet_web/admin_views/admin_grading_view.ex

@@ -151,6 +151,7 @@ defmodule CadetWeb.AdminGradingView do
 
   def render("grading_info.json", %{answer: answer}) do
     transform_map_for_view(answer, %{
+      id: &(&1.id),
       ai_comments: &extract_ai_comments_per_answer(&1.question_id, &1.ai_comments),
       student: &extract_student_data(&1.submission.student),
       team: &extract_team_data(&1.submission.team),