Re-format ai_comments to reference answer_id instead

Author: Tkaixiang

src/commons/sagas/RequestsSaga.ts

@@ -1030,8 +1030,9 @@ export const getGrading = async (
 
   const gradingResult = await resp.json();
   const grading: GradingAnswer = gradingResult.answers.map((gradingQuestion: any) => {
-    const { student, question, grade, team } = gradingQuestion;
+    const { id, student, question, grade, team } = gradingQuestion;
     const result = {
+      id,
       question: {
         answer: question.answer,
         lastModifiedAt: question.lastModifiedAt,
@@ -1555,20 +1556,15 @@ export const removeAssessmentConfig = async (
 };
 
 /**
- * POST /courses/{courseId}/admin/generate-comments/{submissionId}/{questionId}
+ * POST /courses/{courseId}/admin/generate-comments/{answer_id}/
  */
 export const postGenerateComments = async (
   tokens: Tokens,
-  submission_id: number,
-  question_id: number
+  answer_id: number
 ): Promise<{ comments: string[] } | null> => {
-  const resp = await request(
-    `${courseId()}/admin/generate-comments/${submission_id}/${question_id}`,
-    'POST',
-    {
-      ...tokens
-    }
-  );
+  const resp = await request(`${courseId()}/admin/generate-comments/${answer_id}`, 'POST', {
+    ...tokens
+  });
   if (!resp || !resp.ok) {
     return null;
   }
@@ -1578,18 +1574,13 @@ export const postGenerateComments = async (
 
 export const saveFinalComment = async (
   tokens: Tokens,
-  submission_id: number,
-  question_id: number,
+  answer_id: number,
   comment: string
 ): Promise<Response | null> => {
-  const resp = await request(
-    `${courseId()}/admin/save-final-comment/${submission_id}/${question_id}`,
-    'POST',
-    {
-      body: { comment: comment },
-      ...tokens
-    }
-  );
+  const resp = await request(`${courseId()}/admin/save-final-comment/${answer_id}`, 'POST', {
+    body: { comment: comment },
+    ...tokens
+  });
 
   return resp;
 };

src/features/grading/GradingTypes.ts

@@ -170,6 +170,7 @@ export type IGradingTableProperties = {
  * particular question in a submission.
  */
 export type GradingQuestion = {
+  id: number;
   question: AnsweredQuestion;
   team?: Array<{
     username: any;

src/pages/academy/grading/subcomponents/GradingEditor.tsx

@@ -41,6 +41,7 @@ type GradingSaveFunction = (
 ) => void;
 
 type Props = {
+  answer_id: number;
   solution: number | string | null;
   questionId: number;
   submissionId: number;
@@ -119,7 +120,7 @@ const GradingEditor: React.FC<Props> = props => {
   }, [props.submissionId, props.questionId]);
 
   const getCommentSuggestions = async () => {
-    const resp = await postGenerateComments(tokens, props.submissionId, props.questionId);
+    const resp = await postGenerateComments(tokens, props.answer_id);
     return resp;
   };
 
@@ -132,7 +133,7 @@ const GradingEditor: React.FC<Props> = props => {
   };
 
   const postSaveFinalComment = async (comment: string) => {
-    const resp = await saveFinalComment(tokens, props.submissionId, props.questionId, comment);
+    const resp = await saveFinalComment(tokens, props.answer_id, comment);
     return resp;
   };
 

src/pages/academy/grading/subcomponents/GradingWorkspace.tsx

@@ -304,6 +304,7 @@ const GradingWorkspace: React.FC<Props> = props => {
         /* Render an editor with the xp given to the current question. */
         body: (
           <GradingEditor
+            answer_id={grading!.answers[questionId].id}
             ai_comments={grading!.answers[questionId].ai_comments || []}
             solution={grading!.answers[questionId].question.solution}
             questionId={grading!.answers[questionId].question.id}