Add delimeter + bug fixes

Author: Tkaixiang

lib/cadet/assessments/assessments.ex

@@ -3135,7 +3135,6 @@ end
           question = Map.put(ans.question, :question, empty_contest_leaderboard)
           Map.put(ans, :question, question)
         else
-
           ans
         end
       end)

lib/cadet/courses/course.ex

@@ -5,7 +5,7 @@ defmodule Cadet.Courses.Course do
   use Cadet, :model
 
   alias Cadet.Courses.AssessmentConfig
-  alias Cadet.AICommentsHelpers
+  alias CadetWeb.AICommentsHelpers
 
   @type t :: %__MODULE__{
           course_name: String.t(),

lib/cadet_web/admin_views/admin_grading_view.ex

@@ -152,7 +152,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),
+      ai_comments: &extract_ai_comments_per_answer(&1.id, &1.ai_comments),
       student: &extract_student_data(&1.submission.student),
       team: &extract_team_data(&1.submission.team),
       question: &build_grading_question/1,
@@ -165,11 +165,11 @@ defmodule CadetWeb.AdminGradingView do
     %{cols: cols, rows: summary}
   end
 
-  defp extract_ai_comments_per_answer(question_id, ai_comments) do
+  defp extract_ai_comments_per_answer(id, ai_comments) do
     matching_comment =
       ai_comments
       # Equivalent to fn comment -> comment.question_id == question_id end
-      |> Enum.find(&(&1.question_id == question_id))
+      |> Enum.find(&(&1.answer_id == id))
 
     case matching_comment do
       nil -> nil

lib/cadet_web/helpers/ai_comments_helpers.ex

@@ -12,15 +12,18 @@ defmodule CadetWeb.AICommentsHelpers do
 
         case Base.decode64(encrypted_key) do
           {:ok, decoded} ->
-            iv = binary_part(decoded, 0, 16)
-            tag = binary_part(decoded, 16, 16)
-            ciphertext = binary_part(decoded, 32, byte_size(decoded) - 32)
 
-            case :crypto.crypto_one_time_aead(:aes_gcm, key, iv, ciphertext, "", tag, false) do
-              plain_text when is_binary(plain_text) -> {:ok, plain_text}
-              _ -> {:decrypt_error, :decryption_failed}
+            with [iv, tag, ciphertext] <- :binary.split(decoded, <<"|">>, [:global]) do
+              case :crypto.crypto_one_time_aead(:aes_gcm, key, iv, ciphertext, "", tag, false) do
+                plain_text when is_binary(plain_text) -> {:ok, plain_text}
+                _ -> {:decrypt_error, :decryption_failed}
+              end
+            else
+              _ -> {:error, :invalid_format}
             end
 
+
+
           _ ->
             Logger.error(
               "Failed to decode encrypted key, is it a valid AES-256 key of 16, 24 or 32 bytes?"
@@ -55,7 +58,7 @@ defmodule CadetWeb.AICommentsHelpers do
         )
 
       # Store both the IV, ciphertext and tag
-      encrypted = Base.encode64(iv <> tag <> ciphertext)
+      encrypted = Base.encode64(iv <> "|" <> tag <> "|" <> ciphertext)
     else
       {:error, :invalid_encryption_key}
     end