From bb2f1e79eed0c2bc247f6a644dea3e6db95c4ac6 Mon Sep 17 00:00:00 2001
From: Husain <husain.saify.met21@itbhu.ac.in>
Date: Fri, 14 Mar 2025 22:28:35 +0530
Subject: [PATCH] Follow/Unfollow fixed

---
 .../Controllers/AccountController.cs          | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Analysim.Web/Controllers/AccountController.cs b/src/Analysim.Web/Controllers/AccountController.cs
index 6a284c8..3e90da1 100644
--- a/src/Analysim.Web/Controllers/AccountController.cs
+++ b/src/Analysim.Web/Controllers/AccountController.cs
@@ -220,21 +220,17 @@ public async Task<IActionResult> Follow([FromForm] AccountFollowVM formdata)
         {
             var username = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
             var user = await _dbContext.Users.SingleOrDefaultAsync(u => u.UserName == username);
-            if (user == null) return NotFound(new { message = "User Not Found" });
-
-            // Find User
-            //var user = await _dbContext.Users.FindAsync(formdata.UserID);
-            //if (user == null) return NotFound(new { message = "User Not Found " + formdata.UserID });
+            if (user == null) return NotFound(new { message = "Current user not Found" });
 
-            // Find Follower
-            var follower = await _dbContext.Users.FindAsync(formdata.FollowerID);
-            if (follower == null) return NotFound(new { message = "User Not Found " + formdata.UserID });
+            // Find User to follow
+            var userToFollow = await _dbContext.Users.FindAsync(formdata.UserID);
+            if (userToFollow == null) return NotFound(new { message = "User to follow not Found" });
 
             // Create Many To Many Connection
             var userFollower = new UserUser
             {
-                UserID = user.Id,
-                FollowerID = formdata.FollowerID
+                UserID = userToFollow.Id,
+                FollowerID = user.Id
             };
 
             // Add To Database
@@ -246,7 +242,7 @@ public async Task<IActionResult> Follow([FromForm] AccountFollowVM formdata)
             return Ok(new
             {
                 result = userFollower,
-                message = follower.UserName + " is now following " + user.UserName
+                message = user.UserName + " is now following " + userToFollow.UserName
             });
         }
 
@@ -845,18 +841,14 @@ public async Task<IActionResult> Unfollow([FromRoute] int userID, [FromRoute] in
         {
             var username = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
             var user = await _dbContext.Users.SingleOrDefaultAsync(u => u.UserName == username);
-            if (user == null) return NotFound(new { message = "User Not Found" });
-
-            // Find User
-            //var user = await _dbContext.Users.FindAsync(userID);
-            //if (user == null) return NotFound(new { message = "User Not Found" });
+            if (user == null) return NotFound(new { message = "Current user not found" });
 
-            // Find Follower
-            var follower = await _dbContext.Users.FindAsync(followerID);
-            if (follower == null) return NotFound(new { message = "Follower Not Found" });
+            // Find UsertoFollow
+            var userToFollow = await _dbContext.Users.FindAsync(userID);
+            if (userToFollow == null) return NotFound(new { message = "User to follow not found" });
 
             // Find Many To Many
-            var userFollower = await _dbContext.UserUsers.FindAsync(user.Id, follower.Id);
+            var userFollower = await _dbContext.UserUsers.FindAsync(userToFollow.Id, user.Id);
             if (userFollower == null) return NotFound(new { message = "User Follower Connection Not FOund" });
 
             // Remove Project
@@ -868,7 +860,7 @@ public async Task<IActionResult> Unfollow([FromRoute] int userID, [FromRoute] in
             return Ok(new
             {
                 result = userFollower,
-                message = follower.UserName + " has unfollow " + user.UserName
+                message = user.UserName + " has unfollow " + userToFollow.UserName
             });
         }
         #endregion