From ffc6b7cd6e454627c95044e88037b37d31dcfce3 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Thu, 8 Apr 2021 09:29:49 +0300 Subject: Updated adding and removing friends to work with friend username, instead of friend id (temporary solution?) --- src/Services/DevHive.Services/Interfaces/IFriendsService.cs | 4 ++-- src/Services/DevHive.Services/Services/FriendsService.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Services/DevHive.Services') diff --git a/src/Services/DevHive.Services/Interfaces/IFriendsService.cs b/src/Services/DevHive.Services/Interfaces/IFriendsService.cs index e337793..52f23f3 100644 --- a/src/Services/DevHive.Services/Interfaces/IFriendsService.cs +++ b/src/Services/DevHive.Services/Interfaces/IFriendsService.cs @@ -5,7 +5,7 @@ namespace DevHive.Services.Interfaces { public interface IFriendsService { - Task AddFriend(Guid userId, Guid friendId); - Task RemoveFriend(Guid userId, Guid friendId); + Task AddFriend(Guid userId, string friendUsername); + Task RemoveFriend(Guid userId, string friendUsername); } } diff --git a/src/Services/DevHive.Services/Services/FriendsService.cs b/src/Services/DevHive.Services/Services/FriendsService.cs index 4e3e355..98f654b 100644 --- a/src/Services/DevHive.Services/Services/FriendsService.cs +++ b/src/Services/DevHive.Services/Services/FriendsService.cs @@ -16,29 +16,29 @@ namespace DevHive.Services.Services this._friendRepository = friendRepository; } - public async Task AddFriend(Guid userId, Guid friendId) + public async Task AddFriend(Guid userId, string friendUsername) { User user = await this._friendRepository.GetByIdAsync(userId) ?? throw new ArgumentNullException(string.Format(ErrorMessages.DoesNotExist, nameof(user))); - User friend = await this._friendRepository.GetByIdAsync(friendId) ?? + User friend = await this._friendRepository.GetByUsernameAsync(friendUsername) ?? throw new ArgumentNullException(string.Format(ErrorMessages.DoesNotExist, nameof(friend))); bool addedToUser = user.Friends.Add(friend) && await this._friendRepository.EditAsync(userId, user); - bool addedToFriend = friend.Friends.Add(user) && await this._friendRepository.EditAsync(friendId, friend); + bool addedToFriend = friend.Friends.Add(user) && await this._friendRepository.EditAsync(friend.Id, friend); return addedToUser && addedToFriend; } - public async Task RemoveFriend(Guid userId, Guid friendId) + public async Task RemoveFriend(Guid userId, string friendUsername) { User user = await this._friendRepository.GetByIdAsync(userId) ?? throw new ArgumentNullException(string.Format(ErrorMessages.DoesNotExist, nameof(user))); - User friend = await this._friendRepository.GetByIdAsync(friendId) ?? + User friend = await this._friendRepository.GetByUsernameAsync(friendUsername) ?? throw new ArgumentNullException(string.Format(ErrorMessages.DoesNotExist, nameof(friend))); bool addedToUser = user.Friends.Remove(friend) && await this._friendRepository.EditAsync(userId, user); - bool addedToFriend = friend.Friends.Remove(user) && await this._friendRepository.EditAsync(friendId, friend); + bool addedToFriend = friend.Friends.Remove(user) && await this._friendRepository.EditAsync(friend.Id, friend); return addedToUser && addedToFriend; } } -- cgit v1.2.3