Merge pull request #42 from Ali-YousefiTelori/develop

Add more log and update packages
EasyMicroservices · Jan 30, 2024 · 8fa8b92 · 8fa8b92
2 parents 603a606 + 6aba0bf
commit 8fa8b92
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 9 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.22</Version>
+    <Version>0.0.0.23</Version>
     <Description>client generated code.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>microservice,Content,Contents,client</PackageTags>

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Clients/Helpers/ContentLanguageHelper.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.Clients/Helpers/ContentLanguageHelper.cs
@@ -240,13 +240,25 @@ async Task<CategoryContractMessageContract> SaveToContentLanguage(object item, F
             }
             var result = await saveData(request.ToArray());
             if (!result.IsSuccess)
+            {
+                LogContract(result.Error);
                 return result;
+            }
+
             return new CategoryContractMessageContract()
             {
                 IsSuccess = true,
             };
         }
 
+        void LogContract(ErrorContract contract)
+        {
+            Console.WriteLine($"Content Error Message: {contract.Message}");
+            Console.WriteLine($"Content Error EndUserMessage: {contract.EndUserMessage}");
+            Console.WriteLine($"Content Error Details: {contract.Details}");
+            Console.WriteLine($"Content Error ProjectName: {contract.ServiceDetails?.ProjectName}");
+            Console.WriteLine($"Content Error MethodName: {contract.ServiceDetails?.MethodName}");
+        }
 
         async Task<MessageContract> SaveToContentLanguageUpdate(object item, Func<(string UniqueIdentity, string Name, IEnumerable<LanguageDataContract> Languages)[], Task<MessageContract>> saveData)
         {
@@ -273,7 +285,10 @@ async Task<MessageContract> SaveToContentLanguageUpdate(object item, Func<(strin
             }
             var result = await saveData(request.ToArray());
             if (!result.IsSuccess)
+            {
+                LogContract(result.Error);
                 return result;
+            }
             return new MessageContract()
             {
                 IsSuccess = true,
@@ -350,7 +365,10 @@ async Task<CategoryContractMessageContract> AddToContent(params (string UniqueId
             {
                 result = await AddToContent(item.UniqueIdentity, item.Name, item.Languages);
                 if (!result.IsSuccess)
+                {
+                    LogContract(result.Error);
                     return result;
+                }
             }
             return result;
         }
@@ -390,7 +408,10 @@ async Task<MessageContract> UpdateToContent(params (string UniqueIdentity, strin
             {
                 result = await UpdateToContent(item.UniqueIdentity, item.Name, item.Languages);
                 if (!result.IsSuccess)
+                {
+                    LogContract(result.Error);
                     return result;
+                }
             }
             return result;
         }

diff --git a/...ices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj b/...ices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
 	  <PackageReference Include="EasyMicroservices.Configuration" Version="*" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
   </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.76" />
+    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.1.4" />
   </ItemGroup>
 
 </Project>
diff --git a/...rvices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj b/...rvices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.15" />
     <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,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.ContentsMicroservice.Clients" Version="0.0.0.21" />
+    <PackageReference Include="EasyMicroservices.ContentsMicroservice.Clients" Version="0.0.0.22" />
     <PackageReference Include="EasyMicroservices.Tests" Version="*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.6.1" />
@@ -32,7 +32,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>    
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing">
-      <Version>7.0.14</Version>
+      <Version>7.0.15</Version>
     </PackageReference>
   </ItemGroup>
 

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

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/Program.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/Program.cs
@@ -17,7 +17,8 @@ public static async Task Main(string[] args)
         static WebApplicationBuilder CreateBuilder(string[] args)
         {
             var app = StartUpExtensions.Create<ContentContext>(args);
-            app.Services.Builder<ContentContext>("Content");
+            app.Services.Builder<ContentContext>("Content")
+                .UseDefaultSwaggerOptions();
             app.Services.AddTransient((serviceProvider) => new UnitOfWork(serviceProvider));
             app.Services.AddTransient(serviceProvider => new ContentContext(serviceProvider.GetService<IEntityFrameworkCoreDatabaseBuilder>()));
             app.Services.AddTransient<IEntityFrameworkCoreDatabaseBuilder, DatabaseBuilder>();

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/appsettings.json b/src/CSharp/EasyMicroservices.ContentsMicroservice.WebApi/appsettings.json
@@ -26,12 +26,20 @@
     }
   ],
   "Authorization": {
-    "Use": true,
+    "IsUse": false,
     "JWT": {
       "Key": "VGhpc0lzGHGHGHlY3JldEtleUZvckp3dEF1dGhlbnRpY2F0aW9u=",
       "Issuer": "https://github.com/easymicroservices",
       "Audience": "easymicroservices",
+
       "TokenExpireTimeInSeconds": 86400
+    },
+    "FullAccessPAT": "ownerpat"
+  },
+  "Swagger": {
+    "IsUse": true,
+    "SwaggerUI": {
+      "Endpoints": []
     }
   },
   "Urls": "http://*:2003"