Merge pull request #22 from json-api-dotnet/update-to-jadnc-v5.3.0

bkoelman · web-flow · commit b0606543eda9 · 2023-07-25T22:55:40.000+02:00
Update to JsonApiDotNetCore v5.3.0
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <TargetFrameworkName>net6.0</TargetFrameworkName>
     <AspNetVersion>6.0.*</AspNetVersion>
-    <JsonApiDotNetCoreVersion>5.2.0</JsonApiDotNetCoreVersion>
-    <MongoDBDriverVersion>2.15.0</MongoDBDriverVersion>
+    <JsonApiDotNetCoreVersion>5.3.0</JsonApiDotNetCoreVersion>
+    <MongoDBDriverVersion>2.20.0</MongoDBDriverVersion>
     <JsonApiDotNetCoreMongoDbVersionPrefix>5.1.3</JsonApiDotNetCoreMongoDbVersionPrefix>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>9999</WarningLevel>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
     <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.3" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
   </ItemGroup>
@@ -31,7 +31,7 @@
 
   <!-- Test Project Dependencies -->
   <PropertyGroup>
-    <CoverletVersion>3.2.*</CoverletVersion>
+    <CoverletVersion>6.0.*</CoverletVersion>
     <TestSdkVersion>17.6.*</TestSdkVersion>
   </PropertyGroup>
 </Project>
diff --git a/PackageReadme.md b/PackageReadme.md
@@ -0,0 +1 @@
+Persistence layer implementation for use of [MongoDB](https://www.mongodb.com/) in APIs using [JsonApiDotNetCore](https://www.jsonapi.net/).
diff --git a/src/JsonApiDotNetCore.MongoDb/Configuration/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore.MongoDb/Configuration/ServiceCollectionExtensions.cs
@@ -3,7 +3,7 @@
 using JsonApiDotNetCore.MongoDb.AtomicOperations;
 using JsonApiDotNetCore.MongoDb.Queries.Internal;
 using JsonApiDotNetCore.MongoDb.Repositories;
-using JsonApiDotNetCore.Queries.Internal;
+using JsonApiDotNetCore.Queries;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace JsonApiDotNetCore.MongoDb.Configuration;
diff --git a/src/JsonApiDotNetCore.MongoDb/JsonApiDotNetCore.MongoDb.csproj b/src/JsonApiDotNetCore.MongoDb/JsonApiDotNetCore.MongoDb.csproj
@@ -15,16 +15,19 @@
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageReleaseNotes>See https://github.com/json-api-dotnet/JsonApiDotNetCore.MongoDb/releases.</PackageReleaseNotes>
     <PackageIcon>logo.png</PackageIcon>
+    <PackageReadmeFile>PackageReadme.md</PackageReadmeFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(APPVEYOR)' != ''">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
   <ItemGroup>
-    <None Include="..\..\logo.png" Visible="false">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
+    <None Include="..\..\logo.png" Visible="false" Pack="True" PackagePath="" />
+    <None Include="..\..\PackageReadme.md" Visible="false" Pack="True" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/JsonApiDotNetCore.MongoDb/Queries/Internal/HideRelationshipsSparseFieldSetCache.cs b/src/JsonApiDotNetCore.MongoDb/Queries/Internal/HideRelationshipsSparseFieldSetCache.cs
@@ -2,7 +2,6 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.MongoDb.Resources;
 using JsonApiDotNetCore.Queries;
-using JsonApiDotNetCore.Queries.Internal;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
diff --git a/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs b/src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs
@@ -7,7 +7,7 @@
 using JsonApiDotNetCore.MongoDb.Resources;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Queries.Expressions;
-using JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
@@ -29,28 +29,31 @@ public class MongoRepository<TResource, TId> : IResourceRepository<TResource, TI
     private readonly IResourceFactory _resourceFactory;
     private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
     private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
+    private readonly IQueryableBuilder _queryableBuilder;
 
     protected virtual IMongoCollection<TResource> Collection => _mongoDataAccess.MongoDatabase.GetCollection<TResource>(typeof(TResource).Name);
 
     /// <inheritdoc />
     public virtual string? TransactionId => _mongoDataAccess.TransactionId;
 
     public MongoRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph, IResourceFactory resourceFactory,
-        IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor)
+        IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor, IQueryableBuilder queryableBuilder)
     {
         ArgumentGuard.NotNull(mongoDataAccess);
         ArgumentGuard.NotNull(targetedFields);
         ArgumentGuard.NotNull(resourceGraph);
         ArgumentGuard.NotNull(resourceFactory);
         ArgumentGuard.NotNull(constraintProviders);
         ArgumentGuard.NotNull(resourceDefinitionAccessor);
+        ArgumentGuard.NotNull(queryableBuilder);
 
         _mongoDataAccess = mongoDataAccess;
         _targetedFields = targetedFields;
         _resourceGraph = resourceGraph;
         _resourceFactory = resourceFactory;
         _constraintProviders = constraintProviders;
         _resourceDefinitionAccessor = resourceDefinitionAccessor;
+        _queryableBuilder = queryableBuilder;
 
         if (!typeof(TResource).IsAssignableTo(typeof(IMongoIdentifiable)))
         {
@@ -112,12 +115,9 @@ protected virtual IMongoQueryable<TResource> ApplyQueryLayer(QueryLayer queryLay
             source = queryableHandler.Apply(source);
         }
 
-        var nameFactory = new LambdaParameterNameFactory();
+        var context = QueryableBuilderContext.CreateRoot(source, typeof(Queryable), new MongoModel(_resourceGraph), null);
+        Expression expression = _queryableBuilder.ApplyQuery(queryLayer, context);
 
-        var builder = new QueryableBuilder(source.Expression, source.ElementType, typeof(Queryable), nameFactory, _resourceFactory,
-            new MongoModel(_resourceGraph));
-
-        Expression expression = builder.ApplyQuery(queryLayer);
         return (IMongoQueryable<TResource>)source.Provider.CreateQuery<TResource>(expression);
     }
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
@@ -4,6 +4,7 @@
 using JsonApiDotNetCore.MongoDb.AtomicOperations;
 using JsonApiDotNetCore.MongoDb.Repositories;
 using JsonApiDotNetCore.Queries;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Resources;
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Transactions;
@@ -19,8 +20,9 @@ public sealed class LyricRepository : MongoRepository<Lyric, string?>, IAsyncDis
         public override string TransactionId => _transaction.TransactionId;
 
         public LyricRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph, IResourceFactory resourceFactory,
-            IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor)
+            IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,
+            IQueryableBuilder queryableBuilder)
+            : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor, queryableBuilder)
         {
             IMongoDataAccess otherDataAccess = new MongoDataAccess(mongoDataAccess.MongoDatabase);
 
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs
@@ -2,6 +2,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.MongoDb.Repositories;
 using JsonApiDotNetCore.Queries;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Resources;
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Transactions;
@@ -14,8 +15,9 @@ public sealed class MusicTrackRepository : MongoRepository<MusicTrack, string?>
         public override string? TransactionId => null;
 
         public MusicTrackRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor)
+            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,
+            IQueryableBuilder queryableBuilder)
+            : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor, queryableBuilder)
         {
         }
     }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/AccountPreferences.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/AccountPreferences.cs
@@ -5,6 +5,7 @@
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings")]
 public sealed class AccountPreferences : HexStringMongoIdentifiable
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs
@@ -265,7 +265,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         ErrorObject error = responseDocument.Errors[0];
         error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
         error.Title.Should().Be("The specified filter is invalid.");
-        error.Detail.Should().Be("Failed to convert 'ABC' of type 'String' to type 'Int32'.");
+        error.Detail.Should().StartWith("Failed to convert 'ABC' of type 'String' to type 'Int32'.");
         error.Source.ShouldNotBeNull();
         error.Source.Parameter.Should().Be("filter");
     }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Label.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/Label.cs
@@ -6,6 +6,7 @@
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings")]
 public sealed class Label : HexStringMongoIdentifiable
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/LoginAttempt.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/LoginAttempt.cs
@@ -5,6 +5,7 @@
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings")]
 public sealed class LoginAttempt : HexStringMongoIdentifiable
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs
@@ -2,6 +2,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.MongoDb.Repositories;
 using JsonApiDotNetCore.Queries;
+using JsonApiDotNetCore.Queries.QueryableBuilding;
 using JsonApiDotNetCore.Resources;
 
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings.SparseFieldSets;
@@ -17,8 +18,8 @@ public sealed class ResultCapturingRepository<TResource, TId> : MongoRepository<
 
     public ResultCapturingRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph,
         IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,
-        ResourceCaptureStore captureStore)
-        : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor)
+        IQueryableBuilder queryableBuilder, ResourceCaptureStore captureStore)
+        : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor, queryableBuilder)
     {
         _captureStore = captureStore;
     }
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/WorkTag.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/WorkTag.cs
@@ -6,6 +6,7 @@
 namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.ReadWrite;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreMongoDbTests.IntegrationTests.ReadWrite")]
 public sealed class WorkTag : HexStringMongoIdentifiable
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs b/test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs
@@ -29,7 +29,7 @@ public override QueryStringParameterHandlers<Moon> OnRegisterQueryableHandlersFo
 
     private static IQueryable<Moon> FilterByRadius(IQueryable<Moon> source, StringValues parameterValue)
     {
-        bool isFilterOnLargerThan = bool.Parse(parameterValue);
+        bool isFilterOnLargerThan = bool.Parse(parameterValue.ToString());
         return isFilterOnLargerThan ? source.Where(moon => moon.SolarRadius > 1m) : source.Where(moon => moon.SolarRadius <= 1m);
     }
 }
diff --git a/test/TestBuildingBlocks/TestBuildingBlocks.csproj b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Mongo2Go" Version="3.1.3" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Persistence layer implementation for use of [MongoDB](https://www.mongodb.com/) in APIs using [JsonApiDotNetCore](https://www.jsonapi.net/).`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using JsonApiDotNetCore.Configuration;`
`3`	`3`	`using JsonApiDotNetCore.MongoDb.Repositories;`
`4`	`4`	`using JsonApiDotNetCore.Queries;`
	`5`	`+using JsonApiDotNetCore.Queries.QueryableBuilding;`
`5`	`6`	`using JsonApiDotNetCore.Resources;`
`6`	`7`
`7`	`8`	`namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.AtomicOperations.Transactions;`
`@@ -14,8 +15,9 @@ public sealed class MusicTrackRepository : MongoRepository<MusicTrack, string?>`
`14`	`15`	`public override string? TransactionId => null;`
`15`	`16`
`16`	`17`	`public MusicTrackRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targetedFields, IResourceGraph resourceGraph,`
`17`		`- IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor)`
`18`		`- : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor)`
	`18`	`+ IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,`
	`19`	`+ IQueryableBuilder queryableBuilder)`
	`20`	`+ : base(mongoDataAccess, targetedFields, resourceGraph, resourceFactory, constraintProviders, resourceDefinitionAccessor, queryableBuilder)`
`19`	`21`	`{`
`20`	`22`	`}`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings;`
`6`	`6`
`7`	`7`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
	`8`	`+[Resource(ControllerNamespace = "JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings")]`
`8`	`9`	`public sealed class AccountPreferences : HexStringMongoIdentifiable`
`9`	`10`	`{`
`10`	`11`	`[Attr]`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`265`	`265`	`ErrorObject error = responseDocument.Errors[0];`
`266`	`266`	`error.StatusCode.Should().Be(HttpStatusCode.BadRequest);`
`267`	`267`	`error.Title.Should().Be("The specified filter is invalid.");`
`268`		`- error.Detail.Should().Be("Failed to convert 'ABC' of type 'String' to type 'Int32'.");`
	`268`	`+ error.Detail.Should().StartWith("Failed to convert 'ABC' of type 'String' to type 'Int32'.");`
`269`	`269`	`error.Source.ShouldNotBeNull();`
`270`	`270`	`error.Source.Parameter.Should().Be("filter");`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`namespace JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings;`
`7`	`7`
`8`	`8`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
	`9`	`+[Resource(ControllerNamespace = "JsonApiDotNetCoreMongoDbTests.IntegrationTests.QueryStrings")]`
`9`	`10`	`public sealed class Label : HexStringMongoIdentifiable`
`10`	`11`	`{`
`11`	`12`	`[Attr]`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public override QueryStringParameterHandlers<Moon> OnRegisterQueryableHandlersFo`
`29`	`29`
`30`	`30`	`private static IQueryable<Moon> FilterByRadius(IQueryable<Moon> source, StringValues parameterValue)`
`31`	`31`	`{`
`32`		`- bool isFilterOnLargerThan = bool.Parse(parameterValue);`
	`32`	`+ bool isFilterOnLargerThan = bool.Parse(parameterValue.ToString());`
`33`	`33`	`return isFilterOnLargerThan ? source.Where(moon => moon.SolarRadius > 1m) : source.Where(moon => moon.SolarRadius <= 1m);`
`34`	`34`	`}`
`35`	`35`	`}`