6 files changed, 25 insertions, 51 deletions
diff --git a/src/DevHive.Data/DevHiveContext.cs b/src/DevHive.Data/DevHiveContext.cs
index e8eb5fb..39d39d3 100644
--- a/src/DevHive.Data/DevHiveContext.cs
+++ b/src/DevHive.Data/DevHiveContext.cs
@@ -7,7 +7,7 @@ namespace DevHive.Data
 {
 	public class DevHiveContext : IdentityDbContext<User, Role, Guid>
 	{
-		public DevHiveContext(DbContextOptions options)
+		public DevHiveContext(DbContextOptions<DevHiveContext> options)
 			: base(options) { }
 
 		public DbSet<Technology> Technologies { get; set; }
@@ -25,10 +25,6 @@ namespace DevHive.Data
 			builder.Entity<User>()
 				.HasMany(x => x.Friends);
 
-			builder.Entity<Role>()
-				.HasIndex(x => x.Id)
-				.IsUnique();
-
 			base.OnModelCreating(builder);
 		}
 	}
diff --git a/src/DevHive.Data/Repositories/FriendsRepository.cs b/src/DevHive.Data/Repositories/FriendsRepository.cs
deleted file mode 100644
index c65ba5e..0000000
--- a/src/DevHive.Data/Repositories/FriendsRepository.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DevHive.Common.Models.Data;
-using DevHive.Data.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace DevHive.Data.Repositories
-{
-	public class FriendsRepository : UserRepository
-	{
-		private readonly DbContext _context;
-
-		public FriendsRepository(DbContext context) 
-			: base(context)
-		{
-			this._context = context;
-		}
-	
-		//Create
-		public async Task<bool> AddFriendAsync(User user, User friend)
-		{
-			this._context.Update(user);
-			user.Friends.Add(friend);
-
-			return await RepositoryMethods.SaveChangesAsync(this._context);
-		}
-
-		//Delete
-		public async Task<bool> RemoveFriendAsync(User user, User friend)
-		{
-			this._context.Update(user);
-			user.Friends.Remove(friend);
-
-			return await RepositoryMethods.SaveChangesAsync(this._context);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/src/DevHive.Data/Repositories/LanguageRepository.cs b/src/DevHive.Data/Repositories/LanguageRepository.cs
index a33bd5b..6e3a2e3 100644
--- a/src/DevHive.Data/Repositories/LanguageRepository.cs
+++ b/src/DevHive.Data/Repositories/LanguageRepository.cs
@@ -9,9 +9,9 @@ namespace DevHive.Data.Repositories
 {
 	public class LanguageRepository : IRepository<Language>
 	{
-		private readonly DbContext _context;
+		private readonly DevHiveContext _context;
 
-		public LanguageRepository(DbContext context)
+		public LanguageRepository(DevHiveContext context)
 		{
 			this._context = context;
 		}
diff --git a/src/DevHive.Data/Repositories/RoleRepository.cs b/src/DevHive.Data/Repositories/RoleRepository.cs
index 21c29db..1d6f2da 100644
--- a/src/DevHive.Data/Repositories/RoleRepository.cs
+++ b/src/DevHive.Data/Repositories/RoleRepository.cs
@@ -9,9 +9,9 @@ namespace DevHive.Data.Repositories
 {
 	public class RoleRepository : IRepository<Role>
 	{
-		private readonly DbContext _context;
+		private readonly DevHiveContext _context;
 
-		public RoleRepository(DbContext context)
+		public RoleRepository(DevHiveContext context)
 		{
 			this._context = context;
 		}
diff --git a/src/DevHive.Data/Repositories/TechnologyRepository.cs b/src/DevHive.Data/Repositories/TechnologyRepository.cs
index debfd3e..e2e4257 100644
--- a/src/DevHive.Data/Repositories/TechnologyRepository.cs
+++ b/src/DevHive.Data/Repositories/TechnologyRepository.cs
@@ -9,9 +9,9 @@ namespace DevHive.Data.Repositories
 {
 	public class TechnologyRepository : IRepository<Technology>
 	{
-		private readonly DbContext _context;
+		private readonly DevHiveContext _context;
 
-		public TechnologyRepository(DbContext context)
+		public TechnologyRepository(DevHiveContext context)
 		{
 			this._context = context;
 		}
diff --git a/src/DevHive.Data/Repositories/UserRepository.cs b/src/DevHive.Data/Repositories/UserRepository.cs
index 5cd4264..d2a8830 100644
--- a/src/DevHive.Data/Repositories/UserRepository.cs
+++ b/src/DevHive.Data/Repositories/UserRepository.cs
@@ -11,9 +11,9 @@ namespace DevHive.Data.Repositories
 {
 	public class UserRepository : IRepository<User>
 	{
-		private readonly DbContext _context;
+		private readonly DevHiveContext _context;
 
-		public UserRepository(DbContext context)
+		public UserRepository(DevHiveContext context)
 		{
 			this._context = context;
 		}
@@ -27,6 +27,14 @@ namespace DevHive.Data.Repositories
 
 			return await RepositoryMethods.SaveChangesAsync(this._context);
 		}
+
+		public async Task<bool> AddFriendAsync(User user, User friend)
+		{
+			this._context.Update(user);
+			user.Friends.Add(friend);
+
+			return await RepositoryMethods.SaveChangesAsync(this._context);
+		}
 		
 		//Read
 		public IEnumerable<User> QueryAll()
@@ -77,6 +85,14 @@ namespace DevHive.Data.Repositories
 
 			return await RepositoryMethods.SaveChangesAsync(this._context);
 		}
+
+		public async Task<bool> RemoveFriendAsync(User user, User friend)
+		{
+			this._context.Update(user);
+			user.Friends.Remove(friend);
+
+			return await RepositoryMethods.SaveChangesAsync(this._context);
+		}
 	
 		//Validations
 		public bool DoesUserExist(Guid id)