Implement and throw FMDataException for HTTP500 from Data API

.vscode/settings.json

@@ -17,8 +17,12 @@
         "preq",
         "psort",
         "recid",
+        "reserialize",
         "stringly",
         "Szalay",
+        "unencrypted",
+        "Xalan",
+        "Xerces",
         "Xunit"
     ],
     "git.enableCommitSigning": true,

src/FMData.Rest/FileMakerRestClient.cs

@@ -354,7 +354,10 @@ public override async Task<T> GetByFileMakerIdAsync<T>(
                         {
                             return null;
                         }
-                        throw new Exception(responseObject.Messages.First().Message);
+                        throw new FMDataException(
+                            int.Parse(responseObject.Messages.First().Code),
+                            responseObject.Messages.First().Message,
+                            null);
                     default:
                         // other error TODO: Improve handling
                         throw new Exception($"Find Request Error. Request Uri: {response.RequestMessage.RequestUri} responded with {response.StatusCode}");
@@ -398,17 +401,32 @@ public override async Task<ICreateResponse> SendAsync<T>(ICreateRequest<T> req)
         {
             if (string.IsNullOrEmpty(req.Layout)) throw new ArgumentException("Layout is required on the request.");
 
-            var responseMessage = await ExecuteRequestAsync(req);
+            var response = await ExecuteRequestAsync(req);
+
+            if (response.StatusCode == HttpStatusCode.InternalServerError)
+            {
+                // attempt to read response content
+                if (response.Content == null) { throw new Exception("Could not read response from Data API."); }
+
+                var responseJson = await response.Content.ReadAsStringAsync();
+                var responseObject = JsonConvert.DeserializeObject<BaseResponse>(responseJson);
+
+                // throw FMDataException
+                throw new FMDataException(
+                        int.Parse(responseObject.Messages.First().Code),
+                        responseObject.Messages.First().Message,
+                        null);
+            }
 
             try
             {
-                var responseJson = await responseMessage.Content.ReadAsStringAsync();
+                var responseJson = await response.Content.ReadAsStringAsync();
                 return JsonConvert.DeserializeObject<CreateResponse>(responseJson);
             }
             catch (Exception ex)
             {
-                // something bad happened. TODO: improve non-OK response handling
-                throw new Exception($"Non-OK Response: Status = {responseMessage.StatusCode}.", ex);
+                // something bad happened.
+                throw new Exception($"Non-OK Response: Status = {response.StatusCode}.", ex);
             }
         }
 
@@ -430,6 +448,21 @@ public override async Task<IEditResponse> SendAsync<T>(IEditRequest<T> req)
                 return new BaseResponse("404", "Error") as EditResponse;
             }
 
+            if (response.StatusCode == HttpStatusCode.InternalServerError)
+            {
+                // attempt to read response content
+                if (response.Content == null) { throw new Exception("Could not read response from Data API."); }
+
+                var responseJson = await response.Content.ReadAsStringAsync();
+                var responseObject = JsonConvert.DeserializeObject<BaseResponse>(responseJson);
+
+                // throw FMDataException
+                throw new FMDataException(
+                        int.Parse(responseObject.Messages.First().Code),
+                        responseObject.Messages.First().Message,
+                        null);
+            }
+
             try
             {
                 var responseJson = await response.Content.ReadAsStringAsync();
@@ -439,7 +472,7 @@ public override async Task<IEditResponse> SendAsync<T>(IEditRequest<T> req)
             }
             catch (Exception ex)
             {
-                // something bad happened. TODO: improve non-OK response handling
+                // something bad happened.
                 throw new Exception($"Non-OK Response: Status = {response.StatusCode}.", ex);
             }
         }
@@ -461,6 +494,21 @@ public override async Task<IResponse> SendAsync(IDeleteRequest req)
                 return new BaseResponse("404", "Error");
             }
 
+            if (response.StatusCode == HttpStatusCode.InternalServerError)
+            {
+                // attempt to read response content
+                if (response.Content == null) { throw new Exception("Could not read response from Data API."); }
+
+                var responseJson = await response.Content.ReadAsStringAsync();
+                var responseObject = JsonConvert.DeserializeObject<BaseResponse>(responseJson);
+
+                // throw FMDataException
+                throw new FMDataException(
+                        int.Parse(responseObject.Messages.First().Code),
+                        responseObject.Messages.First().Message,
+                        null);
+            }
+
             try
             {
                 var responseJson = await response.Content.ReadAsStringAsync();
@@ -469,7 +517,7 @@ public override async Task<IResponse> SendAsync(IDeleteRequest req)
             }
             catch (Exception ex)
             {
-                // something bad happened. TODO: improve non-OK response handling
+                // something bad happened.
                 throw new Exception($"Non-OK Response: Status = {response.StatusCode}.", ex);
             }
         }
@@ -540,25 +588,21 @@ public override async Task<IResponse> SendAsync(IDeleteRequest req)
 
             if (response.StatusCode == HttpStatusCode.InternalServerError)
             {
-                try
-                {
-                    // attempt to read response content
-                    if (response.Content == null) { throw new Exception("Could not read response from Data API."); }
-
-                    var responseJson = await response.Content.ReadAsStringAsync();
-                    var responseObject = JsonConvert.DeserializeObject<BaseResponse>(responseJson);
-                    if (responseObject.Messages.Any(m => m.Code == "401"))
-                    {
-                        // filemaker no records match the find request => empty list.
-                        return (new List<T>(), new DataInfoModel());
-                    }
+                // attempt to read response content
+                if (response.Content == null) { throw new Exception("Could not read response from Data API."); }
 
-                    throw new Exception(responseObject.Messages.First().Message);
-                }
-                catch (Exception ex)
+                var responseJson = await response.Content.ReadAsStringAsync();
+                var responseObject = JsonConvert.DeserializeObject<BaseResponse>(responseJson);
+                if (responseObject.Messages.Any(m => m.Code == "401"))
                 {
-                    throw new Exception("Could not read response from Data API.", ex);
+                    // filemaker no records match the find request => empty list.
+                    return (new List<T>(), new DataInfoModel());
                 }
+                // throw FMDataException for anything not a 401.
+                throw new FMDataException(
+                        int.Parse(responseObject.Messages.First().Code),
+                        responseObject.Messages.First().Message,
+                        null);
             }
 
             // not found, so return empty list
@@ -567,7 +611,7 @@ public override async Task<IResponse> SendAsync(IDeleteRequest req)
                 return (new List<T>(), new DataInfoModel());
             }
 
-            // other error TODO: Improve handling
+            // other error
             throw new Exception($"Find Request Error. Request Uri: {response.RequestMessage.RequestUri} responded with {response.StatusCode}");
         }
         #endregion

src/FMData/FMData.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard1.3;net45</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <AssemblyTitle>FMData</AssemblyTitle>
     <AssemblyName>FMData</AssemblyName>