Merge pull request #7 from tjuerge/pr-timezone-support

adds timezone support

Author: eugene-khyst

src/main/java/com/example/eventsourcing/domain/OrderAggregate.java

@@ -11,7 +11,7 @@
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.Instant;
+import java.time.OffsetDateTime;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.UUID;
@@ -25,10 +25,10 @@ public class OrderAggregate extends Aggregate {
     private BigDecimal price;
     private List<WaypointDto> route;
     private UUID driverId;
-    private Instant placedDate;
-    private Instant acceptedDate;
-    private Instant completedDate;
-    private Instant cancelledDate;
+    private OffsetDateTime placedDate;
+    private OffsetDateTime acceptedDate;
+    private OffsetDateTime completedDate;
+    private OffsetDateTime cancelledDate;
 
     @JsonCreator
     public OrderAggregate(@NonNull UUID aggregateId, int version) {

src/main/java/com/example/eventsourcing/domain/event/Event.java

@@ -5,7 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
-import java.time.Instant;
+import java.time.OffsetDateTime;
 import java.util.UUID;
 
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
@@ -15,6 +15,6 @@ public class Event {
 
     protected final UUID aggregateId;
     protected final int version;
-    protected final Instant createdDate = Instant.now();
+    protected final OffsetDateTime createdDate = OffsetDateTime.now();
     protected final EventType eventType = EventType.fromClass(this.getClass());
 }

src/main/java/com/example/eventsourcing/dto/OrderDto.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.math.BigDecimal;
+import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.UUID;
 
@@ -12,7 +13,7 @@ public record OrderDto(
         @JsonProperty("event_type")
         String eventType,
         @JsonProperty("event_timestamp")
-        long eventTimestamp,
+        OffsetDateTime eventTimestamp,
         @JsonProperty("version")
         int version,
         @JsonProperty("status")

src/main/java/com/example/eventsourcing/mapper/OrderMapper.java

@@ -7,9 +7,6 @@
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
-import java.time.Instant;
-import java.util.Optional;
-
 @Mapper(componentModel = "spring")
 public interface OrderMapper {
 
@@ -25,8 +22,4 @@ public interface OrderMapper {
     @Mapping(source = "order.route", target = "route")
     @Mapping(source = "order.driverId", target = "driverId")
     OrderDto toDto(Event event, OrderAggregate order);
-
-    default long toEpochMilli(Instant instant) {
-        return Optional.ofNullable(instant).map(Instant::toEpochMilli).orElse(0L);
-    }
 }

src/main/java/com/example/eventsourcing/projection/OrderProjection.java

@@ -11,7 +11,7 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.Instant;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -37,10 +37,10 @@ public class OrderProjection implements Persistable<UUID>, Serializable {
     @ToString.Exclude
     private List<WaypointProjection> route = new ArrayList<>();
     private UUID driverId;
-    private Instant placedDate;
-    private Instant acceptedDate;
-    private Instant completedDate;
-    private Instant cancelledDate;
+    private OffsetDateTime placedDate;
+    private OffsetDateTime acceptedDate;
+    private OffsetDateTime completedDate;
+    private OffsetDateTime cancelledDate;
 
     @JsonIgnore
     @Override

src/main/resources/db/migration/V1__init.sql

@@ -37,16 +37,16 @@ CREATE TABLE IF NOT EXISTS ES_EVENT_SUBSCRIPTION (
 );
 
 CREATE TABLE IF NOT EXISTS RM_ORDER (
-  ID              UUID            PRIMARY KEY,
-  VERSION         INTEGER         NOT NULL,
-  STATUS          TEXT            NOT NULL,
-  RIDER_ID        UUID            NOT NULL,
-  PRICE           DECIMAL(19, 2)  NOT NULL,
+  ID              UUID                      PRIMARY KEY,
+  VERSION         INTEGER                   NOT NULL,
+  STATUS          TEXT                      NOT NULL,
+  RIDER_ID        UUID                      NOT NULL,
+  PRICE           DECIMAL(19, 2)            NOT NULL,
   DRIVER_ID       UUID,
-  PLACED_DATE     TIMESTAMP       NOT NULL,
-  ACCEPTED_DATE   TIMESTAMP,
-  CANCELLED_DATE  TIMESTAMP,
-  COMPLETED_DATE  TIMESTAMP
+  PLACED_DATE     TIMESTAMP WITH TIME ZONE  NOT NULL,
+  ACCEPTED_DATE   TIMESTAMP WITH TIME ZONE,
+  CANCELLED_DATE  TIMESTAMP WITH TIME ZONE,
+  COMPLETED_DATE  TIMESTAMP WITH TIME ZONE
 );
 
 CREATE TABLE IF NOT EXISTS RM_ORDER_ROUTE (