fix: e2e test Can_Create_Guid_Identifiable_Entity_With_Client_Defined_Id_If_Configured

Author: maurei

src/JsonApiDotNetCore/Serialization/Common/BaseDocumentParser.cs

@@ -96,10 +96,15 @@ protected IIdentifiable SetRelationships(IIdentifiable entity, Dictionary<string
             var entityProperties = entity.GetType().GetProperties();
             foreach (var attr in relationshipAttributes)
             {
+                relationshipsValues.TryGetValue(attr.PublicRelationshipName, out RelationshipData relationshipData);
+
+                if (relationshipData == null || !relationshipData.HasData)
+                    continue;
+
                 if (attr is HasOneAttribute hasOne)
-                    SetHasOneRelationship(entity, entityProperties, (HasOneAttribute)attr, relationshipsValues);
+                    SetHasOneRelationship(entity, entityProperties, (HasOneAttribute)attr, relationshipData);
                 else
-                    SetHasManyRelationship(entity, (HasManyAttribute)attr, relationshipsValues);
+                    SetHasManyRelationship(entity, (HasManyAttribute)attr, relationshipData);
 
             }
             return entity;
@@ -152,16 +157,13 @@ private IIdentifiable ParseResourceObject(ResourceObject data)
         /// <param name="entity"></param>
         /// <param name="entityProperties"></param>
         /// <param name="attr"></param>
-        /// <param name="relationships"></param>
+        /// <param name="relationshipData"></param>
         /// <returns></returns>
         private object SetHasOneRelationship(IIdentifiable entity,
             PropertyInfo[] entityProperties,
             HasOneAttribute attr,
-            Dictionary<string, RelationshipData> relationships)
+            RelationshipData relationshipData)
         {
-            if (relationships.TryGetValue(attr.PublicRelationshipName, out RelationshipData relationshipData) == false)
-                return entity;
-
             var rio = (ResourceIdentifierObject)relationshipData.Data;
             var relatedId = rio?.Id ?? null;
 
@@ -173,13 +175,10 @@ private object SetHasOneRelationship(IIdentifiable entity,
                 /// i.e. we're populating the relationship from the dependent side.
                 SetForeignKey(entity, foreignKeyProperty, attr, relatedId);
 
-
             SetNavigation(entity, attr, relatedId);
-            
-
-
-            // allow for additional processing of relationships as required for the
-            // serializer class that implements this abstract class.
+           
+            /// depending on if this base parser is used client-side or server-side,
+            /// different additional processing per field needs to be executed.
             AfterProcessField(entity, attr, relationshipData);
 
             return entity;
@@ -226,24 +225,18 @@ private void SetNavigation(IIdentifiable entity, HasOneAttribute attr, string re
         /// </summary>
         private object SetHasManyRelationship(IIdentifiable entity,
                                               HasManyAttribute attr,
-                                              Dictionary<string, RelationshipData> relationships)
+                                              RelationshipData relationshipData)
         {
-            if (relationships.TryGetValue(attr.PublicRelationshipName, out RelationshipData relationshipData))
+            var relatedResources = relationshipData.ManyData.Select(rio =>
             {
-                if (!relationshipData.IsManyData)
-                    return entity;
+                var relatedInstance = attr.DependentType.New<IIdentifiable>();
+                relatedInstance.StringId = rio.Id;
+                return relatedInstance;
+            });
 
-                var relatedResources = relationshipData.ManyData.Select(rio =>
-                {
-                    var relatedInstance = attr.DependentType.New<IIdentifiable>();
-                    relatedInstance.StringId = rio.Id;
-                    return relatedInstance;
-                });
-
-                var convertedCollection = TypeHelper.ConvertCollection(relatedResources, attr.DependentType);
-                attr.SetValue(entity, convertedCollection);
-                AfterProcessField(entity, attr, relationshipData);
-            }
+            var convertedCollection = TypeHelper.ConvertCollection(relatedResources, attr.DependentType);
+            attr.SetValue(entity, convertedCollection);
+            AfterProcessField(entity, attr, relationshipData);
 
             return entity;
         }

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/CreatingDataTests.cs

@@ -164,7 +164,6 @@ public async Task Can_Create_Entity_With_Client_Defined_Id_If_Configured()
             Assert.Equal(clientDefinedId, deserializedBody.Id);
         }
 
-
         [Fact]
         public async Task Can_Create_Guid_Identifiable_Entity_With_Client_Defined_Id_If_Configured()
         {
@@ -176,34 +175,22 @@ public async Task Can_Create_Guid_Identifiable_Entity_With_Client_Defined_Id_If_
             var client = server.CreateClient();
 
             var context = _fixture.GetService<AppDbContext>();
+            context.RemoveRange(context.TodoItemCollections);
+            await context.SaveChangesAsync();
 
-            var owner = new JsonApiDotNetCoreExample.Models.Person();
+            var owner = new Person();
             context.People.Add(owner);
             await context.SaveChangesAsync();
 
             var route = "/api/v1/todo-collections";
             var request = new HttpRequestMessage(httpMethod, route);
             var clientDefinedId = Guid.NewGuid();
-            var content = new
-            {
-                data = new
-                {
-                    type = "todo-collections",
-                    id = $"{clientDefinedId}",
-                    relationships = new
-                    {
-                        owner = new
-                        {
-                            data = new
-                            {
-                                type = "people",
-                                id = owner.Id.ToString()
-                            }
-                        }
-                    }
-                }
-            };
-            request.Content = new StringContent(JsonConvert.SerializeObject(content));
+
+            var serializer = _fixture.GetSerializer<TodoItemCollection>(tic => new { }, tic => new { tic.Owner });
+            var todoItemCollection = new TodoItemCollection { Owner = owner, OwnerId = owner.Id, Id = clientDefinedId };
+            var content = serializer.Serialize(todoItemCollection);
+
+            request.Content = new StringContent(content);
             request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/vnd.api+json");
 
             // act