Update tools and packages with make update and adapt code as needed by the latest version of HotChocolate, see https://chillicream.com/blog/2021/09/27/hot-chocolate-12

Author: simon-wacker

backend/dotnet-tools.json

@@ -9,19 +9,19 @@
       ]
     },
     "dotnet-counters": {
-      "version": "5.0.227602",
+      "version": "5.0.248003",
       "commands": [
         "dotnet-counters"
       ]
     },
     "dotnet-dump": {
-      "version": "5.0.227602",
+      "version": "5.0.248003",
       "commands": [
         "dotnet-dump"
       ]
     },
     "dotnet-ef": {
-      "version": "5.0.8",
+      "version": "5.0.10",
       "commands": [
         "dotnet-ef"
       ]
@@ -33,37 +33,37 @@
       ]
     },
     "dotnet-script": {
-      "version": "1.1.0",
+      "version": "1.2.1",
       "commands": [
         "dotnet-script"
       ]
     },
     "dotnet-trace": {
-      "version": "5.0.227602",
+      "version": "5.0.248003",
       "commands": [
         "dotnet-trace"
       ]
     },
     "dotnet-gcdump": {
-      "version": "5.0.227602",
+      "version": "5.0.248003",
       "commands": [
         "dotnet-gcdump"
       ]
     },
     "dotnet-sos": {
-      "version": "5.0.227602",
+      "version": "5.0.248003",
       "commands": [
         "dotnet-sos"
       ]
     },
     "roslynator.dotnet.cli": {
-      "version": "0.1.5",
+      "version": "0.2.0",
       "commands": [
         "roslynator"
       ]
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2021.1.4",
+      "version": "2021.2.1",
       "commands": [
         "jb"
       ]

backend/src/Configuration/GraphQlConfiguration.cs

@@ -30,7 +30,8 @@ IWebHostEnvironment environment
             .AddApolloTracing(
                 HotChocolate.Execution.Options.TracingPreference.OnDemand
             ) // TODO Do we want or need this?
-            .EnableRelaySupport()
+            .AddGlobalObjectIdentification()
+            .AddQueryFieldToMutationPayloads()
             .ModifyOptions(options =>
               {
                   // https://github.com/ChilliCream/hotchocolate/blob/main/src/HotChocolate/Core/src/Types/Configuration/Contracts/ISchemaOptions.cs

backend/src/GraphQl/Common/OpenEndedDateTimeRangeType.cs

@@ -19,7 +19,7 @@ IObjectTypeDescriptor<NpgsqlRange<DateTime>> descriptor
             descriptor
               .Field("from")
               .Type<DateTimeType>()
-              .Resolver(context =>
+              .Resolve(context =>
                   {
                       var range = context.Parent<NpgsqlRange<DateTime>>();
                       return range.LowerBoundInfinite
@@ -31,7 +31,7 @@ IObjectTypeDescriptor<NpgsqlRange<DateTime>> descriptor
             descriptor
               .Field("to")
               .Type<DateTimeType>()
-              .Resolver(context =>
+              .Resolve(context =>
                   {
                       var range = context.Parent<NpgsqlRange<DateTime>>();
                       return range.UpperBoundInfinite

backend/src/GraphQl/Components/ComponentByIdDataLoader.cs

@@ -9,10 +9,12 @@ public sealed class ComponentByIdDataLoader
     {
         public ComponentByIdDataLoader(
             IBatchScheduler batchScheduler,
+            DataLoaderOptions options,
             IDbContextFactory<Data.ApplicationDbContext> dbContextFactory
             )
             : base(
                 batchScheduler,
+                options,
                 dbContextFactory,
                 dbContext => dbContext.Components
                 )

backend/src/GraphQl/Components/ComponentManufacturersByComponentIdDataLoader.cs

@@ -10,10 +10,12 @@ public sealed class ComponentManufacturersByComponentIdDataLoader
     {
         public ComponentManufacturersByComponentIdDataLoader(
             IBatchScheduler batchScheduler,
+            DataLoaderOptions options,
             IDbContextFactory<Data.ApplicationDbContext> dbContextFactory
             )
             : base(
                 batchScheduler,
+                options,
                 dbContextFactory,
                 (dbContext, ids) =>
                     dbContext.ComponentManufacturers.AsQueryable().Where(x =>

backend/src/GraphQl/Components/PendingComponentManufacturersByComponentIdDataLoader.cs

@@ -10,10 +10,12 @@ public sealed class PendingComponentManufacturersByComponentIdDataLoader
     {
         public PendingComponentManufacturersByComponentIdDataLoader(
             IBatchScheduler batchScheduler,
+            DataLoaderOptions options,
             IDbContextFactory<Data.ApplicationDbContext> dbContextFactory
             )
             : base(
                 batchScheduler,
+                options,
                 dbContextFactory,
                 (dbContext, ids) =>
                     dbContext.ComponentManufacturers.AsQueryable().Where(x =>

backend/src/GraphQl/DataFormat/DataFormatByIdDataLoader.cs

@@ -9,10 +9,12 @@ public sealed class DataFormatByIdDataLoader
     {
         public DataFormatByIdDataLoader(
             IBatchScheduler batchScheduler,
+            DataLoaderOptions options,
             IDbContextFactory<Data.ApplicationDbContext> dbContextFactory
             )
             : base(
                 batchScheduler,
+                options,
                 dbContextFactory,
                 dbContext => dbContext.DataFormats
                 )

backend/src/GraphQl/Databases/DatabaseByIdDataLoader.cs

@@ -9,10 +9,12 @@ public sealed class DatabaseByIdDataLoader
     {
         public DatabaseByIdDataLoader(
             IBatchScheduler batchScheduler,
+            DataLoaderOptions options,
             IDbContextFactory<Data.ApplicationDbContext> dbContextFactory
             )
             : base(
                 batchScheduler,
+                options,
                 dbContextFactory,
                 dbContext => dbContext.Databases
                 )

backend/src/GraphQl/Databases/DatabaseResolvers.cs

@@ -9,6 +9,7 @@
 using System.Text.Json.Serialization;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using HotChocolate;
 
 namespace Metabase.GraphQl.Databases
 {
@@ -46,7 +47,7 @@ private sealed class DataData
         }
 
         public async Task<DataX.IData?> GetDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             Guid id,
             DateTime? timestamp,
             string? locale,
@@ -81,7 +82,7 @@ private sealed class OpticalDataData
         }
 
         public async Task<DataX.OpticalData?> GetOpticalDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             Guid id,
             DateTime? timestamp,
             string? locale,
@@ -117,7 +118,7 @@ private sealed class HygrothermalDataData
         }
 
         public async Task<DataX.HygrothermalData?> GetHygrothermalDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             Guid id,
             DateTime? timestamp,
             string? locale,
@@ -153,7 +154,7 @@ private sealed class CalorimetricDataData
         }
 
         public async Task<DataX.CalorimetricData?> GetCalorimetricDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             Guid id,
             DateTime? timestamp,
             string? locale,
@@ -189,7 +190,7 @@ private sealed class PhotovoltaicDataData
         }
 
         public async Task<DataX.PhotovoltaicData?> GetPhotovoltaicDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             Guid id,
             DateTime? timestamp,
             string? locale,
@@ -225,7 +226,7 @@ private sealed class AllDataData
         }
 
         public async Task<DataX.DataConnection?> GetAllDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.DataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -269,7 +270,7 @@ private sealed class AllOpticalDataData
         }
 
         public async Task<DataX.OpticalDataConnection?> GetAllOpticalDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.OpticalDataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -315,7 +316,7 @@ private sealed class AllHygrothermalDataData
 
 
         public async Task<DataX.HygrothermalDataConnection?> GetAllHygrothermalDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.HygrothermalDataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -361,7 +362,7 @@ private sealed class AllCalorimetricDataData
 
 
         public async Task<DataX.CalorimetricDataConnection?> GetAllCalorimetricDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.CalorimetricDataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -406,7 +407,7 @@ private sealed class AllPhotovoltaicDataData
         }
 
         public async Task<DataX.PhotovoltaicDataConnection?> GetAllPhotovoltaicDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.PhotovoltaicDataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -451,7 +452,7 @@ private sealed class HasDataData
         }
 
         public async Task<bool?> GetHasDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.DataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -485,7 +486,7 @@ private sealed class HasOpticalDataData
         }
 
         public async Task<bool?> GetHasOpticalDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.DataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -519,7 +520,7 @@ private sealed class HasCalorimetricDataData
         }
 
         public async Task<bool?> GetHasCalorimetricDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.DataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -553,7 +554,7 @@ private sealed class HasHygrothermalDataData
         }
 
         public async Task<bool?> GetHasHygrothermalDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.DataPropositionInput where,
             DateTime? timestamp,
             string? locale,
@@ -587,7 +588,7 @@ private sealed class HasPhotovoltaicDataData
         }
 
         public async Task<bool?> GetHasPhotovoltaicDataAsync(
-            Data.Database database,
+            [Parent] Data.Database database,
             DataX.DataPropositionInput where,
             DateTime? timestamp,
             string? locale,

backend/src/GraphQl/Entities/AssociationsByAssociateIdDataLoader.cs

@@ -4,7 +4,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using GreenDonut;
-using HotChocolate.DataLoader;
 using Microsoft.EntityFrameworkCore;
 using Guid = System.Guid;
 
@@ -19,11 +18,12 @@ public abstract class AssociationsByAssociateIdDataLoader<TAssociation>
 
         protected AssociationsByAssociateIdDataLoader(
             IBatchScheduler batchScheduler,
+            DataLoaderOptions options,
             IDbContextFactory<Data.ApplicationDbContext> dbContextFactory,
             Func<Data.ApplicationDbContext, IReadOnlyList<Guid>, IQueryable<TAssociation>> getAssociations,
             Func<TAssociation, Guid> getAssociateId
             )
-            : base(batchScheduler)
+            : base(batchScheduler, options)
         {
             _dbContextFactory = dbContextFactory;
             _getAssociations = getAssociations;