Merge pull request #101 from Ali-YousefiTelori/develop

Fix swagger error
EasyMicroservices · Dec 22, 2023 · 78d2e60 · 78d2e60
2 parents 4d755f5 + e0336cc
commit 78d2e60
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 29 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.68</Version>
+    <Version>0.0.0.69</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/Interfaces/IReadableQueryServiceController.cs b/src/CSharp/EasyMicroservices.Cores.AspCoreApi/Interfaces/IReadableQueryServiceController.cs
@@ -2,9 +2,6 @@
 using EasyMicroservices.Cores.Database.Interfaces;
 using EasyMicroservices.Cores.Interfaces;
 using EasyMicroservices.ServiceContracts;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -72,16 +69,4 @@ public interface IReadableQueryServiceController<TEntity, TFilterContract, TResp
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     public Task<ListMessageContract<TResponseContract>> GetAllByUniqueIdentity(TUniqueIdentityRequestContract request, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    protected Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetQuery();
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    protected Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetAllQuery();
 }
diff --git a/src/CSharp/EasyMicroservices.Cores.AspCoreApi/MultilingualReadableQueryServiceController.cs b/src/CSharp/EasyMicroservices.Cores.AspCoreApi/MultilingualReadableQueryServiceController.cs
@@ -228,7 +228,7 @@ public async Task<MessageContract<TLanguageResponseContract>> GetAllByUniqueIden
     /// 
     /// </summary>
     /// <returns></returns>
-    public virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetQuery()
+    protected virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetQuery()
     {
         return null;
     }
@@ -237,7 +237,7 @@ public virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetQuery()
     /// 
     /// </summary>
     /// <returns></returns>
-    public virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetAllQuery()
+    protected virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetAllQuery()
     {
         return null;
     }

diff --git a/src/CSharp/EasyMicroservices.Cores.AspCoreApi/MultilingualSimpleQueryServiceController.cs b/src/CSharp/EasyMicroservices.Cores.AspCoreApi/MultilingualSimpleQueryServiceController.cs
@@ -126,7 +126,7 @@ async Task<MessageContract> UpdateToContentLanguage(MessageContract messageContr
         if (!messageContract)
             return messageContract;
         var contentResolver = UnitOfWork.GetContentResolver();
-        await contentResolver.UpdateToContentLanguage(requests.Where(x=> GetUniqueIdentity(x).HasValue()));
+        await contentResolver.UpdateToContentLanguage(requests.Where(x => GetUniqueIdentity(x).HasValue()));
         return messageContract;
     }
 

diff --git a/src/CSharp/EasyMicroservices.Cores.AspCoreApi/ReadableQueryServiceController.cs b/src/CSharp/EasyMicroservices.Cores.AspCoreApi/ReadableQueryServiceController.cs
@@ -124,19 +124,19 @@ public virtual Task<ListMessageContract<TResponseContract>> GetAllByUniqueIdenti
         }
 
         /// <summary>
-        /// 
+        /// do not make it public you will break 
         /// </summary>
         /// <returns></returns>
-        public virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetQuery()
+        protected virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetQuery()
         {
             return null;
         }
 
         /// <summary>
-        /// 
+        ///  do not make it public you will break 
         /// </summary>
         /// <returns></returns>
-        public virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetAllQuery()
+        protected virtual Func<IQueryable<TEntity>, IQueryable<TEntity>> OnGetAllQuery()
         {
             return null;
         }

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.68</Version>
+    <Version>0.0.0.69</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.68</Version>
+    <Version>0.0.0.69</Version>
     <Description>core of database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,client,clients</PackageTags>

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.68</Version>
+    <Version>0.0.0.69</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.68</Version>
+    <Version>0.0.0.69</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.68</Version>
+    <Version>0.0.0.69</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.68</Version>
+    <Version>0.0.0.69</Version>
     <Description>ef core of Relational database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,ef,efcore,Relational</PackageTags>