Merge pull request #27 from Ali-YousefiTelori/develop

Fix server error messages
EasyMicroservices · Dec 29, 2023 · 2f98193 · 2f98193
2 parents ee5eaa3 + 9d0ddd7
commit 2f98193
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/ApiBaseViewModel.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/ApiBaseViewModel.cs
@@ -21,7 +21,7 @@ public class ApiBaseViewModel : BaseViewModel
     /// <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<Exception, Task> onError = default)
+    public async virtual Task ExecuteApi<TResult>(Func<Task<TResult>> getServerResult, Func<MessageContract<TResult>, Task> onSuccess, Func<ErrorContract, Task> onError = default)
     {
         try
         {
@@ -55,7 +55,7 @@ public async virtual Task ExecuteApi<TResult>(Func<Task<object>> getServerResult
     /// <param name="onSuccess"></param>
     /// <param name="onError"></param>
     /// <returns></returns>
-    public virtual async Task ExecuteApi(Func<Task<object>> getServerResult, Func<Task> onSuccess = default, Func<Exception, Task> onError = default)
+    public virtual async Task ExecuteApi(Func<Task<object>> getServerResult, Func<Task> onSuccess = default, Func<ErrorContract, Task> onError = default)
     {
         try
         {
@@ -85,6 +85,6 @@ public virtual async Task ExecuteApi(Func<Task<object>> getServerResult, Func<Ta
     async Task InternalDisplayServerError(ErrorContract error)
     {
         if (OnGlobalServiceErrorHandler == null || !await OnGlobalServiceErrorHandler(error))
-            await DisplayServerError(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
@@ -157,7 +157,7 @@ public virtual Task OnError(Exception exception)
     /// </summary>
     /// <param name="errorContract"></param>
     /// <returns></returns>
-    public virtual Task DisplayServerError(ErrorContract errorContract)
+    public virtual Task OnServerError(ErrorContract errorContract)
     {
         return Task.CompletedTask;
     }

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?.DisplayServerError(ex.MessageContract.Error);
+            _busyViewModel?.OnServerError(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?.DisplayServerError(ex.MessageContract.Error);
+                _busyViewModel?.OnServerError(ex.MessageContract.Error);
             }
             catch (Exception ex)
             {

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.16</Version>
+    <Version>0.0.0.17</Version>
     <Description>Model View View Model</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>mvvm,mvpvm,modelview,modelviewviewmodel</PackageTags>

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

diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/PageBaseViewModel.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/PageBaseViewModel.cs
@@ -136,7 +136,7 @@ public override Task OnError(Exception exception)
     /// </summary>
     /// <param name="errorContract"></param>
     /// <returns></returns>
-    public override Task DisplayServerError(ErrorContract errorContract)
+    public override Task OnServerError(ErrorContract errorContract)
     {
         return Page.DisplayAlert("Server Error", $"{errorContract?.FailedReasonType}{Environment.NewLine}{errorContract?.Message}{Environment.NewLine}{errorContract?.Details}{Environment.NewLine}{errorContract?.StackTrace}", "Ok");
     }