Merge pull request #38 from Ali-YousefiTelori/develop

update packages and support for multiple add and update content resolver
EasyMicroservices · Dec 16, 2023 · fca6ea1 · fca6ea1
2 parents 07e7174 + c9045d4
commit fca6ea1
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 22 deletions.
diff --git a/...rvices.ContentsMicroservice.Clients/EasyMicroservices.ContentsMicroservice.Clients.csproj b/...rvices.ContentsMicroservice.Clients/EasyMicroservices.ContentsMicroservice.Clients.csproj
@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.19</Version>
+    <Version>0.0.0.20</Version>
     <Description>client generated code.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>microservice,Content,Contents,client</PackageTags>
@@ -16,20 +16,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.Clients" Version="0.0.0.61" />
+    <PackageReference Include="EasyMicroservices.Cores.Clients" Version="*" />
     <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="7.0.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NSwag.ApiDescription.Client" Version="13.20.0">
+    <PackageReference Include="Newtonsoft.Json" Version="*" />
+    <PackageReference Include="NSwag.ApiDescription.Client" Version="*">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Net.Http" Version="*" />
   </ItemGroup>
 </Project>
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Clients/Helpers/ContentLanguageHelper.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.Clients/Helpers/ContentLanguageHelper.cs
@@ -165,6 +165,22 @@ public Task<CategoryContractMessageContract> AddToContentLanguage(object item)
             return SaveToContentLanguage(item, AddToContent);
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="items"></param>
+        /// <returns></returns>
+        public async Task<List<CategoryContractMessageContract>> AddToContentLanguage(IEnumerable items)
+        {
+            List<Task<CategoryContractMessageContract>> tasks = new List<Task<CategoryContractMessageContract>>();
+            foreach (var item in items)
+            {
+                tasks.Add(AddToContentLanguage(item));
+            }
+            await Task.WhenAll(tasks);
+            return tasks.Select(x => x.Result).ToList();
+        }
+
         /// <summary>
         /// 
         /// </summary>
@@ -175,6 +191,21 @@ public Task<MessageContract> UpdateToContentLanguage(object item)
             return SaveToContentLanguageUpdate(item, UpdateToContent);
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="items"></param>
+        /// <returns></returns>
+        public async Task UpdateToContentLanguage(IEnumerable items)
+        {
+            List<Task> tasks = new List<Task>();
+            foreach (var item in items)
+            {
+                tasks.Add(UpdateToContentLanguage(item));
+            }
+            await Task.WhenAll(tasks);
+        }
+
         async Task<CategoryContractMessageContract> SaveToContentLanguage(object item, Func<(string UniqueIdentity, string Name, IEnumerable<LanguageDataContract> Languages)[], Task<CategoryContractMessageContract>> saveData)
         {
             if (item.Equals(default))

diff --git a/...ices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj b/...ices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj
@@ -11,9 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="EasyMicroservices.Configuration" Version="0.0.0.2" />
-	  <!--<PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.23" />-->
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
+	  <PackageReference Include="EasyMicroservices.Configuration" Version="*" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...services.ContentsMicroservice.Domain/EasyMicroservices.ContentsMicroservice.Domain.csproj b/...services.ContentsMicroservice.Domain/EasyMicroservices.ContentsMicroservice.Domain.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.46" />
+    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="*" />
   </ItemGroup>
 
 </Project>
diff --git a/...services.ContentsMicroservice.Logics/EasyMicroservices.ContentsMicroservice.Logics.csproj b/...services.ContentsMicroservice.Logics/EasyMicroservices.ContentsMicroservice.Logics.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Mapper.CompileTimeMapper" Version="0.0.0.6" />
-    <PackageReference Include="EasyMicroservices.Mapper.SerializerMapper" Version="0.0.0.3" />
-    <PackageReference Include="EasyMicroservices.Serialization.Newtonsoft.Json" Version="0.0.0.6" />
+    <PackageReference Include="EasyMicroservices.Mapper.CompileTimeMapper" Version="*" />
+    <PackageReference Include="EasyMicroservices.Mapper.SerializerMapper" Version="*" />
+    <PackageReference Include="EasyMicroservices.Serialization.Newtonsoft.Json" Version="*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/DatabaseBuilder.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/DatabaseBuilder.cs
@@ -20,8 +20,8 @@ public DatabaseBuilder(IConfiguration configuration)
 
         public void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            //optionsBuilder.UseInMemoryDatabase("ContentDatabase");
-            optionsBuilder.UseSqlServer(_configuration.GetConnectionString("local"));
+            optionsBuilder.UseInMemoryDatabase("ContentDatabase");
+            //optionsBuilder.UseSqlServer(_configuration.GetConnectionString("local"));
         }
     }
 }
diff --git a/...rvices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj b/...rvices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.WhiteLabelsMicroservice.Clients" Version="0.0.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.13" />
+    <PackageReference Include="EasyMicroservices.WhiteLabelsMicroservice.Clients" Version="*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.14" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
   </ItemGroup>

diff --git a/...roservices.ContentsMicroservice.Tests/EasyMicroservices.ContentsMicroservice.Tests.csproj b/...roservices.ContentsMicroservice.Tests/EasyMicroservices.ContentsMicroservice.Tests.csproj
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.ContentsMicroservice.Clients" Version="0.0.0.16" />
-    <PackageReference Include="EasyMicroservices.Tests" Version="0.0.0.9" />
+    <PackageReference Include="EasyMicroservices.ContentsMicroservice.Clients" Version="*" />
+    <PackageReference Include="EasyMicroservices.Tests" Version="*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.6.1" />
     <PackageReference Include="xunit.runner.console" Version="2.6.1">
@@ -32,7 +32,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>    
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing">
-      <Version>7.0.13</Version>
+      <Version>7.0.14</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/...services.ContentsMicroservice.WebApi/EasyMicroservices.ContentsMicroservice.WebApi.csproj b/...services.ContentsMicroservice.WebApi/EasyMicroservices.ContentsMicroservice.WebApi.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/Program.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/Program.cs
@@ -9,7 +9,7 @@ public class Program
         public static async Task Main(string[] args)
         {
             var app = CreateBuilder(args);
-            var build = await app.Build<ContentContext>(true);
+            var build = await app.BuildWithUseCors<ContentContext>(null, true);
             build.MapControllers();
             build.Run();
         }
@@ -21,6 +21,7 @@ static WebApplicationBuilder CreateBuilder(string[] args)
             app.Services.AddTransient((serviceProvider) => new UnitOfWork(serviceProvider));
             app.Services.AddTransient(serviceProvider => new ContentContext(serviceProvider.GetService<IEntityFrameworkCoreDatabaseBuilder>()));
             app.Services.AddTransient<IEntityFrameworkCoreDatabaseBuilder, DatabaseBuilder>();
+            StartUpExtensions.AddAuthentication("RootAddresses:Authentication");
             StartUpExtensions.AddWhiteLabel("Content", "RootAddresses:WhiteLabel");
             return app;
         }