Merge pull request #220 from companieshouse/bug/dsnd-3300_fix_updated_at_timestamps

DSND-3300: Fix updated at

Author: sthompsonCH

src/main/java/uk/gov/companieshouse/pscdataapi/controller/CompanyPscController.java

@@ -41,7 +41,8 @@ public CompanyPscController(CompanyPscService pscService) {
     }
 
     @PutMapping("/company/{company_number}/persons-with-significant-control/{notification_id}/full_record")
-    public ResponseEntity<Void> submitPscData(@PathVariable("company_number") final String companyNumber,
+    public ResponseEntity<Void> submitPscData(
+            @PathVariable("company_number") final String companyNumber,
             @PathVariable("notification_id") final String notificationId,
             @RequestBody FullRecordCompanyPSCApi request) {
 

src/main/java/uk/gov/companieshouse/pscdataapi/models/Updated.java

@@ -1,17 +1,27 @@
 package uk.gov.companieshouse.pscdataapi.models;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 public class Updated {
 
-    private LocalDate at;
+    private LocalDateTime at;
+    private String by;
 
-    public LocalDate getAt() {
+    public LocalDateTime getAt() {
         return at;
     }
 
-    public Updated setAt(LocalDate at) {
+    public Updated at(LocalDateTime at) {
         this.at = at;
         return this;
     }
+
+    public String getBy() {
+        return by;
+    }
+
+    public Updated by(String by) {
+        this.by = by;
+        return this;
+    }
 }

src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java

@@ -3,6 +3,7 @@
 import static uk.gov.companieshouse.pscdataapi.PscDataApiApplication.APPLICATION_NAME_SPACE;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 import java.util.Optional;
@@ -398,8 +399,7 @@ public ListSummary transformPscDocToListSummary(PscDocument pscDocument) {
      * @param requestBody    request payload.
      * @return PSC mongo Document.
      */
-    public PscDocument transformPscOnInsert(
-            String notificationId, FullRecordCompanyPSCApi requestBody) {
+    public PscDocument transformPscOnInsert(String notificationId, FullRecordCompanyPSCApi requestBody) {
         String pscStatementId = null;
         if (requestBody.getExternalData() != null) {
             final ExternalData externalData = requestBody.getExternalData();
@@ -441,8 +441,9 @@ public PscDocument transformPscOnInsert(
             InternalData internalData = requestBody.getInternalData();
             pscDocument.setDeltaAt(dateTimeFormatter.format(internalData.getDeltaAt()));
 
-            pscDocument.setUpdated(new Updated().setAt(LocalDate.now()));
-            pscDocument.setUpdatedBy(internalData.getUpdatedBy());
+            pscDocument.setUpdated(new Updated()
+                    .at(LocalDateTime.now())
+                    .by(internalData.getUpdatedBy()));
         }
         return pscDocument;
     }

src/test/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformerTest.java

@@ -1,9 +1,11 @@
 package uk.gov.companieshouse.pscdataapi.transform;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -258,7 +260,7 @@ private static void pscInsertAssertions(PscDocument expectedDocument, PscDocumen
 
         assertThat(result.getDeltaAt(), is(expectedDocument.getDeltaAt()));
         assertThat(result.getUpdatedBy(), is(expectedDocument.getUpdatedBy()));
-        assertThat(result.getUpdated().getAt(), is(expectedDocument.getUpdated().getAt()));
+        assertThat(result.getUpdated().getAt(), instanceOf(LocalDateTime.class));
 
         result.setUpdated(expectedDocument.getUpdated()); // Updated objects would be different objects
         assertThat(result, is(expectedDocument));

src/test/java/uk/gov/companieshouse/pscdataapi/util/TestHelper.java

@@ -246,8 +246,9 @@ public static PscDocument buildPscDocument(String kind, boolean showFullDateOfBi
         output.setPscId(PSC_ID);
         output.setCompanyNumber(COMPANY_NUMBER);
         output.setDeltaAt("20220112000000000000");
-        output.setUpdated(new Updated().setAt(LocalDate.now()));
-        output.setUpdatedBy("user");
+        output.setUpdated(new Updated()
+                .at(LocalDateTime.now())
+                .by("user"));
 
         pscData.setKind(kind);
         pscData.setCeasedOn(LocalDate.of(2012, 12, 12));
@@ -365,7 +366,7 @@ public static PscDocument buildPscDocument(String kind, boolean showFullDateOfBi
 
     public static PscDocument buildBasicDocument() {
         PscDocument document = new PscDocument();
-        document.setUpdated(new Updated().setAt(LocalDate.now()));
+        document.setUpdated(new Updated().at(LocalDateTime.now()));
         document.setCompanyNumber(COMPANY_NUMBER);
         document.setPscId(PSC_ID);
         document.setNotificationId(COMPANY_NUMBER);