Even more fixes for resources with parameterized constructors

Bart Koelman · Bart Koelman · commit 8fe35dfa9038 · 2020-05-07T17:22:05.000+02:00
diff --git a/src/Examples/JsonApiDotNetCoreExample/Models/Tag.cs b/src/Examples/JsonApiDotNetCoreExample/Models/Tag.cs
@@ -1,5 +1,7 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 using JsonApiDotNetCore.Models;
+using JsonApiDotNetCoreExample.Data;
 
 namespace JsonApiDotNetCoreExample.Models
 {
@@ -8,5 +10,10 @@ public class Tag : Identifiable
         [Attr]
         [RegularExpression(@"^\W$")]
         public string Name { get; set; }
+
+        public Tag(AppDbContext appDbContext)
+        {
+            if (appDbContext == null) throw new ArgumentNullException(nameof(appDbContext));
+        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Client/ResponseDeserializer.cs b/src/JsonApiDotNetCore/Serialization/Client/ResponseDeserializer.cs
@@ -80,7 +80,7 @@ protected override void AfterProcessField(IIdentifiable entity, IResourceField f
         /// </summary>
         private IIdentifiable ParseIncludedRelationship(RelationshipAttribute relationshipAttr, ResourceIdentifierObject relatedResourceIdentifier)
         {
-            var relatedInstance = (IIdentifiable)TypeHelper.CreateInstance(relationshipAttr.RightType);
+            var relatedInstance = (IIdentifiable)_resourceFactory.CreateInstance(relationshipAttr.RightType);
             relatedInstance.StringId = relatedResourceIdentifier.Id;
 
             var includedResource = GetLinkedResource(relatedResourceIdentifier);
diff --git a/src/JsonApiDotNetCore/Serialization/Common/BaseDocumentParser.cs b/src/JsonApiDotNetCore/Serialization/Common/BaseDocumentParser.cs
@@ -233,7 +233,7 @@ private void SetHasManyRelationship(
             {   // if the relationship is set to null, no need to set the navigation property to null: this is the default value.
                 var relatedResources = relationshipData.ManyData.Select(rio =>
                 {
-                    var relatedInstance = (IIdentifiable)TypeHelper.CreateInstance(attr.RightType);
+                    var relatedInstance = (IIdentifiable)_resourceFactory.CreateInstance(attr.RightType);
                     relatedInstance.StringId = rio.Id;
                     return relatedInstance;
                 });
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/ManyToManyTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/ManyToManyTests.cs
@@ -21,16 +21,21 @@ namespace JsonApiDotNetCoreExampleTests.Acceptance
     [Collection("WebHostCollection")]
     public sealed class ManyToManyTests
     {
-        private static readonly Faker<Article> _articleFaker = new Faker<Article>()
+        private readonly Faker<Article> _articleFaker = new Faker<Article>()
             .RuleFor(a => a.Name, f => f.Random.AlphaNumeric(10))
             .RuleFor(a => a.Author, f => new Author());
 
-        private static readonly Faker<Tag> _tagFaker = new Faker<Tag>().RuleFor(a => a.Name, f => f.Random.AlphaNumeric(10));
+        private readonly Faker<Tag> _tagFaker;
 
         private readonly TestFixture<TestStartup> _fixture;
+
         public ManyToManyTests(TestFixture<TestStartup> fixture)
         {
             _fixture = fixture;
+
+            _tagFaker = new Faker<Tag>()
+                .CustomInstantiator(f => new Tag(_fixture.GetService<AppDbContext>()))
+                .RuleFor(a => a.Name, f => f.Random.AlphaNumeric(10));
         }
 
         [Fact]
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/ModelStateValidationTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/ModelStateValidationTests.cs
@@ -24,7 +24,7 @@ public ModelStateValidationTests(StandardApplicationFactory factory)
         public async Task When_posting_tag_with_invalid_name_it_must_fail()
         {
             // Arrange
-            var tag = new Tag
+            var tag = new Tag(_dbContext)
             {
                 Name = "!@#$%^&*().-"
             };
@@ -60,7 +60,7 @@ public async Task When_posting_tag_with_invalid_name_it_must_fail()
         public async Task When_posting_tag_with_invalid_name_without_model_state_validation_it_must_succeed()
         {
             // Arrange
-            var tag = new Tag
+            var tag = new Tag(_dbContext)
             {
                 Name = "!@#$%^&*().-"
             };
@@ -88,7 +88,7 @@ public async Task When_posting_tag_with_invalid_name_without_model_state_validat
         public async Task When_patching_tag_with_invalid_name_it_must_fail()
         {
             // Arrange
-            var existingTag = new Tag
+            var existingTag = new Tag(_dbContext)
             {
                 Name = "Technology"
             };
@@ -97,7 +97,7 @@ public async Task When_patching_tag_with_invalid_name_it_must_fail()
             context.Tags.Add(existingTag);
             context.SaveChanges();
 
-            var updatedTag = new Tag
+            var updatedTag = new Tag(_dbContext)
             {
                 Id = existingTag.Id,
                 Name = "!@#$%^&*().-"
@@ -134,7 +134,7 @@ public async Task When_patching_tag_with_invalid_name_it_must_fail()
         public async Task When_patching_tag_with_invalid_name_without_model_state_validation_it_must_succeed()
         {
             // Arrange
-            var existingTag = new Tag
+            var existingTag = new Tag(_dbContext)
             {
                 Name = "Technology"
             };
@@ -143,7 +143,7 @@ public async Task When_patching_tag_with_invalid_name_without_model_state_valida
             context.Tags.Add(existingTag);
             context.SaveChanges();
 
-            var updatedTag = new Tag
+            var updatedTag = new Tag(_dbContext)
             {
                 Id = existingTag.Id,
                 Name = "!@#$%^&*().-"
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/ResourceDefinitions/ResourceDefinitionTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/ResourceDefinitions/ResourceDefinitionTests.cs
@@ -26,11 +26,11 @@ public sealed class ResourceDefinitionTests
         private readonly Faker<User> _userFaker;
         private readonly Faker<TodoItem> _todoItemFaker;
         private readonly Faker<Person> _personFaker;
-        private static readonly Faker<Article> _articleFaker = new Faker<Article>()
+        private readonly Faker<Article> _articleFaker = new Faker<Article>()
             .RuleFor(a => a.Name, f => f.Random.AlphaNumeric(10))
             .RuleFor(a => a.Author, f => new Author());
 
-        private static readonly Faker<Tag> _tagFaker = new Faker<Tag>().RuleFor(a => a.Name, f => f.Random.AlphaNumeric(10));
+        private readonly Faker<Tag> _tagFaker;
 
         public ResourceDefinitionTests(TestFixture<TestStartup> fixture)
         {
@@ -47,6 +47,9 @@ public ResourceDefinitionTests(TestFixture<TestStartup> fixture)
             _personFaker = new Faker<Person>()
                 .RuleFor(p => p.FirstName, f => f.Name.FirstName())
                 .RuleFor(p => p.LastName, f => f.Name.LastName());
+            _tagFaker = new Faker<Tag>()
+                .CustomInstantiator(f => new Tag(_context))
+                .RuleFor(a => a.Name, f => f.Random.AlphaNumeric(10));
         }
 
         [Fact]
diff --git a/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs b/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs
@@ -57,7 +57,9 @@ public HooksDummyData()
             _articleFaker = new Faker<Article>().Rules((f, i) => i.Id = f.UniqueIndex + 1);
             _articleTagFaker = new Faker<ArticleTag>().CustomInstantiator(f => new ArticleTag(appDbContext));
             _identifiableArticleTagFaker = new Faker<IdentifiableArticleTag>().Rules((f, i) => i.Id = f.UniqueIndex + 1);
-            _tagFaker = new Faker<Tag>().Rules((f, i) => i.Id = f.UniqueIndex + 1);
+            _tagFaker = new Faker<Tag>()
+                .CustomInstantiator(f => new Tag(appDbContext))
+                .Rules((f, i) => i.Id = f.UniqueIndex + 1);
 
             _passportFaker = new Faker<Passport>()
                 .CustomInstantiator(f => new Passport(appDbContext))

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
	`1`	`+using System;`
`1`	`2`	`using System.ComponentModel.DataAnnotations;`
`2`	`3`	`using JsonApiDotNetCore.Models;`
	`4`	`+using JsonApiDotNetCoreExample.Data;`
`3`	`5`
`4`	`6`	`namespace JsonApiDotNetCoreExample.Models`
`5`	`7`	`{`
`@@ -8,5 +10,10 @@ public class Tag : Identifiable`
`8`	`10`	`[Attr]`
`9`	`11`	`[RegularExpression(@"^\W$")]`
`10`	`12`	`public string Name { get; set; }`
	`13`	`+`
	`14`	`+ public Tag(AppDbContext appDbContext)`
	`15`	`+ {`
	`16`	`+ if (appDbContext == null) throw new ArgumentNullException(nameof(appDbContext));`
	`17`	`+ }`
`11`	`18`	`}`
`12`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ protected override void AfterProcessField(IIdentifiable entity, IResourceField f`
`80`	`80`	`/// </summary>`
`81`	`81`	`private IIdentifiable ParseIncludedRelationship(RelationshipAttribute relationshipAttr, ResourceIdentifierObject relatedResourceIdentifier)`
`82`	`82`	`{`
`83`		`- var relatedInstance = (IIdentifiable)TypeHelper.CreateInstance(relationshipAttr.RightType);`
	`83`	`+ var relatedInstance = (IIdentifiable)_resourceFactory.CreateInstance(relationshipAttr.RightType);`
`84`	`84`	`relatedInstance.StringId = relatedResourceIdentifier.Id;`
`85`	`85`
`86`	`86`	`var includedResource = GetLinkedResource(relatedResourceIdentifier);`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ private void SetHasManyRelationship(`
`233`	`233`	`{ // if the relationship is set to null, no need to set the navigation property to null: this is the default value.`
`234`	`234`	`var relatedResources = relationshipData.ManyData.Select(rio =>`
`235`	`235`	`{`
`236`		`- var relatedInstance = (IIdentifiable)TypeHelper.CreateInstance(attr.RightType);`
	`236`	`+ var relatedInstance = (IIdentifiable)_resourceFactory.CreateInstance(attr.RightType);`
`237`	`237`	`relatedInstance.StringId = rio.Id;`
`238`	`238`	`return relatedInstance;`
`239`	`239`	`});`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public ModelStateValidationTests(StandardApplicationFactory factory)`
`24`	`24`	`public async Task When_posting_tag_with_invalid_name_it_must_fail()`
`25`	`25`	`{`
`26`	`26`	`// Arrange`
`27`		`- var tag = new Tag`
	`27`	`+ var tag = new Tag(_dbContext)`
`28`	`28`	`{`
`29`	`29`	`Name = "!@#$%^&*().-"`
`30`	`30`	`};`
`@@ -60,7 +60,7 @@ public async Task When_posting_tag_with_invalid_name_it_must_fail()`
`60`	`60`	`public async Task When_posting_tag_with_invalid_name_without_model_state_validation_it_must_succeed()`
`61`	`61`	`{`
`62`	`62`	`// Arrange`
`63`		`- var tag = new Tag`
	`63`	`+ var tag = new Tag(_dbContext)`
`64`	`64`	`{`
`65`	`65`	`Name = "!@#$%^&*().-"`
`66`	`66`	`};`
`@@ -88,7 +88,7 @@ public async Task When_posting_tag_with_invalid_name_without_model_state_validat`
`88`	`88`	`public async Task When_patching_tag_with_invalid_name_it_must_fail()`
`89`	`89`	`{`
`90`	`90`	`// Arrange`
`91`		`- var existingTag = new Tag`
	`91`	`+ var existingTag = new Tag(_dbContext)`
`92`	`92`	`{`
`93`	`93`	`Name = "Technology"`
`94`	`94`	`};`
`@@ -97,7 +97,7 @@ public async Task When_patching_tag_with_invalid_name_it_must_fail()`
`97`	`97`	`context.Tags.Add(existingTag);`
`98`	`98`	`context.SaveChanges();`
`99`	`99`
`100`		`- var updatedTag = new Tag`
	`100`	`+ var updatedTag = new Tag(_dbContext)`
`101`	`101`	`{`
`102`	`102`	`Id = existingTag.Id,`
`103`	`103`	`Name = "!@#$%^&*().-"`
`@@ -134,7 +134,7 @@ public async Task When_patching_tag_with_invalid_name_it_must_fail()`
`134`	`134`	`public async Task When_patching_tag_with_invalid_name_without_model_state_validation_it_must_succeed()`
`135`	`135`	`{`
`136`	`136`	`// Arrange`
`137`		`- var existingTag = new Tag`
	`137`	`+ var existingTag = new Tag(_dbContext)`
`138`	`138`	`{`
`139`	`139`	`Name = "Technology"`
`140`	`140`	`};`
`@@ -143,7 +143,7 @@ public async Task When_patching_tag_with_invalid_name_without_model_state_valida`
`143`	`143`	`context.Tags.Add(existingTag);`
`144`	`144`	`context.SaveChanges();`
`145`	`145`
`146`		`- var updatedTag = new Tag`
	`146`	`+ var updatedTag = new Tag(_dbContext)`
`147`	`147`	`{`
`148`	`148`	`Id = existingTag.Id,`
`149`	`149`	`Name = "!@#$%^&*().-"`