Resolve "[Queue-2.0] Recent update breaks request table updates"

Make sure to read our contributing guide

Closes #490 (closed)

src/main/java/nl/tudelft/queue/realtime/messages/RequestCreatedMessage.java

@@ -18,10 +18,9 @@
 package nl.tudelft.queue.realtime.messages;
 
 import lombok.*;
-import nl.tudelft.labracore.api.dto.RoomDetailsDTO;
 import nl.tudelft.librador.dto.view.View;
-import nl.tudelft.queue.dto.view.RequestViewDTO;
-import nl.tudelft.queue.model.Request;
+import nl.tudelft.queue.dto.view.requests.LabRequestViewDTO;
+import nl.tudelft.queue.model.LabRequest;
 import nl.tudelft.queue.model.enums.RequestStatus;
 import nl.tudelft.queue.model.enums.RequestType;
 
@@ -30,18 +29,33 @@ import nl.tudelft.queue.model.enums.RequestType;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class RequestCreatedMessage extends View<Request<?>> implements Message {
+public class RequestCreatedMessage extends View<LabRequest> implements Message {
 	private static final long serialVersionUID = -3558345410667448241L;
 
 	private Long id;
 	private String sentence;
+
+	private Long editionId;
+	private Long courseId;
 	private String organizationName;
-	private RoomDetailsDTO room;
+
+	private String requestedBy;
+
+	private Long roomId;
+	private String roomName;
+	private Long buildingId;
+	private String buildingName;
+
+	private Long assignmentId;
+	private String assignmentName;
+	private Long moduleId;
+	private String moduleName;
 
 	private Long labId;
-	private Long assignment;
 	private RequestStatus status;
+
 	private RequestType requestType;
+	private String requestTypeDisplayName;
 
 	@Override
 	public String getType() {
@@ -50,13 +64,29 @@ public class RequestCreatedMessage extends View<Request<?>> implements Message {
 
 	@Override
 	public void postApply() {
-		RequestViewDTO<?> view = data.toViewDTO();
+		LabRequestViewDTO view = data.toViewDTO();
 
 		sentence = view.toSentence();
+
+		editionId = view.getEdition().getId();
+		courseId = view.getEdition().getCourse().getId();
 		organizationName = view.organizationName();
-		room = view.getRoom();
+
+		requestedBy = view.requesterEntityName();
+
+		roomId = view.getRoom().getId();
+		roomName = view.getRoom().getName();
+		buildingId = view.getRoom().getBuilding().getId();
+		buildingName = view.getRoom().getBuilding().getName();
+
+		assignmentId = view.getAssignment().getId();
+		assignmentName = view.getAssignment().getName();
+		moduleId = view.getAssignment().getModule().getId();
+		moduleName = view.getAssignment().getModule().getName();
 
 		labId = view.getQSession().getId();
 		status = RequestStatus.PENDING;
+
+		requestTypeDisplayName = view.getRequestType().displayName();
 	}
 }