Merge pull request #97 from companieshouse/feature/DSND-2334

super secure should return ceased as a string
companieshouse · Jan 29, 2024 · 396a0a3 · 396a0a3
2 parents d8a869d + 878c903
commit 396a0a3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
         <!-- Internal -->
         <structured-logging.version>1.9.25</structured-logging.version>
-        <private-api-sdk-java.version>2.0.326</private-api-sdk-java.version>
+        <private-api-sdk-java.version>2.0.347</private-api-sdk-java.version>
         <data-sync-api-sdk-java.version>1.0.4</data-sync-api-sdk-java.version>
         <api-security-java.version>0.4.1</api-security-java.version>
         <api-sdk-manager-java-library.version>1.0.8</api-sdk-manager-java-library.version>

diff --git a/src/itest/resources/json/output/get_super_secure_bo_output.json b/src/itest/resources/json/output/get_super_secure_bo_output.json
@@ -1,5 +1,5 @@
 {
-  "ceased": false,
+  "ceased": "0",
   "description": "super-secure-beneficial-owner",
   "etag": "string",
   "kind": "super-secure-beneficial-owner",

diff --git a/src/itest/resources/json/output/get_super_secure_output.json b/src/itest/resources/json/output/get_super_secure_output.json
@@ -1,5 +1,5 @@
 {
-  "ceased": false,
+  "ceased": "0",
   "description": "super-secure-persons-with-significant-control",
   "etag": "string",
   "kind": "super-secure-person-with-significant-control",

diff --git a/src/main/java/uk/gov/companieshouse/pscdataapi/api/ChsKafkaApiService.java b/src/main/java/uk/gov/companieshouse/pscdataapi/api/ChsKafkaApiService.java
@@ -104,7 +104,7 @@ private static String mapKind(String kind) {
         kindMap.put("super-secure-person-with-significant-control", "super-secure");
         kindMap.put("individual-beneficial-owner", "individual-beneficial-owner");
         kindMap.put("legal-person-beneficial-owner", "legal-person-beneficial-owner");
-        kindMap.put("corporate-entity-beneficial-ownerl", "corporate-entity-beneficial-owner");
+        kindMap.put("corporate-entity-beneficial-owner", "corporate-entity-beneficial-owner");
         kindMap.put("super-secure-beneficial-owner", "super-secure-beneficial-owner");
 
         return kindMap.get(kind);

diff --git a/src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java b/src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java
@@ -229,7 +229,11 @@ public SuperSecure transformPscDocToSuperSecure(PscDocument pscDocument) {
         if (pscDocument.getData() != null) {
             PscData pscData = pscDocument.getData();
             superSecure.setEtag(pscData.getEtag());
-            superSecure.setCeased(pscData.getCeased());
+            if (pscData.getCeased()) {
+                superSecure.setCeased("1");
+            } else {
+                superSecure.setCeased("0");
+            }
             superSecure.setLinks(pscData.getLinks());
         }
         return superSecure;
@@ -251,7 +255,11 @@ public SuperSecureBeneficialOwner transformPscDocToSuperSecureBeneficialOwner(
         if (pscDocument.getData() != null) {
             PscData pscData = pscDocument.getData();
             superSecureBo.setEtag(pscData.getEtag());
-            superSecureBo.setCeased(pscData.getCeased());
+            if (pscData.getCeased()) {
+                superSecureBo.setCeased("1");
+            } else {
+                superSecureBo.setCeased("0");
+            }
             superSecureBo.setLinks(pscData.getLinks());
         }
         return superSecureBo;