Merge branch 'refactor_user_updating' into dev

5 files changed, 14 insertions, 23 deletions

diff --git a/src/DevHive.Services/Interfaces/ILanguageService.cs b/src/DevHive.Services/Interfaces/ILanguageService.cs
index eb45a8d..0df9a95 100644
--- a/src/DevHive.Services/Interfaces/ILanguageService.cs
+++ b/src/DevHive.Services/Interfaces/ILanguageService.cs
@@ -6,12 +6,12 @@ namespace DevHive.Services.Interfaces
 {
 	public interface ILanguageService
 	{
-		Task<bool> CreateLanguage(CreateLanguageServiceModel createLanguageServiceModel);
+		Task<Guid> CreateLanguage(CreateLanguageServiceModel createLanguageServiceModel);
 
-		Task<LanguageServiceModel> GetLanguageById(Guid languageId);
+		Task<ReadLanguageServiceModel> GetLanguageById(Guid id);
 
-		Task<bool> UpdateLanguage(Guid languageId, UpdateLanguageServiceModel languageServiceModel);
+		Task<bool> UpdateLanguage(UpdateLanguageServiceModel languageServiceModel);
 
-		Task<bool> DeleteLanguage(Guid languageId);
+		Task<bool> DeleteLanguage(Guid id);
 	}
 }
diff --git a/src/DevHive.Services/Interfaces/IPostService.cs b/src/DevHive.Services/Interfaces/IPostService.cs
index dd886b4..4364c67 100644
--- a/src/DevHive.Services/Interfaces/IPostService.cs
+++ b/src/DevHive.Services/Interfaces/IPostService.cs
@@ -7,8 +7,8 @@ namespace DevHive.Services.Interfaces
 {
 	public interface IPostService
 	{
-		Task<bool> CreatePost(CreatePostServiceModel postServiceModel);
-		Task<bool> AddComment(CreateCommentServiceModel commentServiceModel);
+		Task<Guid> CreatePost(CreatePostServiceModel postServiceModel);
+		Task<Guid> AddComment(CreateCommentServiceModel commentServiceModel);
 
 		Task<CommentServiceModel> GetCommentById(Guid id);
 		Task<PostServiceModel> GetPostById(Guid id);
diff --git a/src/DevHive.Services/Interfaces/IRoleService.cs b/src/DevHive.Services/Interfaces/IRoleService.cs
index 2c7195c..fd661be 100644
--- a/src/DevHive.Services/Interfaces/IRoleService.cs
+++ b/src/DevHive.Services/Interfaces/IRoleService.cs
@@ -1,16 +1,16 @@
 using System;
 using System.Threading.Tasks;
-using DevHive.Common.Models.Identity;
+using DevHive.Services.Models.Identity.Role;
 
 namespace DevHive.Services.Interfaces
 {
-	public interface IRoleService
+    public interface IRoleService
 	{
-		Task<bool> CreateRole(RoleModel roleServiceModel);
+		Task<Guid> CreateRole(RoleServiceModel roleServiceModel);
 
-		Task<RoleModel> GetRoleById(Guid id);
+		Task<RoleServiceModel> GetRoleById(Guid id);
 
-		Task<bool> UpdateRole(RoleModel roleServiceModel);
+		Task<bool> UpdateRole(UpdateRoleServiceModel roleServiceModel);
 
 		Task<bool> DeleteRole(Guid id);
 	}
diff --git a/src/DevHive.Services/Interfaces/ITechnologyService.cs b/src/DevHive.Services/Interfaces/ITechnologyService.cs
index 0797078..9c5661d 100644
--- a/src/DevHive.Services/Interfaces/ITechnologyService.cs
+++ b/src/DevHive.Services/Interfaces/ITechnologyService.cs
@@ -6,11 +6,11 @@ namespace DevHive.Services.Interfaces
 {
 	public interface ITechnologyService
 	{
-		Task<bool> Create(CreateTechnologyServiceModel technologyServiceModel);
+		Task<Guid> Create(CreateTechnologyServiceModel technologyServiceModel);
 
 		Task<CreateTechnologyServiceModel> GetTechnologyById(Guid id);
 
-		Task<bool> UpdateTechnology(Guid technologyId, UpdateTechnologyServiceModel updateTechnologyServiceModel);
+		Task<bool> UpdateTechnology(UpdateTechnologyServiceModel updateTechnologyServiceModel);
 
 		Task<bool> DeleteTechnology(Guid id);
 	}
diff --git a/src/DevHive.Services/Interfaces/IUserService.cs b/src/DevHive.Services/Interfaces/IUserService.cs
index 5ef141f..51e3cf9 100644
--- a/src/DevHive.Services/Interfaces/IUserService.cs
+++ b/src/DevHive.Services/Interfaces/IUserService.cs
@@ -2,8 +2,6 @@ using System;
 using System.Threading.Tasks;
 using DevHive.Common.Models.Identity;
 using DevHive.Services.Models.Identity.User;
-using DevHive.Services.Models.Language;
-using DevHive.Services.Models.Technology;
 
 namespace DevHive.Services.Interfaces
 {
@@ -12,19 +10,12 @@ namespace DevHive.Services.Interfaces
 		Task<TokenModel> LoginUser(LoginServiceModel loginModel);
 		Task<TokenModel> RegisterUser(RegisterServiceModel registerModel);
 
-		Task<bool> AddFriend(Guid userId, Guid friendId);
-		Task<bool> AddLanguageToUser(Guid userId, LanguageServiceModel languageServiceModel);
-		Task<bool> AddTechnologyToUser(Guid userId, TechnologyServiceModel technologyServiceModel);
-
-		Task<UserServiceModel> GetFriendById(Guid friendId);
+		Task<UserServiceModel> GetUserByUsername(string username);
 		Task<UserServiceModel> GetUserById(Guid id);
 
 		Task<UserServiceModel> UpdateUser(UpdateUserServiceModel updateModel);
 
 		Task DeleteUser(Guid id);
-		Task<bool> RemoveFriend(Guid userId, Guid friendId);
-		Task<bool> RemoveLanguageFromUser(Guid userId, LanguageServiceModel languageServiceModel);
-		Task<bool> RemoveTechnologyFromUser(Guid userId, TechnologyServiceModel technologyServiceModel);
 
 		Task<bool> ValidJWT(Guid id, string rawTokenData);
 	}