diff --git a/docs/Errors.md b/docs/Errors.md index 7b7a8928b0..59f4f6da21 100644 --- a/docs/Errors.md +++ b/docs/Errors.md @@ -31,8 +31,8 @@ public override async Task PostAsync([FromBody] MyEntity entity) return Error(new CustomError("507", "Database is full.", "Theres no more room.", "Sorry.")); if(model.Validations.IsValid == false) - return Errors(model.Validations.Select(v => v.GetErrors())); - + return Errors(model.Validations.GetErrors()); + // ... } ``` \ No newline at end of file diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs index 2ff94b3ef3..094a74f2d3 100644 --- a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs +++ b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs @@ -64,11 +64,11 @@ public virtual async Task GetAsync(TId id) [HttpGet("{id}/relationships/{relationshipName}")] public virtual async Task GetRelationshipsAsync(TId id, string relationshipName) { - var relationship = _resourceService.GetRelationshipsAsync(id, relationshipName); + var relationship = await _resourceService.GetRelationshipsAsync(id, relationshipName); if(relationship == null) return NotFound(); - return await GetRelationshipAsync(id, relationshipName); + return Ok(relationship); } [HttpGet("{id}/{relationshipName}")] diff --git a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs index 2005478bbf..4630cf3b49 100644 --- a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs +++ b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs @@ -51,7 +51,7 @@ public virtual IQueryable Get() { if(_jsonApiContext.QuerySet?.Fields != null && _jsonApiContext.QuerySet.Fields.Any()) return _dbSet.Select(_jsonApiContext.QuerySet?.Fields); - + return _dbSet; } @@ -92,12 +92,9 @@ public virtual async Task GetAndIncludeAsync(TId id, string relationshi var result = await Get() .Include(relationshipName) - .Where(e => e.Id.Equals(id)) - .ToListAsync(); - - _logger.LogDebug($"[JADN] Found {result.Count} entity"); + .SingleOrDefaultAsync(e => e.Id.Equals(id)); - return result.SingleOrDefault(); + return result; } public virtual async Task CreateAsync(TEntity entity) diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj index 6ae3272ca4..eb6ca54017 100755 --- a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj +++ b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj @@ -1,6 +1,6 @@  - 2.0.5 + 2.0.6 netstandard1.6 JsonApiDotNetCore JsonApiDotNetCore