[core] (step-5) 게시글 권한 부여 [게시글 열람, 수정, 삭제 권한]

.gitignore

@@ -6,6 +6,7 @@ build/
 !**/src/test/**/build/
 .gitignore
 db/be-java-cafe.mv.db
+db/be-java-cafe.trace.db
 
 ### STS ###
 .apt_generated

src/main/java/kr/codesqaud/cafe/config/CafeConfig.java

@@ -36,7 +36,6 @@ public void addViewControllers(ViewControllerRegistry registry) {
         registry.addViewController("/user/login").setViewName("user/login");
         registry.addViewController("/user/form").setViewName("user/form");
         registry.addViewController("/qna/show").setViewName("qna/show");
-        registry.addViewController("/qna/article").setViewName("qna/form");
         registry.addViewController("/login_fail").setViewName("user/login_fail");
     }
 }

src/main/java/kr/codesqaud/cafe/controller/ArticleController.java

@@ -1,11 +1,15 @@
 package kr.codesqaud.cafe.controller;
 
 import kr.codesqaud.cafe.domain.Article;
+import kr.codesqaud.cafe.domain.Member;
 import kr.codesqaud.cafe.service.ArticleService;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpSession;
+
 @Controller
 public class ArticleController {
 
@@ -16,12 +20,30 @@ public ArticleController(ArticleService articleService) {
         this.articleService = articleService;
     }
 
+    @GetMapping("/qna/article")
+    public String askQuestion(HttpSession httpSession) {
+        Member member = (Member) httpSession.getAttribute("sessionedUser");
+        if (member == null) {
+            return "redirect:/user/login";
+        }
+        return "qna/form";
+    }
+
     @PostMapping("/qna/ask")
-    public String registerArticle(Article article) {
+    public String registerArticle(Article article, HttpSession httpSession) {
+        Member loginMember = (Member) httpSession.getAttribute("sessionedUser");
+        article.setWriter(loginMember.getNickName());
         articleService.writeArticle(article);
         return "redirect:/";
     }
 
+    @PostMapping("/qna/{articleId}/update")
+    public String updateArticle(@PathVariable long articleId, Article article) {
+        article.setArticleId(articleId);
+        articleService.updateArticle(article);
+        return "redirect:/";
+    }
+
     @GetMapping("/")
     public String printArticleList(Model model) {
         model.addAttribute("article", articleService.findArticles());
@@ -30,9 +52,34 @@ public String printArticleList(Model model) {
     }
 
     @GetMapping("/qna/{articleId}")
-    public String printDetailArticle(@PathVariable int articleId, Model model) {
+    public String printDetailArticle(@PathVariable int articleId, HttpSession httpSession, Model model) {
+        if (httpSession.getAttribute("sessionedUser") == null) {
+            return "redirect:/user/login";
+        };
         Article article = articleService.findOneArticleById(articleId).get();
         model.addAttribute("article", article);
         return "qna/show";
     }
+
+    @GetMapping("/article/{articleId}/edite")
+    public String editeArticle(@PathVariable long articleId, HttpSession httpSession, Model model) {
+        Article writedArticle = articleService.findOneArticleById(articleId).orElseThrow(() -> new EmptyResultDataAccessException(1));
+        Member loginMember = (Member) httpSession.getAttribute("sessionedUser");
+        if (loginMember.getNickName().equals(writedArticle.getWriter())) {
+            model.addAttribute("article", writedArticle);
+            return "qna/updateForm";
+        }
+        return "qna/edite_fail";
+    }
+
+    @DeleteMapping("/article/{articleId}/delete")
+    public String deleteArticle(@PathVariable long articleId, HttpSession httpSession) {
+        Article writedArticle = articleService.findOneArticleById(articleId).orElseThrow(() -> new EmptyResultDataAccessException(1));
+        Member loginMember = (Member) httpSession.getAttribute("sessionedUser");
+        if (loginMember.getNickName().equals(writedArticle.getWriter())) {
+            articleService.deleteArticle(articleId);
+            return "redirect:/";
+        }
+        return "qna/delete_fail";
+    }
 }

src/main/java/kr/codesqaud/cafe/controller/LoginController.java

@@ -3,6 +3,7 @@
 import kr.codesqaud.cafe.domain.Member;
 import kr.codesqaud.cafe.service.MemberService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 
@@ -19,7 +20,7 @@ public LoginController(MemberService memberService) {
 
     @PostMapping("/login")
     public String login(Member member, HttpSession httpSession) {
-        Member loginMember = memberService.findOneMemberByEmail(member.getEmail()).orElse(null);
+        Member loginMember = memberService.findOneMemberByEmail(member.getEmail()).orElseThrow(() -> new EmptyResultDataAccessException(1));
         if (loginMember != null && memberService.checkMember(loginMember, member)) {
             httpSession.setAttribute("sessionedUser", loginMember);
             return "redirect:/";

src/main/java/kr/codesqaud/cafe/controller/UserController.java

@@ -5,6 +5,7 @@
 import kr.codesqaud.cafe.service.MemberService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +37,7 @@ public String showList(Model model) {
     @GetMapping("/profile/{nickName}")
     public String showProfile(@PathVariable String nickName, Model model) {
         model.addAttribute("nickName", nickName);
-        String email = memberService.findOneMemberByNickname(nickName).orElse(null).getEmail();
+        String email = memberService.findOneMemberByNickname(nickName).orElseThrow(() -> new EmptyResultDataAccessException(1)).getEmail();
         model.addAttribute("email", email);
         return "user/profile";
     }

src/main/java/kr/codesqaud/cafe/domain/Article.java

@@ -33,7 +33,7 @@ public void setWriter(String author) {
         this.writer = author;
     }
 
-    public void setArticleId(int id) {
+    public void setArticleId(long id) {
         articleId = id;
     }
 
@@ -81,4 +81,4 @@ public String toString() {
                 ", formattedRegistrationDate='" + formattedRegistrationDate + '\'' +
                 '}';
     }
-}
+}

src/main/java/kr/codesqaud/cafe/domain/Member.java

@@ -7,7 +7,7 @@
 
 public class Member {
 
-    private long id;
+    private long userId;
     private String email;
     private String nickName;
     private String password;
@@ -26,7 +26,7 @@ public Member(String email, String nickName, String password) {
     }
 
     public long getId() {
-        return id;
+        return userId;
     }
 
     public String getEmail() {
@@ -64,5 +64,8 @@ public void setSignUpDate(LocalDateTime signUpDate) {
     public String getFormattedSignUpDate() {
         return formattedSignUpDate;
     }
-}
 
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+}

src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java

@@ -8,8 +8,9 @@
 
 public interface ArticleRepository {
     void saveArticle(Article article);
-    Optional<Article> findOneArticleById(int id);
+    Optional<Article> findOneArticleById(long id);
     List<Article> getArticles();
-    void deleteArticle(Member member);
+    void deleteArticle(long articleId);
     int getSize();
+    void updateArticle(Article article);
 }

src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java

@@ -1,7 +1,6 @@
 package kr.codesqaud.cafe.repository;
 
 import kr.codesqaud.cafe.domain.Article;
-import kr.codesqaud.cafe.domain.Member;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -36,8 +35,7 @@ public void saveArticle(Article article) {
     }
 
     @Override
-    public Optional<Article> findOneArticleById(int id) {
-        System.out.println(id);
+    public Optional<Article> findOneArticleById(long id) {
         return Optional.ofNullable(jdbcTemplate.queryForObject("select * from article where articleId = ?", articleRowMapper(), id));
     }
 
@@ -47,15 +45,22 @@ public List<Article> getArticles() {
     }
 
     @Override
-    public void deleteArticle(Member member) {
-
+    public void deleteArticle(long articleId) {
+        String sql = "delete from article where articleId = ?";
+        jdbcTemplate.update(sql, articleId);
     }
 
     @Override
     public int getSize() {
         return jdbcTemplate.queryForObject("select count(*) from article", Integer.class);
     }
 
+    @Override
+    public void updateArticle(Article article) {
+        String sql = "update article set title = ?, contents = ? where articleId = ?";
+        jdbcTemplate.update(sql, article.getTitle(), article.getContents(), article.getId());
+    }
+
     private RowMapper<Article> articleRowMapper() {
         return (rs, rowNum) -> {
             Article article = new Article();

src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateMemberRepository.java

@@ -23,7 +23,7 @@ public JdbcTemplateMemberRepository(DataSource datasource) {
     }
 
     @Override
-    public Member saveMember(Member member) {
+    public void saveMember(Member member) {
         SimpleJdbcInsert jdbcInsert = new SimpleJdbcInsert(jdbcTemplate);
         jdbcInsert.withTableName("member").usingGeneratedKeyColumns("id");
 
@@ -34,7 +34,6 @@ public Member saveMember(Member member) {
         parameters.put("signUpDate", Timestamp.valueOf(member.getSignUpDate().format(DateTimeFormatter.ofPattern("yyy-MM-dd")) + " 00:00:00"));
 
         jdbcInsert.execute(new MapSqlParameterSource(parameters));
-        return member;
     }
 
     @Override
@@ -61,7 +60,6 @@ public int getSize() {
     @Override
     public void editeMember(Member member) {
         jdbcTemplate.update("UPDATE member SET nickName = ? WHERE email = ?", member.getNickName(), member.getEmail());
-
     }
 
     private RowMapper<Member> memberRowMapper() {

src/main/java/kr/codesqaud/cafe/repository/MemberRepository.java

@@ -6,7 +6,7 @@
 import java.util.Optional;
 
 public interface MemberRepository {
-    Member saveMember(Member member);
+    void saveMember(Member member);
 
     Optional<Member> findOneMemberbyEmail(String email);
 

src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java

@@ -22,7 +22,7 @@ public void saveArticle(Article article) {
     }
 
     @Override
-    public Optional<Article> findOneArticleById(int id) {
+    public Optional<Article> findOneArticleById(long id) {
         return articlesRepository.stream()
                 .filter(article -> article.getId() == id)
                 .findAny();
@@ -39,7 +39,12 @@ public int getSize() {
     }
 
     @Override
-    public void deleteArticle(Member member) {
+    public void updateArticle(Article article) {
+
+    }
+
+    @Override
+    public void deleteArticle(long articleId) {
 
     }
 

src/main/java/kr/codesqaud/cafe/repository/MemoryMemberRepository.java

@@ -13,9 +13,8 @@ public MemoryMemberRepository() {
     }
 
     @Override
-    public Member saveMember(Member member) {
+    public void saveMember(Member member) {
         repository.put(member.getEmail(), member);
-        return member;
     }
 
     @Override

src/main/java/kr/codesqaud/cafe/service/ArticleService.java

@@ -19,7 +19,7 @@ public void writeArticle(Article article) {
         articleRepository.saveArticle(article);
     }
 
-    public Optional<Article> findOneArticleById(int id) {
+    public Optional<Article> findOneArticleById(long id) {
         return articleRepository.findOneArticleById(id);
     }
 
@@ -30,4 +30,12 @@ public List<Article> findArticles() {
     public int getTotalNumberOfArticles() {
         return articleRepository.getSize();
     }
+
+    public void updateArticle(Article article) {
+        articleRepository.updateArticle(article);
+    }
+
+    public void deleteArticle(long articleId) {
+        articleRepository.deleteArticle(articleId);
+    }
 }

src/main/resources/templates/data.sql

@@ -5,4 +5,7 @@ insert into member (email, nickname, password)
 values ('[email protected]', 'kim', '123');
 
 insert into article (writer, title, contents)
-values ('manju', 'hi', 'hello');
+values ('manju', '가입인사 드립니다.', '등업해주세요!');
+
+insert into article (writer, title, contents)
+values ('core', '자바 질문', '스트림에 대해서 질문합니다.');

src/main/resources/templates/qna/delete_fail.html

@@ -0,0 +1,13 @@
+{{>user/header}}
+
+    <link href="../../css/user/login_fail.css" rel="stylesheet">
+
+    <div class="container" id="main">
+        <header class="post-header">
+            <p class="title">다른 사람의 글을 삭제할 수 없습니다!</p>
+        </header>
+        <a href="/" class="btn">홈으로</a>
+    </div>
+</div>
+</body>
+</html>

src/main/resources/templates/qna/edite_fail.html

@@ -0,0 +1,13 @@
+{{>user/header}}
+
+    <link href="../../css/user/login_fail.css" rel="stylesheet">
+
+    <div class="container" id="main">
+        <header class="post-header">
+            <p class="title">다른 사람의 글을 수정할 수 없습니다!</p>
+        </header>
+        <a href="/" class="btn">홈으로</a>
+    </div>
+</div>
+</body>
+</html>

src/main/resources/templates/qna/form.html

@@ -77,10 +77,6 @@
     <div class="col-md-12 col-sm-12 col-lg-10 col-lg-offset-1">
         <div class="panel panel-default content-main">
             <form name="question" method="post" action="/qna/ask">
-                <div class="form-group">
-                    <label for="writer">글쓴이</label>
-                    <input type="text" class="form-control" id="writer" name="writer" placeholder="글쓴이"/>
-                </div>
                 <div class="form-group">
                     <label for="title">제목</label>
                     <input type="text" class="form-control" id="title" name="title" placeholder="제목"/>

src/main/resources/templates/qna/show.html

@@ -100,10 +100,10 @@ <h2 class="qna-title">{{title}}</h2>
                     <div class="article-util">
                         <ul class="article-util-list">
                             <li>
-                                <a class="link-modify-article" href="/questions/423/form">수정</a>
+                                <a class="link-modify-article" href="/article/{{articleId}}/edite">수정</a>
                             </li>
                             <li>
-                                <form class="form-delete" action="/questions/423" method="POST">
+                                <form class="form-delete" action="/article/{{articleId}}/delete" method="POST">
                                     <input type="hidden" name="_method" value="DELETE">
                                     <button class="link-delete-article" type="submit">삭제</button>
                                 </form>