Update spring boot and resolve minor issues

Signed-off-by: Otto Visser <O.W.Visser@tudelft.nl>

build.gradle.kts

@@ -55,7 +55,7 @@ plugins {
 
 	// Spring plugins for managing dependencies and creating
 	// a nice Spring Boot application.
-	id("org.springframework.boot").version("2.5.12")
+	id("org.springframework.boot").version("2.5.14")
 	id("io.spring.dependency-management").version("1.0.11.RELEASE")
 
 	// Plugin to provide task to check the current versions of

src/main/java/nl/tudelft/queue/model/LabRequestConstraint.java

@@ -18,6 +18,7 @@
 package nl.tudelft.queue.model;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -94,5 +95,5 @@ public abstract class LabRequestConstraint {
 	 *
 	 * @param session The lab to set.
 	 */
-	public abstract void setSession(QueueSession<?> session);
+	public abstract void setSession(@NotNull QueueSession<?> session);
 }

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

@@ -432,11 +432,9 @@ public class LabService {
 	 */
 	public long countOngoingLabs(List<Lab> labs) {
 		LocalDateTime now = LocalDateTime.now();
-		return labs.stream().filter(l -> {
-			SessionDetailsDTO session = sCache.getOrThrow(l.getSession());
-			return session.getStart().isBefore(now) &&
-					session.getEnd().isAfter(now);
-		}).count();
+		List<SessionDetailsDTO> sessions = sCache.get(labs.stream().map(QueueSession::getSession));
+		return sessions.stream().filter(s -> s.getStart().isBefore(now) &&
+				s.getEnd().isAfter(now)).count();
 	}
 
 	/**
@@ -453,7 +451,7 @@ public class LabService {
 				case EXAM:
 					AbstractSlottedLab<TimeSlot> lab = (AbstractSlottedLab<TimeSlot>) l;
 					return lab.getSlottedLabConfig().getSelectionOpensAt().isBefore(now)
-							|| sCache.getOrThrow(lab.getSession()).getStart().isAfter(now);
+							&& sCache.getOrThrow(lab.getSession()).getEnd().isAfter(now);
 				default:
 					return false;
 			}

src/test/java/nl/tudelft/queue/controller/SharedEditionControllerTest.java

@@ -46,6 +46,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
@@ -59,6 +60,7 @@ import test.test.TestQueueApplication;
 
 @Transactional
 @AutoConfigureMockMvc
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 @SpringBootTest(classes = TestQueueApplication.class)
 public class SharedEditionControllerTest {