Some Data loader stuff

WotBlitzStatistics.GraphQl/DataLoaders/ClanDataLoader.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using GreenDonut;
+using WotBlitzStatisticsPro.WgApiClient;
+using WotBlitzStatisticsPro.WgApiClient.Model;
+
+namespace WotBlitzStatistics.GraphQl.DataLoaders
+{
+    public class ClanDataLoader : DataLoaderBase<long, ClanInfo>
+    {
+        private readonly IWargamingApiClient _wgApiClient;
+
+        public ClanDataLoader(IWargamingApiClient wgApiClient)
+        {
+            _wgApiClient = wgApiClient;
+        }
+
+        protected override async Task<IReadOnlyList<Result<ClanInfo>>> FetchAsync(
+            IReadOnlyList<long> keys, 
+            CancellationToken cancellationToken)
+        {
+            var result = new List<Result<ClanInfo>>();
+            foreach (var key in keys)
+            {
+                result.Add(await _wgApiClient.GetClanInfo(key));
+            }
+
+            return result.AsReadOnly();
+        }
+    }
+}

WotBlitzStatistics.GraphQl/ObjectTypes/PlayerClanInfoObjectType.cs

@@ -2,6 +2,7 @@
 using GreenDonut;
 using HotChocolate.Resolvers;
 using HotChocolate.Types;
+using WotBlitzStatistics.GraphQl.Resolvers;
 using WotBlitzStatisticsPro.WgApiClient;
 using WotBlitzStatisticsPro.WgApiClient.Model;
 
@@ -11,17 +12,7 @@ namespace WotBlitzStatistics.GraphQl.ObjectTypes
 	{
         protected override void Configure(IObjectTypeDescriptor<ClanAccountInfo> descriptor)
         {
-			// ToDo: Cache clan info!
+            descriptor.Include<ClanInfoResolver>();
-			// https://hotchocolate.io/docs/dataloaders
-            descriptor.Field("clanInfo")
-                .Resolver(c =>
-                {
-                    var warGamingClient = c.Service<IWargamingApiClient>();
-                    var clanDataLoader = c.CacheDataLoader<long, ClanInfo>(
-                        "clanInfoById",
-                        clanId => warGamingClient.GetClanInfo(clanId));
-                    return clanDataLoader.LoadAsync(c.Parent<ClanAccountInfo>().ClanId.Value);
-                });
         }
 	}
 }

WotBlitzStatistics.GraphQl/Resolvers/ClanInfoResolver.cs

@@ -0,0 +1,20 @@
+using System.Threading;
+using System.Threading.Tasks;
+using HotChocolate;
+using WotBlitzStatistics.GraphQl.DataLoaders;
+using WotBlitzStatisticsPro.WgApiClient;
+using WotBlitzStatisticsPro.WgApiClient.Model;
+
+namespace WotBlitzStatistics.GraphQl.Resolvers
+{
+    [GraphQLResolverOf(typeof(ClanInfo))]
+    public class ClanInfoResolver
+    {
+        public async Task<ClanInfo> GetClanInfo(
+            [Parent] ClanAccountInfo clanAccountInfo,
+            [DataLoader] ClanDataLoader clanDataLoader)
+        {
+            return (await clanDataLoader.LoadAsync(new[] {clanAccountInfo.ClanId.Value}, CancellationToken.None))[0];
+        }
+    }
+}

WotBlitzStatistics.GraphQl/Startup.cs

@@ -1,6 +1,7 @@
 using HotChocolate;
 using HotChocolate.AspNetCore;
 using HotChocolate.AspNetCore.Voyager;
+using HotChocolate.DataLoader;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -30,8 +31,10 @@ namespace WotBlitzStatistics.GraphQl
 			services.AddSingleton<IWargamingApiSettings>(wgApiConfig);
 			services.AddHttpClient<IWargamingApiClient, WargamingApiClient>();
 
-            // this enables you to use DataLoader in your resolvers.
+			// Global data loader - caches data between requests
-            services.AddDataLoaderRegistry();
+			//services.AddSingleton<IDataLoaderRegistry, DataLoaderRegistry>();
+			// this enables you to use DataLoader in your resolvers.
+			services.AddDataLoaderRegistry();
 
 			// Add GraphQL Services
 			services.AddGraphQL(sp => SchemaBuilder.New()

WotBlitzStatisticsPro.WgApiClient/WargamingApiClient.cs

@@ -55,7 +55,6 @@ namespace WotBlitzStatisticsPro.WgApiClient
             RealmType realmType = RealmType.Ru, 
             RequestLanguage language = RequestLanguage.En)
         {
-			// https://api.wotblitz.ru/wotb/clans/info/?application_id=adc1387489cf9fc8d9a1d85dbd27763d&clan_id=40493
 			var clanInfo = await GetFromBlitzApi<Dictionary<string, ClanInfo>>(
                 realmType,
                 language,
@@ -68,5 +67,7 @@ namespace WotBlitzStatisticsPro.WgApiClient
             return null;
 		}
 
+		// https://api.wotblitz.ru/wotb/encyclopedia/achievements/?application_id=adc1387489cf9fc8d9a1d85dbd27763d
+
 	}
 }