Fix id validation in OperationService #25963

2 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
index 3e811d4..d91c90a 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
@@ -51,6 +51,8 @@ public class OperationServiceImpl implements OperationService {
 
         if (o.severity() != null) throw new InvalidOperationException("Severity must not be set");
 
+        if (o.id() != 0) throw new InvalidOperationException("Id must be 0");
+
         if (o.status() != Status.ACTIVE)
             LOG.warn("Status was set but will be overridden"); // TODO: nullable instead??
 
@@ -218,8 +220,6 @@ public class OperationServiceImpl implements OperationService {
     }
 
     private static void validateOperation(Operation o) throws InvalidOperationException {
-        if (o.id() <= 0) throw new InvalidOperationException("Id is invalid");
-
         if (o.vehicles().isEmpty())
             throw new InvalidOperationException(
                     "Es muss mindestens ein Fahrzeug ausgewählt werden!");
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceTest.java
index ac53555..67fb77d 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceTest.java
@@ -105,7 +105,6 @@ public class OperationServiceTest {
 
         baseOp =
                 Operation.builder()
-                        .id(1)
                         .opCode("ALP-95E7")
                         .severity(Severity.E)
                         .status(Status.ACTIVE)
@@ -113,7 +112,7 @@ public class OperationServiceTest {
                         .destination("Wiedner Hauptstraße 35, Wien")
                         .build();
 
-        o1 = baseOp.toBuilder().created(Instant.now()).build();
+        o1 = baseOp.toBuilder().id(1).created(Instant.now()).build();
         o2 = o1.toBuilder().id(5).status(Status.CANCELLED).build();
 
         when(operationDAO.get(anyLong()))