Kamen's proposal in Update() at BaseRepo merged

2 files changed, 6 insertions, 11 deletions

diff --git a/src/DevHive.Data/Interfaces/Repositories/IRepository.cs b/src/DevHive.Data/Interfaces/Repositories/IRepository.cs
index d9f7c7a..0d11cd3 100644
--- a/src/DevHive.Data/Interfaces/Repositories/IRepository.cs
+++ b/src/DevHive.Data/Interfaces/Repositories/IRepository.cs
@@ -13,7 +13,7 @@ namespace DevHive.Data.Repositories.Interfaces
 		Task<TEntity> GetByIdAsync(Guid id);
 
 		//Modify Entity from database
-		Task<bool> EditAsync(TEntity newEntity);
+		Task<bool> EditAsync(Guid id, TEntity newEntity);
 
 		//Delete Entity from database
 		Task<bool> DeleteAsync(TEntity entity);
diff --git a/src/DevHive.Data/Repositories/BaseRepository.cs b/src/DevHive.Data/Repositories/BaseRepository.cs
index dabb35b..0a97ac1 100644
--- a/src/DevHive.Data/Repositories/BaseRepository.cs
+++ b/src/DevHive.Data/Repositories/BaseRepository.cs
@@ -32,18 +32,13 @@ namespace DevHive.Data.Repositories
 				.FindAsync(id);
 		}
 
-		public virtual async Task<bool> EditAsync(TEntity newEntity)
+		public virtual async Task<bool> EditAsync(Guid id, TEntity newEntity)
 		{
-			// Old way(backup)
-			// User user = await this._context.Users
-			// 	.FirstOrDefaultAsync(x => x.Id == entity.Id);
-
-			// this._context.Update(user);
-			// this._context.Entry(entity).CurrentValues.SetValues(entity);
-
+			TEntity currEnt = await this.GetByIdAsync(id);
 			this._context
-				.Set<TEntity>()
-				.Update(newEntity);
+				.Entry(currEnt)
+				.CurrentValues
+				.SetValues(newEntity);
 
 			return await this.SaveChangesAsync(_context);
 		}