fix resetAccountAction (#12934)

Co-authored-by: Zhang Ziqing <69516975+ziqing26@users.noreply.github.com>
TEAMMATES · Mar 26, 2024 · 11b8b81 · 11b8b81
1 parent a02f444
commit 11b8b81
Showing 1 changed file with 4 additions and 24 deletions.
diff --git a/src/main/java/teammates/ui/webapi/ResetAccountAction.java b/src/main/java/teammates/ui/webapi/ResetAccountAction.java
@@ -35,12 +35,7 @@ public JsonResult execute() {
                 wrongGoogleId = existingStudent.getGoogleId();
 
                 try {
-                    if (isAccountMigrated(wrongGoogleId)) {
-                        sqlLogic.resetStudentGoogleId(studentEmail, courseId, wrongGoogleId);
-                    } else {
-                        logic.resetStudentGoogleId(studentEmail, courseId);
-                    }
-
+                    sqlLogic.resetStudentGoogleId(studentEmail, courseId, wrongGoogleId);
                     taskQueuer.scheduleCourseRegistrationInviteToStudent(courseId, studentEmail, true);
                 } catch (EntityDoesNotExistException e) {
                     throw new EntityNotFoundException(e);
@@ -55,12 +50,7 @@ public JsonResult execute() {
                 wrongGoogleId = existingInstructor.getGoogleId();
 
                 try {
-                    if (isAccountMigrated(wrongGoogleId)) {
-                        sqlLogic.resetInstructorGoogleId(instructorEmail, courseId, wrongGoogleId);
-                    } else {
-                        logic.resetInstructorGoogleId(instructorEmail, courseId);
-                    }
-
+                    sqlLogic.resetInstructorGoogleId(instructorEmail, courseId, wrongGoogleId);
                     taskQueuer.scheduleCourseRegistrationInviteToInstructor(null, instructorEmail, courseId, true);
                 } catch (EntityDoesNotExistException e) {
                     throw new EntityNotFoundException(e);
@@ -76,12 +66,7 @@ public JsonResult execute() {
                 wrongGoogleId = existingStudent.getGoogleId();
 
                 try {
-                    if (isAccountMigrated(wrongGoogleId)) {
-                        sqlLogic.resetStudentGoogleId(studentEmail, courseId, wrongGoogleId);
-                    } else {
-                        logic.resetStudentGoogleId(studentEmail, courseId);
-                    }
-
+                    logic.resetStudentGoogleId(studentEmail, courseId);
                     taskQueuer.scheduleCourseRegistrationInviteToStudent(courseId, studentEmail, true);
                 } catch (EntityDoesNotExistException e) {
                     throw new EntityNotFoundException(e);
@@ -95,12 +80,7 @@ public JsonResult execute() {
                 wrongGoogleId = existingInstructor.getGoogleId();
 
                 try {
-                    if (isAccountMigrated(wrongGoogleId)) {
-                        sqlLogic.resetInstructorGoogleId(instructorEmail, courseId, wrongGoogleId);
-                    } else {
-                        logic.resetInstructorGoogleId(instructorEmail, courseId);
-                    }
-
+                    logic.resetInstructorGoogleId(instructorEmail, courseId);
                     taskQueuer.scheduleCourseRegistrationInviteToInstructor(null, instructorEmail, courseId, true);
                 } catch (EntityDoesNotExistException e) {
                     throw new EntityNotFoundException(e);