Added tracking methods and fix unit of work methods

Author: TanerSaydam

GenericRepository/GenericRepository.csproj

@@ -14,7 +14,7 @@
     <PackageId>EntityFrameworkCore.GenericRepository.Nuget</PackageId>
     <AssemblyVersion></AssemblyVersion>
     <FileVersion></FileVersion>
-    <Version>8.0.0</Version>
+    <Version>8.0.1</Version>
     <Authors>Taner Saydam</Authors>
     <PackageTags>genericrepository</PackageTags>
   </PropertyGroup>

GenericRepository/IRepository.cs

@@ -6,12 +6,16 @@ public interface IRepository<TEntity>
     where TEntity : class
 {
     IQueryable<TEntity> GetAll();
+    IQueryable<TEntity> GetAllWithTacking();
     IQueryable<TEntity> GetWhere(Expression<Func<TEntity, bool>> expression);    
+    IQueryable<TEntity> GetWhereWithTracking(Expression<Func<TEntity, bool>> expression);    
     Task<TEntity> GetByExpressionAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellationToken = default);
+    Task<TEntity> GetByExpressionWithTrackingAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellationToken = default);
     Task<TEntity> GetFirstAsync(CancellationToken cancellationToken = default);
     Task<bool> AnyAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellationToken = default);
     bool Any(Expression<Func<TEntity, bool>> expression);
     TEntity GetByExpression(Expression<Func<TEntity, bool>> expression);
+    TEntity GetByExpressionWithTracking(Expression<Func<TEntity, bool>> expression);
     TEntity GetFirst();
     Task AddAsync(TEntity entity, CancellationToken cancellationToken = default);
     void Add(TEntity entity);

GenericRepository/IUnitOfWork.cs

@@ -3,5 +3,5 @@
 public interface IUnitOfWork
 {
     Task<int> SaveChangesAsync(CancellationToken cancellationToken = default);
-    void SaveChanges();
+    int SaveChanges();
 }

GenericRepository/Repository.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.Linq.Expressions;
+using System.Threading;
 
 namespace GenericRepository;
 
@@ -68,6 +69,11 @@ public IQueryable<TEntity> GetAll()
         return Entity.AsNoTracking().AsQueryable();
     }
 
+    public IQueryable<TEntity> GetAllWithTacking()
+    {
+        return Entity.AsQueryable();
+    }
+
     public TEntity GetByExpression(Expression<Func<TEntity, bool>> expression)
     {
         TEntity entity = Entity.Where(expression).AsNoTracking().FirstOrDefault();
@@ -78,7 +84,19 @@ public async Task<TEntity> GetByExpressionAsync(Expression<Func<TEntity, bool>>
     {
         TEntity entity = await Entity.Where(expression).AsNoTracking().FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
         return entity;
-    } 
+    }
+
+    public TEntity GetByExpressionWithTracking(Expression<Func<TEntity, bool>> expression)
+    {
+        TEntity entity = Entity.Where(expression).FirstOrDefault();
+        return entity;
+    }
+
+    public async Task<TEntity> GetByExpressionWithTrackingAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellationToken = default)
+    {
+        TEntity entity = await Entity.Where(expression).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
+        return entity;
+    }
 
     public TEntity GetFirst()
     {
@@ -97,6 +115,11 @@ public IQueryable<TEntity> GetWhere(Expression<Func<TEntity, bool>> expression)
         return Entity.AsNoTracking().Where(expression).AsQueryable();
     }
 
+    public IQueryable<TEntity> GetWhereWithTracking(Expression<Func<TEntity, bool>> expression)
+    {
+        return Entity.Where(expression).AsQueryable();
+    }
+
     public void Update(TEntity entity)
     {
         Entity.Update(entity);

README.md

@@ -62,12 +62,16 @@ public interface IRepository<TEntity>
     where TEntity : class
 {
     IQueryable<TEntity> GetAll();
+    IQueryable<TEntity> GetAllWithTacking();
     IQueryable<TEntity> GetWhere(Expression<Func<TEntity, bool>> expression);    
+    IQueryable<TEntity> GetWhereWithTracking(Expression<Func<TEntity, bool>> expression);    
     Task<TEntity> GetByExpressionAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellationToken = default);
+    Task<TEntity> GetByExpressionWithTrackingAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellationToken = default);
     Task<TEntity> GetFirstAsync(CancellationToken cancellationToken = default);
     Task<bool> AnyAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellationToken = default);
     bool Any(Expression<Func<TEntity, bool>> expression);
     TEntity GetByExpression(Expression<Func<TEntity, bool>> expression);
+    TEntity GetByExpressionWithTracking(Expression<Func<TEntity, bool>> expression);
     TEntity GetFirst();
     Task AddAsync(TEntity entity, CancellationToken cancellationToken = default);
     void Add(TEntity entity);
@@ -80,7 +84,9 @@ public interface IRepository<TEntity>
     void DeleteRange(ICollection<TEntity> entities);
 
 }
+```
 
+```Csharp
 public class Repository<TEntity, TContext> : IRepository<TEntity>
     where TEntity : class
     where TContext : DbContext
@@ -146,6 +152,11 @@ public class Repository<TEntity, TContext> : IRepository<TEntity>
         return Entity.AsNoTracking().AsQueryable();
     }
 
+    public IQueryable<TEntity> GetAllWithTacking()
+    {
+        return Entity.AsQueryable();
+    }
+
     public TEntity GetByExpression(Expression<Func<TEntity, bool>> expression)
     {
         TEntity entity = Entity.Where(expression).AsNoTracking().FirstOrDefault();
@@ -156,7 +167,19 @@ public class Repository<TEntity, TContext> : IRepository<TEntity>
     {
         TEntity entity = await Entity.Where(expression).AsNoTracking().FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
         return entity;
-    } 
+    }
+
+    public TEntity GetByExpressionWithTracking(Expression<Func<TEntity, bool>> expression)
+    {
+        TEntity entity = Entity.Where(expression).FirstOrDefault();
+        return entity;
+    }
+
+    public async Task<TEntity> GetByExpressionWithTrackingAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancellationToken = default)
+    {
+        TEntity entity = await Entity.Where(expression).FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
+        return entity;
+    }
 
     public TEntity GetFirst()
     {
@@ -175,6 +198,11 @@ public class Repository<TEntity, TContext> : IRepository<TEntity>
         return Entity.AsNoTracking().Where(expression).AsQueryable();
     }
 
+    public IQueryable<TEntity> GetWhereWithTracking(Expression<Func<TEntity, bool>> expression)
+    {
+        return Entity.Where(expression).AsQueryable();
+    }
+
     public void Update(TEntity entity)
     {
         Entity.Update(entity);
@@ -193,6 +221,6 @@ public class Repository<TEntity, TContext> : IRepository<TEntity>
 public interface IUnitOfWork
 {
     Task<int> SaveChangesAsync(CancellationToken cancellationToken = default);
-    void SaveChanges();
+    int SaveChanges();
 }
 ```