Update giver and last editor to User entity and update failing ITs an…

…d test data (partial)
TEAMMATES · Feb 24, 2024 · 1105467 · 1105467
1 parent 1dc7c7a
commit 1105467
Show file tree

Hide file tree

Showing 17 changed files with 402 additions and 107 deletions.
diff --git a/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java b/src/it/java/teammates/it/sqllogic/core/DataBundleLogicIT.java
@@ -198,10 +198,11 @@ public void testCreateDataBundle_typicalValues_createdCorrectly() throws Excepti
 
         ______TS("verify feedback response comments deserialized correctly");
         FeedbackResponseComment actualComment1 = dataBundle.feedbackResponseComments.get("comment1ToResponse1ForQ1");
-        FeedbackResponseComment expectedComment1 = new FeedbackResponseComment(expectedResponse1, "[email protected]",
+        Instructor expectedInstructor = dataBundle.instructors.get("instructor1OfTypicalCourse");
+        FeedbackResponseComment expectedComment1 = new FeedbackResponseComment(expectedResponse1, expectedInstructor,
                 FeedbackParticipantType.INSTRUCTORS, expectedSection, expectedSection,
                 "Instructor 1 comment to student 1 self feedback", false, false,
-                new ArrayList<FeedbackParticipantType>(), new ArrayList<FeedbackParticipantType>(), "[email protected]");
+                new ArrayList<FeedbackParticipantType>(), new ArrayList<FeedbackParticipantType>(), expectedInstructor);
         expectedComment1.setId(actualComment1.getId());
         verifyEquals(expectedComment1, actualComment1);
     }

diff --git a/src/it/java/teammates/it/ui/webapi/CreateFeedbackResponseCommentActionIT.java b/src/it/java/teammates/it/ui/webapi/CreateFeedbackResponseCommentActionIT.java
@@ -61,7 +61,7 @@ protected void testExecute() throws Exception {
         FeedbackResponseComment comment =
                 logic.getFeedbackResponseCommentForResponseFromParticipant(fr.getId());
         assertEquals(comment.getCommentText(), "Student submission comment");
-        assertEquals(student.getEmail(), comment.getGiver());
+        assertEquals(student.getEmail(), comment.getGiver().getEmail());
         assertTrue(comment.getIsCommentFromFeedbackParticipant());
         assertTrue(comment.getIsVisibilityFollowingFeedbackQuestion());
         assertEquals(FeedbackParticipantType.STUDENTS, comment.getGiverType());

diff --git a/src/it/java/teammates/it/ui/webapi/UpdateFeedbackResponseCommentActionIT.java b/src/it/java/teammates/it/ui/webapi/UpdateFeedbackResponseCommentActionIT.java
@@ -59,7 +59,7 @@ protected void testExecute() throws Exception {
 
         FeedbackResponseComment actualFrc = logic.getFeedbackResponseComment(frc.getId());
         assertEquals(newCommentText, actualFrc.getCommentText());
-        assertEquals(instructor.getEmail(), actualFrc.getLastEditorEmail());
+        assertEquals(instructor.getEmail(), actualFrc.getLastEditor().getEmail());
     }
 
     @Test

diff --git a/src/it/resources/data/DataBundleLogicIT.json b/src/it/resources/data/DataBundleLogicIT.json
@@ -324,7 +324,11 @@
           "answer": "Student 1 self feedback."
         }
       },
-      "giver": "[email protected]",
+      "giver": {
+        "id": "00000000-0000-4000-8000-000000000501",
+        "type": "instructor",
+        "email": "[email protected]"
+      },
       "giverType": "INSTRUCTORS",
       "giverSection": {
         "id": "00000000-0000-4000-8000-000000000201"
@@ -337,7 +341,11 @@
       "isCommentFromFeedbackParticipant": false,
       "showCommentTo": [],
       "showGiverNameTo": [],
-      "lastEditorEmail": "[email protected]"
+      "lastEditor": {
+        "id": "00000000-0000-4000-8000-000000000501",
+        "type": "instructor",
+        "email": "[email protected]"
+      }
     }
   },
   "notifications": {