Merge pull request #121 from dongkyun0713/dongkyun

conflict fix
SKHU-TITTO · Feb 28, 2024 · 1d14b11 · 1d14b11
2 parents 399dc0c + d5a394a
commit 1d14b11
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/.../src/main/java/com/example/titto_backend/questionBoard/controller/QuestionController.java b/.../src/main/java/com/example/titto_backend/questionBoard/controller/QuestionController.java
@@ -51,7 +51,7 @@ public ResponseEntity<String> createQuestion(@RequestBody QuestionDTO.Request re
         return ResponseEntity.status(HttpStatus.CREATED).body(questionService.save(email, request));
     }
 
-    // Read
+   /* // Read
     @GetMapping("/posts")
     @Operation(
             summary = "질문 목록 조회",
@@ -64,7 +64,7 @@ public ResponseEntity<Page<QuestionDTO.Response>> getAllQuestions(@RequestParam(
                                                                       @RequestParam(defaultValue = "", value = "keyword") String keyword) {
         Page<QuestionDTO.Response> questions = questionService.findAll(page, keyword);
         return ResponseEntity.ok(questions);
-    }
+    }*/
 
     @GetMapping("/{postId}")
     @Operation(
@@ -99,6 +99,20 @@ public ResponseEntity<Page<QuestionDTO.Response>> getQuestionsByCategory(@PathVa
         return ResponseEntity.ok(questions);
     }
 
+    @GetMapping("/status/{status}")
+    @Operation(
+            summary = "상태별 질문 조회",
+            description = "상태별 질문을 조회합니다",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "요청 성공"),
+                    @ApiResponse(responseCode = "404", description = "질문을 찾을 수 없음")
+            })
+    public ResponseEntity<Page<QuestionDTO.Response>> getQuestionsByStatus(@PathVariable("status") String status,
+                                                                           @RequestParam(defaultValue = "0") int page) {
+        Page<QuestionDTO.Response> questions = questionService.findByStatus(page, status);
+        return ResponseEntity.ok(questions);
+    }
+
     @GetMapping("/search")
     @Operation(
             summary = "질문 게시판 검색",

diff --git a/...ackend/src/main/java/com/example/titto_backend/questionBoard/service/QuestionService.java b/...ackend/src/main/java/com/example/titto_backend/questionBoard/service/QuestionService.java
@@ -13,16 +13,9 @@
 import com.example.titto_backend.questionBoard.dto.QuestionDTO.Response;
 import com.example.titto_backend.questionBoard.repository.AnswerRepository;
 import com.example.titto_backend.questionBoard.repository.QuestionRepository;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Join;
-import jakarta.persistence.criteria.JoinType;
-import jakarta.persistence.criteria.Predicate;
-import jakarta.persistence.criteria.Root;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.Serial;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -32,7 +25,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -68,7 +60,7 @@ public String save(String email, QuestionDTO.Request request) throws CustomExcep
         return "질문이 성공적으로 등록되었습니다.";
     }
 
-    // Keyword가 null이면 전체목록, 있으면 검색
+    /*// Keyword가 null이면 전체목록, 있으면 검색
     @Transactional(readOnly = true)
     public Page<Response> findAll(int page, String keyword) {
         Pageable pageable = Pageable.ofSize(10).withPage(page);
@@ -77,7 +69,7 @@ public Page<Response> findAll(int page, String keyword) {
             return questionRepository.findAllByOrderByCreateDateDesc(pageable).map(QuestionDTO.Response::new);
         }
         return questionRepository.findAll(spec, pageable).map(QuestionDTO.Response::new);
-    }
+    }*/
 
     @Transactional(readOnly = true)
     public Page<Response> findByStatus(int page, String status) {
@@ -101,7 +93,7 @@ public Page<QuestionDTO.Response> findByCategory(int page, String category) {
                 .map(QuestionDTO.Response::new);
     }
 
-    // Keyword Search
+    /*// Keyword Search
     private Specification<Question> searchByKeyword(String keyword) {
         return new Specification<>() {
             @Serial
@@ -120,7 +112,7 @@ public Predicate toPredicate(Root<Question> q, CriteriaQuery<?> query, CriteriaB
                         cb.like(u2.get("nickname"), "%" + keyword + "%")
                 );
             }
-        };
+        };*/
     @Transactional(readOnly = true)
     public Page<QuestionDTO.Response> searchByKeyword(String keyWord, int page) {
         Pageable pageable = Pageable.ofSize(10).withPage(page);