feat: introduced caching in the server + Added serilog

WotBlitzStatisticsPro.GraphQl/Mutation/WotBlitzStatisticsMutation.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using HotChocolate;
 using HotChocolate.AspNetCore.Authorization;
 using HotChocolate.Types;
@@ -43,7 +44,7 @@ namespace WotBlitzStatisticsPro.GraphQl.Mutation
         /// <param name="requestLanguage">Request language</param>
         /// <param name="wgToken">Wargaming authentication token</param>
         /// <returns></returns>
-        public Task<AccountInfoResponse> GatherAccountInformation(
+        public Task<DateTime> GatherAccountInformation(
             RealmType realmType, 
             long accountId, 
             RequestLanguage requestLanguage,

WotBlitzStatisticsPro.GraphQl/Program.cs

@@ -1,5 +1,9 @@
+using System;
+using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
+using Serilog;
 
 namespace WotBlitzStatisticsPro.GraphQl
 {
@@ -7,12 +11,36 @@ namespace WotBlitzStatisticsPro.GraphQl
 	{
 		public static void Main(string[] args)
 		{
-			CreateHostBuilder(args).Build().Run();
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json")
+                .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json", true)
+                .AddEnvironmentVariables()
+                .Build();
+
+            Log.Logger = new LoggerConfiguration()
+                .ReadFrom.Configuration(configuration)
+                .CreateLogger();
+
+            try
+            {
+                Log.Information("Starting web host");
+                CreateHostBuilder(args).Build().Run();
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal(ex, "Host terminated unexpectedly");
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
 		}
 
-		public static IHostBuilder CreateHostBuilder(string[] args) =>
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
 			Host.CreateDefaultBuilder(args)
-				.ConfigureWebHostDefaults(webBuilder =>
+                .UseSerilog()
+                .ConfigureWebHostDefaults(webBuilder =>
 				{
 					webBuilder.UseStartup<Startup>();
 				});

WotBlitzStatisticsPro.GraphQl/Query/WotBlitzStatisticsQuery.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using HotChocolate.Types;
+using Microsoft.Extensions.Logging;
 using WotBlitzStatisticsPro.Common.Model;
 using WotBlitzStatisticsPro.Logic;
 

WotBlitzStatisticsPro.GraphQl/Startup.cs

@@ -14,6 +14,7 @@ using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
+using Serilog;
 using WotBlitzStatisticsPro.Common;
 using WotBlitzStatisticsPro.Common.Model;
 using WotBlitzStatisticsPro.GraphQl.GitHubOauth;
@@ -37,7 +38,10 @@ namespace WotBlitzStatisticsPro.GraphQl
 
 		public void ConfigureServices(IServiceCollection services)
 		{
-			var wgApiConfig = new WargamingApiSettings();
+            //services.AddLogging(loggingBuilder =>
+            //    loggingBuilder.AddSerilog(dispose: true));
+
+            var wgApiConfig = new WargamingApiSettings();
 			Configuration.GetSection("WargamingApi").Bind(wgApiConfig);
 
 			var mongoConfig = new MongoSettings();

WotBlitzStatisticsPro.GraphQl/WotBlitzStatisticsPro.GraphQl.csproj

@@ -17,6 +17,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.4" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.10.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.10.0" />
   </ItemGroup>
 

WotBlitzStatisticsPro.GraphQl/appsettings.Development.json

@@ -1,9 +1,25 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+    "Logging": {
+        "LogLevel": {
+            "Default": "Information",
+            "Microsoft": "Warning",
+            "Microsoft.Hosting.Lifetime": "Information"
+        }
+    },
+    "Serilog": {
+        "Using": [ "Serilog.Sinks.Console" ],
+        "MinimumLevel": {
+            "Default": "Debug",
+            "Override": {
+                "Microsoft": "Warning",
+                "Microsoft.Hosting.Lifetime": "Information",
+                "System": "Warning"
+            }
+
+        },
+        "WriteTo": [
+            { "Name": "Console" }
+        ],
+        "Enrich": [ "FromLogContext" ]
     }
-  }
 }

WotBlitzStatisticsPro.GraphQl/appsettings.Production.json

@@ -0,0 +1,17 @@
+{
+    "Serilog": {
+        "Using": [ "Serilog.Sinks.Console" ],
+        "MinimumLevel": {
+            "Default": "Information",
+            "Override": {
+                "Microsoft": "Warning",
+                "Microsoft.Hosting.Lifetime": "Information",
+                "System": "Warning"
+            }
+        },
+        "WriteTo": [
+            { "Name": "Console" }
+        ],
+        "Enrich": [ "FromLogContext" ]
+    }
+}

WotBlitzStatisticsPro.GraphQl/appsettings.json

@@ -14,9 +14,30 @@
 	"Mongo": {
 		"ConnectionString": "*",
 		"DatabaseName": "*"
-	}, 
+	},
 	"GitHubOAuth": {
 		"ClientId": "YourClientId",
-		"ClientSecret":  "YourSecret" 
-    }
-}
+		"ClientSecret": "YourSecret"
+	},
+	"Serilog": {
+		"Using": [ "Serilog.Sinks.Console" ],
+		"MinimumLevel": {
+			"Default": "Information",
+			"Override": {
+				"Microsoft": "Warning",
+				"Microsoft.Hosting.Lifetime": "Information",
+				"System": "Warning"
+			}
+		},
+		"WriteTo": [
+			{
+				"Name": "Console",
+				"Args": {
+					"theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
+					"outputTemplate": "{Timestamp:HH:mm:ss.fff} [{Level:u3}] {Message:lj} |{SourceContext}|{NewLine}{Exception}"
+				}
+			}
+		],
+		"Enrich": [ "FromLogContext" ]
+	}
+}