Merge pull request #103 from Ali-YousefiTelori/develop

update packages and fix some methods in multiple language requests
EasyMicroservices · Dec 24, 2023 · 4a5502b · 4a5502b
2 parents 520d6d4 + c03ca66
commit 4a5502b
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 10 deletions.
diff --git a/src/CSharp/EasyMicroservices.Cores.AspCoreApi/EasyMicroservices.Cores.AspCoreApi.csproj b/src/CSharp/EasyMicroservices.Cores.AspCoreApi/EasyMicroservices.Cores.AspCoreApi.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.70</Version>
+    <Version>0.0.0.71</Version>
     <Description>asp core servces.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,services,asp,aspnet</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.Cores.AspCoreApi/MultilingualReadableQueryServiceController.cs b/src/CSharp/EasyMicroservices.Cores.AspCoreApi/MultilingualReadableQueryServiceController.cs
@@ -97,6 +97,17 @@ async Task<MessageContract<TLanguageResponseContract>> ResolveContentAllLanguage
         return mapped;
     }
 
+    async Task<ListMessageContract<TLanguageResponseContract>> ResolveContentAllLanguage<T>(ListMessageContract<T> result)
+    {
+        if (!result)
+            return result.ToListContract<TLanguageResponseContract>();
+        var contentResolver = UnitOfWork.GetContentResolver();
+        var mapper = UnitOfWork.GetMapper();
+        var mapped = mapper.MapToList<TLanguageResponseContract>(result.Result);
+        await contentResolver.ResolveContentAllLanguage(mapped);
+        return mapped;
+    }
+
     /// <summary>
     /// 
     /// </summary>
@@ -169,7 +180,7 @@ public virtual async Task<ListMessageContract<TResponseContract>> Filter(TFilter
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     [HttpPost]
-    public async Task<MessageContract<TLanguageResponseContract>> FilterAllLanguage(TFilterContract filterRequest, CancellationToken cancellationToken = default)
+    public async Task<ListMessageContract<TLanguageResponseContract>> FilterAllLanguage(TFilterContract filterRequest, CancellationToken cancellationToken = default)
     {
         var result = await ContractLogic.Filter(filterRequest, OnGetAllQuery(), cancellationToken);
         return await ResolveContentAllLanguage(result);
@@ -187,13 +198,26 @@ public virtual async Task<ListMessageContract<TResponseContract>> GetAll(Cancell
         return await ResolveContentLanguage(result, default);
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="getByLanguageRequest"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<ListMessageContract<TResponseContract>> GetAllByLanguage(GetByLanguageRequestContract getByLanguageRequest, CancellationToken cancellationToken = default)
+    {
+        var result = await ContractLogic.GetAll(OnGetAllQuery(), cancellationToken);
+        return await ResolveContentLanguage(result, getByLanguageRequest.LanguageShortName);
+    }
+
     /// <summary>
     /// 
     /// </summary>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     [HttpPost]
-    public async Task<MessageContract<TLanguageResponseContract>> GetAllWithAllLanguage(CancellationToken cancellationToken = default)
+    public async Task<ListMessageContract<TLanguageResponseContract>> GetAllWithAllLanguage(CancellationToken cancellationToken = default)
     {
         var result = await ContractLogic.GetAll(OnGetAllQuery(), cancellationToken);
         return await ResolveContentAllLanguage(result);
@@ -218,7 +242,7 @@ public virtual async Task<ListMessageContract<TResponseContract>> GetAllByUnique
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     [HttpPost]
-    public async Task<MessageContract<TLanguageResponseContract>> GetAllByUniqueIdentityAllLanguage(GetByUniqueIdentityRequestContract request, CancellationToken cancellationToken = default)
+    public async Task<ListMessageContract<TLanguageResponseContract>> GetAllByUniqueIdentityAllLanguage(GetByUniqueIdentityRequestContract request, CancellationToken cancellationToken = default)
     {
         var result = await ContractLogic.GetAllByUniqueIdentity(request, request.Type, OnGetAllQuery(), cancellationToken);
         return await ResolveContentAllLanguage(result);

diff --git a/....Cores.AspEntityFrameworkCoreApi/EasyMicroservices.Cores.AspEntityFrameworkCoreApi.csproj b/....Cores.AspEntityFrameworkCoreApi/EasyMicroservices.Cores.AspEntityFrameworkCoreApi.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.70</Version>
+    <Version>0.0.0.71</Version>
     <Description>asp core servces.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,services,asp,aspnet,aspcore,efcore</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.Cores.Clients/EasyMicroservices.Cores.Clients.csproj b/src/CSharp/EasyMicroservices.Cores.Clients/EasyMicroservices.Cores.Clients.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.70</Version>
+    <Version>0.0.0.71</Version>
     <Description>core of database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,client,clients</PackageTags>

diff --git a/...oservices.Cores.Contracts/Contracts/Requests/Multilingual/GetByLanguageRequestContract.cs b/...oservices.Cores.Contracts/Contracts/Requests/Multilingual/GetByLanguageRequestContract.cs
@@ -0,0 +1,22 @@
+namespace EasyMicroservices.Cores.Contracts.Requests.Multilingual;
+/// <summary>
+/// 
+/// </summary>
+public class GetByLanguageRequestContract
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public string LanguageShortName { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="languageShortName"></param>
+    public static implicit operator GetByLanguageRequestContract(string languageShortName)
+    {
+        return new GetByLanguageRequestContract()
+        {
+            LanguageShortName = languageShortName
+        };
+    }
+}
diff --git a/src/CSharp/EasyMicroservices.Cores.Contracts/EasyMicroservices.Cores.Contracts.csproj b/src/CSharp/EasyMicroservices.Cores.Contracts/EasyMicroservices.Cores.Contracts.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.70</Version>
+    <Version>0.0.0.71</Version>
     <Description>core contracts.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,contract,contracts,dto,dtos</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.Cores.Database/EasyMicroservices.Cores.Database.csproj b/src/CSharp/EasyMicroservices.Cores.Database/EasyMicroservices.Cores.Database.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.70</Version>
+    <Version>0.0.0.71</Version>
     <Description>core of database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database</PackageTags>

diff --git a/...icroservices.Cores.EntityFrameworkCore/EasyMicroservices.Cores.EntityFrameworkCore.csproj b/...icroservices.Cores.EntityFrameworkCore/EasyMicroservices.Cores.EntityFrameworkCore.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.70</Version>
+    <Version>0.0.0.71</Version>
     <Description>ef core of database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,ef,efcore</PackageTags>

diff --git a/...ational.EntityFrameworkCore/EasyMicroservices.Cores.Relational.EntityFrameworkCore.csproj b/...ational.EntityFrameworkCore/EasyMicroservices.Cores.Relational.EntityFrameworkCore.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.0.70</Version>
+    <Version>0.0.0.71</Version>
     <Description>ef core of Relational database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,ef,efcore,Relational</PackageTags>