Resolve "[Queue 2.0] Status page filtering on request type"

What does this mr do?

Add a filter for requests to the status page of a lab

Screenshots

before

after

Does this MR meet the acceptance criteria?

• I have added a changelog entry to reflect the significant changes I made.
• Tests were created to test the feature.
• I have updated the documentation accordingly.
• I adhere to the style guide. Closes #501 (closed)

src/main/java/nl/tudelft/queue/controller/EditionStatusController.java

@@ -27,6 +27,7 @@ import nl.tudelft.queue.dto.view.statistics.RequestFrequencyViewDto;
 import nl.tudelft.queue.dto.view.statistics.RequestStatusViewDto;
 import nl.tudelft.queue.model.LabRequest;
 import nl.tudelft.queue.model.enums.RequestStatus;
+import nl.tudelft.queue.model.enums.RequestType;
 import nl.tudelft.queue.model.labs.Lab;
 import nl.tudelft.queue.service.EditionStatusService;
 
@@ -64,8 +65,9 @@ public class EditionStatusController {
 			@RequestParam(required = false, defaultValue = "") List<Lab> labs,
 			@RequestParam(required = false, defaultValue = "") List<Long> assignments,
 			@RequestParam(required = false, defaultValue = "") List<Long> rooms,
+			@RequestParam(required = false, defaultValue = "") List<RequestType> type,
 			@RequestParam(required = false, defaultValue = "5") int nBuckets) {
-		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms);
+		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms, type);
 		TreeSet<Long> buckets = ess.createBucketsOverCourse(labs, nBuckets);
 
 		return new RequestFrequencyViewDto(
@@ -90,8 +92,9 @@ public class EditionStatusController {
 	public RequestStatusViewDto getRequestStatusFrequencies(@PathVariable Long editionId,
 			@RequestParam(required = false, defaultValue = "") List<Lab> labs,
 			@RequestParam(required = false, defaultValue = "") List<Long> assignments,
-			@RequestParam(required = false, defaultValue = "") List<Long> rooms) {
-		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms);
+			@RequestParam(required = false, defaultValue = "") List<Long> rooms,
+			@RequestParam(required = false, defaultValue = "") List<RequestType> type) {
+		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms, type);
 
 		return new RequestStatusViewDto(
 				ess.countWhere(requests, r -> r.getEventInfo().getStatus().isPending()),
@@ -119,8 +122,9 @@ public class EditionStatusController {
 	public LabStatisticsViewDto getGenericLabInformation(@PathVariable Long editionId,
 			@RequestParam(required = false, defaultValue = "") List<Lab> labs,
 			@RequestParam(required = false, defaultValue = "") List<Long> assignments,
-			@RequestParam(required = false, defaultValue = "") List<Long> rooms) {
-		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms);
+			@RequestParam(required = false, defaultValue = "") List<Long> rooms,
+			@RequestParam(required = false, defaultValue = "") List<RequestType> type) {
+		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms, type);
 
 		return new LabStatisticsViewDto(
 				ess.countDistinctUsers(requests),
@@ -148,8 +152,9 @@ public class EditionStatusController {
 	public Map<String, Long> getAssignmentCounts(@PathVariable Long editionId,
 			@RequestParam(required = false, defaultValue = "") List<Lab> labs,
 			@RequestParam(required = false, defaultValue = "") List<Long> assignments,
-			@RequestParam(required = false, defaultValue = "") List<Long> rooms) {
-		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms);
+			@RequestParam(required = false, defaultValue = "") List<Long> rooms,
+			@RequestParam(required = false, defaultValue = "") List<RequestType> type) {
+		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms, type);
 
 		return ess.countRequestsPerAssignment(assignments, requests);
 	}
@@ -169,8 +174,9 @@ public class EditionStatusController {
 	public Map<String, Long> getRoomCounts(@PathVariable Long editionId,
 			@RequestParam(required = false, defaultValue = "") List<Lab> labs,
 			@RequestParam(required = false, defaultValue = "") List<Long> assignments,
-			@RequestParam(required = false, defaultValue = "") List<Long> rooms) {
-		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms);
+			@RequestParam(required = false, defaultValue = "") List<Long> rooms,
+			@RequestParam(required = false, defaultValue = "") List<RequestType> type) {
+		List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms, type);
 
 		return ess.countRequestsPerRoom(rooms, requests);
 	}