Replace LocalDateTime With ZonedDateTime

src/main/java/com/duffel/model/AirlineInitiatedChange.java

@@ -7,7 +7,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.util.List;
 
 /**
@@ -31,7 +31,7 @@ public class AirlineInitiatedChange extends Data<AirlineInitiatedChange> {
      * The ISO 8601 datetime at which an action was taken
      */
     @JsonProperty("action_taken_at")
-    private LocalDateTime actionTakenAt;
+    private ZonedDateTime actionTakenAt;
 
     /**
      * List of updated slices and segments following the change. These slices and segments may each have a new ID
@@ -55,7 +55,7 @@ public class AirlineInitiatedChange extends Data<AirlineInitiatedChange> {
      * The ISO 8601 datetime at which we detected the airline-initiated change
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * Duffel's unique identifier for the airline-initiated change
@@ -86,7 +86,7 @@ public class AirlineInitiatedChange extends Data<AirlineInitiatedChange> {
      * The ISO 8601 datetime at which the airline-initiated change was last updated
      */
     @JsonProperty("updated_at")
-    private LocalDateTime updatedAt;
+    private ZonedDateTime updatedAt;
 
     /**
      * Actions that can be taken for this change.

src/main/java/com/duffel/model/Webhook.java

@@ -6,7 +6,7 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.util.List;
 
 /**
@@ -29,7 +29,7 @@ public class Webhook extends Data<Webhook> {
      * Example: "2020-04-11T15:48:11.642Z"
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * The events that this webhook will be subscribed to
@@ -59,7 +59,7 @@ public class Webhook extends Data<Webhook> {
      * Example: "2020-04-11T15:48:11.642Z"
      */
     @JsonProperty("updated_at")
-    private LocalDateTime updatedAt;
+    private ZonedDateTime updatedAt;
 
     /**
      * The URL where your webhook will be received

src/main/java/com/duffel/model/response/Offer.java

@@ -11,7 +11,7 @@
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.util.List;
 
 /**
@@ -73,15 +73,15 @@ public class Offer extends Data<Offer> {
      * Example: "2020-01-17T10:12:14.545Z"
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * The ISO 8601 datetime expiry of the offer before which the traveller should use this offer to create an order.
      * After this time the offer can no longer be used to create an order.
      * Example: "2020-01-17T10:42:14.545Z"
      */
     @JsonProperty("expires_at")
-    private LocalDateTime expiresAt;
+    private ZonedDateTime expiresAt;
 
     /**
      * Duffel's unique identifier for the offer
@@ -189,6 +189,6 @@ public class Offer extends Data<Offer> {
      * Example: "2020-01-17T10:12:14.545Z"
      */
     @JsonProperty("updated_at")
-    private LocalDateTime updatedAt;
+    private ZonedDateTime updatedAt;
 
 }

src/main/java/com/duffel/model/response/OfferResponse.java

@@ -7,7 +7,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.util.List;
 
 /**
@@ -44,7 +44,7 @@ public class OfferResponse extends Data<OfferResponse> {
      * Example: "2020-02-12T15:21:01.927Z"
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * Whether the offer request was created in live mode. This field will be set to true if the offer request was

src/main/java/com/duffel/model/response/Order.java

@@ -10,7 +10,7 @@
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -60,7 +60,7 @@ public class Order extends Data<Order> {
      * e.g. "2020-04-11T15:48:11.642Z"
      */
     @JsonProperty("cancelled_at")
-    private LocalDateTime cancelledAt;
+    private ZonedDateTime cancelledAt;
 
     /**
      * The conditions associated with this order, describing the kinds of modifications you can make to it and any
@@ -78,7 +78,7 @@ public class Order extends Data<Order> {
      * e.g. "2020-04-11T15:48:11.642Z"
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * The documents issued for this order
@@ -146,7 +146,7 @@ public class Order extends Data<Order> {
      * datetime is in the last minute you can consider the order up to date.
      */
     @JsonProperty("synced_at")
-    private LocalDateTime syncedAt;
+    private ZonedDateTime syncedAt;
 
     /**
      * The amount of tax payable on the order for all the flights booked

src/main/java/com/duffel/model/response/OrderCancellation.java

@@ -7,7 +7,7 @@
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 
 /**
  * Order cancellation.
@@ -21,19 +21,19 @@ public class OrderCancellation {
      * The ISO 8601 datetime that indicates when the order cancellation was confirmed
      */
     @JsonProperty("confirmed_at")
-    private LocalDateTime confirmedAt;
+    private ZonedDateTime confirmedAt;
 
     /**
      * The ISO 8601 datetime at which the order cancellation was created
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * The ISO 8601 datetime by which this cancellation must be confirmed
      */
     @JsonProperty("expires_at")
-    private LocalDateTime expiresAt;
+    private ZonedDateTime expiresAt;
 
     /**
      * Duffel's unique identifier for the order cancellation

src/main/java/com/duffel/model/response/PaymentRequirements.java

@@ -5,7 +5,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 
 /**
  * Payment requirements for an order.
@@ -22,15 +22,15 @@ public class PaymentRequirements {
      * Example: "2020-01-17T10:42:14Z"
      */
     @JsonProperty("payment_required_by")
-    private LocalDateTime paymentRequiredBy;
+    private ZonedDateTime paymentRequiredBy;
 
     /**
      * The ISO 8601 datetime at which the price associated with the order will no longer be guaranteed by the airline
      * and may change before payment. This will be null when requires_instant_payment is true.
      * Example: "2020-01-17T10:42:14"
      */
     @JsonProperty("price_guarantee_expires_at")
-    private LocalDateTime priceGuaranteeExpiresAt;
+    private ZonedDateTime priceGuaranteeExpiresAt;
 
     /**
      * When payment is required at the time of booking this will be true and payment_required_by and

src/main/java/com/duffel/model/response/PaymentResponse.java

@@ -8,7 +8,7 @@
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 
 /**
  * Payment response.
@@ -30,7 +30,7 @@ public class PaymentResponse extends Data<PaymentResponse> {
      * Example: "2020-04-11T15:48:11.642Z"
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * The currency of the amount, as an ISO 4217 currency code. It will match your organisation's billing currency

src/main/java/com/duffel/model/response/order/PaymentStatus.java

@@ -5,7 +5,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 
 /**
  * Status of an order payment.
@@ -28,13 +28,13 @@ public class PaymentStatus {
     * where awaiting_payment is false.
     */
     @JsonProperty("payment_required_by")
-    private LocalDateTime paymentRequiredBy;
+    private ZonedDateTime paymentRequiredBy;
 
     /**
     *  The ISO 8601 datetime at which the price associated with the order will no longer be guaranteed by the airline
     *  and the order will need to be repriced before payment. This will be null when there is no price guarantee.
     */
     @JsonProperty("price_guarantee_expires_at")
-    private LocalDateTime priceGuaranteeExpiresAt;
+    private ZonedDateTime priceGuaranteeExpiresAt;
 
 }

src/main/java/com/duffel/model/response/orderchange/OrderChangeOffer.java

@@ -8,7 +8,7 @@
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 
 /**
  * Change order possible offer.
@@ -38,13 +38,13 @@ public class OrderChangeOffer extends Data<OrderChangeOffer> {
      * The ISO 8601 datetime at which the offer was created
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * The ISO 8601 datetime at which the offer will expire and no longer be usable to create an order
      */
     @JsonProperty("expires_at")
-    private LocalDateTime expiresAt;
+    private ZonedDateTime expiresAt;
 
     /**
      * Duffel's unique identifier for the order change offer
@@ -107,7 +107,7 @@ public class OrderChangeOffer extends Data<OrderChangeOffer> {
      * The ISO 8601 datetime at which the offer was last updated
      */
     @JsonProperty("updated_at")
-    private LocalDateTime updatedAt;
+    private ZonedDateTime updatedAt;
 
     /**
      * The slices within an order change that are being added to and/or removed from the order

src/main/java/com/duffel/model/response/orderchange/OrderChangeResponse.java

@@ -7,7 +7,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 import java.util.List;
 
 /**
@@ -22,7 +22,7 @@ public class OrderChangeResponse extends Data<OrderChangeResponse> {
      * The ISO 8601 datetime at which the order change request was created
      */
     @JsonProperty("created_at")
-    private LocalDateTime createdAt;
+    private ZonedDateTime createdAt;
 
     /**
      * The ID of your order change request
@@ -59,6 +59,6 @@ public class OrderChangeResponse extends Data<OrderChangeResponse> {
      * The ISO 8601 datetime at which the order change request was last updated
      */
     @JsonProperty("updated_at")
-    private LocalDateTime updatedAt;
+    private ZonedDateTime updatedAt;
 
 }

src/test/java/com/duffel/service/AirlineInitiatedChangeTest.java

@@ -12,7 +12,7 @@
 import org.mockserver.model.Parameter;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -67,7 +67,7 @@ void update(MockServerClient mockClient) {
 
         assertEquals("aic_0000AMPr4lUGju0EEBrHCC", airlineInitiatedChange.getId());
         assertEquals(AirlineInitiatedChangeActionTaken.cancelled, airlineInitiatedChange.getActionTaken());
-        assertEquals(LocalDateTime.parse("2022-08-11T10:51:30.702393"), airlineInitiatedChange.getUpdatedAt());
+        assertEquals(ZonedDateTime.parse("2022-08-11T10:51:30.702393Z"), airlineInitiatedChange.getUpdatedAt());
     }
 
 }