delete data when not in core

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

@@ -180,6 +180,8 @@ public class LabController {
 		List<? extends Request<?>> requests;
 		if (qSession instanceof Lab lab) {
 			requests = lrr.findAllByFilter(List.of(lab), filter, Language.ANY);
+			requests.removeIf(rq -> qSession.getRequests().stream().map(Request::getId)
+					.noneMatch(rId -> rId.equals(rq.getId())));
 		} else {
 			requests = qSession.getRequests();
 		}
@@ -816,7 +818,11 @@ public class LabController {
 
 			Set<Long> alreadyInGroup = sgCache.getByPerson(person.getId()).stream()
 					.map(g -> g.getModule().getId()).collect(Collectors.toSet());
-			Set<Long> hasEmptyGroups = qSession.getModules().stream()
+
+			Set<Long> hasEmptyGroups = mCache
+					.getAndHandle(new ArrayList<>(qSession.getModules()),
+							id -> ls.removeModuleForSession(qSession, id))
+					.stream().map(ModuleDetailsDTO::getId)
 					.filter(m -> !alreadyInGroup.contains(m))
 					.filter(m -> sgApi.getAllGroupsInModule(m).any(g -> g.getMemberUsernames().isEmpty())
 							.block())
@@ -834,7 +840,7 @@ public class LabController {
 		} else {
 			model.addAttribute("modules",
 					mCache.getAndHandle(qSession.getModules().stream(),
-							moduleID -> qSession.getModules().remove(moduleID))
+							moduleId -> ls.removeModuleForSession(qSession, moduleId))
 							.stream().sorted(Comparator.comparing(ModuleDetailsDTO::getName))
 							.collect(Collectors.toList()));
 		}

src/main/java/nl/tudelft/queue/service/LabService.java

@@ -36,9 +36,11 @@ import nl.tudelft.labracore.api.SessionControllerApi;
 import nl.tudelft.labracore.api.dto.*;
 import nl.tudelft.labracore.lib.security.user.Person;
 import nl.tudelft.librador.dto.view.View;
+import nl.tudelft.queue.cache.AssignmentCacheManager;
 import nl.tudelft.queue.cache.EditionCacheManager;
 import nl.tudelft.queue.cache.EditionCollectionCacheManager;
 import nl.tudelft.queue.cache.SessionCacheManager;
+import nl.tudelft.queue.cache.StudentGroupCacheManager;
 import nl.tudelft.queue.csv.*;
 import nl.tudelft.queue.dto.create.QueueSessionCreateDTO;
 import nl.tudelft.queue.dto.create.labs.AbstractSlottedLabCreateDTO;
@@ -88,9 +90,15 @@ public class LabService {
 	@Autowired
 	private EditionCacheManager eCache;
 
+	@Autowired
+	private StudentGroupCacheManager sgCache;
+
 	@Autowired
 	private EditionCollectionCacheManager ecCache;
 
+	@Autowired
+	private AssignmentCacheManager aCache;
+
 	@Autowired
 	private SessionCacheManager sCache;
 
@@ -537,6 +545,24 @@ public class LabService {
 		return labs.stream().map(Lab::getOnlineModes).flatMap(Set::stream).collect(Collectors.toSet());
 	}
 
+	/**
+	 * Responsible for removing things that are no longer needed when a module is deleted.
+	 *
+	 * @param qs       The session in question
+	 * @param moduleId The module id that was deleted.
+	 */
+	@Transactional
+	public void removeModuleForSession(QueueSession<?> qs, Long moduleId) {
+		qs.getModules().remove(moduleId);
+		qs.getRequests().removeIf(r -> sgCache.get(r.getStudentGroup()).isEmpty());
+
+		if (qs instanceof Lab) {
+			Lab lab = (Lab) qs;
+			lab.getAllowedRequests().removeIf(ar -> aCache.get(ar.getAssignment()).isEmpty());
+			lab.getRequests().removeIf(r -> aCache.get(r.getAssignment()).isEmpty());
+		}
+	}
+
 	/**
 	 * Adds students, identified by their netid in a CSV file to an exam lab to give them priority during the
 	 * review.

src/main/java/nl/tudelft/queue/service/RequestTableService.java

@@ -236,6 +236,10 @@ public class RequestTableService {
 		rCache.getAndIgnoreMissing(
 				requests.stream().map(Request::getRoom).filter(Objects::nonNull).distinct());
 
+		for (Request r : requests) {
+			r.toViewDTO();
+		}
+
 		// Map each of the request to view DTOs that individually do cache requests
 		return requests.stream().map(Request::toViewDTO).collect(Collectors.toList());
 	}