From e3110cc235db4700ce905262db9a70dad3f9058f Mon Sep 17 00:00:00 2001
From: LiamClark <L.A.Clark@student.tudelft.nl>
Date: Fri, 6 Sep 2019 15:17:00 +0200
Subject: [PATCH] fix post loads
---
src/main/java/nl/tudelft/ewi/queue/model/Request.java | 2 +-
.../java/nl/tudelft/ewi/queue/model/RequestApprovedEvent.java | 1 -
.../java/nl/tudelft/ewi/queue/model/RequestAssignedEvent.java | 1 -
.../nl/tudelft/ewi/queue/model/RequestForwardToAnyEvent.java | 1 -
.../java/nl/tudelft/ewi/queue/model/RequestForwardedEvent.java | 1 -
.../java/nl/tudelft/ewi/queue/model/RequestProcessingEvent.java | 1 -
.../java/nl/tudelft/ewi/queue/model/RequestRejectedEvent.java | 1 -
.../java/nl/tudelft/ewi/queue/model/RequestRevokedEvent.java | 1 -
8 files changed, 1 insertion(+), 8 deletions(-)
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 49d86c615..3d8bb2e0b 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 a37d590ee..c2d861081 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 0d5aa01ab..e36b341ec 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 e208e7a07..512c319f3 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 646f098a2..d91668d4a 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 11abae454..387581f24 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 800b263ee..c8110f2d7 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 4772d99af..6e096ee5c 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
--
GitLab