Merge pull request #6 from Ali-YousefiTelori/develop

update packages
EasyMicroservices · Nov 13, 2023 · 1bbc509 · 1bbc509
2 parents f8af658 + 046d049
commit 1bbc509
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/src/CSharp/EasyMicroservices.UI.Core.Mvvm/Commands/BaseCommand.cs b/src/CSharp/EasyMicroservices.UI.Core.Mvvm/Commands/BaseCommand.cs
@@ -1,4 +1,5 @@
-using EasyMicroservices.UI.Core.Interfaces;
+using EasyMicroservices.ServiceContracts.Exceptions;
+using EasyMicroservices.UI.Core.Interfaces;
 using System;
 using System.Windows.Input;
 
@@ -83,6 +84,10 @@ public virtual void Execute(object parameter)
             }
             _execute(parameter);
         }
+        catch (InvalidResultOfMessageContractException ex)
+        {
+            _busyViewModel?.DisplayFetchError(ex.MessageContract.Error);
+        }
         catch (Exception ex)
         {
             _busyViewModel?.OnError(ex);

diff --git a/src/CSharp/EasyMicroservices.UI.Core.Mvvm/Commands/TaskBaseCommand.cs b/src/CSharp/EasyMicroservices.UI.Core.Mvvm/Commands/TaskBaseCommand.cs
@@ -1,4 +1,5 @@
-using EasyMicroservices.UI.Core.Interfaces;
+using EasyMicroservices.ServiceContracts.Exceptions;
+using EasyMicroservices.UI.Core.Interfaces;
 using System;
 using System.Threading.Tasks;
 using System.Windows.Input;
@@ -89,6 +90,10 @@ async Task InternalExecute(object parameter)
             {
                 await _execute(parameter);
             }
+            catch (InvalidResultOfMessageContractException ex)
+            {
+                _busyViewModel?.DisplayFetchError(ex.MessageContract.Error);
+            }
             catch (Exception ex)
             {
                 _busyViewModel?.OnError(ex);

diff --git a/src/CSharp/EasyMicroservices.UI.Core.Mvvm/EasyMicroservices.UI.Core.Mvvm.csproj b/src/CSharp/EasyMicroservices.UI.Core.Mvvm/EasyMicroservices.UI.Core.Mvvm.csproj
@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.5</Version>
+    <Version>0.0.0.6</Version>
     <Description>Model View View Model</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>mvvm,mvpvm,modelview,modelviewviewmodel</PackageTags>
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.ServiceContracts" Version="0.0.0.17" />
+    <PackageReference Include="EasyMicroservices.ServiceContracts" Version="0.0.0.18" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CSharp/EasyMicroservices.UI.Core.Mvvm/Interfaces/IBusyViewModel.cs b/src/CSharp/EasyMicroservices.UI.Core.Mvvm/Interfaces/IBusyViewModel.cs
@@ -1,4 +1,5 @@
-using System;
+using EasyMicroservices.ServiceContracts;
+using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
 
@@ -34,5 +35,18 @@ public interface IBusyViewModel : INotifyPropertyChanged
         /// <param name="exception"></param>
         /// <returns></returns>
         Task OnError(Exception exception);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="errorContract"></param>
+        /// <returns></returns>
+        Task DisplayFetchError(ErrorContract errorContract);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        Task DisplayError(string message);
     }
 }