Resolve import issues

bounswe · Dec 16, 2024 · 9564344 · 9564344
1 parent e9cfbe3
commit 9564344
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...nd/src/main/java/com/group1/programminglanguagesforum/Controllers/QuestionController.java b/...nd/src/main/java/com/group1/programminglanguagesforum/Controllers/QuestionController.java
@@ -31,6 +31,7 @@
 import com.group1.programminglanguagesforum.DTOs.Responses.QuestionSummaryDto;
 import com.group1.programminglanguagesforum.Entities.DifficultyLevel;
 import com.group1.programminglanguagesforum.Entities.Question;
+import com.group1.programminglanguagesforum.Entities.User;
 import com.group1.programminglanguagesforum.Exceptions.ExceptionResponseHandler;
 import com.group1.programminglanguagesforum.Exceptions.UnauthorizedAccessException;
 import com.group1.programminglanguagesforum.Services.QuestionDifficultyRateService;
@@ -123,9 +124,11 @@ public ResponseEntity<GenericApiResponse<Map<String, Object>>> searchQuestions(
             @RequestParam(required = false) String tags,
             @RequestParam(required = false) DifficultyLevel difficulty,
             @RequestParam(defaultValue = "1") int page,
-            @RequestParam(defaultValue = "20") int pageSize) {
+            @RequestParam(defaultValue = "20") int pageSize,
+            @RequestParam(defaultValue = "recommended") String sort,
+            @RequestParam(required = false) User currentUser) {
 
-        Page<Question> questionPage = questionService.searchQuestions(query, tags, difficulty, page, pageSize);
+        Page<Question> questionPage = questionService.searchQuestions(query, tags, difficulty, page, pageSize, sort, currentUser);
 
         List<QuestionSummaryDto> questionSummaries = questionPage.getContent().stream()
                 .map(QuestionService::mapToQuestionSummary)

diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionService.java b/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionService.java
@@ -10,6 +10,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.Objects;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -233,7 +234,9 @@ public Page<Question> searchQuestions(
                 if (Objects.equals(sort, "default") || Objects.equals(currentUser, null)) {
                         return questionRepository.searchQuestions(query, tagIds, difficulty, pageable);
                 } else {
-                        List<Long> authorIds = getFollowingIds(currentUser);
+                        List<Long> authorIds = currentUser.getFollowing().stream()
+                        .map(User::getId) // Map each User to its ID
+                        .collect(Collectors.toList()); // Collect the IDs into a List
                         return questionRepository.searchQuestionsByRecommended(query, authorIds, tagIds, difficulty, pageable);
                 }
 

diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Services/UserService.java b/backend/src/main/java/com/group1/programminglanguagesforum/Services/UserService.java
@@ -18,6 +18,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor