add OnServerErrorHandling

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

Hide file tree

Showing 5 changed files with 25 additions and 14 deletions.
diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/ApiBaseViewModel.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/ApiBaseViewModel.cs
@@ -9,10 +9,6 @@ namespace EasyMicroservices.UI.Cores;
 /// </summary>
 public class ApiBaseViewModel : BaseViewModel
 {
-    /// <summary>
-    /// 
-    /// </summary>
-    public static Func<ErrorContract, Task<bool>> OnGlobalServiceErrorHandler { get; set; }
     /// <summary>
     /// 
     /// </summary>
@@ -33,7 +29,7 @@ public async virtual Task ExecuteApi<TResult>(Func<Task<TResult>> getServerResul
             if (response.IsSuccess)
                 await onSuccess(response);
             else
-                await InternalDisplayServerError(response.Error);
+                await OnServerErrorHandling(response.Error);
         }
         catch (Exception ex)
         {
@@ -67,7 +63,7 @@ public virtual async Task ExecuteApi(Func<Task<object>> getServerResult, Func<Ta
             if (response.IsSuccess)
                 await onSuccess?.Invoke();
             else
-                await InternalDisplayServerError(response.Error);
+                await OnServerErrorHandling(response.Error);
         }
         catch (Exception ex)
         {
@@ -81,10 +77,4 @@ public virtual async Task ExecuteApi(Func<Task<object>> getServerResult, Func<Ta
             UnBusy();
         }
     }
-
-    async Task InternalDisplayServerError(ErrorContract error)
-    {
-        if (OnGlobalServiceErrorHandler == null || !await OnGlobalServiceErrorHandler(error))
-            await OnServerError(error);
-    }
 }
diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/BaseViewModel.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/BaseViewModel.cs
@@ -15,6 +15,10 @@ namespace EasyMicroservices.UI.Cores;
 /// </summary>
 public abstract class BaseViewModel : IBusyViewModel, INotifyPropertyChanged, IDisposable
 {
+    /// <summary>
+    /// 
+    /// </summary>
+    public static Func<ErrorContract, Task<bool>> OnGlobalServiceErrorHandler { get; set; }
     /// <summary>
     /// 
     /// </summary>
@@ -162,6 +166,17 @@ public virtual Task OnServerError(ErrorContract errorContract)
         return Task.CompletedTask;
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="error"></param>
+    /// <returns></returns>
+    public virtual async Task OnServerErrorHandling(ErrorContract error)
+    {
+        if (OnGlobalServiceErrorHandler == null || !await OnGlobalServiceErrorHandler(error))
+            await OnServerError(error);
+    }
+
     /// <summary>
     /// 
     /// </summary>

diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Commands/BaseCommand.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Commands/BaseCommand.cs
@@ -86,7 +86,7 @@ public virtual void Execute(object parameter)
         }
         catch (InvalidResultOfMessageContractException ex)
         {
-            _busyViewModel?.OnServerError(ex.MessageContract.Error);
+            _busyViewModel?.OnServerErrorHandling(ex.MessageContract.Error);
         }
         catch (Exception ex)
         {

diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Commands/TaskBaseCommand.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Commands/TaskBaseCommand.cs
@@ -87,7 +87,7 @@ async Task InternalExecute(object parameter)
             }
             catch (InvalidResultOfMessageContractException ex)
             {
-                _busyViewModel?.OnServerError(ex.MessageContract.Error);
+                _busyViewModel?.OnServerErrorHandling(ex.MessageContract.Error);
             }
             catch (Exception ex)
             {

diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Interfaces/IBusyViewModel.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Interfaces/IBusyViewModel.cs
@@ -41,6 +41,12 @@ public interface IBusyViewModel : INotifyPropertyChanged
         /// <param name="errorContract"></param>
         /// <returns></returns>
         Task OnServerError(ErrorContract errorContract);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="errorContract"></param>
+        /// <returns></returns>
+        Task OnServerErrorHandling(ErrorContract errorContract);
 
         /// <summary>
         ///