Skip to content
Snippets Groups Projects

Resolve "Refactor Methods in RequestTableService"

Files

@@ -37,6 +37,7 @@ import nl.tudelft.queue.model.LabRequest;
@@ -37,6 +37,7 @@ import nl.tudelft.queue.model.LabRequest;
import nl.tudelft.queue.model.enums.RequestStatus;
import nl.tudelft.queue.model.enums.RequestStatus;
import nl.tudelft.queue.model.enums.RequestType;
import nl.tudelft.queue.model.enums.RequestType;
import nl.tudelft.queue.model.labs.Lab;
import nl.tudelft.queue.model.labs.Lab;
 
import nl.tudelft.queue.service.AssignmentService;
import nl.tudelft.queue.service.EditionStatusService;
import nl.tudelft.queue.service.EditionStatusService;
@Validated
@Validated
@@ -45,6 +46,8 @@ public class EditionStatusController {
@@ -45,6 +46,8 @@ public class EditionStatusController {
@Autowired
@Autowired
private EditionStatusService ess;
private EditionStatusService ess;
 
@Autowired
 
public AssignmentService as;
/**
/**
* Creates and returns the data for a histogram regarding the status of requests over time. The data for
* Creates and returns the data for a histogram regarding the status of requests over time. The data for
@@ -134,7 +137,7 @@ public class EditionStatusController {
@@ -134,7 +137,7 @@ public class EditionStatusController {
ess.countDistinctAssistants(requests),
ess.countDistinctAssistants(requests),
ess.countWhere(requests, r -> r.getEventInfo().getStatus().isPending()),
ess.countWhere(requests, r -> r.getEventInfo().getStatus().isPending()),
ess.countWhere(requests, r -> r.getEventInfo().getStatus().isHandled()),
ess.countWhere(requests, r -> r.getEventInfo().getStatus().isHandled()),
ess.mostCountedName(ess.countRequestsPerAssignment(assignments, requests)),
ess.mostCountedName(ess.as.countRequestsPerAssignment(assignments, requests)),
ess.mostCountedName(ess.countRequestsPerRoom(rooms, requests)),
ess.mostCountedName(ess.countRequestsPerRoom(rooms, requests)),
ess.averageWaitingTime(requests),
ess.averageWaitingTime(requests),
ess.averageProcessingTime(requests));
ess.averageProcessingTime(requests));
@@ -160,7 +163,7 @@ public class EditionStatusController {
@@ -160,7 +163,7 @@ public class EditionStatusController {
@RequestParam(required = false, defaultValue = "") List<RequestType> type) {
@RequestParam(required = false, defaultValue = "") List<RequestType> type) {
List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms, type);
List<LabRequest> requests = ess.getFilteredRequests(labs, assignments, rooms, type);
return ess.countRequestsPerAssignment(assignments, requests);
return as.countRequestsPerAssignment(assignments, requests);
}
}
/**
/**
Loading