Refactor query context

BioWareRu · Jun 4, 2019 · dd9f7cc · dd9f7cc
1 parent debf279
commit dd9f7cc
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 55 deletions.
diff --git a/src/BioEngine.Core.API/ContentEntityController.cs b/src/BioEngine.Core.API/ContentEntityController.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BioEngine.Core.Abstractions;
 using BioEngine.Core.API.Models;
 using BioEngine.Core.DB;
 using BioEngine.Core.Entities;
@@ -13,17 +14,17 @@ namespace BioEngine.Core.API
 {
     public abstract class
         ContentEntityController<TEntity, TRepository, TResponse, TRequest> : RequestRestController<
-            TEntity, ContentEntityQueryContext<TEntity>, TRepository, TResponse, TRequest>
+            TEntity, TRepository, TResponse, TRequest>
         where TEntity : class, IContentEntity, IEntity
         where TResponse : class, IContentResponseRestModel<TEntity>
         where TRequest : class, IContentRequestRestModel<TEntity>
-        where TRepository : IContentEntityRepository<TEntity, ContentEntityQueryContext<TEntity>>
+        where TRepository : IContentEntityRepository<TEntity>
     {
         private readonly ContentBlocksRepository _blocksRepository;
         protected BioEntitiesManager EntitiesManager { get; }
 
         protected ContentEntityController(
-            BaseControllerContext<TEntity, ContentEntityQueryContext<TEntity>, TRepository> context,
+            BaseControllerContext<TEntity, TRepository> context,
             BioEntitiesManager entitiesManager, ContentBlocksRepository blocksRepository) : base(context)
         {
             _blocksRepository = blocksRepository;

diff --git a/src/BioEngine.Core.API/Controllers/MenuController.cs b/src/BioEngine.Core.API/Controllers/MenuController.cs
@@ -1,13 +1,12 @@
-using BioEngine.Core.DB;
 using BioEngine.Core.Entities;
 using BioEngine.Core.Repository;
 using BioEngine.Core.Web;
 
 namespace BioEngine.Core.API.Controllers
 {
-    public class MenuController : ResponseRequestRestController<Menu, QueryContext<Menu>, MenuRepository, Entities.Menu>
+    public class MenuController : ResponseRequestRestController<Menu, MenuRepository, Entities.Menu>
     {
-        public MenuController(BaseControllerContext<Menu, QueryContext<Menu>, MenuRepository> context) : base(context)
+        public MenuController(BaseControllerContext<Menu, MenuRepository> context) : base(context)
         {
         }
     }

diff --git a/src/BioEngine.Core.API/Controllers/SectionsController.cs b/src/BioEngine.Core.API/Controllers/SectionsController.cs
@@ -1,16 +1,12 @@
-using BioEngine.Core.DB;
-using BioEngine.Core.Entities;
+using BioEngine.Core.Entities;
 using BioEngine.Core.Repository;
 using BioEngine.Core.Web;
 
 namespace BioEngine.Core.API.Controllers
 {
-    public class SectionsController : SectionController<Section, ContentEntityQueryContext<Section>, SectionsRepository,
-        Entities.Section>
+    public class SectionsController : SectionController<Section, SectionsRepository, Entities.Section>
     {
-        public SectionsController(
-            BaseControllerContext<Section, ContentEntityQueryContext<Section>, SectionsRepository> context) :
-            base(context)
+        public SectionsController(BaseControllerContext<Section, SectionsRepository> context) : base(context)
         {
         }
     }

diff --git a/src/BioEngine.Core.API/Controllers/SitesController.cs b/src/BioEngine.Core.API/Controllers/SitesController.cs
@@ -1,14 +1,13 @@
-using BioEngine.Core.DB;
-using BioEngine.Core.Entities;
+using BioEngine.Core.Entities;
 using BioEngine.Core.Repository;
 using BioEngine.Core.Web;
 
 namespace BioEngine.Core.API.Controllers
 {
     public class
-        SitesController : ResponseRequestRestController<Site, QueryContext<Site>, SitesRepository, Entities.Site>
+        SitesController : ResponseRequestRestController<Site, SitesRepository, Entities.Site>
     {
-        public SitesController(BaseControllerContext<Site, QueryContext<Site>, SitesRepository> context) : base(context)
+        public SitesController(BaseControllerContext<Site, SitesRepository> context) : base(context)
         {
         }
     }

diff --git a/src/BioEngine.Core.API/Controllers/TagsController.cs b/src/BioEngine.Core.API/Controllers/TagsController.cs
@@ -1,13 +1,12 @@
-using BioEngine.Core.DB;
-using BioEngine.Core.Entities;
+using BioEngine.Core.Entities;
 using BioEngine.Core.Repository;
 using BioEngine.Core.Web;
 
 namespace BioEngine.Core.API.Controllers
 {
-    public class TagsController : ResponseRequestRestController<Tag, QueryContext<Tag>, TagsRepository, Entities.Tag>
+    public class TagsController : ResponseRequestRestController<Tag, TagsRepository, Entities.Tag>
     {
-        public TagsController(BaseControllerContext<Tag, QueryContext<Tag>, TagsRepository> context) : base(context)
+        public TagsController(BaseControllerContext<Tag, TagsRepository> context) : base(context)
         {
         }
     }

diff --git a/src/BioEngine.Core.API/Models/ContentEntityRestModel.cs b/src/BioEngine.Core.API/Models/ContentEntityRestModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using BioEngine.Core.Entities;
+using BioEngine.Core.Abstractions;
 
 namespace BioEngine.Core.API.Models
 {

diff --git a/src/BioEngine.Core.API/Models/IRequestRestModel.cs b/src/BioEngine.Core.API/Models/IRequestRestModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using BioEngine.Core.Entities;
+using BioEngine.Core.Abstractions;
 using ContentBlock = BioEngine.Core.API.Entities.ContentBlock;
 
 namespace BioEngine.Core.API.Models

diff --git a/src/BioEngine.Core.API/Models/IResponseRestModel.cs b/src/BioEngine.Core.API/Models/IResponseRestModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using BioEngine.Core.Entities;
+using BioEngine.Core.Abstractions;
 using ContentBlock = BioEngine.Core.API.Entities.ContentBlock;
 
 namespace BioEngine.Core.API.Models

diff --git a/src/BioEngine.Core.API/Models/RestModel.cs b/src/BioEngine.Core.API/Models/RestModel.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BioEngine.Core.Abstractions;
 using BioEngine.Core.API.Entities;
-using BioEngine.Core.Entities;
 using BioEngine.Core.Properties;
 using Newtonsoft.Json;
 

diff --git a/src/BioEngine.Core.API/Models/SectionEntityRestModel.cs b/src/BioEngine.Core.API/Models/SectionEntityRestModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using BioEngine.Core.Entities;
+using BioEngine.Core.Abstractions;
 
 namespace BioEngine.Core.API.Models
 {

diff --git a/src/BioEngine.Core.API/Models/SectionRestModel.cs b/src/BioEngine.Core.API/Models/SectionRestModel.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BioEngine.Core.Abstractions;
 using BioEngine.Core.Entities;
 
 namespace BioEngine.Core.API.Models

diff --git a/src/BioEngine.Core.API/Models/SiteEntityRestModel.cs b/src/BioEngine.Core.API/Models/SiteEntityRestModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using BioEngine.Core.Entities;
+using BioEngine.Core.Abstractions;
 
 namespace BioEngine.Core.API.Models
 {

diff --git a/src/BioEngine.Core.API/RequestRestController.cs b/src/BioEngine.Core.API/RequestRestController.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using BioEngine.Core.Abstractions;
 using BioEngine.Core.API.Models;
 using BioEngine.Core.API.Response;
-using BioEngine.Core.DB;
 using BioEngine.Core.Entities;
 using BioEngine.Core.Repository;
 using BioEngine.Core.Web;
@@ -13,16 +13,15 @@
 namespace BioEngine.Core.API
 {
     public abstract class
-        RequestRestController<TEntity, TQueryContext, TRepository, TResponse, TRequest> : ResponseRestController<TEntity
-            , TQueryContext, TRepository,
+        RequestRestController<TEntity, TRepository, TResponse, TRequest> : ResponseRestController<TEntity
+            , TRepository,
             TResponse>
         where TEntity : class, IEntity
         where TResponse : class, IResponseRestModel<TEntity>
         where TRequest : class, IRequestRestModel<TEntity>
-        where TQueryContext : QueryContext<TEntity>, new()
-        where TRepository : IBioRepository<TEntity, TQueryContext>
+        where TRepository : IBioRepository<TEntity>
     {
-        protected RequestRestController(BaseControllerContext<TEntity, TQueryContext, TRepository> context) :
+        protected RequestRestController(BaseControllerContext<TEntity, TRepository> context) :
             base(context)
         {
         }
@@ -131,14 +130,13 @@ protected virtual Task AfterDeleteAsync(TEntity domainModel)
     }
 
     public abstract class
-        ResponseRequestRestController<TEntity, TQueryContext, TRepository, TRequestResponse> :
-            RequestRestController<TEntity, TQueryContext, TRepository, TRequestResponse, TRequestResponse>
+        ResponseRequestRestController<TEntity, TRepository, TRequestResponse> :
+            RequestRestController<TEntity, TRepository, TRequestResponse, TRequestResponse>
         where TEntity : class, IEntity
         where TRequestResponse : class, IResponseRestModel<TEntity>, IRequestRestModel<TEntity>
-        where TQueryContext : QueryContext<TEntity>, new()
-        where TRepository : IBioRepository<TEntity, TQueryContext>
+        where TRepository : IBioRepository<TEntity>
     {
-        protected ResponseRequestRestController(BaseControllerContext<TEntity, TQueryContext, TRepository> context) :
+        protected ResponseRequestRestController(BaseControllerContext<TEntity, TRepository> context) :
             base(context)
         {
         }

diff --git a/src/BioEngine.Core.API/ResponseRestController.cs b/src/BioEngine.Core.API/ResponseRestController.cs
@@ -3,12 +3,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Web;
+using BioEngine.Core.Abstractions;
 using BioEngine.Core.API.Interfaces;
 using BioEngine.Core.API.Models;
 using BioEngine.Core.API.Response;
-using BioEngine.Core.DB;
-using BioEngine.Core.Entities;
-using BioEngine.Core.Repository;
+using BioEngine.Core.DB.Queries;
 using BioEngine.Core.Web;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -17,15 +16,14 @@
 
 namespace BioEngine.Core.API
 {
-    public abstract class ResponseRestController<TEntity, TQueryContext, TRepository, TResponse> : ApiController
+    public abstract class ResponseRestController<TEntity, TRepository, TResponse> : ApiController
         where TResponse : IResponseRestModel<TEntity>
         where TEntity : class, IEntity
-        where TQueryContext : QueryContext<TEntity>, new()
-        where TRepository : IBioRepository<TEntity, TQueryContext>
+        where TRepository : IBioRepository<TEntity>
     {
         protected TRepository Repository { get; }
 
-        protected ResponseRestController(BaseControllerContext<TEntity, TQueryContext, TRepository> context) : base(context)
+        protected ResponseRestController(BaseControllerContext<TEntity, TRepository> context) : base(context)
         {
             Repository = context.Repository;
         }
@@ -72,9 +70,9 @@ public virtual async Task<ActionResult<int>> CountAsync([FromQuery] int limit =
             return Ok(result);
         }
 
-        protected TQueryContext GetQueryContext(int limit, int offset, string order, string filter)
+        protected IQueryContext<TEntity> GetQueryContext(int limit, int offset, string order, string filter)
         {
-            var context = new TQueryContext();
+            var context = HttpContext.RequestServices.GetRequiredService<IQueryContext<TEntity>>();
             if (limit > 0)
             {
                 context.Limit = limit;

diff --git a/src/BioEngine.Core.API/SectionController.cs b/src/BioEngine.Core.API/SectionController.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Threading.Tasks;
+using BioEngine.Core.Abstractions;
 using BioEngine.Core.API.Models;
 using BioEngine.Core.DB;
 using BioEngine.Core.Entities;
@@ -18,9 +19,9 @@ public abstract class
         where TData : ITypedData, new()
         where TResponse : class, IContentResponseRestModel<TEntity>
         where TRequest : SectionRestModel<TEntity>, IContentRequestRestModel<TEntity>
-        where TRepository : IContentEntityRepository<TEntity, ContentEntityQueryContext<TEntity>>
+        where TRepository : IContentEntityRepository<TEntity>
     {
-        protected SectionController(BaseControllerContext<TEntity, ContentEntityQueryContext<TEntity>, TRepository> context,
+        protected SectionController(BaseControllerContext<TEntity, TRepository> context,
             BioEntitiesManager entitiesManager,
             ContentBlocksRepository blocksRepository) : base(context, entitiesManager, blocksRepository)
         {
@@ -37,14 +38,13 @@ public override async Task<ActionResult<StorageItem>> UploadAsync([FromQuery] st
     }
 
     public abstract class
-        SectionController<TEntity, TQueryContext, TRepository, TResponse> : ResponseRestController<TEntity,
-            TQueryContext, TRepository, TResponse>
+        SectionController<TEntity, TRepository, TResponse> : ResponseRestController<TEntity,
+            TRepository, TResponse>
         where TEntity : Section, IEntity
         where TResponse : IResponseRestModel<TEntity>
-        where TRepository : IBioRepository<TEntity, TQueryContext>
-        where TQueryContext : QueryContext<TEntity>, new()
+        where TRepository : IBioRepository<TEntity>
     {
-        protected SectionController(BaseControllerContext<TEntity, TQueryContext, TRepository> context) : base(context)
+        protected SectionController(BaseControllerContext<TEntity, TRepository> context) : base(context)
         {
         }
     }

diff --git a/src/BioEngine.Core.API/Startup.cs b/src/BioEngine.Core.API/Startup.cs
@@ -20,7 +20,7 @@ protected BioEngineApiStartup(IConfiguration configuration, IHostEnvironment hos
 
         protected override IMvcBuilder ConfigureMvc(IMvcBuilder mvcBuilder)
         {
-            return base.ConfigureMvc(mvcBuilder).AddApplicationPart(typeof(ResponseRestController<,,,>).Assembly);
+            return base.ConfigureMvc(mvcBuilder).AddApplicationPart(typeof(ResponseRestController<,,>).Assembly);
         }
 
         public override void ConfigureServices(IServiceCollection services)