Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#13173] Fix SearchAccountRequestsActionTest #13257

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[#13173] Fix SearchAccountRequestsActionTest #13257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e87aa4f
Add back getting account request via email and institute
jasonqiu212 Mar 6, 2025
a48ae14
Fix lint
jasonqiu212 Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/main/java/teammates/storage/sqlapi/AccountRequestsDb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,20 @@ public AccountRequest getAccountRequest(UUID id) {
return HibernateUtil.get(AccountRequest.class, id);
}

/**
* Get AccountRequest by {@code email} and {@code institute} from database.
*/
public AccountRequest getAccountRequest(String email, String institute) {
CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder();
CriteriaQuery<AccountRequest> cr = cb.createQuery(AccountRequest.class);
Root<AccountRequest> root = cr.from(AccountRequest.class);
cr.select(root).where(cb.and(cb.equal(
root.get("email"), email), cb.equal(root.get("institute"), institute)));

TypedQuery<AccountRequest> query = HibernateUtil.createQuery(cr);
return query.getResultStream().findFirst().orElse(null);
}

/**
* Get all Account Requests with {@code status} of 'pending'.
*/
Expand Down Expand Up @@ -119,7 +133,8 @@ public AccountRequest getAccountRequestByRegistrationKey(String registrationKey)
}

/**
* Get AccountRequest with {@code createdTime} within the times {@code startTime} and {@code endTime}.
* Get AccountRequest with {@code createdTime} within the times
* {@code startTime} and {@code endTime}.
*/
public List<AccountRequest> getAccountRequests(Instant startTime, Instant endTime) {
CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder();
Expand All @@ -145,7 +160,7 @@ public AccountRequest updateAccountRequest(AccountRequest accountRequest)

if (getAccountRequest(accountRequest.getId()) == null) {
throw new EntityDoesNotExistException(
String.format(ERROR_UPDATE_NON_EXISTENT, accountRequest.toString()));
String.format(ERROR_UPDATE_NON_EXISTENT, accountRequest.toString()));
}

merge(accountRequest);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/teammates/storage/sqlsearch/AccountRequestSearchManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.Comparator;
import java.util.List;
import java.util.UUID;

import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.QueryResponse;
Expand Down Expand Up @@ -36,8 +35,9 @@ AccountRequestSearchDocument createDocument(AccountRequest accountRequest) {

@Override
AccountRequest getEntityFromDocument(SolrDocument document) {
UUID id = UUID.fromString((String) document.getFieldValue("id"));
return accountRequestsDb.getAccountRequest(id);
String email = (String) document.getFirstValue("email");
String institute = (String) document.getFirstValue("institute");
return accountRequestsDb.getAccountRequest(email, institute);
}

@Override
Expand Down
Loading