[#11878] Get account request by uuid (#13007)

* change GetAccountRequestAction to get by id * fix tests * remove unncessary todo
TEAMMATES · Apr 12, 2024 · 41524a5 · 41524a5
1 parent ce75a0a
commit 41524a5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 20 deletions.
diff --git a/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminHomePageE2ETest.java
@@ -46,10 +46,6 @@ public void testAll() {
         String failureMessage = homePage.getMessageForInstructor(1);
         assertTrue(failureMessage.contains(
                 "\"invalidemail\" is not acceptable to TEAMMATES as a/an email because it is not in the correct format."));
-
-        assertNotNull(BACKDOOR.getAccountRequest(email, institute));
-        // TODO: delete account request after get
-        // BACKDOOR.deleteAccountRequest(email, institute);
     }
 
 }
diff --git a/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/AdminSearchPageE2ETest.java
@@ -132,7 +132,7 @@ public void testAll() {
         searchPage.inputSearchContent(searchContent);
         searchPage.clickSearchButton();
         searchPage.clickResetAccountRequestButton(accountRequest);
-        assertNull(BACKDOOR.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()).getRegisteredAt());
+        assertNull(BACKDOOR.getAccountRequest(accountRequest.getId()).getRegisteredAt());
 
         ______TS("Typical case: Delete account request successful");
         accountRequest = sqlTestData.accountRequests.get("unregisteredInstructor1");
@@ -141,7 +141,7 @@ public void testAll() {
         searchPage.inputSearchContent(searchContent);
         searchPage.clickSearchButton();
         searchPage.clickDeleteAccountRequestButton(accountRequest);
-        assertNull(BACKDOOR.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute()));
+        assertNull(BACKDOOR.getAccountRequest(accountRequest.getId()));
     }
 
     private String getExpectedStudentDetails(StudentAttributes student) {

diff --git a/src/e2e/java/teammates/e2e/cases/BaseE2ETestCase.java b/src/e2e/java/teammates/e2e/cases/BaseE2ETestCase.java
@@ -4,6 +4,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.UUID;
 
 import org.testng.ITestContext;
 import org.testng.annotations.AfterClass;
@@ -329,7 +330,7 @@ protected String getKeyForStudent(StudentAttributes student) {
 
     @Override
     protected AccountRequestAttributes getAccountRequest(AccountRequestAttributes accountRequest) {
-        return BACKDOOR.getAccountRequest(accountRequest.getEmail(), accountRequest.getInstitute());
+        return BACKDOOR.getAccountRequest(UUID.fromString(accountRequest.getId()));
     }
 
     NotificationAttributes getNotification(String notificationId) {

diff --git a/src/e2e/java/teammates/e2e/cases/InstructorCourseJoinConfirmationPageE2ETest.java b/src/e2e/java/teammates/e2e/cases/InstructorCourseJoinConfirmationPageE2ETest.java
@@ -68,7 +68,7 @@ public void testAll() {
         ______TS("Click join link: valid account request key");
 
         String regKey = BACKDOOR
-                .getRegKeyForAccountRequest("ICJoinConf.newinstr@gmail.tmt", "TEAMMATES Test Institute 1");
+                .getRegKeyForAccountRequest(sqlTestData.accountRequests.get("ICJoinConf.newinstr").getId());
 
         joinLink = createFrontendUrl(Const.WebPageURIs.JOIN_PAGE)
                 .withIsCreatingAccount("true")

diff --git a/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java b/src/it/java/teammates/it/ui/webapi/RejectAccountRequestActionIT.java
@@ -222,7 +222,7 @@ protected void tearDown() {
         HibernateUtil.beginTransaction();
         List<AccountRequest> accountRequests = logic.getAllAccountRequests();
         for (AccountRequest ar : accountRequests) {
-            logic.deleteAccountRequest(ar.getEmail(), ar.getInstitute());
+            logic.deleteAccountRequest(ar.getId());
         }
         HibernateUtil.commitTransaction();
     }

diff --git a/src/main/java/teammates/ui/webapi/GetAccountRequestAction.java b/src/main/java/teammates/ui/webapi/GetAccountRequestAction.java
@@ -1,5 +1,7 @@
 package teammates.ui.webapi;
 
+import java.util.UUID;
+
 import teammates.common.util.Const;
 import teammates.storage.sqlentity.AccountRequest;
 import teammates.ui.output.AccountRequestData;
@@ -11,14 +13,12 @@ class GetAccountRequestAction extends AdminOnlyAction {
 
     @Override
     public JsonResult execute() {
-        String email = getNonNullRequestParamValue(Const.ParamsNames.INSTRUCTOR_EMAIL);
-        String institute = getNonNullRequestParamValue(Const.ParamsNames.INSTRUCTOR_INSTITUTION);
+        UUID id = getUuidRequestParamValue(Const.ParamsNames.ACCOUNT_REQUEST_ID);
 
-        AccountRequest accountRequest = sqlLogic.getAccountRequest(email, institute);
+        AccountRequest accountRequest = sqlLogic.getAccountRequest(id);
 
         if (accountRequest == null) {
-            throw new EntityNotFoundException("Account request for email: "
-                    + email + " and institute: " + institute + " not found.");
+            throw new EntityNotFoundException("Account request with id: " + id.toString() + " does not exist.");
         }
 
         AccountRequestData output = new AccountRequestData(accountRequest);

diff --git a/src/test/java/teammates/test/AbstractBackDoor.java b/src/test/java/teammates/test/AbstractBackDoor.java
@@ -832,10 +832,9 @@ public void deleteCourse(String courseId) {
     /**
      * Gets an account request from the database.
      */
-    public AccountRequestAttributes getAccountRequest(String email, String institute) {
+    public AccountRequestAttributes getAccountRequest(UUID id) {
         Map<String, String> params = new HashMap<>();
-        params.put(Const.ParamsNames.INSTRUCTOR_EMAIL, email);
-        params.put(Const.ParamsNames.INSTRUCTOR_INSTITUTION, institute);
+        params.put(Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString());
 
         ResponseBodyAndCode response = executeGetRequest(Const.ResourceURIs.ACCOUNT_REQUEST, params);
         if (response.responseCode == HttpStatus.SC_NOT_FOUND) {
@@ -852,10 +851,9 @@ public AccountRequestAttributes getAccountRequest(String email, String institute
     /**
      * Gets registration key of an account request from the database.
      */
-    public String getRegKeyForAccountRequest(String email, String institute) {
+    public String getRegKeyForAccountRequest(UUID id) {
         Map<String, String> params = new HashMap<>();
-        params.put(Const.ParamsNames.INSTRUCTOR_EMAIL, email);
-        params.put(Const.ParamsNames.INSTRUCTOR_INSTITUTION, institute);
+        params.put(Const.ParamsNames.ACCOUNT_REQUEST_ID, id.toString());
 
         ResponseBodyAndCode response = executeGetRequest(Const.ResourceURIs.ACCOUNT_REQUEST, params);
         if (response.responseCode == HttpStatus.SC_NOT_FOUND) {