Merge pull request #343 from getyoti/SDK-2165

SDK-2165: Add ErrorDetails getter to ActivityFailureException

Author: irotech

yoti-sdk-api/src/main/java/com/yoti/api/client/ActivityFailureException.java

@@ -1,14 +1,33 @@
 package com.yoti.api.client;
 
+import java.util.Optional;
+
+import com.yoti.api.client.spi.remote.call.ErrorDetails;
+import com.yoti.api.client.spi.remote.call.ProfileResponse;
+
 /**
  * Signals activity failure -- ie. there was a problem during sharing.
  */
 public class ActivityFailureException extends ProfileException {
 
     private static final long serialVersionUID = 4496989849870743641L;
 
-    public ActivityFailureException(String message) {
-        super(message);
+    private static final String ERROR_MSG = "Sharing activity unsuccessful for %s%s";
+
+    private final ErrorDetails errorDetails;
+
+    public ActivityFailureException(ProfileResponse profile) {
+        super(
+                String.format(
+                        ERROR_MSG,
+                        profile.getReceipt().getDisplayReceiptId(),
+                        Optional.ofNullable(profile.getError()).map(e -> String.format(" - %s", e)).orElse(""))
+        );
+        errorDetails = profile.getError();
+    }
+
+    public ErrorDetails errorDetails() {
+        return errorDetails;
     }
 
 }

yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/ReceiptFetcher.java

@@ -58,12 +58,7 @@ private void validateReceipt(ProfileResponse profile, String connectToken) throw
                 .orElseThrow(() -> new ProfileException("No profile for '" + connectToken + "' was found"));
 
         if (!receipt.hasOutcome(Receipt.Outcome.SUCCESS)) {
-            throw new ActivityFailureException(
-                    String.format("Sharing activity unsuccessful for %s%s",
-                            receipt.getDisplayReceiptId(),
-                            Optional.ofNullable(profile.getError()).map(e -> String.format(" - %s", e)).orElse("")
-                    )
-            );
+            throw new ActivityFailureException(profile);
         }
     }
 

yoti-sdk-api/src/main/java/com/yoti/api/client/spi/remote/call/ErrorDetails.java

@@ -1,12 +1,15 @@
 package com.yoti.api.client.spi.remote.call;
 
+import java.io.Serializable;
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 @JsonDeserialize(builder = ErrorDetails.Builder.class)
-public final class ErrorDetails {
+public final class ErrorDetails implements Serializable {
+
+    private static final long serialVersionUID = -6429196723990930305L;
 
     private final String code;
     private final String description;

yoti-sdk-api/src/test/java/com/yoti/api/client/spi/remote/ReceiptFetcherTest.java

@@ -154,11 +154,18 @@ public void shouldFailForFailureReceiptWithErrorCode() throws Exception {
         try {
             testObj.fetch(encryptedToken, keyPair, APP_ID);
         } catch (ActivityFailureException ex) {
-            assertThat(ex.getMessage(), containsString(ENCODED_RECEIPT_STRING));
-            assertThat(ex.getMessage(), containsString(errorCode));
-            assertThat(ex.getMessage(), containsString(errorDescription));
+            String exMsg = ex.getMessage();
+            assertThat(exMsg, containsString(ENCODED_RECEIPT_STRING));
+            assertThat(exMsg, containsString(errorCode));
+            assertThat(exMsg, containsString(errorDescription));
+
+            ErrorDetails exError = ex.errorDetails();
+            assertThat(exError.getCode(), is(equalTo(errorCode)));
+            assertThat(exError.getDescription(), is(equalTo(errorDescription)));
+
             return;
         }
+
         fail("Expected an Exception");
     }