Merge pull request EduardoPires#24 from AlbertoMonteiro/master

Using ProjectTo from AutoMapper
Dekorg · Aug 9, 2017 · 095ce0e · 095ce0e
2 parents 87ab1a7 + 9674ce3
commit 095ce0e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/src/Equinox.Application/Services/CustomerAppService.cs b/src/Equinox.Application/Services/CustomerAppService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using AutoMapper;
+using AutoMapper.QueryableExtensions;
 using Equinox.Application.EventSourcedNormalizers;
 using Equinox.Application.Interfaces;
 using Equinox.Application.ViewModels;
@@ -18,9 +19,9 @@ public class CustomerAppService : ICustomerAppService
         private readonly IEventStoreRepository _eventStoreRepository;
         private readonly IBus Bus;
 
-        public CustomerAppService(IMapper mapper, 
-                                  ICustomerRepository customerRepository, 
-                                  IBus bus, 
+        public CustomerAppService(IMapper mapper,
+                                  ICustomerRepository customerRepository,
+                                  IBus bus,
                                   IEventStoreRepository eventStoreRepository)
         {
             _mapper = mapper;
@@ -31,7 +32,7 @@ public CustomerAppService(IMapper mapper,
 
         public IEnumerable<CustomerViewModel> GetAll()
         {
-            return _mapper.Map<IEnumerable<CustomerViewModel>>(_customerRepository.GetAll());
+            return _customerRepository.GetAll().ProjectTo<CustomerViewModel>();
         }
 
         public CustomerViewModel GetById(Guid id)

diff --git a/src/Equinox.Domain/Interfaces/IRepository.cs b/src/Equinox.Domain/Interfaces/IRepository.cs
@@ -1,17 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
+using System.Linq;
 
 namespace Equinox.Domain.Interfaces
 {
     public interface IRepository<TEntity> : IDisposable where TEntity : class
     {
         void Add(TEntity obj);
         TEntity GetById(Guid id);
-        IEnumerable<TEntity> GetAll();
+        IQueryable<TEntity> GetAll();
         void Update(TEntity obj);
         void Remove(Guid id);
-        IEnumerable<TEntity> Find(Expression<Func<TEntity, bool>> predicate);
         int SaveChanges();
     }
 }
diff --git a/src/Equinox.Infra.Data/Repository/CustomerRepository.cs b/src/Equinox.Infra.Data/Repository/CustomerRepository.cs
@@ -5,17 +5,17 @@
 
 namespace Equinox.Infra.Data.Repository
 {
-    public class CustomerRepository : Repository<Customer>,  ICustomerRepository
+    public class CustomerRepository : Repository<Customer>, ICustomerRepository
     {
         public CustomerRepository(EquinoxContext context)
-            :base(context)
+            : base(context)
         {
 
-        }       
+        }
 
         public Customer GetByEmail(string email)
         {
-            return Find(c => c.Email == email).FirstOrDefault();
+            return DbSet.AsNoTracking().FirstOrDefault(c => c.Email == email);
         }
     }
 }
diff --git a/src/Equinox.Infra.Data/Repository/Repository.cs b/src/Equinox.Infra.Data/Repository/Repository.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
 using Equinox.Domain.Interfaces;
 using Equinox.Infra.Data.Context;
 using Microsoft.EntityFrameworkCore;
@@ -10,8 +8,8 @@ namespace Equinox.Infra.Data.Repository
 {
     public class Repository<TEntity> : IRepository<TEntity> where TEntity : class
     {
-        protected EquinoxContext Db;
-        protected DbSet<TEntity> DbSet;
+        protected readonly EquinoxContext Db;
+        protected readonly DbSet<TEntity> DbSet;
 
         public Repository(EquinoxContext context)
         {
@@ -29,9 +27,9 @@ public virtual TEntity GetById(Guid id)
             return DbSet.Find(id);
         }
 
-        public virtual IEnumerable<TEntity> GetAll()
+        public virtual IQueryable<TEntity> GetAll()
         {
-            return DbSet.ToList();
+            return DbSet;
         }
 
         public virtual void Update(TEntity obj)
@@ -44,11 +42,6 @@ public virtual void Remove(Guid id)
             DbSet.Remove(DbSet.Find(id));
         }
 
-        public IEnumerable<TEntity> Find(Expression<Func<TEntity, bool>> predicate)
-        {
-            return DbSet.AsNoTracking().Where(predicate);
-        }
-
         public int SaveChanges()
         {
             return Db.SaveChanges();