Merge pull request #28 from Capstone-C1SE04-TI/FIX-MAIN

fix unfollow

Author: Tare-Vcio

src/controllers/User.js

@@ -219,18 +219,17 @@ function UserController() {
 	this.unfollowSharkWallet = async (req, res, next) => {
 		let { userId, sharkId } = req.body;
 
-		if (!userId) userId = null;
+		if (!userId || _.isEmpty(userId)) userId = null;
 		else {
 			if (isNaN(userId)) userId = undefined;
 			else userId = Number(userId);
 		}
 
-		if (!sharkId) sharkId = null;
+		if (!sharkId || _.isEmpty(sharkId)) sharkId = null;
 		else {
 			if (isNaN(sharkId)) sharkId = undefined;
 			else sharkId = Number(sharkId);
 		}
-
 		await unfollowWalletOfShark(userId, sharkId)
 			.then((data) => {
 				if (data.message === "success")

src/services/crud-database/user.js

@@ -239,8 +239,8 @@ const followWalletOfShark = async (userId, sharkId) => {
 
 const unfollowWalletOfShark = async (userId, sharkId) => {
 	try {
-		if (userId === null) return "userid-required";
-		if (userId === undefined) return "userid-invalid";
+		if (userId === null) return { message: "userid-required"};
+		if (userId === undefined) return { message: "userid-invalid"};
 		if (sharkId === null) return { message: "sharkid-required" };
 		if (sharkId === undefined) return { message: "sharkid-invalid" };
 
@@ -271,7 +271,6 @@ const unfollowWalletOfShark = async (userId, sharkId) => {
 
 		return {
 			message: "success",
-			data: { ...shark, unfollowed: true }
 		};
 	} catch (error) {
 		return { message: "error-unfollow-failed", error: error };
@@ -348,7 +347,7 @@ const getTransactionsOfAllSharks = async (page, valueFilter = 0) => {
 		.sort({ timeStamp: "desc" })
 		.skip((page - 1) * QUERY_LIMIT_ITEM)
 		.limit(QUERY_LIMIT_ITEM);
-
+ 
 	return transactions || [];
 };