Merge pull request #165 from Ali-YousefiTelori/develop

Fix null reference bug
EasyMicroservices · Feb 15, 2024 · 5b70fa9 · 5b70fa9
2 parents 8d73d52 + b7c578b
commit 5b70fa9
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 8 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>netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.1.54</Version>
+    <Version>0.0.1.55</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
@@ -66,6 +66,7 @@ public MultilingualReadableQueryServiceController(IBaseUnitOfWork unitOfWork, IC
     public MultilingualReadableQueryServiceController(IBaseUnitOfWork unitOfWork)
     {
         ContractLogic = unitOfWork.GetReadableContractLogic<TEntity, TResponseContract, TId>();
+        UnitOfWork = unitOfWork;
     }
 
     async Task<MessageContract<T>> ResolveContentLanguage<T>(MessageContract<T> result, string languageShortName)

diff --git a/src/CSharp/EasyMicroservices.Cores.AspCoreApi/ReadableQueryServiceController.cs b/src/CSharp/EasyMicroservices.Cores.AspCoreApi/ReadableQueryServiceController.cs
@@ -63,7 +63,9 @@ public ReadableQueryServiceController(IBaseUnitOfWork unitOfWork, IContractReada
         public ReadableQueryServiceController(IBaseUnitOfWork unitOfWork)
         {
             ContractLogic = unitOfWork.GetReadableContractLogic<TEntity, TResponseContract, TId>();
+            UnitOfWork = unitOfWork;
         }
+
         /// <summary>
         /// 
         /// </summary>

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.1.54</Version>
+    <Version>0.0.1.55</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.1.54</Version>
+    <Version>0.0.1.55</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.1.54</Version>
+    <Version>0.0.1.55</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/Database/Widgets/SimpleReportingEntityWidget.cs b/src/CSharp/EasyMicroservices.Cores.Database/Database/Widgets/SimpleReportingEntityWidget.cs
@@ -70,6 +70,8 @@ public async Task AddProcess(IDatabaseWidgetManager databaseWidgetManager, IBase
             DoStopReporting = true
         });
         DatabaseExtensions.SetIdToRecordId(logic.GetReadableContext(), entity, reportEntity);
+        if (reportEntity is IUniqueIdentitySchema reportUniqueIdentity && entity is IUniqueIdentitySchema entityUniqueIdentity)
+            reportUniqueIdentity.UniqueIdentity = entityUniqueIdentity.UniqueIdentity;
         await logic
             .Add(reportEntity, cancellationToken)
             .AsCheckedResult();
@@ -93,6 +95,13 @@ public async Task AddBulkProcess(IDatabaseWidgetManager databaseWidgetManager, I
             DoStopReporting = true
         });
         DatabaseExtensions.SetIdToRecordId(logic.GetReadableContext(), reportEntities);
+        foreach (var item in reportEntities)
+        {
+            DatabaseExtensions.SetIdToRecordId(logic.GetReadableContext(), item.Key, item.Value);
+            if (item.Key is IUniqueIdentitySchema reportUniqueIdentity && item.Value is IUniqueIdentitySchema entityUniqueIdentity)
+                reportUniqueIdentity.UniqueIdentity = entityUniqueIdentity.UniqueIdentity;
+        }
+
         await logic
             .AddBulk(reportEntities.Values.ToList(), cancellationToken)
             .AsCheckedResult();

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.1.54</Version>
+    <Version>0.0.1.55</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>netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
-    <Version>0.0.1.54</Version>
+    <Version>0.0.1.55</Version>
     <Description>ef core of database.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,database,ef,efcore</PackageTags>

diff --git a/...harp/EasyMicroservices.Cores.Infrastructure/EasyMicroservices.Cores.Infrastructure.csproj b/...harp/EasyMicroservices.Cores.Infrastructure/EasyMicroservices.Cores.Infrastructure.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.1.54</Version>
+    <Version>0.0.1.55</Version>
     <Description>core of infrastructure.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>core,cores,base,infrastructure</PackageTags>

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