From 80088de20cdbf665282ad74bd0513d40954fe354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= Date: Tue, 17 Oct 2023 19:32:53 +0200 Subject: [PATCH 1/2] Temporarily disable SquigglyUtils due to not handling booleans correctly. --- src/main/java/com/uu/au/controllers/HelpRequestController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/uu/au/controllers/HelpRequestController.java b/src/main/java/com/uu/au/controllers/HelpRequestController.java index 35b146c..3dd2f90 100644 --- a/src/main/java/com/uu/au/controllers/HelpRequestController.java +++ b/src/main/java/com/uu/au/controllers/HelpRequestController.java @@ -83,7 +83,8 @@ List all() { @CrossOrigin @GetMapping("/helpRequests/active") List 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 pending() { From 83c5151cd584d68815df6629e9e28e4fadc4c768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= Date: Tue, 17 Oct 2023 19:38:45 +0200 Subject: [PATCH 2/2] Added needsProfilePic to filter for future use. --- src/main/java/com/uu/au/controllers/HelpRequestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/uu/au/controllers/HelpRequestController.java b/src/main/java/com/uu/au/controllers/HelpRequestController.java index 3dd2f90..c455554 100644 --- a/src/main/java/com/uu/au/controllers/HelpRequestController.java +++ b/src/main/java/com/uu/au/controllers/HelpRequestController.java @@ -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 helpRequestsCurrentCourseInstance() { var currentCourseStartDate = courses.currentCourseInstance().getStartDate().atStartOfDay();