Merge pull request #106 from Research-Institute/hotfix/null-ref-include

fix null ref on GetRelationshipsAsync
json-api-dotnet · May 12, 2017 · c5bcaad · c5bcaad
2 parents 9daab2e + 5ef646b
commit c5bcaad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/JsonApiDotNetCore/Internal/ContextGraph.cs b/src/JsonApiDotNetCore/Internal/ContextGraph.cs
@@ -46,7 +46,7 @@ public string GetRelationshipName<TParent>(string relationshipName)
                     e.EntityType == entityType)
                 .Relationships
                 .FirstOrDefault(r => 
-                    r.InternalRelationshipName.ToLower() == relationshipName.ToLower())
+                    r.PublicRelationshipName.ToLower() == relationshipName.ToLower())
                 ?.InternalRelationshipName;
         }
     }

diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>2.0.2</VersionPrefix>
+    <VersionPrefix>2.0.3</VersionPrefix>
     <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <AssemblyName>JsonApiDotNetCore</AssemblyName>
     <PackageId>JsonApiDotNetCore</PackageId>

diff --git a/src/JsonApiDotNetCore/Services/EntityResourceService.cs b/src/JsonApiDotNetCore/Services/EntityResourceService.cs
@@ -92,6 +92,8 @@ public async Task<object> GetRelationshipAsync(TId id, string relationshipName)
             if (relationshipName == null)
                 throw new JsonApiException("422", "Relationship name not specified.");
 
+            _logger.LogTrace($"Looking up '{relationshipName}'...");
+
             var entity = await _entities.GetAndIncludeAsync(id, relationshipName);
             if (entity == null)
                 throw new JsonApiException("404", $"Relationship {relationshipName} not found.");
@@ -116,7 +118,7 @@ public async Task<T> UpdateAsync(TId id, T entity)
         public async Task UpdateRelationshipsAsync(TId id, string relationshipName, List<DocumentData> relationships)
         {
             relationshipName = _jsonApiContext.ContextGraph
-                      .GetRelationshipName<T>(relationshipName.ToProperCase());
+                      .GetRelationshipName<T>(relationshipName);
 
             if (relationshipName == null)
                 throw new JsonApiException("422", "Relationship name not specified.");