Changed enums (and similar fields) to match enum names of Java

3 files changed, 11 insertions, 9 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
index e4bc0ab..8fbcd18 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
@@ -25,7 +25,7 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
     private static final String ADD_REGISTRATION =
             "INSERT INTO Registration (vehicleId, employeeId, start, end, active) VALUES (?,?,?,?,?);";
     private static final String UPDATE_VEHICLE =
-            "UPDATE Vehicle SET status = 'frei_wache' WHERE id = ?;";
+            "UPDATE Vehicle SET status = 'FREI_WACHE' WHERE id = ?;";
 
     private PreparedStatement addRegistration;
     private PreparedStatement updateVehicle;
diff --git a/src/main/resources/sql/H2RegistrationDAOTest_populate.sql b/src/main/resources/sql/H2RegistrationDAOTest_populate.sql
index b81eb78..3c268a0 100644
--- a/src/main/resources/sql/H2RegistrationDAOTest_populate.sql
+++ b/src/main/resources/sql/H2RegistrationDAOTest_populate.sql
@@ -4,7 +4,7 @@ INSERT INTO EmployeeVersion (id, name, birthday, educationLevel, isDriver, isPil
 INSERT INTO Employee (id, version) VALUES (1, 1);
 INSERT INTO Employee (id, version) VALUES (2, 2);
 INSERT INTO Employee (id, version) VALUES (3, 3);
-INSERT INTO VehicleVersion (id, name, hasNef, constructionType, type) VALUES (1, 'RTW-1', TRUE, 'Hochdach', 'RTW');
-INSERT INTO VehicleVersion (id, name, hasNef, constructionType, type) VALUES (2, 'NEF-1', FALSE, 'Normal', 'NEF');
-INSERT INTO Vehicle (id, version, status) VALUES (1, 1, 'abgemeldet');
-INSERT INTO Vehicle (id, version, status) VALUES (2, 2, 'abgemeldet');
\ No newline at end of file
+INSERT INTO VehicleVersion (id, name, hasNef, constructionType, type) VALUES (1, 'RTW-1', TRUE, 'HOCHDACH', 'RTW');
+INSERT INTO VehicleVersion (id, name, hasNef, constructionType, type) VALUES (2, 'NEF-1', FALSE, 'NORMAL', 'NEF');
+INSERT INTO Vehicle (id, version, status) VALUES (1, 1, 'ABGEMELDET');
+INSERT INTO Vehicle (id, version, status) VALUES (2, 2, 'ABGEMELDET');
\ No newline at end of file
diff --git a/src/main/resources/sql/database.sql b/src/main/resources/sql/database.sql
index e775550..4f3adf7 100644
--- a/src/main/resources/sql/database.sql
+++ b/src/main/resources/sql/database.sql
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS VehicleVersion (
   constructionType VARCHAR NOT NULL,
   type VARCHAR NOT NULL,
   hasNef BOOLEAN NOT NULL,
-  CHECK constructionType IN ('Normal', 'Hochdach', 'Mittelhochdach'),
+  CHECK constructionType IN ('NORMAL', 'HOCHDACH', 'MITTELHOCHDACH'),
   CHECK type IN ('BKTW', 'KTW-B', 'KTW', 'RTW', 'NEF', 'NAH')
 );
 
@@ -13,8 +13,8 @@ CREATE TABLE IF NOT EXISTS Vehicle (
   version BIGINT NOT NULL,
   status VARCHAR NOT NULL,
   FOREIGN KEY (version) REFERENCES VehicleVersion(id),
-  CHECK status IN ('abgemeldet', 'frei_wache', 'zum_berufungsort', 'am_berufungsort', 'zum_zielort',
-              'am_zielort', 'frei_funk', 'deleted')
+  CHECK status IN ('ABGEMELDET', 'FREI_WACHE', 'ZUM_BERUFUNGSORT', 'AM_BERUFUNGSORT', 'ZUM_ZIELORT',
+              'AM_ZIELORT', 'FREI_FUNK', 'DELETED')
 );
 
 CREATE TABLE IF NOT EXISTS EmployeeVersion (
@@ -51,7 +51,9 @@ CREATE TABLE IF NOT EXISTS Operation (
   created TIMESTAMP NOT NULL,
   destination VARCHAR(100) NOT NULL,
   additionalInfo VARCHAR(100),
-  CHECK severity IN ('A', 'B', 'C', 'D', 'E', 'O')
+  status VARCHAR NOT NULL,
+  CHECK severity IN ('A', 'B', 'C', 'D', 'E', 'O'),
+  CHECK status IN ('ACTIVE', 'COMPLETED', 'CANCELLED')
 );
 
 CREATE TABLE IF NOT EXISTS VehicleOperation (