Merge pull request #73 from bunq/#63-add-response-id-to-failed-request

(#63) add response id to failed request

Author: OGKevin

.idea/.idea.BunqSdk/.idea/contentModel.xml

@@ -0,0 +1,31 @@
+using System;
+using Bunq.Sdk.Context;
+using Bunq.Sdk.Exception;
+using Bunq.Sdk.Model.Generated.Endpoint;
+using Xunit;
+
+namespace Bunq.Sdk.Tests.Http
+{
+    public class ResponseIdOnBadRequestTest : BunqSdkTestBase
+    {
+        /// <summary>
+        /// API context to use for the test API calls.
+        /// </summary>
+        private static readonly ApiContext API_CONTEXT = GetApiContext();
+        
+        /// <summary>
+        /// Invalid user id to trigger BadRequestException
+        /// </summary>
+        private const int INVALID_USER_PERSON_ID = 0;
+
+        [Fact]
+        public void TestBadRequestWithResponseId()
+        {
+            var caughtException = Assert.Throws<BadRequestException>(
+                () => UserPerson.Get(API_CONTEXT, INVALID_USER_PERSON_ID)
+            );
+            
+            Assert.NotNull(caughtException.ResponseId);
+        }
+    }
+}

BunqSdk.Tests/Http/ResponseIdOnBadRequestTest.cs

@@ -4,12 +4,16 @@ namespace Bunq.Sdk.Exception
     public class ApiException : System.Exception
     {
         public int ResponseCode { get; private set; }
+        public string ResponseId { get; private set; }
 
+        /// <inheritdoc />
         /// <param name="responseCode">The HTTP Response code of the failed request.</param>
         /// <param name="message">The error message related to this exception.</param>
-        public ApiException(int responseCode, string message) : base(message)
+        /// <param name="responseId"></param>
+        protected ApiException(int responseCode, string message, string responseId) : base(message)
         {
             ResponseCode = responseCode;
+            ResponseId = responseId;
         }
     }   
 }

BunqSdk/Exception/ApiException.cs

@@ -2,7 +2,8 @@
 {
     public class BadRequestException : ApiException
     {
-        public BadRequestException(int responseCode, string message) : base(responseCode, message)
+        public BadRequestException(int responseCode, string message, string responseId)
+            : base(responseCode, message, responseId)
         {
         }
     }

BunqSdk/Exception/BadRequestException.cs

@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Exception
 {
+    /// <summary>
+    /// This class makes sure that the correct exception is thrown for the given response code.
+    /// </summary>
     public class ExceptionFactory
     {
         /// <summary>
@@ -16,39 +20,49 @@ public class ExceptionFactory
         private const int HTTP_RESPONSE_CODE_INTERNAL_SERVER_ERROR = 500;
 
         /// <summary>
-        /// Glue to concatenate the error messages.
+        /// String format constants.
         /// </summary>
-        private const string GLUE_ERROR_MESSAGES = "\n";
+        private const string FORMAT_ERROR_MESSAGE = "Response id to help bunq debug: {0}. \n Error message: {1}";
 
         /// <returns>The exception that belongs to this status code.</returns>
-        public static ApiException CreateExceptionForResponse(int responseCode, IList<string> messages)
+        public static ApiException CreateExceptionForResponse(
+            int responseCode,
+            IEnumerable<string> messages,
+            string responseId
+        )
         {
-            var errorMessage = ConcatenateMessages(messages);
+            var errorMessage = FormatExceptionMessage(messages, responseId);
 
             switch (responseCode)
             {
                 case HTTP_RESPONSE_CODE_BAD_REQUEST:
-                    return new BadRequestException(responseCode, errorMessage);
+                    return new BadRequestException(responseCode, errorMessage, responseId);
                 case HTTP_RESPONSE_CODE_UNAUTHORIZED:
-                    return new UnauthorizedException(responseCode, errorMessage);
+                    return new UnauthorizedException(responseCode, errorMessage, responseId);
                 case HTTP_RESPONSE_CODE_FORBIDDEN:
-                    return new ForbiddenException(responseCode, errorMessage);
+                    return new ForbiddenException(responseCode, errorMessage, responseId);
                 case HTTP_RESPONSE_CODE_NOT_FOUND:
-                    return new NotFoundException(responseCode, errorMessage);
+                    return new NotFoundException(responseCode, errorMessage, responseId);
                 case HTTP_RESPONSE_CODE_METHOD_NOT_ALLOWED:
-                    return new MethodNotAllowedException(responseCode, errorMessage);
+                    return new MethodNotAllowedException(responseCode, errorMessage, responseId);
                 case HTTP_RESPONSE_CODE_TOO_MANY_REQUESTS:
-                    return new TooManyRequestsException(responseCode, errorMessage);
+                    return new TooManyRequestsException(responseCode, errorMessage, responseId);
                 case HTTP_RESPONSE_CODE_INTERNAL_SERVER_ERROR:
-                    return new PleaseContactBunqException(responseCode, errorMessage);
+                    return new PleaseContactBunqException(responseCode, errorMessage, responseId);
                 default:
-                     return new UnknownApiErrorException(responseCode, errorMessage);
+                     return new UnknownApiErrorException(responseCode, errorMessage, responseId);
             }
         }
 
-        private static string ConcatenateMessages(IEnumerable<string> messages)
+        /// <summary>
+        /// Formats the exception message accordingly.
+        /// </summary>
+        private static string FormatExceptionMessage(IEnumerable<string> messages, string responseId)
         {
-            return string.Join(GLUE_ERROR_MESSAGES, messages);
+            return string.Format(FORMAT_ERROR_MESSAGE,
+                responseId,
+                string.Join(Environment.NewLine, messages)
+            );
         }
     }
 }

BunqSdk/Exception/ExceptionFactory.cs

@@ -2,7 +2,8 @@
 {
     public class ForbiddenException : ApiException
     {
-        public ForbiddenException(int responseCode, string message) : base(responseCode, message)
+        public ForbiddenException(int responseCode, string message, string responseId)
+            : base(responseCode, message, responseId)
         {
         }
     }

BunqSdk/Exception/ForbiddenException.cs

@@ -2,7 +2,8 @@
 {
     public class MethodNotAllowedException : ApiException
     {
-        public MethodNotAllowedException(int responseCode, string message) : base(responseCode, message)
+        public MethodNotAllowedException(int responseCode, string message, string responseId)
+            : base(responseCode, message, responseId)
         {
         }
     }

BunqSdk/Exception/MethodNotAllowedException.cs

@@ -2,7 +2,8 @@
 {
     public class NotFoundException : ApiException
     {
-        public NotFoundException(int responseCode, string message) : base(responseCode, message)
+        public NotFoundException(int responseCode, string message, string responseId)
+            : base(responseCode, message, responseId)
         {
         }
     }

BunqSdk/Exception/NotFoundException.cs

@@ -2,7 +2,8 @@
 {
     public class PleaseContactBunqException : ApiException
     {
-        public PleaseContactBunqException(int responseCode, string message) : base(responseCode, message)
+        public PleaseContactBunqException(int responseCode, string message, string responseId)
+            : base(responseCode, message, responseId)
         {
         }
     }

BunqSdk/Exception/PleaseContactBunqException.cs

@@ -2,7 +2,8 @@
 {
     public class TooManyRequestsException : ApiException
     {
-        public TooManyRequestsException(int responseCode, string message) : base(responseCode, message)
+        public TooManyRequestsException(int responseCode, string message, string responseId)
+            : base(responseCode, message, responseId)
         {
         }
     }