Removed DocumentType, suppressed Include warning, updated DbContext mapping

Author: Bart Koelman

test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/DocumentType.cs

@@ -17,9 +17,6 @@ public sealed class Engagement : EntityBase<Guid>
 
         // Navigation Properties
 
-        [HasMany]
-        public ICollection<DocumentType> DocumentTypes { get; set; } //= new List<DocumentType>();
-
         [HasMany]
         [EagerLoad]
         public ICollection<EngagementParty> Parties { get; set; } //= new List<EngagementParty>();

test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/DocumentTypesController.cs

@@ -1,18 +1,28 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
+// @formatter:wrap_chained_method_calls chop_always
+
 namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Issue988
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
     public sealed class IssueDbContext : DbContext
     {
         public DbSet<Engagement> Engagements { get; set; }
         public DbSet<EngagementParty> EngagementParties { get; set; }
-        public DbSet<DocumentType> DocumentTypes { get; set; }
 
         public IssueDbContext(DbContextOptions<IssueDbContext> options)
             : base(options)
         {
         }
+
+        protected override void OnModelCreating(ModelBuilder builder)
+        {
+            builder.Entity<EngagementParty>()
+                .HasOne(engagementParty => engagementParty.Engagement)
+                .WithMany(engagement => engagement.Parties)
+                .IsRequired()
+                .OnDelete(DeleteBehavior.Restrict);
+        }
     }
 }

test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/Engagement.cs

@@ -1,14 +1,12 @@
 using System;
 using Bogus;
-using JetBrains.Annotations;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
 namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Issue988
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
     internal sealed class IssueFakers : FakerContainer
     {
         private readonly Lazy<Faker<Engagement>> _lazyEngagementFaker = new Lazy<Faker<Engagement>>(() =>
@@ -22,13 +20,7 @@ internal sealed class IssueFakers : FakerContainer
                 .RuleFor(party => party.Role, faker => faker.Lorem.Word())
                 .RuleFor(party => party.ShortName, faker => faker.Lorem.Word()));
 
-        private readonly Lazy<Faker<DocumentType>> _lazyDocumentTypeFaker = new Lazy<Faker<DocumentType>>(() =>
-            new Faker<DocumentType>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(documentType => documentType.Description, faker => faker.Lorem.Sentence()));
-
         public Faker<Engagement> Engagement => _lazyEngagementFaker.Value;
         public Faker<EngagementParty> EngagementParty => _lazyEngagementPartyFaker.Value;
-        public Faker<DocumentType> DocumentType => _lazyDocumentTypeFaker.Value;
     }
 }

test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/IssueDbContext.cs

@@ -24,7 +24,6 @@ public IssueTests(ExampleIntegrationTestContext<TestableStartup<IssueDbContext>,
 
             testContext.UseController<EngagementsController>();
             testContext.UseController<EngagementPartiesController>();
-            testContext.UseController<DocumentTypesController>();
 
             testContext.ConfigureServicesAfterStartup(services =>
             {
@@ -58,7 +57,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             responseDocument.Included.Should().BeNull();
         }
 
-        [Fact(Skip = "Fails in EF Core with: Unable to find navigation 'FirstParties' specified in string based include path 'FirstParties'.")]
+        [Fact]
         public async Task Can_get_primary_resource_by_ID_with_includes()
         {
             // Arrange
@@ -183,7 +182,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             responseDocument.Included.Should().BeNull();
         }
 
-        [Fact(Skip = "Fails in EF Core with: Unable to find navigation 'FirstParties' specified in string based include path 'FirstParties'.")]
+        [Fact]
         public async Task Can_get_unmapped_secondary_resources_by_ID()
         {
             // Arrange

test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/IssueFakers.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -74,6 +75,8 @@ private WebApplicationFactory<TRemoteStartup> CreateFactory()
                     options.UseNpgsql(dbConnectionString);
                     options.EnableSensitiveDataLogging();
                     options.EnableDetailedErrors();
+
+                    options.ConfigureWarnings(builder => builder.Ignore(CoreEventId.InvalidIncludePathError));
                 });
             });