add more control on execute api

EasyMicroservices · Dec 29, 2023 · d8eb058 · d8eb058
1 parent cb8de24
commit d8eb058
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 2 deletions.
diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/ApiBaseViewModel.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/ApiBaseViewModel.cs
@@ -13,11 +13,83 @@ public class ApiBaseViewModel : BaseViewModel
     /// 
     /// </summary>
     /// <typeparam name="TResult"></typeparam>
+    /// <typeparam name="TMappedResult"></typeparam>
     /// <param name="getServerResult"></param>
+    /// <param name="mapResult"></param>
     /// <param name="onSuccess"></param>
     /// <param name="onError"></param>
     /// <returns></returns>
-    public async virtual Task ExecuteApi<TResult>(Func<Task<TResult>> getServerResult, Func<MessageContract<TResult>, Task> onSuccess, Func<ErrorContract, Task> onError = default)
+    public async virtual Task ExecuteMapApi<TResult, TMappedResult>(Func<Task<TResult>> getServerResult, Func<Task<TMappedResult>> mapResult, Func<MessageContract<TMappedResult>, Task> onSuccess, Func<ErrorContract, Task> onError = default)
+    {
+        try
+        {
+            Busy();
+            var result = await getServerResult();
+
+            var response = result.ToContract<TMappedResult>();
+
+            if (response.IsSuccess)
+                await onSuccess(response);
+            else
+                await OnServerErrorHandling(response.Error);
+        }
+        catch (Exception ex)
+        {
+            if (onError != null)
+                await onError(ex);
+            else
+                await OnError(ex);
+        }
+        finally
+        {
+            UnBusy();
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TResult"></typeparam>
+    /// <param name="getServerResult"></param>
+    /// <param name="onSuccess"></param>
+    /// <param name="onError"></param>
+    /// <returns></returns>
+    public async virtual Task ExecuteMapApi<TResult>(Func<Task<TResult>> getServerResult, Func<MessageContract<TResult>, Task> onSuccess, Func<ErrorContract, Task> onError = default)
+    {
+        try
+        {
+            Busy();
+            var result = await getServerResult();
+
+            var response = result.ToContract<TResult>();
+
+            if (response.IsSuccess)
+                await onSuccess(response);
+            else
+                await OnServerErrorHandling(response.Error);
+        }
+        catch (Exception ex)
+        {
+            if (onError != null)
+                await onError(ex);
+            else
+                await OnError(ex);
+        }
+        finally
+        {
+            UnBusy();
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TResult"></typeparam>
+    /// <param name="getServerResult"></param>
+    /// <param name="onSuccess"></param>
+    /// <param name="onError"></param>
+    /// <returns></returns>
+    public async virtual Task ExecuteApi<TResult>(Func<Task<object>> getServerResult, Func<MessageContract<TResult>, Task> onSuccess, Func<ErrorContract, Task> onError = default)
     {
         try
         {

diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/EasyMicroservices.UI.Cores.Mvvm.csproj b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/EasyMicroservices.UI.Cores.Mvvm.csproj
@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <IsPackable>true</IsPackable>
-    <Version>0.0.0.17</Version>
+    <Version>0.0.0.18</Version>
     <Description>Model View View Model</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>mvvm,mvpvm,modelview,modelviewviewmodel</PackageTags>