perf: use query as a method

leynier · May 19, 2022 · 259b6c1 · 259b6c1
1 parent 827ee4a
commit 259b6c1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 37 deletions.
diff --git a/Gateways.Api/Controllers/DevicesController.cs b/Gateways.Api/Controllers/DevicesController.cs
@@ -24,7 +24,7 @@ public DevicesController(IDeviceService service, IMapper mapper, IConfiguration
     [HttpPost]
     public override Response<DeviceGetModel> Post([FromBody] DevicePostModel model)
     {
-        var count = service.Where(g => g.GatewayId == model.GatewayId).Count();
+        var count = service.Query().Where(g => g.GatewayId == model.GatewayId).Count();
         if (count >= maxNumberOfDevicesPerGateway)
             throw new BadRequestError("Maximum number of devices reached for gateway");
         return base.Post(model);
@@ -34,14 +34,15 @@ public override Response<DeviceGetModel> Post([FromBody] DevicePostModel model)
     public override Response<DeviceGetModel> Put(int id, [FromBody] DevicePutModel model)
     {
         var gatewayId = service
+            .Query()
             .Where(g => Equals(g.Id, id))
             .Select(g => g.GatewayId)
             .FirstOrDefault();
         if (gatewayId == null)
             throw new NotFoundError();
         if (gatewayId != model.GatewayId)
         {
-            var count = service.Where(g => g.GatewayId == model.GatewayId).Count();
+            var count = service.Query().Where(g => g.GatewayId == model.GatewayId).Count();
             if (count >= maxNumberOfDevicesPerGateway)
                 throw new BadRequestError("Maximum number of devices reached for gateway");
         }

diff --git a/Gateways.Business.Contracts/Contracts/IRepository.cs b/Gateways.Business.Contracts/Contracts/IRepository.cs
@@ -1,8 +1,9 @@
 namespace Gateways.Business.Contracts;
 
-public interface IRepository<TEntity> : IQueryable<TEntity> where TEntity : class
+public interface IRepository<TEntity> where TEntity : class
 {
     IObjectContext Context { get; }
+    IQueryable<TEntity> Query();
     void Add(TEntity entity);
     void Update(TEntity entity);
     void Remove(TEntity entity);

diff --git a/Gateways.Business.Contracts/Services/IService.cs b/Gateways.Business.Contracts/Services/IService.cs
@@ -1,7 +1,8 @@
 namespace Gateways.Business.Contracts.Services;
 
-public interface IService<TEntity> : IQueryable<TEntity> where TEntity : class
+public interface IService<TEntity> where TEntity : class
 {
+    IQueryable<TEntity> Query();
     void Add(TEntity entity);
     void Update(TEntity entity);
     void Remove(TEntity entity);

diff --git a/Gateways.Business.Implementations/Services/BaseService.cs b/Gateways.Business.Implementations/Services/BaseService.cs
@@ -1,7 +1,5 @@
 using Gateways.Business.Contracts;
 using Gateways.Business.Contracts.Services;
-using System.Collections;
-using System.Linq.Expressions;
 
 namespace Gateways.Business.Implementations.Services;
 
@@ -13,17 +11,9 @@ public BaseService(IRepository<TEntity> repository)
     }
 
     protected IRepository<TEntity> BaseRepository { get; }
-
-    public Type ElementType => BaseRepository.ElementType;
-
-    public Expression Expression => BaseRepository.Expression;
-
-    public IQueryProvider Provider => BaseRepository.Provider;
-
-    public IEnumerator<TEntity> GetEnumerator() => BaseRepository.GetEnumerator();
-
-    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
+
+    public IQueryable<TEntity> Query() => BaseRepository.Query();
+
     public void Add(TEntity entity) => BaseRepository.Add(entity);
 
     public void Update(TEntity entity) => BaseRepository.Update(entity);
@@ -33,4 +23,5 @@ public BaseService(IRepository<TEntity> repository)
     public void Commit() => BaseRepository.Commit();
 
     public Task CommitAsync() => BaseRepository.CommitAsync();
+
 }
diff --git a/Gateways.Common/Controllers/CrudApiControllerBase.cs b/Gateways.Common/Controllers/CrudApiControllerBase.cs
@@ -30,7 +30,7 @@ public virtual PaginatedResponse<IEnumerable<TGet>> GetAll([FromQuery] Paginatio
     {
         var skip = pagination.Page * pagination.PageSize;
         var take = pagination.PageSize;
-        var query = service.AsNoTrackingWithIdentityResolution();
+        var query = service.Query().AsNoTrackingWithIdentityResolution();
         if (order != null)
             query = order(query);
         var models = query.Skip(skip).Take(pagination.PageSize).ToList();
@@ -42,7 +42,7 @@ public virtual PaginatedResponse<IEnumerable<TGet>> GetAll([FromQuery] Paginatio
     [HttpGet("{id}")]
     public virtual Response<TGetDetails> Get(TKey id)
     {
-        IQueryable<TEntity> query = service.AsNoTrackingWithIdentityResolution();
+        IQueryable<TEntity> query = service.Query().AsNoTrackingWithIdentityResolution();
         if (includer != null)
             query = includer(query);
         var model = query.FirstOrDefault(g => Equals(g.Id, id));
@@ -63,7 +63,7 @@ public virtual Response<TGet> Post([FromBody] TPost model)
     [HttpPut("{id}")]
     public virtual Response<TGet> Put(TKey id, [FromBody] TPut model)
     {
-        var entity = service.FirstOrDefault(g => Equals(g.Id, id));
+        var entity = service.Query().FirstOrDefault(g => Equals(g.Id, id));
         if (entity == null)
             throw new NotFoundError();
         mapper.Map(model, entity);
@@ -74,7 +74,7 @@ public virtual Response<TGet> Put(TKey id, [FromBody] TPut model)
     [HttpDelete("{id}")]
     public virtual Response<TGet> Delete(TKey id)
     {
-        var entity = service.FirstOrDefault(g => Equals(g.Id, id));
+        var entity = service.Query().FirstOrDefault(g => Equals(g.Id, id));
         if (entity == null)
             throw new NotFoundError();
         service.Remove(entity);

diff --git a/Gateways.Data.Implementations/Repositories/BaseRepository.cs b/Gateways.Data.Implementations/Repositories/BaseRepository.cs
@@ -1,6 +1,4 @@
 using Gateways.Business.Contracts;
-using System.Collections;
-using System.Linq.Expressions;
 
 namespace Gateways.Data.Implementations.Repositories;
 
@@ -9,29 +7,19 @@ public class BaseRepository<TEntity> : IRepository<TEntity> where TEntity : clas
     public BaseRepository(IObjectContext context)
     {
         Context = context;
-        Expression = context.Query<TEntity>().Expression;
-        Provider = context.Query<TEntity>().Provider;
     }
 
     public IObjectContext Context { get; }
 
-    public Expression Expression { get; }
-
-    public IQueryProvider Provider { get; }
-
-    public Type ElementType => typeof(TEntity);
+    public IQueryable<TEntity> Query() => Context.Query<TEntity>();
 
     public void Add(TEntity entity) => Context.Add(entity);
 
-    public void Commit() => Context.Commit();
-
-    public Task CommitAsync() => Context.CommitAsync();
-
-    public IEnumerator<TEntity> GetEnumerator() => Context.Query<TEntity>().GetEnumerator();
+    public void Update(TEntity entity) => Context.Update(entity);
 
     public void Remove(TEntity entity) => Context.Remove(entity);
 
-    public void Update(TEntity entity) => Context.Update(entity);
+    public void Commit() => Context.Commit();
 
-    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    public Task CommitAsync() => Context.CommitAsync();
 }