Skip to content

Commit

Permalink
Merge pull request #246 from bounswe/backend/feature/242-format-respo…
Browse files Browse the repository at this point in the history 
…nse-for-/follow-/unfollow

Format response for /follow /unfollow  endpoints (isFollowing field)
  • Loading branch information
@EnesBaserr
EnesBaserr authored May 15, 2024
2 parents eab4b9e + 072ea1c commit 2c047ae
Show file tree
Hide file tree
Showing 5 changed files with 143 additions and 38 deletions.
43 changes: 34 additions & 9 deletions backend/src/main/java/com/group1/cuisines/controllers/SearchController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;

@RestController
Expand All @@ -30,20 +32,43 @@ public class SearchController {

@GetMapping("/users")
public ResponseEntity<?> searchUsers(@RequestParam(required = false) String q) {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
Integer currentUserId = null;
if (authentication != null && authentication.isAuthenticated() && !authentication.getPrincipal().equals("anonymousUser")) {
currentUserId = ((User) authentication.getPrincipal()).getId();
}
else{
currentUserId = null;
}
List<User> users = userService.searchUsers(q);
if (users.isEmpty()) {
// Return a custom message with a "No Content" status when no users are found
return ResponseEntity.ok(new ErrorResponse(204,"No users found"));
}
return ResponseEntity.ok(new SuccessResponse<>(200, users.stream().map(user -> new UserDto(
user.getId(),
user.getUsername(),
user.getFirstName(),
user.getLastName(),
user.getFollowerCount(),
user.getFollowingCount(),
user.getRecipeCount()
)).collect(Collectors.toList()), "Users fetched successfully"));
Integer finalCurrentUserId = currentUserId;
List<UserDto> userDtos = users.stream().map(user -> {
Integer currentId = finalCurrentUserId;
boolean isSelf = user.getId().equals(currentId); // Check if the current user is the same as the user in the list
boolean isFollowing = false;
if (currentId != null && !isSelf) {
isFollowing = userService.isFollowing(currentId, user.getId()); // Checking following status
}
return new UserDto(
user.getId(),
user.getUsername(),
user.getFirstName(),
user.getLastName(),
isFollowing,
user.getFollowerCount(),
user.getFollowingCount(),
user.getRecipeCount()


);
}).collect(Collectors.toList());

return ResponseEntity.ok(new SuccessResponse<>(200, userDtos, "Users fetched successfully"));


}

Expand Down
96 changes: 70 additions & 26 deletions backend/src/main/java/com/group1/cuisines/controllers/UserController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.group1.cuisines.entities.User;
import com.group1.cuisines.repositories.UserRepository;
import com.group1.cuisines.services.UserService;
import com.sun.security.auth.UserPrincipal;
import jakarta.persistence.EntityNotFoundException;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
Expand Down Expand Up @@ -56,10 +57,44 @@ public ResponseEntity<?> getUserDetails(@AuthenticationPrincipal UserDetails use
}

return ResponseEntity.status(HttpStatus.FORBIDDEN).body("User not authenticated");

}
@DeleteMapping("/{userId}/unfollow")
public ResponseEntity<?> unfollowUser(@PathVariable Integer userId) {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if(authentication.getPrincipal()=="anonymousUser"){
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse(401,"Authentication required") );
}

String username = authentication.getName();
Integer followerId = userRepository.findUserIdByUsername(username);



if (followerId == null || userId == null) {
return ResponseEntity.ok(new ErrorResponse(204,"Invalid user data"));
}
if (userId.equals(followerId)) {
return ResponseEntity.badRequest().body(new ErrorResponse(400, "Cannot unfollow yourself"));
}

boolean result = userService.unfollowUser(userId, followerId);
if (!result) {

return ResponseEntity.ok(new ErrorResponse(209,"Follow relationship does not exist"));
}

UserProfileDto followedUserDto = userService.getUserProfileDtoById(userId);

if (followedUserDto == null) {
return ResponseEntity.ok(new ErrorResponse(404, "User not found"));
}
followedUserDto.setSelfFollowing(false);
return ResponseEntity.ok(new SuccessResponse<>(200,followedUserDto,"Unfollowed successfully"));
}

@PostMapping("/follow")
public ResponseEntity<?> followUser(@RequestBody Map<String, Integer> requestBody) {
@PostMapping("/{userId}/follow")
public ResponseEntity<?> followUser(@PathVariable Integer userId) {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if(authentication.getPrincipal()=="anonymousUser"){
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse(401,"Authentication required") );
Expand All @@ -69,21 +104,29 @@ public ResponseEntity<?> followUser(@RequestBody Map<String, Integer> requestBod
String username = authentication.getName();

Integer followerId = userRepository.findUserIdByUsername(username);
Integer userId = requestBody.get("userId");



if (followerId == null || userId == null) {

return ResponseEntity.ok(new ErrorResponse(204,"Invalid user data"));
}
if (userId.equals(followerId)) {
return ResponseEntity.badRequest().body(new ErrorResponse(400, "Cannot follow yourself"));
}

boolean result = userService.followUser(userId, followerId);
if (!result) {

return ResponseEntity.ok(new ErrorResponse(209,"Already following"));
}
UserProfileDto followedUserDto = userService.getUserProfileDtoById(userId);
if (followedUserDto == null) {
return ResponseEntity.ok(new ErrorResponse(404, "User not found"));
}
followedUserDto.setSelfFollowing(true);

return ResponseEntity.ok(new SuccessResponse<>(200,null,"Followed successfully"));
return ResponseEntity.ok(new SuccessResponse<>(200,followedUserDto,"Followed successfully"));
}
@GetMapping("/{userId}/following")
public ResponseEntity<?> getUserFollowing(@PathVariable Integer userId) {
Expand All @@ -95,17 +138,27 @@ public ResponseEntity<?> getUserFollowing(@PathVariable Integer userId) {
if(userRepository.findById(userId).isEmpty()){
return ResponseEntity.ok(new ErrorResponse(204,"User not found") );
}
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
Integer currentUserId = null;
if (authentication.getPrincipal()!="anonymousUser" && authentication != null && authentication.isAuthenticated()) {
currentUserId = ((User) authentication.getPrincipal()).getId();
}
else{
currentUserId=null;
}

Set<User> following = userService.getUserFollowing(userId);
if (following.isEmpty()) {
return ResponseEntity.ok(new ErrorResponse(204,"User is not following anyone"));
} else {
Integer finalCurrentUserId = currentUserId;
Set<UserDto> followingDto = following.stream()
.map(user -> UserDto.builder()
.id(user.getId())
.username(user.getUsername())
.firstName(user.getFirstName())
.lastName(user.getLastName())
.selfFollowing(userService.isFollowing(finalCurrentUserId, user.getId()))
.followerCount(user.getFollowerCount())
.followingCount(user.getFollowingCount())
.recipeCount(user.getRecipeCount())
Expand All @@ -124,16 +177,29 @@ public ResponseEntity<?> getUserFollowers(@PathVariable Integer userId) {
if(userRepository.findById(userId).isEmpty()){
return ResponseEntity.ok(new ErrorResponse(204,"User not found") );
}
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
Integer currentUserId = null;
if (authentication.getPrincipal()!="anonymousUser" && authentication != null && authentication.isAuthenticated()) {
currentUserId = ((User) authentication.getPrincipal()).getId();
}
else{
currentUserId=null;
}



Set<User> followers = userService.getUserFollower(userId);
if (followers.isEmpty()) {
return ResponseEntity.ok(new ErrorResponse(204,"User is not followed by anyone"));
} else {
Integer finalCurrentUserId = currentUserId;
Set<UserDto> followingDto = followers.stream()
.map(user -> UserDto.builder()
.id(user.getId())
.username(user.getUsername())
.firstName(user.getFirstName())
.lastName(user.getLastName())
.selfFollowing(userService.isFollowing(finalCurrentUserId, user.getId()))
.followerCount(user.getFollowerCount())
.followingCount(user.getFollowingCount())
.recipeCount(user.getRecipeCount())
Expand All @@ -142,28 +208,6 @@ public ResponseEntity<?> getUserFollowers(@PathVariable Integer userId) {
return ResponseEntity.ok(new SuccessResponse<>(200,followingDto, "User followers fetched successfully"));
}
}
@PostMapping("/unfollow")
public ResponseEntity<?> unfollowUser(@RequestBody Map<String, Integer> requestBody) {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if(authentication.getPrincipal()=="anonymousUser"){
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse(401,"Authentication required") );
}

String username = authentication.getName();
Integer followerId = userRepository.findUserIdByUsername(username);
Integer userId = requestBody.get("userId");


if (followerId == null || userId == null) {
return ResponseEntity.ok(new ErrorResponse(204,"Invalid user data"));
}

boolean result = userService.unfollowUser(userId, followerId);
if (!result) {

return ResponseEntity.ok(new ErrorResponse(209,"Follow relationship does not exist"));
}
return ResponseEntity.ok(new SuccessResponse<>(200,null,"Unfollowed successfully"));
}

}
1 change: 1 addition & 0 deletions backend/src/main/java/com/group1/cuisines/dto/UserDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class UserDto {
private String username;
private String firstName;
private String lastName;
private boolean selfFollowing;
private int followerCount;
private int followingCount;
private int recipeCount;
Expand Down
1 change: 1 addition & 0 deletions backend/src/main/java/com/group1/cuisines/dto/UserProfileDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class UserProfileDto {
private String username;
private String name;
private String bio;
private boolean selfFollowing;
private Integer followersCount;
private Integer followingCount;
//private String gender;
Expand Down
40 changes: 37 additions & 3 deletions backend/src/main/java/com/group1/cuisines/services/UserService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ public boolean followUser(Integer userId, Integer followerId) {
}
return false;
}
public boolean isFollowing(Integer followerId, Integer followedId) {
if (followerId == null || followedId == null) {
return false;
}
User follower = userRepository.findById(followerId).orElse(null);
User followed = userRepository.findById(followedId).orElse(null);
if (follower != null && followed != null) {
return follower.getFollowing().contains(followed);
}
return false;
}
public Set<User> getUserFollowing(Integer userId) {
User user = userRepository.findById(userId).orElse(null);
if (user != null) {
Expand Down Expand Up @@ -117,6 +128,7 @@ public Set<User> getUserFollower(Integer userId) {
public UserProfileDto getUserProfileById(Integer userId, String currentUsername) {
User user = userRepository.findById(userId)
.orElseThrow(() -> new EntityNotFoundException("User not found"));
Integer currentUserId = userRepository.findUserIdByUsername(currentUsername);

boolean isSelf = user.getUsername().equals(currentUsername);

Expand All @@ -125,6 +137,7 @@ public UserProfileDto getUserProfileById(Integer userId, String currentUsername)
profile.setUsername(user.getUsername());
profile.setName(user.getFirstName() + " " + user.getLastName());
profile.setBio(user.getBio());
profile.setSelfFollowing(isFollowing(currentUserId, userId));
profile.setFollowersCount(user.getFollowers().size());
profile.setFollowingCount(user.getFollowing().size());
profile.setRecipeCount(user.getRecipes().size());
Expand Down Expand Up @@ -167,8 +180,8 @@ else if(recipe.getDish() != null && recipe.getDish().getCuisines().isEmpty()){
cuisineDto,
new DishDto(recipe.getDish().getId(), recipe.getDish().getName(), recipe.getDish().getImage()),
recipe.getAverageRating(),
new AuthorDto(recipe.getUser().getId(), recipe.getUser().getUsername(), recipe.getUser().getFirstName(),
recipe.getUser().getFollowingCount(), recipe.getUser().getFollowerCount(),recipe.getUser().getRecipeCount())
new AuthorDto(recipe.getUser().getId(), recipe.getUser().getUsername(), recipe.getUser().getFirstName()+ " " + recipe.getUser().getLastName() ,
recipe.getUser().getFollowerCount(), recipe.getUser().getFollowingCount(),recipe.getUser().getRecipeCount())
);
}

Expand Down Expand Up @@ -200,7 +213,28 @@ else if(recipe.getDish() != null && recipe.getDish().getCuisines().isEmpty()){
new DishDto(recipe.getDish().getId(), recipe.getDish().getName(), recipe.getDish().getImage()),
recipe.getAverageRating(),
new AuthorDto(recipe.getUser().getId(), recipe.getUser().getUsername(), recipe.getUser().getFirstName(),
recipe.getUser().getFollowingCount(), recipe.getUser().getFollowerCount(),recipe.getUser().getRecipeCount())
recipe.getUser().getFollowerCount(), recipe.getUser().getFollowingCount(),recipe.getUser().getRecipeCount())
);
}

public UserProfileDto getUserProfileDtoById(Integer userId) {
User user = userRepository.findById(userId).orElse(null);
if (user == null) {
return null;
}
// Map the User entity to UserProfileDto, possibly using ModelMapper or manual mapping
UserProfileDto profile = new UserProfileDto();
profile.setId(user.getId());
profile.setUsername(user.getUsername());
profile.setName(user.getFirstName() + " " + user.getLastName());
profile.setBio(user.getBio());

profile.setFollowersCount(user.getFollowers().size());
profile.setFollowingCount(user.getFollowing().size());
profile.setRecipeCount(user.getRecipes().size());
profile.setRecipes(user.getRecipes().stream()
.map(this::convertToRecipeDetailsDto)
.collect(Collectors.toList()));
return profile;
}
}

0 comments on commit 2c047ae

Please sign in to comment.