Merge pull request #14 from companieshouse/feature/resolve-transform

removed try catch block from transformer
companieshouse · Apr 26, 2023 · e4c2332 · e4c2332
2 parents ccaea15 + 67d0aff
commit e4c2332
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 40 deletions.
diff --git a/src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java b/src/main/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformer.java
@@ -39,33 +39,27 @@ public PscDocument transformPsc(String notificationId, FullRecordCompanyPSCApi r
         PscDocument pscDocument = new PscDocument();
         logger.info(String.format("transforming incoming payload with Id: %s", notificationId));
 
-        try {
-            pscDocument.setId(notificationId);
-            pscDocument.setNotificationId(notificationId);
-            pscDocument.setPscId(requestBody.getExternalData().getPscId());
-            pscDocument.setCompanyNumber(requestBody.getExternalData().getCompanyNumber());
-            OffsetDateTime deltaAt = requestBody.getInternalData().getDeltaAt();
-            pscDocument.setDeltaAt(dateTimeFormatter.format(deltaAt));
-            PscTransformationHelper.createDateFields(requestBody, pscDocument);
-            pscDocument.setUpdatedBy(requestBody.getInternalData().getUpdatedBy());
-            pscDocument.setData(transformDataFields(requestBody));
-
-            String kind = requestBody.getExternalData().getData().getKind();
-
-            if (IndividualPscRoles.includes(kind)) {
-                pscDocument.setSensitiveData(transformSensitiveDataFields(requestBody));
-                handleUraSameAsRo(pscDocument.getData(),
-                        requestBody.getExternalData().getSensitiveData());
-                handleIndividualFields(requestBody, pscDocument.getData());
-            }
-            if (SecurePscRoles.includes(kind)) {
-                handleSecureFields(requestBody, pscDocument.getData());
-            }
-        } catch (Exception exception) {
-            throw new FailedToTransformException(String.format(
-                    "Failed to transform API payload: %s", exception.getMessage()));
+        pscDocument.setId(notificationId);
+        pscDocument.setNotificationId(notificationId);
+        pscDocument.setPscId(requestBody.getExternalData().getPscId());
+        pscDocument.setCompanyNumber(requestBody.getExternalData().getCompanyNumber());
+        OffsetDateTime deltaAt = requestBody.getInternalData().getDeltaAt();
+        pscDocument.setDeltaAt(dateTimeFormatter.format(deltaAt));
+        PscTransformationHelper.createDateFields(requestBody, pscDocument);
+        pscDocument.setUpdatedBy(requestBody.getInternalData().getUpdatedBy());
+        pscDocument.setData(transformDataFields(requestBody));
+
+        String kind = requestBody.getExternalData().getData().getKind();
+
+        if (IndividualPscRoles.includes(kind)) {
+            pscDocument.setSensitiveData(transformSensitiveDataFields(requestBody));
+            handleUraSameAsRo(pscDocument.getData(),
+                    requestBody.getExternalData().getSensitiveData());
+            handleIndividualFields(requestBody, pscDocument.getData());
+        }
+        if (SecurePscRoles.includes(kind)) {
+            handleSecureFields(requestBody, pscDocument.getData());
         }
-
         return pscDocument;
     }
 

diff --git a/src/test/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformerTest.java b/src/test/java/uk/gov/companieshouse/pscdataapi/transform/CompanyPscTransformerTest.java
@@ -76,18 +76,4 @@ void testSecurePscIsTransformedSuccessfully() throws FailedToTransformException
         assertThat(result.getUpdated().getAt(), is(expectedDocument.getUpdated().getAt()));
         assertThat(result.getUpdatedBy(), is(expectedDocument.getUpdatedBy()));
     }
-
-    @Test
-    void testApiThrowsExceptionWhenTransformFails() {
-        FullRecordCompanyPSCApi api = new FullRecordCompanyPSCApi();
-        try {
-            pscTransformer.transformPsc("id", api);
-            Assert.fail("Expected a FailedToTransformException to be thrown");
-        } catch (FailedToTransformException e) {
-            assert(e.getMessage().contains("Failed to transform API payload:"));
-        }
-    }
-
-
-
 }