Merge pull request #224 from bounswe/backend/feature/223-format-/user…

…s/userId/following-response Format GET /users/{userId}/following response
bounswe · May 14, 2024 · feec97f · feec97f
2 parents 72e577f + 3646bf7
commit feec97f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/backend/src/main/java/com/group1/cuisines/controllers/UserController.java b/backend/src/main/java/com/group1/cuisines/controllers/UserController.java
@@ -84,12 +84,16 @@ public ResponseEntity<?> followUser(@PathVariable Integer userId) {
     public ResponseEntity<?> getUserFollowing(@PathVariable Integer userId) {
         // Validate the provided user ID
         if (userId == null) {
-            return ResponseEntity.badRequest().body("Invalid user ID provided");
+
+            return ResponseEntity.ok(new ErrorResponse(204,"Invalid user ID provided")  );
+        }
+        if(userRepository.findById(userId).isEmpty()){
+            return ResponseEntity.ok(new ErrorResponse(204,"User not found")  );
         }
 
         Set<User> following = userService.getUserFollowing(userId);
         if (following.isEmpty()) {
-            return ResponseEntity.ok().body("User is not following anyone");
+            return ResponseEntity.ok(new ErrorResponse(204,"User is not following anyone"));
         } else {
             Set<UserDto> followingDto = following.stream()
                     .map(user -> UserDto.builder()
@@ -102,7 +106,7 @@ public ResponseEntity<?> getUserFollowing(@PathVariable Integer userId) {
                             .recipeCount(user.getRecipeCount())
                             .build())
                     .collect(Collectors.toSet());
-            return ResponseEntity.ok().body(followingDto);
+            return ResponseEntity.ok(new SuccessResponse<>(200,followingDto, "User following fetched successfully"));
         }
     }
     @GetMapping("/{userId}/followers")