Merge pull request #118 from companieshouse/bug/dsnd-2756_rename_stat…

…ements_to_statement DSND-2756: Rename statements to statement
companieshouse · Jul 18, 2024 · e1ae11b · e1ae11b
2 parents 42c92f1 + 81bc8af
commit e1ae11b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
 
         <!-- Internal -->
         <structured-logging.version>3.0.8</structured-logging.version>
-        <private-api-sdk-java.version>4.0.162</private-api-sdk-java.version>
+        <private-api-sdk-java.version>4.0.165</private-api-sdk-java.version>
         <data-sync-api-sdk-java.version>1.0.6</data-sync-api-sdk-java.version>
         <api-security-java.version>2.0.5</api-security-java.version>
         <api-sdk-manager-java-library.version>3.0.5</api-sdk-manager-java-library.version>

diff --git a/src/itest/java/uk/gov/companieshouse/pscdataapi/steps/PscDataSteps.java b/src/itest/java/uk/gov/companieshouse/pscdataapi/steps/PscDataSteps.java
@@ -296,7 +296,7 @@ public void aPSCExistsForForSuperSecure(String dataFile, String companyNumber) t
         pscData.setDescription("super-secure-persons-with-significant-control");
         Links links = new Links();
         links.setSelf("/company/" + companyNumber + "/persons-with-significant-control/super-secure/" + notificationId);
-        links.setStatements("string");
+        links.setStatement("string");
         pscData.setLinks(links);
         pscData.setCeased(false);
         document.setData(pscData);
@@ -390,7 +390,7 @@ public void aPSCExistsForForSuperSecureBeneficialOwner(String dataFile, String c
         pscData.setDescription("super-secure-beneficial-owner");
         Links links = new Links();
         links.setSelf("/company/" + companyNumber + "/persons-with-significant-control/super-secure-beneficial-owner/" + notificationId);
-        links.setStatements("string");
+        links.setStatement("string");
         pscData.setLinks(links);
         pscData.setCeased(false);
         document.setData(pscData);
@@ -486,7 +486,7 @@ public void aPSCExistsForCorporateEntity(String dataFile, String companyNumber)
         pscData.setKind("corporate-entity-person-with-significant-control");
         Links links = new Links();
         links.setSelf("/company/" + companyNumber + "/persons-with-significant-control/corporate-entity/" + notificationId);
-        links.setStatements("string");
+        links.setStatement("string");
         pscData.setLinks(links);
         Address address = new Address();
         address.setAddressLine1("ura_line1");
@@ -615,7 +615,7 @@ public void aPSCExistsFor(String dataFile, String companyNumber) throws JsonProc
         document.setSensitiveData(pscSensitiveData);
         Links links = new Links();
         links.setSelf("/company/" + companyNumber + "/persons-with-significant-control/individual/" + NOTIFICATION_ID);
-        links.setStatements("string");
+        links.setStatement("string");
         pscData.setLinks(links);
         pscData.setNationality("British");
         Address address = new Address();

diff --git a/src/main/java/uk/gov/companieshouse/pscdataapi/models/Links.java b/src/main/java/uk/gov/companieshouse/pscdataapi/models/Links.java
@@ -8,8 +8,8 @@ public class Links {
     @Field("self")
     private String self;
 
-    @Field("statements")
-    private String statements;
+    @Field("statement")
+    private String statement;
 
     public String getSelf() {
         return self;
@@ -19,12 +19,12 @@ public void setSelf(String self) {
         this.self = self;
     }
 
-    public String getStatements() {
-        return statements;
+    public String getStatement() {
+        return statement;
     }
 
-    public void setStatements(String statements) {
-        this.statements = statements;
+    public void setStatement(String statement) {
+        this.statement = statement;
     }
 
     @Override
@@ -33,8 +33,8 @@ public String toString() {
                 + "self='"
                 + self
                 + '\''
-                + ", statements='"
-                + statements
+                + ", statement='"
+                + statement
                 + '\''
                 + '}';
     }
@@ -49,11 +49,11 @@ public boolean equals(Object object) {
         }
         Links links = (Links) object;
         return Objects.equals(self, links.self)
-                && Objects.equals(statements, links.statements);
+                && Objects.equals(statement, links.statement);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(self, statements);
+        return Objects.hash(self, statement);
     }
 }
diff --git a/src/main/java/uk/gov/companieshouse/pscdataapi/util/PscTransformationHelper.java b/src/main/java/uk/gov/companieshouse/pscdataapi/util/PscTransformationHelper.java
@@ -24,9 +24,9 @@ public static Links createLinks(Data data, String pscStatementId) {
             links.setSelf(itemLinkTypes.getSelf());
 
             if (pscStatementId != null) {
-                links.setStatements(itemLinkTypes.getStatements());
+                links.setStatement(itemLinkTypes.getStatement());
             } else {
-                links.setStatements(null);
+                links.setStatement(null);
             }
         }
         return links;

diff --git a/src/test/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformerTest.java b/src/test/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformerTest.java
@@ -197,9 +197,8 @@ void testInsertIndividualBeneficialOwnerPscIsTransformedSuccessfullyNoPscStateme
         Assertions.assertNotNull(result.getData().getName());
         Assertions.assertNotNull(result.getData().getNationality());
         Assertions.assertNotNull(result.getData().getCountryOfResidence());
-        Assertions.assertNull(result.getData().getLinks().getStatements());
+        Assertions.assertNull(result.getData().getLinks().getStatement());
         Assertions.assertNotNull(result.getData().getCeasedOn());
-
         pscInsertAssertions(expectedDocument, result);
     }
 

diff --git a/src/test/java/uk/gov/companieshouse/pscdataapi/util/TestHelper.java b/src/test/java/uk/gov/companieshouse/pscdataapi/util/TestHelper.java
@@ -81,7 +81,7 @@ public static FullRecordCompanyPSCApi buildFullRecordPsc(String kind, boolean sh
         links.setSelf("self");
 
         if (pscStatementsExists) {
-            links.setStatements("linkStatements");
+            links.setStatement("linkStatements");
         }
 
         data.setLinks(List.of(links));
@@ -221,7 +221,7 @@ public static PscDocument buildPscDocument(String kind, boolean showFullDateOfBi
         Links links = new Links();
         links.setSelf("self");
         if (pscStatementsExists) {
-            links.setStatements("linkStatements");
+            links.setStatement("linkStatements");
         }
         pscData.setLinks(links);