re-change the typing since it was causing issues when the entity had more than one property with that type

roblankey · roblankey · commit 6bc818722216 · 2018-11-13T07:22:31.000-05:00
diff --git a/src/Examples/JsonApiDotNetCoreExample/Models/Resources/CourseResource.cs b/src/Examples/JsonApiDotNetCoreExample/Models/Resources/CourseResource.cs
@@ -18,7 +18,7 @@ public class CourseResource : Identifiable
         [Attr("description")]
         public string Description { get; set; }
 
-        [HasOne("department", withEntityType: typeof(DepartmentEntity))]
+        [HasOne("department", withEntity: "Department")]
         public DepartmentResource Department { get; set; }
         public int? DepartmentId { get; set; }
 
diff --git a/src/JsonApiDotNetCore/Builders/ContextGraphBuilder.cs b/src/JsonApiDotNetCore/Builders/ContextGraphBuilder.cs
@@ -165,7 +165,7 @@ protected virtual List<RelationshipAttribute> GetRelationships(Type entityType)
 
                 attribute.PublicRelationshipName = attribute.PublicRelationshipName ?? JsonApiOptions.ResourceNameFormatter.FormatPropertyName(prop);
                 attribute.InternalRelationshipName = prop.Name;
-                attribute.ResourceType = GetRelationshipType(attribute, prop);
+                attribute.Type = GetRelationshipType(attribute, prop);
                 attributes.Add(attribute);
 
                 if (attribute is HasManyThroughAttribute hasManyThroughAttribute) {
@@ -198,13 +198,13 @@ protected virtual List<RelationshipAttribute> GetRelationships(Type entityType)
                         ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a relationship id property to type {entityType} with name {leftIdPropertyName}");
 
                     // Article → ArticleTag.Tag
-                    hasManyThroughAttribute.RightProperty = throughProperties.SingleOrDefault(x => x.PropertyType == hasManyThroughAttribute.ResourceType)
-                        ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a navigation property to type {hasManyThroughAttribute.ResourceType}");
+                    hasManyThroughAttribute.RightProperty = throughProperties.SingleOrDefault(x => x.PropertyType == hasManyThroughAttribute.Type)
+                        ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a navigation property to type {hasManyThroughAttribute.Type}");
                     
                     // ArticleTag.TagId
                     var rightIdPropertyName = JsonApiOptions.RelatedIdMapper.GetRelatedIdPropertyName(hasManyThroughAttribute.RightProperty.Name);
                     hasManyThroughAttribute.RightIdProperty = throughProperties.SingleOrDefault(x => x.Name == rightIdPropertyName)
-                        ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a relationship id property to type {hasManyThroughAttribute.ResourceType} with name {rightIdPropertyName}");
+                        ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a relationship id property to type {hasManyThroughAttribute.Type} with name {rightIdPropertyName}");
                 }
             }
 
diff --git a/src/JsonApiDotNetCore/Builders/DocumentBuilder.cs b/src/JsonApiDotNetCore/Builders/DocumentBuilder.cs
@@ -242,7 +242,7 @@ private List<ResourceObject> IncludeSingleResourceRelationships(
         {
             if (relationshipChainIndex < relationshipChain.Length)
             {
-                var nextContextEntity = _jsonApiContext.ResourceGraph.GetContextEntity(relationship.ResourceType);
+                var nextContextEntity = _jsonApiContext.ResourceGraph.GetContextEntity(relationship.Type);
                 var resource = (IIdentifiable)navigationEntity;
                 // recursive call
                 if (relationshipChainIndex < relationshipChain.Length - 1)
@@ -329,7 +329,7 @@ private ResourceIdentifierObject GetIndependentRelationshipIdentifier(HasOneAttr
             if (independentRelationshipIdentifier == null)
                 return null;
 
-            var relatedContextEntity = _jsonApiContext.ResourceGraph.GetContextEntity(hasOne.ResourceType);
+            var relatedContextEntity = _jsonApiContext.ResourceGraph.GetContextEntity(hasOne.Type);
             if (relatedContextEntity == null) // TODO: this should probably be a debug log at minimum
                 return null;
 
diff --git a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs
@@ -163,7 +163,17 @@ public void DetachRelationshipPointers(TEntity entity)
         {
             foreach (var hasOneRelationship in _jsonApiContext.HasOneRelationshipPointers.Get())
             {
-                _context.Entry(hasOneRelationship.Key.EntityType).State = EntityState.Detached;
+                var hasOne = (HasOneAttribute) hasOneRelationship.Key;
+                if (hasOne.EntityPropertyName != null)
+                {
+                    var relatedEntity = entity.GetType().GetProperty(hasOne.EntityPropertyName)?.GetValue(entity);
+                    if (relatedEntity != null)
+                        _context.Entry(relatedEntity).State = EntityState.Detached;
+                }
+                else
+                {
+                    _context.Entry(hasOneRelationship.Value).State = EntityState.Detached;
+                }
             }
 
             foreach (var hasManyRelationship in _jsonApiContext.HasManyRelationshipPointers.Get())
@@ -232,12 +242,21 @@ private void AttachHasOnePointers(TEntity entity)
             var relationships = _jsonApiContext.HasOneRelationshipPointers.Get();
             foreach (var relationship in relationships)
             {
-                var relatedEntityType = relationship.Key.EntityType; // DepartmentEntity
-                var relatedEntityMember = typeof(TEntity).GetProperties().SingleOrDefault(p => p.PropertyType == relatedEntityType)?.Name;
-                var relatedEntity = relatedEntityMember == null ? null : entity.GetType().GetProperty(relatedEntityMember)?.GetValue(entity);
-                
-                if (relatedEntity != null && _context.Entry(relatedEntity).State == EntityState.Detached && _context.EntityIsTracked((IIdentifiable)relatedEntity) == false)
-                    _context.Entry(relatedEntity).State = EntityState.Unchanged;
+                if (relationship.Key.GetType() != typeof(HasOneAttribute))
+                    continue;
+
+                var hasOne = (HasOneAttribute) relationship.Key;
+                if (hasOne.EntityPropertyName != null)
+                {
+                    var relatedEntity = entity.GetType().GetProperty(hasOne.EntityPropertyName)?.GetValue(entity);
+                    if (relatedEntity != null && _context.Entry(relatedEntity).State == EntityState.Detached && _context.EntityIsTracked((IIdentifiable)relatedEntity) == false)
+                        _context.Entry(relatedEntity).State = EntityState.Unchanged;
+                }
+                else
+                {
+                    if (_context.Entry(relationship.Value).State == EntityState.Detached && _context.EntityIsTracked(relationship.Value) == false)
+                        _context.Entry(relationship.Value).State = EntityState.Unchanged;
+                }
             }
         }
 
@@ -271,7 +290,7 @@ public async Task UpdateRelationshipsAsync(object parent, RelationshipAttribute
             // of the property...
             var typeToUpdate = (relationship is HasManyThroughAttribute hasManyThrough)
                 ? hasManyThrough.ThroughType
-                : relationship.ResourceType;
+                : relationship.Type;
 
             var genericProcessor = _genericProcessorFactory.GetProcessor<IGenericProcessor>(typeof(GenericProcessor<>), typeToUpdate);
             await genericProcessor.UpdateRelationshipsAsync(parent, relationship, relationshipIds);
@@ -323,7 +342,7 @@ public virtual IQueryable<TEntity> Include(IQueryable<TEntity> entities, string
                     : $"{internalRelationshipPath}.{relationship.RelationshipPath}";
 
                 if(i < relationshipChain.Length)
-                    entity = _jsonApiContext.ResourceGraph.GetContextEntity(relationship.ResourceType);
+                    entity = _jsonApiContext.ResourceGraph.GetContextEntity(relationship.Type);
             }
 
             return entities.Include(internalRelationshipPath);
diff --git a/src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs b/src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs
@@ -254,7 +254,7 @@ private static IQueryable<TSource> CallGenericWhereMethod<TSource>(IQueryable<TS
                 if (relationProperty == null)
                     throw new ArgumentException($"'{filter.Relationship.InternalRelationshipName}' is not a valid relationship of '{concreteType}'");
 
-                var relatedType = filter.Relationship.ResourceType;
+                var relatedType = filter.Relationship.Type;
                 property = relatedType.GetProperty(filter.Attribute.InternalAttributeName);
                 if (property == null)
                     throw new ArgumentException($"'{filter.Attribute.InternalAttributeName}' is not a valid attribute of '{filter.Relationship.InternalRelationshipName}'");
diff --git a/src/JsonApiDotNetCore/Models/HasManyAttribute.cs b/src/JsonApiDotNetCore/Models/HasManyAttribute.cs
@@ -11,7 +11,6 @@ public class HasManyAttribute : RelationshipAttribute
         /// <param name="publicName">The relationship name as exposed by the API</param>
         /// <param name="documentLinks">Which links are available. Defaults to <see cref="Link.All"/></param>
         /// <param name="canInclude">Whether or not this relationship can be included using the <c>?include=public-name</c> query string</param>
-        /// <param name="withEntityType">If the entity model of this relationship refers to a different type, specify that here</param>
         /// 
         /// <example>
         /// 
@@ -24,8 +23,8 @@ public class HasManyAttribute : RelationshipAttribute
         /// </code>
         /// 
         /// </example>
-        public HasManyAttribute(string publicName = null, Link documentLinks = Link.All, bool canInclude = true, Type withEntityType = null)
-        : base(publicName, documentLinks, canInclude, withEntityType)
+        public HasManyAttribute(string publicName = null, Link documentLinks = Link.All, bool canInclude = true)
+        : base(publicName, documentLinks, canInclude)
         { }
 
         /// <summary>
diff --git a/src/JsonApiDotNetCore/Models/HasOneAttribute.cs b/src/JsonApiDotNetCore/Models/HasOneAttribute.cs
@@ -11,9 +11,9 @@ public class HasOneAttribute : RelationshipAttribute
         /// 
         /// <param name="publicName">The relationship name as exposed by the API</param>
         /// <param name="documentLinks">Which links are available. Defaults to <see cref="Link.All"/></param>
-        /// <param name="withEntityType">If the entity model of this relationship refers to a different type, specify that here</param>
         /// <param name="canInclude">Whether or not this relationship can be included using the <c>?include=public-name</c> query string</param>
         /// <param name="withForeignKey">The foreign key property name. Defaults to <c>"{RelationshipName}Id"</c></param>
+        /// <param name="withEntity">If the entity model of this relationship refers to a different type, specify that here</param>
         /// 
         /// <example>
         /// Using an alternative foreign key:
@@ -28,13 +28,15 @@ public class HasOneAttribute : RelationshipAttribute
         /// </code>
         /// 
         /// </example>
-        public HasOneAttribute(string publicName = null, Link documentLinks = Link.All, Type withEntityType = null, bool canInclude = true, string withForeignKey = null)
-        : base(publicName, documentLinks, canInclude, withEntityType)
+        public HasOneAttribute(string publicName = null, Link documentLinks = Link.All, bool canInclude = true, string withForeignKey = null, string withEntity = null)
+        : base(publicName, documentLinks, canInclude)
         {
             _explicitIdentifiablePropertyName = withForeignKey;
+            EntityPropertyName = withEntity;
         }
 
         private readonly string _explicitIdentifiablePropertyName;
+        private readonly string _relatedEntityPropertyName;
         
         /// <summary>
         /// The independent resource identifier.
@@ -43,14 +45,19 @@ public HasOneAttribute(string publicName = null, Link documentLinks = Link.All,
             ? JsonApiOptions.RelatedIdMapper.GetRelatedIdPropertyName(InternalRelationshipName)
             : _explicitIdentifiablePropertyName;
 
+        /// <summary>
+        /// For use in entity / resource separation when the related property is also separated
+        /// </summary>
+        public string EntityPropertyName { get; }
+
         /// <summary>
         /// Sets the value of the property identified by this attribute
         /// </summary>
         /// <param name="resource">The target object</param>
         /// <param name="newValue">The new property value</param>
         public override void SetValue(object resource, object newValue)
         {
-            var propertyName = (newValue?.GetType() == ResourceType)
+            var propertyName = (newValue?.GetType() == Type)
                 ? InternalRelationshipName
                 : IdentifiablePropertyName;
 
diff --git a/src/JsonApiDotNetCore/Models/RelationshipAttribute.cs b/src/JsonApiDotNetCore/Models/RelationshipAttribute.cs
@@ -6,12 +6,11 @@ namespace JsonApiDotNetCore.Models
 {
     public abstract class RelationshipAttribute : Attribute
     {
-        protected RelationshipAttribute(string publicName, Link documentLinks, bool canInclude, Type withEntityType)
+        protected RelationshipAttribute(string publicName, Link documentLinks, bool canInclude)
         {
             PublicRelationshipName = publicName;
             DocumentLinks = documentLinks;
             CanInclude = canInclude;
-            _entityType = withEntityType;
         }
 
         public string PublicRelationshipName { get; internal set; }
@@ -27,11 +26,7 @@ protected RelationshipAttribute(string publicName, Link documentLinks, bool canI
         /// public List&lt;Tag&gt; Tags { get; set; } // Type => Tag
         /// </code>
         /// </example>
-        public Type ResourceType { get; internal set; }
-
-        private readonly Type _entityType;
-        public Type EntityType => _entityType == null ? ResourceType : _entityType;
-
+        public Type Type { get; internal set; }
         public bool IsHasMany => GetType() == typeof(HasManyAttribute) || GetType().Inherits(typeof(HasManyAttribute));
         public bool IsHasOne => GetType() == typeof(HasOneAttribute);
         public Link DocumentLinks { get; } = Link.All;
diff --git a/src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs b/src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs
@@ -218,7 +218,7 @@ private object SetHasOneRelationship(object entity,
             if(included != null) 
             {
                 var navigationPropertyValue = attr.GetValue(entity);
-                var resourceGraphEntity = _jsonApiContext.ResourceGraph.GetContextEntity(attr.ResourceType);
+                var resourceGraphEntity = _jsonApiContext.ResourceGraph.GetContextEntity(attr.Type);
                 if(navigationPropertyValue != null && resourceGraphEntity != null)
                 {
                     var includedResource = included.SingleOrDefault(r => r.Type == rio.Type && r.Id == rio.Id);
@@ -292,7 +292,7 @@ private object SetHasManyRelationship(object entity,
                     return instance;
                 });
 
-                var convertedCollection = TypeHelper.ConvertCollection(relatedResources, attr.ResourceType);
+                var convertedCollection = TypeHelper.ConvertCollection(relatedResources, attr.Type);
 
                 attr.SetValue(entity, convertedCollection);
 
@@ -305,7 +305,7 @@ private object SetHasManyRelationship(object entity,
         private IIdentifiable GetIncludedRelationship(ResourceIdentifierObject relatedResourceIdentifier, List<ResourceObject> includedResources, RelationshipAttribute relationshipAttr)
         {
             // at this point we can be sure the relationshipAttr.Type is IIdentifiable because we were able to successfully build the ResourceGraph
-            var relatedInstance = relationshipAttr.ResourceType.New<IIdentifiable>();
+            var relatedInstance = relationshipAttr.Type.New<IIdentifiable>();
             relatedInstance.StringId = relatedResourceIdentifier.Id;
 
             // can't provide any more data other than the rio since it is not contained in the included section
@@ -316,9 +316,9 @@ private IIdentifiable GetIncludedRelationship(ResourceIdentifierObject relatedRe
             if (includedResource == null)
                 return relatedInstance;
 
-            var contextEntity = _jsonApiContext.ResourceGraph.GetContextEntity(relationshipAttr.ResourceType);
+            var contextEntity = _jsonApiContext.ResourceGraph.GetContextEntity(relationshipAttr.Type);
             if (contextEntity == null)
-                throw new JsonApiException(400, $"Included type '{relationshipAttr.ResourceType}' is not a registered json:api resource.");
+                throw new JsonApiException(400, $"Included type '{relationshipAttr.Type}' is not a registered json:api resource.");
 
             SetEntityAttributes(relatedInstance, contextEntity, includedResource.Attributes);
 
diff --git a/src/JsonApiDotNetCore/Services/EntityResourceService.cs b/src/JsonApiDotNetCore/Services/EntityResourceService.cs
@@ -170,7 +170,7 @@ public virtual async Task UpdateRelationshipsAsync(TId id, string relationshipNa
                 .Relationships
                 .FirstOrDefault(r => r.Is(relationshipName));
 
-            var relationshipType = relationship.ResourceType;
+            var relationshipType = relationship.Type;
 
             // update relationship type with internalname
             var entityProperty = typeof(TEntity).GetProperty(relationship.InternalRelationshipName);
@@ -180,15 +180,15 @@ public virtual async Task UpdateRelationshipsAsync(TId id, string relationshipNa
                     $"could not be found on entity.");
             }
 
-            relationship.ResourceType = relationship.IsHasMany
+            relationship.Type = relationship.IsHasMany
                 ? entityProperty.PropertyType.GetGenericArguments()[0]
                 : entityProperty.PropertyType;
 
             var relationshipIds = relationships.Select(r => r?.Id?.ToString());
 
             await _entities.UpdateRelationshipsAsync(entity, relationship, relationshipIds);
 
-            relationship.ResourceType = relationshipType;
+            relationship.Type = relationshipType;
         }
 
         protected virtual async Task<IEnumerable<TResource>> ApplyPageQueryAsync(IQueryable<TEntity> entities)
diff --git a/src/JsonApiDotNetCore/Services/Operations/Processors/GetOpProcessor.cs b/src/JsonApiDotNetCore/Services/Operations/Processors/GetOpProcessor.cs
@@ -135,7 +135,7 @@ private async Task<object> GetRelationshipAsync(Operation operation)
             // TODO: need a better way to get the ContextEntity from a relationship name
             // when no generic parameter is available
             var relationshipType = _resourceGraph.GetContextEntity(operation.GetResourceTypeName())
-                .Relationships.Single(r => r.Is(operation.Ref.Relationship)).ResourceType;
+                .Relationships.Single(r => r.Is(operation.Ref.Relationship)).Type;
 
             var relatedContextEntity = _jsonApiContext.ResourceGraph.GetContextEntity(relationshipType);
 
