From 47082dacbcd592300afa2aeaabb1d47486d70774 Mon Sep 17 00:00:00 2001 From: kanamycine Date: Mon, 25 Apr 2022 16:42:14 +0900 Subject: [PATCH] refactor --- .../codesquad/controller/QuestionController.java | 12 +++++++----- .../domain/question/QuestionRepository.java | 5 ++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/codesquad/controller/QuestionController.java b/src/main/java/codesquad/controller/QuestionController.java index 6d203e08..faf78dce 100644 --- a/src/main/java/codesquad/controller/QuestionController.java +++ b/src/main/java/codesquad/controller/QuestionController.java @@ -1,5 +1,6 @@ package codesquad.controller; +import java.util.List; import java.util.NoSuchElementException; import javax.servlet.http.HttpSession; @@ -32,7 +33,8 @@ public String getForm() { @GetMapping("/") // @RequestMapping(value = "/", method = RequestMethod.GET) public String list(Model model) { - model.addAttribute("questions", questionRepository.findAllByState(true)); + List notDeletedQuestion = questionRepository.findNotDeletedStateQuestion(true); + model.addAttribute("questions", notDeletedQuestion); return "index"; } @@ -86,14 +88,14 @@ public String update(@PathVariable Long index, Question updatedQuestion, HttpSes public String delete(@PathVariable Long index, HttpSession session) { User sessionedUser = (User) session.getAttribute("sessionedUser"); Question question = questionRepository.findById(index).orElseThrow(NoSuchElementException::new); - if(!question.isSameWriter(sessionedUser)){ - return "redircet:/questions/{index}"; - } - if(sessionedUser == null) { return "redirect:/login"; } + if(!question.isSameWriter(sessionedUser)){ + return "redircet:/questions/{index}"; + } + if(!question.checkEmptyAnswerList()){ if(!question.checkExistAnotherAnswerWriter(sessionedUser)){ return "redircet:/questions/{index}"; diff --git a/src/main/java/codesquad/domain/question/QuestionRepository.java b/src/main/java/codesquad/domain/question/QuestionRepository.java index 38c0ce4b..338f4516 100644 --- a/src/main/java/codesquad/domain/question/QuestionRepository.java +++ b/src/main/java/codesquad/domain/question/QuestionRepository.java @@ -1,7 +1,10 @@ package codesquad.domain.question; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; public interface QuestionRepository extends JpaRepository { - Question findAllByState(boolean state); + List findNotDeletedStateQuestion(boolean state); + }