Fix rendering StringId in errors for injected resources

Author: Bart Koelman

src/Examples/JsonApiDotNetCoreExample/HexadecimalObfuscationCodec.cs

@@ -33,7 +33,7 @@ private static string FromHexString(string hexString)
                 bytes.Add(bt);
             }
 
-            var chars = Encoding.Unicode.GetChars(bytes.ToArray());
+            var chars = Encoding.ASCII.GetChars(bytes.ToArray());
             return new string(chars);
         }
 
@@ -52,7 +52,7 @@ private static string ToHexString(string value)
         {
             var builder = new StringBuilder();
 
-            foreach (byte bt in Encoding.Unicode.GetBytes(value))
+            foreach (byte bt in Encoding.ASCII.GetBytes(value))
             {
                 builder.Append(bt.ToString("X2"));
             }

src/JsonApiDotNetCore/Extensions/QueryableExtensions.cs

@@ -206,9 +206,7 @@ private static IQueryable<TSource> CallGenericWhereContainsMethod<TSource>(IQuer
                 member = Expression.Property(entity, filter.Attribute.PropertyInfo.Name);
 
             var method = ContainsMethod.MakeGenericMethod(member.Type);
-
-            var listType = typeof(List<>).MakeGenericType(member.Type);
-            var list = (IList)TypeHelper.CreateInstance(listType);
+            var list = TypeHelper.CreateListFor(member.Type);
 
             foreach (var value in propertyValues)
             {

src/JsonApiDotNetCore/Internal/TypeHelper.cs

@@ -219,11 +219,6 @@ public static Type GetIdType(Type resourceType)
             return property.PropertyType;
         }
 
-        public static T CreateInstance<T>()
-        {
-            return (T) CreateInstance(typeof(T));
-        }
-
         public static object CreateInstance(Type type)
         {
             if (type == null) throw new ArgumentNullException(nameof(type));
@@ -251,9 +246,9 @@ public static object GetResourceTypedId(IIdentifiable resource)
             return property.GetValue(resource);
         }
 
-        public static string GetResourceStringId<TResource, TId>(TId id) where TResource : class, IIdentifiable<TId>
+        public static string GetResourceStringId<TResource, TId>(TId id, IResourceFactory resourceFactory) where TResource : class, IIdentifiable<TId>
         {
-            TResource tempResource = CreateInstance<TResource>();
+            TResource tempResource = resourceFactory.CreateInstance<TResource>();
             tempResource.Id = id;
             return tempResource.StringId;
         }

src/JsonApiDotNetCore/Services/DefaultResourceService.cs

@@ -91,11 +91,11 @@ public virtual async Task DeleteAsync(TId id)
 
                 _hookExecutor.BeforeDelete(AsList(entity), ResourcePipeline.Delete);
             }
-            
+
             var succeeded = await _repository.DeleteAsync(id);
             if (!succeeded)
             {
-                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id);
+                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id, _resourceFactory);
                 throw new ResourceNotFoundException(resourceId, _currentRequestResource.ResourceName);
             }
 
@@ -149,7 +149,7 @@ public virtual async Task<TResource> GetAsync(TId id)
 
             if (entity == null)
             {
-                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id);
+                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id, _resourceFactory);
                 throw new ResourceNotFoundException(resourceId, _currentRequestResource.ResourceName);
             }
 
@@ -177,7 +177,7 @@ public virtual async Task<TResource> GetRelationshipsAsync(TId id, string relati
 
             if (entity == null)
             {
-                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id);
+                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id, _resourceFactory);
                 throw new ResourceNotFoundException(resourceId, _currentRequestResource.ResourceName);
             }
 
@@ -207,7 +207,7 @@ public virtual async Task<TResource> UpdateAsync(TId id, TResource requestEntity
             TResource databaseEntity = await _repository.Get(id).FirstOrDefaultAsync();
             if (databaseEntity == null)
             {
-                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id);
+                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id, _resourceFactory);
                 throw new ResourceNotFoundException(resourceId, _currentRequestResource.ResourceName);
             }
 
@@ -243,7 +243,7 @@ public virtual async Task UpdateRelationshipsAsync(TId id, string relationshipNa
 
             if (entity == null)
             {
-                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id);
+                string resourceId = TypeHelper.GetResourceStringId<TResource, TId>(id, _resourceFactory);
                 throw new ResourceNotFoundException(resourceId, _currentRequestResource.ResourceName);
             }
 

test/JsonApiDotNetCoreExampleTests/Acceptance/InjectableResourceTests.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Bogus;
 using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Models.JsonApiDocuments;
 using JsonApiDotNetCoreExample;
 using JsonApiDotNetCoreExample.Data;
 using JsonApiDotNetCoreExample.Models;
@@ -195,5 +196,27 @@ public async Task Can_Get_Passports_With_Sparse_Fieldset()
             Assert.DoesNotContain(document.Included,
                 resource => resource.Attributes.ContainsKey("lastName"));
         }
+
+        [Fact]
+        public async Task Fail_When_Deleting_Missing_Passport()
+        {
+            // Arrange
+            string passportId = HexadecimalObfuscationCodec.Encode(1234567890);
+
+            var request = new HttpRequestMessage(HttpMethod.Delete, "/api/v1/passports/" + passportId);
+
+            // Act
+            var response = await _fixture.Client.SendAsync(request);
+
+            // Assert
+            _fixture.AssertEqualStatusCode(HttpStatusCode.NotFound, response);
+
+            var body = await response.Content.ReadAsStringAsync();
+            var errorDocument = JsonConvert.DeserializeObject<ErrorDocument>(body);
+            Assert.Single(errorDocument.Errors);
+            Assert.Equal(HttpStatusCode.NotFound, errorDocument.Errors[0].StatusCode);
+            Assert.Equal("The requested resource does not exist.", errorDocument.Errors[0].Title);
+            Assert.Equal("Resource of type 'passports' with id '" + passportId + "' does not exist.", errorDocument.Errors[0].Detail);
+        }
     }
 }