Husky/DaSaSo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring durchgeführt

Browse Source
This commit is contained in:
HuskyTeufel
2021-09-14 17:08:06 +02:00
parent 6b2ed0d5ab
commit 8eccf7c478
24 changed files with 430 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DaSaSo.EntityFramework/Services/ClientDataService.cs
View File

@@ -1,5 +1,6 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.EntityFramework.Services.Common;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking;
using System;
@@ -13,31 +14,22 @@ namespace DaSaSo.EntityFramework.Services
public class ClientDataService : IDataService<Client>
{
private readonly DaSaSoDbContextFactory _contextFactory;
private readonly NonQueryDataService<Client> _nonQueryDataService;
public ClientDataService(DaSaSoDbContextFactory contextFactory)
{
_contextFactory = contextFactory;
_nonQueryDataService = new NonQueryDataService<Client>(contextFactory);
}
public async Task<Client> Create(Client entity)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
EntityEntry<Client> createdResult = await context.Set<Client>().AddAsync(entity);
await context.SaveChangesAsync();
return createdResult.Entity;
}
return await _nonQueryDataService.Create(entity);
}
public async Task<bool> Delete(int id)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
Client entity = await context.Set<Client>().FirstOrDefaultAsync((e) => e.Id == id);
context.Set<Client>().Remove(entity);
await context.SaveChangesAsync();
return true;
}
return await _nonQueryDataService.Delete(id);
}
public async Task<Client> Get(int id)
@@ -54,7 +46,7 @@ namespace DaSaSo.EntityFramework.Services
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
IEnumerable<Client> entities = await context.Set<Client>().ToListAsync();
IEnumerable<Client> entities = await context.Clients.ToListAsync();
return entities;
}
@@ -62,13 +54,7 @@ namespace DaSaSo.EntityFramework.Services
public async Task<Client> Update(int id, Client entity)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
entity.Id = id;
context.Set<Client>().Update(entity);
await context.SaveChangesAsync();
return entity;
}
return await _nonQueryDataService.Update(id, entity);
}
}
}

51
DaSaSo.EntityFramework/Services/Common/NonQueryDataService.cs Normal file
View File

@@ -0,0 +1,51 @@
using DaSaSo.Domain.Model;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.EntityFramework.Services.Common
{
class NonQueryDataService<T> where T: DomainObject
{
private readonly DaSaSoDbContextFactory _contextFactory;
public NonQueryDataService(DaSaSoDbContextFactory contextFactory)
{
_contextFactory = contextFactory;
}
public async Task<T> Create(T entity)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
EntityEntry<T> createdEntity = await context.Set<T>().AddAsync(entity);
await context.SaveChangesAsync();
return createdEntity.Entity;
}
}
public async Task<bool> Delete(int id)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
T entity = await context.Set<T>().FirstOrDefaultAsync((e) => e.Id == id);
context.Set<T>().Remove(entity);
await context.SaveChangesAsync();
return true;
}
}
public async Task<T> Update(int id, T entity)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
entity.Id = id;
context.Set<T>().Update(entity);
await context.SaveChangesAsync();
return entity;
}
}
}
}

26
DaSaSo.EntityFramework/Services/GenericDataService.cs
View File

@@ -1,5 +1,6 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.EntityFramework.Services.Common;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking;
using System;
@@ -13,31 +14,22 @@ namespace DaSaSo.EntityFramework.Services
public class GenericDataService<T> : IDataService<T> where T : DomainObject
{
private readonly DaSaSoDbContextFactory _contextFactory;
private readonly NonQueryDataService<T> _nonQueryDataService;
public GenericDataService(DaSaSoDbContextFactory contextFactory)
{
this._contextFactory = contextFactory;
_nonQueryDataService = new NonQueryDataService<T>(contextFactory);
}
public async Task<T> Create(T entity)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
EntityEntry<T> createdEntity = await context.Set<T>().AddAsync(entity);
await context.SaveChangesAsync();
return createdEntity.Entity;
}
return await _nonQueryDataService.Create(entity);
}
public async Task<bool> Delete(int id)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
T entity = await context.Set<T>().FirstOrDefaultAsync((e) => e.Id == id);
context.Set<T>().Remove(entity);
await context.SaveChangesAsync();
return true;
}
return await _nonQueryDataService.Delete(id);
}
public async Task<T> Get(int id)
@@ -62,13 +54,7 @@ namespace DaSaSo.EntityFramework.Services
public async Task<T> Update(int id, T entity)
{
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
{
entity.Id = id;
context.Set<T>().Update(entity);
await context.SaveChangesAsync();
return entity;
}
return await _nonQueryDataService.Update(id, entity);
}
}
}