Simplify keys for students and instructors

TEAMMATES · Mar 21, 2024 · cbb6e52 · cbb6e52
1 parent 5925dc1
commit cbb6e52
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/...lient/java/teammates/client/scripts/testdataconversion/ConvertDatastoreJsonToSqlJson.java b/...lient/java/teammates/client/scripts/testdataconversion/ConvertDatastoreJsonToSqlJson.java
@@ -157,28 +157,18 @@ private void migrateDependentEntities(SqlDataBundle sqlDataBundle) {
 
             if (!sqlDataBundle.teams.containsKey(jsonKey)) {
                 Team sqlTeam = entityConverter.createTeam(student);
-                sqlDataBundle.teams.put(jsonKey, sqlTeam);
+                sqlDataBundle.teams.put(k, sqlTeam);
             }
         });
 
-        dataStoreBundle.instructors.forEach((k, instructor) -> {
-            // Sets instructor key as "courseid-instructorName"
-            String jsonKey = removeWhitespace(instructor.getCourseId() + "-" + instructor.getName());
-
-            if (!sqlDataBundle.instructors.containsKey(jsonKey)) {
-                Instructor sqlInstructor = entityConverter.convert(instructor);
-                sqlDataBundle.instructors.put(jsonKey, sqlInstructor);
-            }
+        dataStoreBundle.instructors.forEach((k, instructor) -> {   
+            Instructor sqlInstructor = entityConverter.convert(instructor);
+            sqlDataBundle.instructors.put(k, sqlInstructor);
         });
 
         dataStoreBundle.students.forEach((k, student) -> {
-            // Sets instructor key as "courseid-instructorName"
-            String jsonKey = removeWhitespace(student.getCourse() + "-" + student.getName());
-
-            if (!sqlDataBundle.students.containsKey(jsonKey)) {
-                Student sqlStudent = entityConverter.convert(student);
-                sqlDataBundle.students.put(jsonKey, sqlStudent);
-            }
+            Student sqlStudent = entityConverter.convert(student);
+            sqlDataBundle.students.put(k, sqlStudent);
         });
 
         dataStoreBundle.deadlineExtensions.forEach((k, deadlineExtension) -> {