payroll http client: extended get record id to support json objects

updated version to 0.9.0-beta.14

Author: Jani Giannoudis

Client.Core/Exchange/ExchangeImport.cs

@@ -585,7 +585,9 @@ protected override async Task VisitPayrunJobInvocationAsync(IExchangeTenant tena
         // create new payrun job (POST only)
         using var response = await HttpClient.PostAsync(PayrunApiEndpoints.PayrunJobsUrl(tenant.Id),
             DefaultJsonSerializer.SerializeJson(invocation));
-        var payrunJobId = PayrollHttpClient.GetRecordId(response);
+
+        // payrun job id
+        var payrunJobId =  await PayrollHttpClient.GetRecordIdAsync(response);
         if (payrunJobId <= 0)
         {
             throw new PayrollException($"Error while creating the payrun job {invocation.Name}.");

Client.Core/PayrollEngine.Client.Core.csproj

@@ -89,7 +89,7 @@
 	  </None>
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="PayrollEngine.Core" Version="0.9.0-beta.13" />
+	  <PackageReference Include="PayrollEngine.Core" Version="0.9.0-beta.14" />
 	</ItemGroup>
 
 	<!--  build json schema -->

Client.Core/PayrollEngine.Client.Core.xml

@@ -8477,7 +8477,7 @@
             <param name="address">The address to test</param>
             <returns>True if internet connection is available</returns>
         </member>
-        <member name="M:PayrollEngine.Client.PayrollHttpClient.GetRecordId(System.Net.Http.HttpResponseMessage)">
+        <member name="M:PayrollEngine.Client.PayrollHttpClient.GetRecordIdAsync(System.Net.Http.HttpResponseMessage)">
             <summary>Get record id from the response (last uri segment)</summary>
             <param name="response">The http response message</param>
             <returns>The new record id</returns>

Client.Core/PayrollHttpClient.cs

@@ -8,6 +8,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using System.Text.Json;
 using Task = System.Threading.Tasks.Task;
 using PayrollEngine.Serialization;
 
@@ -223,15 +224,32 @@ public async Task<bool> IsConnectionAvailableAsync(string address)
     /// <summary>Get record id from the response (last uri segment)</summary>
     /// <param name="response">The http response message</param>
     /// <returns>The new record id</returns>
-    public static int GetRecordId(HttpResponseMessage response)
+    public static async Task<int> GetRecordIdAsync(HttpResponseMessage response)
     {
         if (response == null)
         {
             throw new ArgumentNullException(nameof(response));
         }
-        return response.Headers.Location == null ?
-            0 :
-            response.Headers.Location.GetLastSegmentId();
+
+        // location header
+        if (response.Headers.Location != null && 
+            response.Headers.Location.TryGetLastSegmentId(out var id))
+        {
+            return id;
+        }
+
+        // created object
+        var json = await response.Content.ReadAsStringAsync();
+        if (!string.IsNullOrWhiteSpace(json))
+        {
+            var obj = DefaultJsonSerializer.Deserialize<Dictionary<string, object>>(json);
+            if (obj.TryGetValue("id", out var objId) && objId is JsonElement jsonValue)
+            {
+                return jsonValue.GetInt32();
+            }
+        }
+
+        return 0;
     }
 
     /// <summary>Get backend resource response</summary>
@@ -299,7 +317,7 @@ public async Task<T> GetAsync<T>(string requestUri)
         {
             return default;
         }
-        return string.IsNullOrWhiteSpace(json) ? default : DefaultJsonSerializer.Deserialize<T>(json);
+        return DefaultJsonSerializer.Deserialize<T>(json);
     }
 
     /// <summary>Get backend resource with request content</summary>
@@ -425,7 +443,7 @@ public async Task<T> PostAsync<T>(string requestUri)
 
         if (responseObj is IModel model && model.Id == 0)
         {
-            model.Id = GetRecordId(response);
+            model.Id = await GetRecordIdAsync(response);
         }
         LogPost(requestUri, responseObj);
         return responseObj;
@@ -465,7 +483,7 @@ public async Task<T> PostAsync<T>(string requestUri, T content) where T : class
 
         if (responseObj is IModel model && model.Id == 0)
         {
-            model.Id = GetRecordId(response);
+            model.Id = await GetRecordIdAsync(response);
         }
         LogPost(requestUri, responseObj);
         return responseObj;
@@ -505,7 +523,7 @@ public async Task<TOut> PostAsync<TIn, TOut>(string requestUri, TIn content)
 
         if (responseObj is IModel model && model.Id == 0)
         {
-            model.Id = GetRecordId(response);
+            model.Id = await GetRecordIdAsync(response);
         }
         LogPost(requestUri, responseObj);
         return responseObj;
@@ -666,7 +684,7 @@ public async Task UpsertObjectAsync<T>(string requestUri, T newObject, T existin
 
             using var response = await HttpClient.PostAsync(requestUri, DefaultJsonSerializer.SerializeJson(newObject));
             await EnsureSuccessResponse(response);
-            newObject.Id = GetRecordId(response);
+            newObject.Id = await GetRecordIdAsync(response);
             if (newObject.Id <= 0)
             {
                 throw new PayrollException($"error while creating new record of object {newObject}.");

Directory.Build.props

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
-		<Version>0.9.0-beta.13</Version>
+		<Version>0.9.0-beta.14</Version>
 		<FileVersion>0.9.0</FileVersion>
 		<InformationalVersion></InformationalVersion>
 		<Authors>Jani Giannoudis</Authors>