Skip to content

Disable filter use for retrieving active help requests #7

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

Open
joelsiks wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Disable filter use for retrieving active help requests #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80088de
Temporarily disable SquigglyUtils due to not handling booleans correc…
Oct 17, 2023
83c5151
Added needsProfilePic to filter for future use.
Oct 17, 2023
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
5 changes: 3 additions & 2 deletions src/main/java/com/uu/au/controllers/HelpRequestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class HelpRequestController {

private final Logger logger = LoggerFactory.getLogger(UserController.class);

public static final String filterStudent = "**,submitters[id,firstName,lastName,verifiedProfilePic],helper[id,firstName,lastName]";
public static final String filterStudent = "**,submitters[id,firstName,lastName,verifiedProfilePic,needsProfilePic],helper[id,firstName,lastName]";

public List<HelpRequest> helpRequestsCurrentCourseInstance() {
var currentCourseStartDate = courses.currentCourseInstance().getStartDate().atStartOfDay();
Expand All @@ -83,7 +83,8 @@ List<HelpRequest> all() {
@CrossOrigin
@GetMapping("/helpRequests/active")
List<HelpRequest> active() {
return SquigglyUtils.listify(Squiggly.init(AUPortal.OBJECT_MAPPER, HelpRequestController.filterStudent), pending(), HelpRequest.class);
return pending();
//return SquigglyUtils.listify(Squiggly.init(AUPortal.OBJECT_MAPPER, HelpRequestController.filterStudent), pending(), HelpRequest.class);
}

List<HelpRequest> pending() {
Expand Down