Merge pull request #180 from companieshouse/bi-13910-fix-paid-at-datetime

BI-13910: Fix paid_at datetime conversion

Author: tombradley1

src/main/java/uk/gov/companieshouse/orders/api/controller/BasketController.java

@@ -11,6 +11,7 @@
 import static uk.gov.companieshouse.orders.api.logging.LoggingUtils.APPLICATION_NAME_SPACE;
 
 import java.io.IOException;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -566,7 +567,7 @@ private Checkout updateCheckout(final Checkout checkout, final BasketPaymentRequ
         final CheckoutData data = checkout.getData();
         data.setStatus(update.getStatus());
         if (update.getStatus() == PaymentStatus.PAID) {
-            data.setPaidAt(update.getPaidAt());
+            data.setPaidAt(update.getPaidAt().atZoneSameInstant(ZoneId.systemDefault()).toLocalDateTime());
             data.setPaymentReference(update.getPaymentReference());
         }
         checkoutService.saveCheckout(checkout);

src/main/java/uk/gov/companieshouse/orders/api/dto/BasketPaymentRequestDTO.java

@@ -4,24 +4,24 @@
 import com.google.gson.Gson;
 import uk.gov.companieshouse.orders.api.model.PaymentStatus;
 
-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 
 public class BasketPaymentRequestDTO {
 
     @JsonProperty("paid_at")
-    private LocalDateTime paidAt;
+    private OffsetDateTime paidAt;
 
     @JsonProperty("payment_reference")
     private String paymentReference;
 
     @JsonProperty("status")
     private PaymentStatus status;
 
-    public LocalDateTime getPaidAt() {
+    public OffsetDateTime getPaidAt() {
         return paidAt;
     }
 
-    public void setPaidAt(LocalDateTime paidAt) {
+    public void setPaidAt(OffsetDateTime paidAt) {
         this.paidAt = paidAt;
     }
 

src/test/java/uk/gov/companieshouse/orders/api/controller/BasketControllerIntegrationTest.java

@@ -57,6 +57,7 @@
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.Month;
+import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -2246,7 +2247,7 @@ private List<ItemCosts> createItemCosts(){
 
     private BasketPaymentRequestDTO createBasketPaymentRequest(PaymentStatus paymentStatus) {
         final BasketPaymentRequestDTO basketPaymentRequestDTO = new BasketPaymentRequestDTO();
-        basketPaymentRequestDTO.setPaidAt(LocalDateTime.now());
+        basketPaymentRequestDTO.setPaidAt(OffsetDateTime.now());
         basketPaymentRequestDTO.setPaymentReference(PAYMENT_ID);
         basketPaymentRequestDTO.setStatus(paymentStatus);
 

src/test/java/uk/gov/companieshouse/orders/api/controller/BasketControllerTest.java

@@ -21,6 +21,7 @@
 import java.io.IOException;
 
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -673,7 +674,8 @@ private void patchPaymentDetailsStatusUpdateIsSaved(final PaymentStatus paymentO
         final String checkout_id = "123456789";
         final String payment_id = "987654321";
         final String eric_header = "EricHeader";
-        final LocalDateTime paidAt = LocalDateTime.now();
+        final OffsetDateTime paidAt = OffsetDateTime.now();
+        final LocalDateTime paidAtLocal = paidAt.toLocalDateTime();
 
         final MockHttpServletRequest request = new MockHttpServletRequest();
         request.addHeader(ApiSdkManager.getEricPassthroughTokenHeader(), eric_header);
@@ -704,7 +706,7 @@ private void patchPaymentDetailsStatusUpdateIsSaved(final PaymentStatus paymentO
         // Then
         verify(checkoutData).setStatus(paymentOutcome);
         if (paymentOutcome.equals(PaymentStatus.PAID)) {
-            verify(checkoutData).setPaidAt(paidAt);
+            verify(checkoutData).setPaidAt(paidAtLocal);
             verify(checkoutData).setPaymentReference(payment_id);
         }
         verify(checkoutService).saveCheckout(checkout);