1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java
index 1989764..b526d36 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDatabaseDAO.java
@@ -11,10 +11,10 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Timestamp;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
 import java.util.EnumSet;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.springframework.lang.NonNull;
@@ -46,7 +46,7 @@ public class OperationDatabaseDAO implements OperationDAO {
             try (PreparedStatement pstmt = con.prepareStatement(sql)) {
                 pstmt.setString(1, o.opCode());
                 pstmt.setInt(2, o.severity().ordinal());
-                pstmt.setTimestamp(3, Timestamp.from(Objects.requireNonNull(o.created())));
+                pstmt.setObject(3, OffsetDateTime.ofInstant(o.created(), ZoneId.systemDefault()));
                 pstmt.setString(4, o.destination());
                 pstmt.setString(5, o.additionalInfo());
                 pstmt.setInt(6, o.status().ordinal());
@@ -188,7 +188,7 @@ public class OperationDatabaseDAO implements OperationDAO {
                 .severity(Severity.valueOf(rs.getString("severity")))
                 .status(Status.valueOf(rs.getString("status")))
                 .vehicles(getVehiclesFromOperationId(operationId))
-                .created(rs.getTimestamp("created").toInstant())
+                .created((rs.getObject("created", OffsetDateTime.class)).toInstant())
                 .destination(rs.getString("destination"))
                 .additionalInfo(rs.getString("additionalInfo"))
                 .build();