Merge pull request #685 from bounswe/627-backend-get-usersuserid-shou…

…ld-return-answer-questions-for-that-user 627 [BACKEND] GET users/{userid} should return answers, questions, and followed tags for that user
bounswe · Dec 16, 2024 · d20138e · d20138e
2 parents 4cae533 + be4aff2
commit d20138e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Controllers/UserController.java b/backend/src/main/java/com/group1/programminglanguagesforum/Controllers/UserController.java
@@ -42,16 +42,14 @@ public ResponseEntity<GenericApiResponse<SelfProfileResponseDto>> getUser() {
                         List<QuestionSummaryDto> questions = questionService.findByAuthorId(user.getId());
                         List<GetAnswerDtoForProfile> answers = answerService.findByAnsweredBy(user.getId());
                         selfProfileResponseDto.setFollowedTags(
-                                tagService.getFollowedTags(user.getId())
-                        );
+                                        tagService.getFollowedTags(user.getId()));
                         selfProfileResponseDto.setReputationPoints(userService.calculateReputation(user));
                         selfProfileResponseDto.setQuestionCount((long) questions.size());
                         selfProfileResponseDto.setQuestions(
-                                questions);
+                                        questions);
                         selfProfileResponseDto.setAnswerCount((long) answers.size());
                         selfProfileResponseDto.setAnswers(
-                                answers);
-
+                                        answers);
 
                         GenericApiResponse<SelfProfileResponseDto> response = ApiResponseBuilder.buildSuccessResponse(
                                         selfProfileResponseDto.getClass(),
@@ -84,10 +82,13 @@ public ResponseEntity<GenericApiResponse<UserProfileResponseDto>> getUserById(
                                         UserProfileResponseDto.class);
                         userProfileResponseDto.setReputationPoints(userService.calculateReputation(user.get()));
                         userProfileResponseDto.setSelfFollowing(userService.selfFollowing(user.get()));
-                        userProfileResponseDto.setFollowedTags(
-                                tagService.getFollowedTags(user.get().getId())
-                        );
-
+                        List<QuestionSummaryDto> questions = questionService.findByAuthorId(id);
+                        userProfileResponseDto.setQuestions(questions);
+                        userProfileResponseDto.setQuestionCount((long) questions.size());
+                        List<GetAnswerDtoForProfile> answers = answerService.findByAnsweredBy(id);
+                        userProfileResponseDto.setAnswers(answers);
+                        userProfileResponseDto.setAnswerCount((long) answers.size());
+                        userProfileResponseDto.setFollowedTags(tagService.getFollowedTags(id));
 
                         GenericApiResponse<UserProfileResponseDto> response = ApiResponseBuilder.buildSuccessResponse(
                                         userProfileResponseDto.getClass(),

diff --git a/...main/java/com/group1/programminglanguagesforum/DTOs/Responses/UserProfileResponseDto.java b/...main/java/com/group1/programminglanguagesforum/DTOs/Responses/UserProfileResponseDto.java
@@ -1,4 +1,5 @@
 package com.group1.programminglanguagesforum.DTOs.Responses;
+
 import com.group1.programminglanguagesforum.Entities.ExperienceLevel;
 import lombok.*;
 
@@ -25,5 +26,7 @@ public class UserProfileResponseDto {
     private ExperienceLevel experienceLevel;
     @Builder.Default
     private List<SelfProfileResponseDto.FollowedTags> followedTags = new ArrayList<>();
-
+    private Long questionCount;
+    private List<QuestionSummaryDto> questions;
+    private List<GetAnswerDtoForProfile> answers;
 }