diff --git a/src/main/java/nl/tudelft/ewi/queue/model/Request.java b/src/main/java/nl/tudelft/ewi/queue/model/Request.java index 49d86c6155274b2505c63ab64bc36b7dd1d03ac0..3d8bb2e0b6c4d03ba3e5542f50a006cf0aa8aae0 100644 --- a/src/main/java/nl/tudelft/ewi/queue/model/Request.java +++ b/src/main/java/nl/tudelft/ewi/queue/model/Request.java @@ -489,7 +489,7 @@ public class Request implements RecordsEvents<Request>, Serializable, Comparable @Override public void addEvent(Event<Request> event) { events.add((RequestEvent) event); -// event.apply(this); + event.apply(this); } @Override diff --git a/src/main/java/nl/tudelft/ewi/queue/model/RequestApprovedEvent.java b/src/main/java/nl/tudelft/ewi/queue/model/RequestApprovedEvent.java index a37d590eefbed1a738e8f45aeb8418b145187f89..c2d861081568b094c6ae468a7fd7d1ff30095f4b 100644 --- a/src/main/java/nl/tudelft/ewi/queue/model/RequestApprovedEvent.java +++ b/src/main/java/nl/tudelft/ewi/queue/model/RequestApprovedEvent.java @@ -46,7 +46,6 @@ public class RequestApprovedEvent extends RequestEvent { this.approvedAt = approvedAt; this.assistant = assistant; this.reason = reason; - this.request.setStatus(Request.Status.APPROVED); } @Override diff --git a/src/main/java/nl/tudelft/ewi/queue/model/RequestAssignedEvent.java b/src/main/java/nl/tudelft/ewi/queue/model/RequestAssignedEvent.java index 0d5aa01ab1ccca4592a0f25ee983aab3b6e47b25..e36b341ec49ac12c2c096c2fa8cc5d8e69c48ae3 100644 --- a/src/main/java/nl/tudelft/ewi/queue/model/RequestAssignedEvent.java +++ b/src/main/java/nl/tudelft/ewi/queue/model/RequestAssignedEvent.java @@ -41,7 +41,6 @@ public class RequestAssignedEvent extends RequestEvent { this.assignedAt = assignedAt; this.assignedTo = assignedTo; - this.request.setStatus(Request.Status.ASSIGNED); } @Override diff --git a/src/main/java/nl/tudelft/ewi/queue/model/RequestForwardToAnyEvent.java b/src/main/java/nl/tudelft/ewi/queue/model/RequestForwardToAnyEvent.java index e208e7a07afb0cd7b40bd9ff920ccd6ccbb8f59b..512c319f38a1ded6832a90374a5c37db67e7b52b 100644 --- a/src/main/java/nl/tudelft/ewi/queue/model/RequestForwardToAnyEvent.java +++ b/src/main/java/nl/tudelft/ewi/queue/model/RequestForwardToAnyEvent.java @@ -41,7 +41,6 @@ public class RequestForwardToAnyEvent extends RequestEvent { this.reason = reason; this.forwardedAt = forwardedAt; - this.request.setStatus(Request.Status.PENDING); } @Override diff --git a/src/main/java/nl/tudelft/ewi/queue/model/RequestForwardedEvent.java b/src/main/java/nl/tudelft/ewi/queue/model/RequestForwardedEvent.java index 646f098a2278363e8daa716d0aeb3324d640e64d..d91668d4a13fbc729097a5db1345951c6f7c4aaa 100644 --- a/src/main/java/nl/tudelft/ewi/queue/model/RequestForwardedEvent.java +++ b/src/main/java/nl/tudelft/ewi/queue/model/RequestForwardedEvent.java @@ -47,7 +47,6 @@ public class RequestForwardedEvent extends RequestEvent { this.forwardedAt = forwardedAt; this.forwardedTo = forwardedTo; this.reason = reason; - this.request.setStatus(Request.Status.FORWARDED); } @Override diff --git a/src/main/java/nl/tudelft/ewi/queue/model/RequestProcessingEvent.java b/src/main/java/nl/tudelft/ewi/queue/model/RequestProcessingEvent.java index 11abae45497e00427cf6542414286197a76ad38b..387581f24230ce0c5a62554163c665608a39c6e2 100644 --- a/src/main/java/nl/tudelft/ewi/queue/model/RequestProcessingEvent.java +++ b/src/main/java/nl/tudelft/ewi/queue/model/RequestProcessingEvent.java @@ -34,7 +34,6 @@ public class RequestProcessingEvent extends RequestEvent { public RequestProcessingEvent(Request request, LocalDateTime processingAt) { super(request); this.processingAt = processingAt; - this.request.setStatus(Request.Status.PROCESSING); } @Override diff --git a/src/main/java/nl/tudelft/ewi/queue/model/RequestRejectedEvent.java b/src/main/java/nl/tudelft/ewi/queue/model/RequestRejectedEvent.java index 800b263eede1048450a2ab191e24178afd94e7b5..c8110f2d79fdeebad3ef9982616f947e893ae984 100644 --- a/src/main/java/nl/tudelft/ewi/queue/model/RequestRejectedEvent.java +++ b/src/main/java/nl/tudelft/ewi/queue/model/RequestRejectedEvent.java @@ -51,7 +51,6 @@ public class RequestRejectedEvent extends RequestEvent { this.assistant = assistant; this.reason = reason; this.reasonForStudent = reasonForStudent; - this.request.setStatus(Request.Status.REJECTED); } @Override diff --git a/src/main/java/nl/tudelft/ewi/queue/model/RequestRevokedEvent.java b/src/main/java/nl/tudelft/ewi/queue/model/RequestRevokedEvent.java index 4772d99af0ab2837c615bc8cb2405c50b9ab6fbf..6e096ee5c5ceaa805b0209e8a3743c41540f7565 100644 --- a/src/main/java/nl/tudelft/ewi/queue/model/RequestRevokedEvent.java +++ b/src/main/java/nl/tudelft/ewi/queue/model/RequestRevokedEvent.java @@ -35,7 +35,6 @@ public class RequestRevokedEvent extends RequestEvent { super(request); this.revokedAt = revokedAt; - this.request.setStatus(Request.Status.REVOKED); } @Override