Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Code refactor #52

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Code refactor #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
120 changes: 44 additions & 76 deletions src/TanvirArjel.EFCore.GenericRepository/Repository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,21 @@ internal sealed class Repository<TDbContext> : QueryRepository<TDbContext>, IRep
private readonly TDbContext _dbContext;

public Repository(TDbContext dbContext)
: base(dbContext)
{
_dbContext = dbContext;
}
: base(dbContext) => _dbContext = dbContext;

public async Task<IDbContextTransaction> BeginTransactionAsync(
IsolationLevel isolationLevel = IsolationLevel.Unspecified,
CancellationToken cancellationToken = default)
{
IDbContextTransaction dbContextTransaction = await _dbContext.Database.BeginTransactionAsync(isolationLevel, cancellationToken);

return dbContextTransaction;
}

public async Task<object[]> InsertAsync<TEntity>(TEntity entity, CancellationToken cancellationToken = default)
where TEntity : class
{
if (entity == null)
{
throw new ArgumentNullException(nameof(entity));
}
CheckEntityIsNull<TEntity>(entity);

EntityEntry<TEntity> entityEntry = await _dbContext.Set<TEntity>().AddAsync(entity, cancellationToken).ConfigureAwait(false);
await _dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
Expand All @@ -58,10 +53,7 @@ public async Task<object[]> InsertAsync<TEntity>(TEntity entity, CancellationTok
public async Task InsertAsync<TEntity>(IEnumerable<TEntity> entities, CancellationToken cancellationToken = default)
where TEntity : class
{
if (entities == null)
{
throw new ArgumentNullException(nameof(entities));
}
CheckEntitiesIsNull<TEntity>(entities);

await _dbContext.Set<TEntity>().AddRangeAsync(entities, cancellationToken).ConfigureAwait(false);
await _dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
Expand All @@ -70,10 +62,7 @@ public async Task InsertAsync<TEntity>(IEnumerable<TEntity> entities, Cancellati
public async Task<int> UpdateAsync<TEntity>(TEntity entity, CancellationToken cancellationToken = default)
where TEntity : class
{
if (entity == null)
{
throw new ArgumentNullException(nameof(entity));
}
CheckEntityIsNull<TEntity>(entity);

EntityEntry<TEntity> trackedEntity = _dbContext.ChangeTracker.Entries<TEntity>().FirstOrDefault(x => x.Entity == entity);

Expand Down Expand Up @@ -106,119 +95,90 @@ public async Task<int> UpdateAsync<TEntity>(TEntity entity, CancellationToken ca
}

int count = await _dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);

return count;
}

public async Task<int> UpdateAsync<T>(IEnumerable<T> entities, CancellationToken cancellationToken = default)
where T : class
{
if (entities == null)
{
throw new ArgumentNullException(nameof(entities));
}
CheckEntitiesIsNull<T>(entities);

_dbContext.Set<T>().UpdateRange(entities);
int count = await _dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);

return count;
}

public async Task<int> DeleteAsync<T>(T entity, CancellationToken cancellationToken = default)
where T : class
{
if (entity == null)
{
throw new ArgumentNullException(nameof(entity));
}
CheckEntityIsNull<T>(entity);

_dbContext.Set<T>().Remove(entity);
int count = await _dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);

return count;
}

public async Task<int> DeleteAsync<T>(IEnumerable<T> entities, CancellationToken cancellationToken = default)
where T : class
{
if (entities == null)
{
throw new ArgumentNullException(nameof(entities));
}
CheckEntitiesIsNull<T>(entities);

_dbContext.Set<T>().RemoveRange(entities);
int count = await _dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);

return count;
}

public Task<int> ExecuteSqlCommandAsync(string sql, CancellationToken cancellationToken = default)
{
return _dbContext.Database.ExecuteSqlRawAsync(sql, cancellationToken);
}
public Task<int> ExecuteSqlCommandAsync(string sql, CancellationToken cancellationToken = default) =>
_dbContext.Database.ExecuteSqlRawAsync(sql, cancellationToken);

public Task<int> ExecuteSqlCommandAsync(string sql, params object[] parameters)
{
return _dbContext.Database.ExecuteSqlRawAsync(sql, parameters);
}
public Task<int> ExecuteSqlCommandAsync(string sql, params object[] parameters) =>
_dbContext.Database.ExecuteSqlRawAsync(sql, parameters);

public Task<int> ExecuteSqlCommandAsync(string sql, IEnumerable<object> parameters, CancellationToken cancellationToken = default)
{
return _dbContext.Database.ExecuteSqlRawAsync(sql, parameters, cancellationToken);
}
public Task<int> ExecuteSqlCommandAsync(string sql, IEnumerable<object> parameters, CancellationToken cancellationToken = default) =>
_dbContext.Database.ExecuteSqlRawAsync(sql, parameters, cancellationToken);

public void ClearChangeTracker()
{
_dbContext.ChangeTracker.Clear();
}
public void ClearChangeTracker() => _dbContext.ChangeTracker.Clear();

public void Add<TEntity>(TEntity entity)
where TEntity : class
{
if (entity == null)
{
throw new ArgumentNullException(nameof(entity));
}
CheckEntityIsNull<TEntity>(entity);

_dbContext.Set<TEntity>().Add(entity);
}

public async Task AddAsync<TEntity>(TEntity entity, CancellationToken cancellationToken = default)
where TEntity : class
{
if (entity == null)
{
throw new ArgumentNullException(nameof(entity));
}
CheckEntityIsNull<TEntity>(entity);

await _dbContext.Set<TEntity>().AddAsync(entity, cancellationToken).ConfigureAwait(false);
}

public void Add<TEntity>(IEnumerable<TEntity> entities)
where TEntity : class
{
if (entities == null)
{
throw new ArgumentNullException(nameof(entities));
}
CheckEntitiesIsNull<TEntity>(entities);

_dbContext.Set<TEntity>().AddRange(entities);
}

public async Task AddAsync<TEntity>(IEnumerable<TEntity> entities, CancellationToken cancellationToken = default)
where TEntity : class
{
if (entities == null)
{
throw new ArgumentNullException(nameof(entities));
}
CheckEntitiesIsNull<TEntity>(entities);

await _dbContext.Set<TEntity>().AddRangeAsync(entities, cancellationToken).ConfigureAwait(false);
}

public void Update<TEntity>(TEntity entity)
where TEntity : class
{
if (entity == null)
{
throw new ArgumentNullException(nameof(entity));
}
CheckEntityIsNull<TEntity>(entity);

EntityEntry<TEntity> trackedEntity = _dbContext.ChangeTracker
.Entries<TEntity>().FirstOrDefault(x => x.Entity == entity);
Expand Down Expand Up @@ -255,42 +215,50 @@ public void Update<TEntity>(TEntity entity)
public void Update<TEntity>(IEnumerable<TEntity> entities)
where TEntity : class
{
if (entities == null)
{
throw new ArgumentNullException(nameof(entities));
}
CheckEntitiesIsNull<TEntity>(entities);

_dbContext.Set<TEntity>().UpdateRange(entities);
}

public void Remove<TEntity>(TEntity entity)
where TEntity : class
{
if (entity == null)
{
throw new ArgumentNullException(nameof(entity));
}
CheckEntityIsNull<TEntity>(entity);

_dbContext.Set<TEntity>().Remove(entity);
}

public void Remove<TEntity>(IEnumerable<TEntity> entities)
where TEntity : class
{
if (entities == null)
{
throw new ArgumentNullException(nameof(entities));
}
CheckEntitiesIsNull<TEntity>(entities);

_dbContext.Set<TEntity>().RemoveRange(entities);
}

public async Task<int> SaveChangesAsync(CancellationToken cancellationToken)
{
int count = await _dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);

return count;
}

private void CheckEntityIsNull<TEntity>(TEntity entity)
{
if (entity is null)
{
throw new ArgumentNullException(nameof(entity));
}
}

private void CheckEntitiesIsNull<TEntity>(IEnumerable<TEntity> entities )
{
if (entities is null)
{
throw new ArgumentNullException(nameof(entities));
}
}

#if NET7_0_OR_GREATER
public async Task<int> ExecuteUpdateAsync<TEntity>(
Expression<Func<SetPropertyCalls<TEntity>, SetPropertyCalls<TEntity>>> setPropertyCalls,
Expand Down
15 changes: 3 additions & 12 deletions src/TanvirArjel.EFCore.QueryRepository/QueryRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,13 @@ public async Task<List<T>> GetListAsync<T>(
}

public Task<List<T>> GetListAsync<T>(Expression<Func<T, bool>> condition, CancellationToken cancellationToken = default)
where T : class
{
return GetListAsync(condition, false, cancellationToken);
}
where T : class => GetListAsync(condition, false, cancellationToken);

public Task<List<T>> GetListAsync<T>(
Expression<Func<T, bool>> condition,
bool asNoTracking,
CancellationToken cancellationToken = default)
where T : class
{
return GetListAsync(condition, null, asNoTracking, cancellationToken);
}
where T : class => GetListAsync(condition, null, asNoTracking, cancellationToken);

public async Task<List<T>> GetListAsync<T>(
Expression<Func<T, bool>> condition,
Expand Down Expand Up @@ -128,10 +122,7 @@ public async Task<List<T>> GetListAsync<T>(
}

public Task<List<T>> GetListAsync<T>(Specification<T> specification, CancellationToken cancellationToken = default)
where T : class
{
return GetListAsync(specification, false, cancellationToken);
}
where T : class => GetListAsync(specification, false, cancellationToken);

public async Task<List<T>> GetListAsync<T>(
Specification<T> specification,
Expand Down