fix

MyOffice.Data.Repositories/RepositoryBase.cs

@@ -5,6 +5,7 @@ using DbContext;
 
 public class RepositoryBase<TEntity> where TEntity : class
 {
+	//TODO: Rename
 	protected readonly AppDbContext _context;
 
 	protected RepositoryBase(
@@ -49,41 +50,37 @@ public class RepositoryBase<TEntity> where TEntity : class
 		return _context.Set<TEntity>().Find(id);
 	}
 
-	protected async Task<int> AddBaseAsync(TEntity entity)
-	{
-		//await _context.Set<TEntity>().AddAsync(entity);
-		await _context.AddAsync(entity);
-		return await SaveChangesAsync();
-	}
-
 	protected int AddBase(TEntity entity)
 	{
-		//_context.Set<TEntity>().Add(entity);
-		_context.Add(entity);
-		return SaveChanges();
+		//_context.Add(entity);
+		_context.Entry(entity).State = EntityState.Added;
+
+		var result = SaveChanges();
+
+		_context.Entry(entity).State = EntityState.Detached;
+		return result;
 	}
 
 	protected int RemoveBase(TEntity entity)
 	{
 		_context.Set<TEntity>().Remove(entity);
+		
 		_context.Entry(entity).State = EntityState.Deleted;
 
-		return SaveChanges();
-	}
+		var result = SaveChanges();
 
-	protected async Task<int> UpdateBaseAsync(TEntity entity)
-	{
-		_context.Attach(entity);
-		_context.Entry(entity).State = EntityState.Modified;
-
-		return await SaveChangesAsync();
+		_context.Entry(entity).State = EntityState.Detached;
+		return result;
 	}
 
 	protected int UpdateBase(TEntity entity)
 	{
-		_context.Attach(entity);
+		//_context.Attach(entity);
 		_context.Entry(entity).State = EntityState.Modified;
 
-		return SaveChanges();
+		var result = SaveChanges();
+
+		_context.Entry(entity).State = EntityState.Detached;
+		return result;
 	}
 }