Merge pull request #107 from companieshouse/bugfix/dateTimeFix

add sensitive data converters

src/main/java/uk/gov/companieshouse/pscdataapi/config/ApplicationConfig.java

@@ -16,9 +16,13 @@
 import uk.gov.companieshouse.api.InternalApiClient;
 import uk.gov.companieshouse.api.api.CompanyMetricsApiService;
 import uk.gov.companieshouse.api.converter.EnumWriteConverter;
+import uk.gov.companieshouse.api.psc.SensitiveData;
 import uk.gov.companieshouse.pscdataapi.converter.CompanyPscReadConverter;
+import uk.gov.companieshouse.pscdataapi.converter.CompanyPscSensitiveReadConverter;
+import uk.gov.companieshouse.pscdataapi.converter.CompanyPscSensitiveWriteConverter;
 import uk.gov.companieshouse.pscdataapi.converter.CompanyPscWriteConverter;
 import uk.gov.companieshouse.pscdataapi.models.PscData;
+import uk.gov.companieshouse.pscdataapi.models.PscSensitiveData;
 import uk.gov.companieshouse.pscdataapi.serialization.LocalDateDeSerializer;
 import uk.gov.companieshouse.pscdataapi.serialization.LocalDateSerializer;
 import uk.gov.companieshouse.sdk.manager.ApiSdkManager;
@@ -35,7 +39,9 @@ public class ApplicationConfig {
     public MongoCustomConversions mongoCustomConversions() {
         ObjectMapper objectMapper = mongoDbObjectMapper();
         return new MongoCustomConversions(List.of(new CompanyPscWriteConverter(objectMapper),
+                new CompanyPscSensitiveWriteConverter(objectMapper),
                 new CompanyPscReadConverter(objectMapper, PscData.class),
+                new CompanyPscSensitiveReadConverter(objectMapper, PscSensitiveData.class),
                 new EnumWriteConverter()));
     }
 

src/main/java/uk/gov/companieshouse/pscdataapi/converter/CompanyPscSensitiveReadConverter.java

@@ -0,0 +1,16 @@
+package uk.gov.companieshouse.pscdataapi.converter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.data.convert.ReadingConverter;
+import uk.gov.companieshouse.api.converter.ReadConverter;
+import uk.gov.companieshouse.api.psc.SensitiveData;
+import uk.gov.companieshouse.pscdataapi.models.PscData;
+import uk.gov.companieshouse.pscdataapi.models.PscSensitiveData;
+
+@ReadingConverter
+public class CompanyPscSensitiveReadConverter extends ReadConverter<PscSensitiveData> {
+    public CompanyPscSensitiveReadConverter(ObjectMapper objectMapper,
+                                            Class<PscSensitiveData> objectClass) {
+        super(objectMapper, objectClass);
+    }
+}

src/main/java/uk/gov/companieshouse/pscdataapi/converter/CompanyPscSensitiveWriteConverter.java

@@ -0,0 +1,15 @@
+package uk.gov.companieshouse.pscdataapi.converter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.data.convert.WritingConverter;
+import uk.gov.companieshouse.api.converter.WriteConverter;
+import uk.gov.companieshouse.api.psc.SensitiveData;
+import uk.gov.companieshouse.pscdataapi.models.PscData;
+import uk.gov.companieshouse.pscdataapi.models.PscSensitiveData;
+
+@WritingConverter
+public class CompanyPscSensitiveWriteConverter extends WriteConverter<PscSensitiveData> {
+    public CompanyPscSensitiveWriteConverter(ObjectMapper objectMapper) {
+        super(objectMapper);
+    }
+}

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

@@ -1,20 +1,22 @@
 package uk.gov.companieshouse.pscdataapi.models;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.Objects;
-import org.springframework.data.mongodb.core.mapping.Field;
+
 
 public class NameElements {
 
-    @Field("title")
+    @JsonProperty("title")
     private String title;
 
-    @Field("forename")
+    @JsonProperty("forename")
     private String forename;
 
-    @Field("surname")
+    @JsonProperty("surname")
     private String surname;
 
-    @Field("middle_name")
+    @JsonProperty("middle_name")
     private String middleName;
 
     public NameElements() {}

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

@@ -1,14 +1,16 @@
 package uk.gov.companieshouse.pscdataapi.models;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.Objects;
 import org.springframework.data.mongodb.core.mapping.Field;
 
 public class PscSensitiveData {
-    @Field("usual_residential_address")
+    @JsonProperty("usual_residential_address")
     private Address usualResidentialAddress;
-    @Field("date_of_birth")
+    @JsonProperty("date_of_birth")
     private DateOfBirth dateOfBirth;
-    @Field("residential_address_is_same_as_service_address")
+    @JsonProperty("residential_address_is_same_as_service_address")
     private Boolean residentialAddressIsSameAsServiceAddress;
 
     public Address getUsualResidentialAddress() {