Fix delete friend response
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/pr Build is failing Details

pull/15/head
avalin 11 months ago
parent 680b1c2cb1
commit 95dcaf6098

@ -53,8 +53,10 @@ class PostgresFriendDataSource(private val database: Database) : FriendDataSourc
override fun deleteFriend(senderId: String, receiverId: String): Boolean {
database.friends.removeIf { (it.sender eq receiverId) and (it.receiver eq senderId) }
return database.friends.removeIf { (it.sender eq senderId) and (it.receiver eq receiverId) } > 0
val result = database.friends.removeIf { (it.sender eq receiverId) and (it.receiver eq senderId) } +
database.friends.removeIf { (it.sender eq senderId) and (it.receiver eq receiverId) }
return result > 0
}
override fun isFriend(firstUser: String, secondUser: String) =

@ -154,12 +154,10 @@ fun Application.friendRouter() {
if (user == null || userFriend == null) {
call.respond(HttpStatusCode.Conflict, ApiMessage.USER_NOT_FOUND)
} else {
val friendlist = friendDataSource.getFriendFromUserId(user.id)
if (!friendlist.map { it.id }.contains(userFriend.id)) {
call.respond(HttpStatusCode.Conflict, ApiMessage.FRIENDS_DOESNT_EXISTS)
} else {
friendDataSource.deleteFriend(user.id, userFriend.id)
if (friendDataSource.deleteFriend(user.id, userFriend.id)) {
call.respond(HttpStatusCode.Created, usernameFriend)
} else {
call.respond(HttpStatusCode.Conflict, ApiMessage.FRIENDS_DOESNT_EXISTS)
}
}
}

Loading…
Cancel
Save