Merge pull request json-api-dotnet#265 from json-api-dotnet/feat/json…

…-api-dotnet#239 make private service methods protected virtual
effexe · Apr 22, 2018 · 6223645 · 6223645
2 parents e7c65db + e65ad92
commit 6223645
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs
@@ -17,6 +17,12 @@ public JsonApiController(
             : base(jsonApiContext, resourceService, loggerFactory)
         { }
 
+        public JsonApiController(
+            IJsonApiContext jsonApiContext,
+            IResourceService<T, int> resourceService)
+            : base(jsonApiContext, resourceService)
+        { }
+
         public JsonApiController(
             IJsonApiContext jsonApiContext,
             IGetAllService<T, int> getAll = null,

diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>2.2.1</VersionPrefix>
+    <VersionPrefix>2.2.2</VersionPrefix>
     <TargetFrameworks>$(NetStandardVersion)</TargetFrameworks>
     <AssemblyName>JsonApiDotNetCore</AssemblyName>
     <PackageId>JsonApiDotNetCore</PackageId>
@@ -35,4 +35,4 @@
     <PackageReference Include="docfx.console" Version="2.33.0" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/JsonApiDotNetCore/Services/EntityResourceService.cs b/src/JsonApiDotNetCore/Services/EntityResourceService.cs
@@ -146,7 +146,7 @@ public virtual async Task<bool> DeleteAsync(TId id)
             return await _entities.DeleteAsync(id);
         }
 
-        private IQueryable<T> ApplySortAndFilterQuery(IQueryable<T> entities)
+        protected virtual IQueryable<T> ApplySortAndFilterQuery(IQueryable<T> entities)
         {
             var query = _jsonApiContext.QuerySet;
 
@@ -163,7 +163,7 @@ private IQueryable<T> ApplySortAndFilterQuery(IQueryable<T> entities)
             return entities;
         }
 
-        private async Task<IEnumerable<T>> ApplyPageQueryAsync(IQueryable<T> entities)
+        protected virtual async Task<IEnumerable<T>> ApplyPageQueryAsync(IQueryable<T> entities)
         {
             var pageManager = _jsonApiContext.PageManager;
             if (!pageManager.IsPaginated)
@@ -174,7 +174,7 @@ private async Task<IEnumerable<T>> ApplyPageQueryAsync(IQueryable<T> entities)
             return await _entities.PageAsync(entities, pageManager.PageSize, pageManager.CurrentPage);
         }
 
-        private IQueryable<T> IncludeRelationships(IQueryable<T> entities, List<string> relationships)
+        protected virtual IQueryable<T> IncludeRelationships(IQueryable<T> entities, List<string> relationships)
         {
             _jsonApiContext.IncludedRelationships = relationships;