Merge pull request #100 from Ali-YousefiTelori/develop

add support for GetLogic
EasyMicroservices · Dec 21, 2023 · 4d755f5 · 4d755f5
2 parents 43d8241 + e1c6826
commit 4d755f5
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 16 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.67</Version>
+    <Version>0.0.0.68</Version>
     <Description>asp core servces.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,services,asp,aspnet</PackageTags>

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.67</Version>
+    <Version>0.0.0.68</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.AspEntityFrameworkCoreApi/UnitOfWork.cs b/src/CSharp/EasyMicroservices.Cores.AspEntityFrameworkCoreApi/UnitOfWork.cs
@@ -117,6 +117,17 @@ public virtual IContractLogic<TEntity, TEntity, TEntity, TEntity, long> GetLongL
             return GetInternalLongContractLogic<TEntity, TEntity, TEntity, TEntity>();
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="TEntity"></typeparam>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public IContractLogic<TEntity, TEntity, TEntity, TEntity, TEntity> GetLogic<TEntity>() where TEntity : class
+        {
+            return GetInternalContractLogic<TEntity, TEntity, TEntity, TEntity, TEntity>();
+        }
+
         /// <summary>
         /// 
         /// </summary>

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.67</Version>
+    <Version>0.0.0.68</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.67</Version>
+    <Version>0.0.0.68</Version>
     <Description>core contracts.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,contract,contracts,dto,dtos</PackageTags>

diff --git a/...Sharp/EasyMicroservices.Cores.Database/Database/Logics/IdSchemaDatabaseMappedLogicBase.cs b/...Sharp/EasyMicroservices.Cores.Database/Database/Logics/IdSchemaDatabaseMappedLogicBase.cs
@@ -96,6 +96,16 @@ public async Task<MessageContract<TResponseContract>> GetBy(Expression<Func<TEnt
             return await GetBy<TEntity, TResponseContract>(_easyReadableQueryable, predicate, func, cancellationToken);
         }
 
+        TId MapToTId<T>(T result)
+        {
+            if (result is IIdSchema<TId> schema)
+                return schema.Id;
+            else if (result is TId tid)
+                return tid;
+            else if ((typeof(TId) == typeof(long) || typeof(TId) == typeof(int)) && result?.GetType() != typeof(string) && (result?.GetType()?.IsClass).GetValueOrDefault())
+                throw new Exception($"I think you cannot convert TId from type {typeof(TId).Name} to type {result?.GetType()?.Name}, maybe you don't need to use LongLogic?");
+            return MapperProvider.Map<TId>(result);
+        }
 
         /// <summary>
         /// 
@@ -107,11 +117,7 @@ public async Task<MessageContract<TId>> Add(TCreateRequestContract contract, Can
         {
             var result = await Add(_easyWriteableQueryable, contract, cancellationToken);
             if (result)
-            {
-                if (result.Result is IIdSchema<TId> schema)
-                    return schema.Id;
-                return MapperProvider.Map<TId>(result.Result);
-            }
+                return MapToTId(result.Result);
             return result.ToContract<TId>();
         }
 
@@ -130,10 +136,7 @@ public async Task<ListMessageContract<TId>> AddBulk(CreateBulkRequestContract<TC
                 List<TId> items = new List<TId>();
                 foreach (var item in result.Result)
                 {
-                    if (item is IIdSchema<TId> schema)
-                        items.Add(schema.Id);
-                    else
-                        items.Add(MapperProvider.Map<TId>(item));
+                    items.Add(MapToTId(item));
                 }
                 return items;
             }

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

diff --git a/src/CSharp/EasyMicroservices.Cores.Database/Interfaces/IBaseUnitOfWork.cs b/src/CSharp/EasyMicroservices.Cores.Database/Interfaces/IBaseUnitOfWork.cs
@@ -95,6 +95,14 @@ IContractLogic<TEntity, TContract, TContract, TContract, long> GetLongReadableCo
         IContractLogic<TEntity, TEntity, TEntity, TEntity, TId> GetLogic<TEntity, TId>()
            where TEntity : class;
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="TEntity"></typeparam>
+        /// <returns></returns>
+        IContractLogic<TEntity, TEntity, TEntity, TEntity, TEntity> GetLogic<TEntity>()
+           where TEntity : class;
+
         /// <summary>
         /// 
         /// </summary>

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