diff --git a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs index 9922c7c84f..4cd32de946 100644 --- a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs +++ b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs @@ -78,18 +78,8 @@ public DefaultEntityRepository( _resourceDefinition = resourceDefinition; } - - - public virtual IQueryable Get() - { - if (_jsonApiContext.QuerySet?.Fields != null && _jsonApiContext.QuerySet.Fields.Count > 0) - return _dbSet.Select(_jsonApiContext.QuerySet?.Fields); - - return _dbSet; - } - /// - public virtual IQueryable GetQueryable() + public virtual IQueryable Get() => _dbSet; public virtual IQueryable Select(IQueryable entities, List fields) @@ -140,7 +130,7 @@ public virtual IQueryable Sort(IQueryable entities, List public virtual async Task GetAsync(TId id) { - return await Select(GetQueryable(), _jsonApiContext.QuerySet?.Fields).SingleOrDefaultAsync(e => e.Id.Equals(id)); + return await Select(Get(), _jsonApiContext.QuerySet?.Fields).SingleOrDefaultAsync(e => e.Id.Equals(id)); } /// @@ -148,7 +138,7 @@ public virtual async Task GetAndIncludeAsync(TId id, string relationshi { _logger?.LogDebug($"[JADN] GetAndIncludeAsync({id}, {relationshipName})"); - var includedSet = Include(Select(GetQueryable(), _jsonApiContext.QuerySet?.Fields), relationshipName); + var includedSet = Include(Select(Get(), _jsonApiContext.QuerySet?.Fields), relationshipName); var result = await includedSet.SingleOrDefaultAsync(e => e.Id.Equals(id)); return result; diff --git a/src/JsonApiDotNetCore/Data/IEntityReadRepository.cs b/src/JsonApiDotNetCore/Data/IEntityReadRepository.cs index ce23eb8ed2..74e147cc55 100644 --- a/src/JsonApiDotNetCore/Data/IEntityReadRepository.cs +++ b/src/JsonApiDotNetCore/Data/IEntityReadRepository.cs @@ -19,9 +19,6 @@ public interface IEntityReadRepository /// The base GET query. This is a good place to apply rules that should affect all reads, /// such as authorization of resources. /// - IQueryable GetQueryable(); - - [Obsolete("This method has been deprecated, use GetQueryable() instead")] IQueryable Get(); /// diff --git a/src/JsonApiDotNetCore/Services/EntityResourceService.cs b/src/JsonApiDotNetCore/Services/EntityResourceService.cs index 815c34157b..b392b3600d 100644 --- a/src/JsonApiDotNetCore/Services/EntityResourceService.cs +++ b/src/JsonApiDotNetCore/Services/EntityResourceService.cs @@ -98,7 +98,7 @@ public virtual async Task DeleteAsync(TId id) public virtual async Task> GetAsync() { - var entities = _entities.GetQueryable(); + var entities = _entities.Get(); entities = ApplySortAndFilterQuery(entities); @@ -242,7 +242,7 @@ protected virtual IQueryable IncludeRelationships(IQueryable e private async Task GetWithRelationshipsAsync(TId id) { - var query = _entities.Select(_entities.GetQueryable(), _jsonApiContext.QuerySet?.Fields).Where(e => e.Id.Equals(id)); + var query = _entities.Select(_entities.Get(), _jsonApiContext.QuerySet?.Fields).Where(e => e.Id.Equals(id)); _jsonApiContext.QuerySet.IncludedRelationships.ForEach(r => { diff --git a/test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs b/test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs index 2bf33346c4..4ce5da35d8 100644 --- a/test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs +++ b/test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs @@ -23,9 +23,9 @@ public AuthorizedTodoItemsRepository( _authService = authService; } - public override IQueryable GetQueryable() + public override IQueryable Get() { - return base.GetQueryable().Where(todoItem => todoItem.OwnerId == _authService.CurrentUserId); + return base.Get().Where(todoItem => todoItem.OwnerId == _authService.CurrentUserId); } } }