From 53fa5602d58a332c1f70462b2ebd8efe5b3bb83a Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Wed, 29 Mar 2023 17:55:43 +0900 Subject: [PATCH 01/11] =?UTF-8?q?feat(mission5):=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=EA=B8=80=20=EC=9E=91=EC=84=B1=EC=8B=9C=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=EC=9E=90=20=EC=9E=85=EB=A0=A5=20=ED=95=84=EB=93=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qan/form.html 파일에서 작성자 입력 필드 삭제 --- src/main/resources/templates/data.sql | 5 ++++- src/main/resources/templates/qna/form.html | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/data.sql b/src/main/resources/templates/data.sql index 1eaf93f5..544e85db 100644 --- a/src/main/resources/templates/data.sql +++ b/src/main/resources/templates/data.sql @@ -5,4 +5,7 @@ insert into member (email, nickname, password) values ('kim@naver.com', 'kim', '123'); insert into article (writer, title, contents) -values ('manju', 'hi', 'hello'); +values ('manju', '가입인사 드립니다.', '등업해주세요!'); + +insert into article (writer, title, contents) +values ('core', '자바 질문', '스트림에 대해서 질문합니다.'); diff --git a/src/main/resources/templates/qna/form.html b/src/main/resources/templates/qna/form.html index 92df1af8..2e50eb48 100644 --- a/src/main/resources/templates/qna/form.html +++ b/src/main/resources/templates/qna/form.html @@ -77,10 +77,6 @@
-
- - -
From 0c45ea982822b9988dc4ec02d66b79030e07e116 Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Thu, 30 Mar 2023 11:45:49 +0900 Subject: [PATCH 02/11] =?UTF-8?q?feat(mission5):=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EC=9D=B4=EC=A0=84=EC=97=90=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=EA=B8=80=EC=93=B0=EA=B8=B0=20=EC=8B=9C=EB=8F=84=EC=8B=9C=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=98=EB=8A=94=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit askQuestion() 메소드 생성한 후 Session을 가지고 와서 null인 경우 로그인 페이지로 리다이렉트 실행 --- .../java/kr/codesqaud/cafe/config/CafeConfig.java | 1 - .../codesqaud/cafe/controller/ArticleController.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/kr/codesqaud/cafe/config/CafeConfig.java b/src/main/java/kr/codesqaud/cafe/config/CafeConfig.java index d104201b..8a7e5afc 100644 --- a/src/main/java/kr/codesqaud/cafe/config/CafeConfig.java +++ b/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"); } } diff --git a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java index a5a481f8..b94b7761 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java +++ b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java @@ -1,11 +1,14 @@ 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.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpSession; + @Controller public class ArticleController { @@ -16,6 +19,15 @@ 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) { articleService.writeArticle(article); From 7af2c75dc651ea6519aed108ec2e178f8aabb9db Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Thu, 30 Mar 2023 12:17:41 +0900 Subject: [PATCH 03/11] =?UTF-8?q?feat(mission5):=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EC=9D=B4=EC=A0=84=EC=97=90=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=EA=B8=80=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=ED=99=94=EB=A9=B4=EC=9C=BC=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cafe/controller/ArticleController.java | 5 ++++- .../java/kr/codesqaud/cafe/domain/Article.java | 14 +------------- src/main/java/kr/codesqaud/cafe/domain/Member.java | 1 - 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java index b94b7761..c708aa67 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java +++ b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java @@ -42,7 +42,10 @@ 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"; diff --git a/src/main/java/kr/codesqaud/cafe/domain/Article.java b/src/main/java/kr/codesqaud/cafe/domain/Article.java index cf1984ad..12cc6e26 100644 --- a/src/main/java/kr/codesqaud/cafe/domain/Article.java +++ b/src/main/java/kr/codesqaud/cafe/domain/Article.java @@ -69,16 +69,4 @@ public void setRegistrationDate(LocalDateTime registrationDate) { public String getFormattedRegistrationDate() { return formattedRegistrationDate; } - - @Override - public String toString() { - return "Article{" + - "articleId=" + articleId + - ", writer='" + writer + '\'' + - ", title='" + title + '\'' + - ", contents='" + contents + '\'' + - ", registrationDate=" + registrationDate + - ", formattedRegistrationDate='" + formattedRegistrationDate + '\'' + - '}'; - } -} \ No newline at end of file +} diff --git a/src/main/java/kr/codesqaud/cafe/domain/Member.java b/src/main/java/kr/codesqaud/cafe/domain/Member.java index a9db62e3..60380348 100644 --- a/src/main/java/kr/codesqaud/cafe/domain/Member.java +++ b/src/main/java/kr/codesqaud/cafe/domain/Member.java @@ -65,4 +65,3 @@ public String getFormattedSignUpDate() { return formattedSignUpDate; } } - From c75d94a2d9b6c6ace56ded0adbac83561235f9bb Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Thu, 30 Mar 2023 16:30:33 +0900 Subject: [PATCH 04/11] =?UTF-8?q?feat(mission5):=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=ED=95=9C=20=EB=8B=89=EB=84=A4=EC=9E=84=EA=B3=BC=20?= =?UTF-8?q?=EA=B8=80=20=EC=9E=91=EC=84=B1=20=EB=8B=89=EB=84=A4=EC=9E=84?= =?UTF-8?q?=EC=9D=B4=20=EC=9D=BC=EC=B9=98=ED=95=98=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EC=97=90=20=EC=88=98=EC=A0=95=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 일치하지 않을 경우 '글 작성자만 수정할 수 있습니다' 오류페이지로 이동 --- .../cafe/controller/ArticleController.java | 15 +++ .../java/kr/codesqaud/cafe/domain/Member.java | 8 +- .../cafe/repository/ArticleRepository.java | 1 + .../JdbcTemplateArticleRepository.java | 6 +- .../JdbcTemplateMemberRepository.java | 4 +- .../cafe/repository/MemberRepository.java | 2 +- .../repository/MemoryArticleRepository.java | 5 + .../repository/MemoryMemberRepository.java | 3 +- .../cafe/service/ArticleService.java | 4 + .../resources/templates/qna/edite_fail.html | 13 +++ src/main/resources/templates/qna/show.html | 2 +- .../resources/templates/qna/updateForm.html | 100 ++++++++++++++++++ src/main/resources/templates/schema.sql | 4 +- src/main/resources/templates/user/header.html | 2 +- 14 files changed, 157 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/templates/qna/edite_fail.html create mode 100644 src/main/resources/templates/qna/updateForm.html diff --git a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java index c708aa67..daad22e9 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java +++ b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java @@ -34,6 +34,12 @@ public String registerArticle(Article article) { return "redirect:/"; } +// @PostMapping("/qna/update") +// public String updateArticle(Article artice) { +// articleService. +// return "redirect:/"; +// } + @GetMapping("/") public String printArticleList(Model model) { model.addAttribute("article", articleService.findArticles()); @@ -50,4 +56,13 @@ public String printDetailArticle(@PathVariable int articleId, HttpSession httpSe model.addAttribute("article", article); return "qna/show"; } + + @GetMapping("/article/{nickName}/edite") + public String editeArticle(@PathVariable String nickName, HttpSession httpSession) { + Member member = (Member) httpSession.getAttribute("sessionedUser"); + if (member.getNickName().equals(nickName)) { + return "qna/updateForm"; + } + return "qna/edite_fail"; + } } diff --git a/src/main/java/kr/codesqaud/cafe/domain/Member.java b/src/main/java/kr/codesqaud/cafe/domain/Member.java index 60380348..513be843 100644 --- a/src/main/java/kr/codesqaud/cafe/domain/Member.java +++ b/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,4 +64,8 @@ public void setSignUpDate(LocalDateTime signUpDate) { public String getFormattedSignUpDate() { return formattedSignUpDate; } + + public void setUserId(long userId) { + this.userId = userId; + } } diff --git a/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java index 4b8588f3..970eb958 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java @@ -12,4 +12,5 @@ public interface ArticleRepository { List
getArticles(); void deleteArticle(Member member); int getSize(); + void updateArticle(Article article); } diff --git a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java index 20b09b0b..b33e412d 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java @@ -37,7 +37,6 @@ public void saveArticle(Article article) { @Override public Optional
findOneArticleById(int id) { - System.out.println(id); return Optional.ofNullable(jdbcTemplate.queryForObject("select * from article where articleId = ?", articleRowMapper(), id)); } @@ -56,6 +55,11 @@ public int getSize() { return jdbcTemplate.queryForObject("select count(*) from article", Integer.class); } + @Override + public void updateArticle(Article article) { + + } + private RowMapper
articleRowMapper() { return (rs, rowNum) -> { Article article = new Article(); diff --git a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateMemberRepository.java b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateMemberRepository.java index fc531b28..0312cbf9 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateMemberRepository.java +++ b/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 memberRowMapper() { diff --git a/src/main/java/kr/codesqaud/cafe/repository/MemberRepository.java b/src/main/java/kr/codesqaud/cafe/repository/MemberRepository.java index 12162aeb..07795f08 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/MemberRepository.java +++ b/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 findOneMemberbyEmail(String email); diff --git a/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java index b3e3c912..7d0b9fff 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java @@ -38,6 +38,11 @@ public int getSize() { return articlesRepository.size(); } + @Override + public void updateArticle(Article article) { + + } + @Override public void deleteArticle(Member member) { diff --git a/src/main/java/kr/codesqaud/cafe/repository/MemoryMemberRepository.java b/src/main/java/kr/codesqaud/cafe/repository/MemoryMemberRepository.java index 083d5564..463f36dd 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/MemoryMemberRepository.java +++ b/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 diff --git a/src/main/java/kr/codesqaud/cafe/service/ArticleService.java b/src/main/java/kr/codesqaud/cafe/service/ArticleService.java index 618760ae..c468ee52 100644 --- a/src/main/java/kr/codesqaud/cafe/service/ArticleService.java +++ b/src/main/java/kr/codesqaud/cafe/service/ArticleService.java @@ -30,4 +30,8 @@ public List
findArticles() { public int getTotalNumberOfArticles() { return articleRepository.getSize(); } + + public void updateArticle(Article article) { + articleRepository.updateArticle(article); + } } diff --git a/src/main/resources/templates/qna/edite_fail.html b/src/main/resources/templates/qna/edite_fail.html new file mode 100644 index 00000000..54c9cc79 --- /dev/null +++ b/src/main/resources/templates/qna/edite_fail.html @@ -0,0 +1,13 @@ +{{>user/header}} + + + +
+
+

다른 사람의 글을 수정할 수 없습니다!

+
+ 홈으로 +
+
+ + diff --git a/src/main/resources/templates/qna/show.html b/src/main/resources/templates/qna/show.html index 5eb5b6aa..bf1c4069 100644 --- a/src/main/resources/templates/qna/show.html +++ b/src/main/resources/templates/qna/show.html @@ -100,7 +100,7 @@

{{title}}

  • - 수정 + 수정
  • diff --git a/src/main/resources/templates/qna/updateForm.html b/src/main/resources/templates/qna/updateForm.html new file mode 100644 index 00000000..1a678ef7 --- /dev/null +++ b/src/main/resources/templates/qna/updateForm.html @@ -0,0 +1,100 @@ + + + + + + SLiPP Java Web Programming + + + + + + + + + +
    +
    +
    +
    +
    + + +
    +
    + + +
    + +
    + +
    +
    +
    + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/schema.sql b/src/main/resources/templates/schema.sql index d32ff0ce..3ce88f5e 100644 --- a/src/main/resources/templates/schema.sql +++ b/src/main/resources/templates/schema.sql @@ -14,6 +14,8 @@ create table article ( writer varchar(255), title varchar(255), contents varchar(255), - registrationDate DateTime default now() + registrationDate DateTime default now(), + userId bigint, + FOREIGN KEY (userId) references member (id) ); diff --git a/src/main/resources/templates/user/header.html b/src/main/resources/templates/user/header.html index 8446b0af..a296c4a5 100644 --- a/src/main/resources/templates/user/header.html +++ b/src/main/resources/templates/user/header.html @@ -30,7 +30,7 @@ {{/sessionedUser}} {{#sessionedUser}}
      -
    • 안녕하세요,{{nickName}}님 반갑습니다.
      • +
    • 안녕하세요, {{nickName}}님 반갑습니다.
    • 멤버 리스트
    • 회원정보수정
    • 로그아웃
      • From 8a0a81df9940fd73e2929de29345386df5d26c64 Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Thu, 30 Mar 2023 16:34:15 +0900 Subject: [PATCH 05/11] =?UTF-8?q?fix(mission5):=20db/be-java-cafe.trace.db?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EC=A0=81=20=EC=95=88=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=ED=95=B4=20.gitignore=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EC=97=90=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d21dc654..c75e42ac 100644 --- a/.gitignore +++ b/.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 From ff6233d26796d076f1ba0065e5d080ff344b6c6c Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Fri, 31 Mar 2023 12:15:34 +0900 Subject: [PATCH 06/11] =?UTF-8?q?feat(mission5):=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=EA=B8=80=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EA=B8=B0=EC=A1=B4?= =?UTF-8?q?=20=EA=B2=8C=EC=8B=9C=EA=B8=80=EC=9D=98=20=EC=A0=9C=EB=AA=A9?= =?UTF-8?q?=EA=B3=BC=20=EB=B3=B8=EB=AC=B8=20=EB=82=B4=EC=9A=A9=EC=9D=84=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=99=80=EC=84=9C=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codesqaud/cafe/controller/ArticleController.java | 11 +++++++---- .../codesqaud/cafe/repository/ArticleRepository.java | 2 +- .../repository/JdbcTemplateArticleRepository.java | 2 +- .../cafe/repository/MemoryArticleRepository.java | 2 +- .../kr/codesqaud/cafe/service/ArticleService.java | 2 +- src/main/resources/templates/qna/show.html | 2 +- src/main/resources/templates/qna/updateForm.html | 4 ++-- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java index daad22e9..37772cde 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java +++ b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java @@ -57,10 +57,13 @@ public String printDetailArticle(@PathVariable int articleId, HttpSession httpSe return "qna/show"; } - @GetMapping("/article/{nickName}/edite") - public String editeArticle(@PathVariable String nickName, HttpSession httpSession) { - Member member = (Member) httpSession.getAttribute("sessionedUser"); - if (member.getNickName().equals(nickName)) { + @GetMapping("/article/{articleId}/edite") + public String editeArticle(@PathVariable long articleId, HttpSession httpSession, Model model) { + Article writedArticle = articleService.findOneArticleById(articleId).orElseThrow(() -> new NullPointerException("해당하는 게시글이 없습니다.")); + Member loginMember = (Member) httpSession.getAttribute("sessionedUser"); + if (loginMember.getNickName().equals(writedArticle.getWriter())) { + model.addAttribute("title", writedArticle.getTitle()); + model.addAttribute("content", writedArticle.getContents()); return "qna/updateForm"; } return "qna/edite_fail"; diff --git a/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java index 970eb958..2bf1ff05 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java @@ -8,7 +8,7 @@ public interface ArticleRepository { void saveArticle(Article article); - Optional
      findOneArticleById(int id); + Optional
      findOneArticleById(long id); List
      getArticles(); void deleteArticle(Member member); int getSize(); diff --git a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java index b33e412d..d0c04fec 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java @@ -36,7 +36,7 @@ public void saveArticle(Article article) { } @Override - public Optional
      findOneArticleById(int id) { + public Optional
      findOneArticleById(long id) { return Optional.ofNullable(jdbcTemplate.queryForObject("select * from article where articleId = ?", articleRowMapper(), id)); } diff --git a/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java index 7d0b9fff..9702983c 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java @@ -22,7 +22,7 @@ public void saveArticle(Article article) { } @Override - public Optional
      findOneArticleById(int id) { + public Optional
      findOneArticleById(long id) { return articlesRepository.stream() .filter(article -> article.getId() == id) .findAny(); diff --git a/src/main/java/kr/codesqaud/cafe/service/ArticleService.java b/src/main/java/kr/codesqaud/cafe/service/ArticleService.java index c468ee52..cfbbc6e3 100644 --- a/src/main/java/kr/codesqaud/cafe/service/ArticleService.java +++ b/src/main/java/kr/codesqaud/cafe/service/ArticleService.java @@ -19,7 +19,7 @@ public void writeArticle(Article article) { articleRepository.saveArticle(article); } - public Optional
      findOneArticleById(int id) { + public Optional
      findOneArticleById(long id) { return articleRepository.findOneArticleById(id); } diff --git a/src/main/resources/templates/qna/show.html b/src/main/resources/templates/qna/show.html index bf1c4069..9bfee385 100644 --- a/src/main/resources/templates/qna/show.html +++ b/src/main/resources/templates/qna/show.html @@ -100,7 +100,7 @@

      {{title}}

      • - 수정 + 수정
      • diff --git a/src/main/resources/templates/qna/updateForm.html b/src/main/resources/templates/qna/updateForm.html index 1a678ef7..15386840 100644 --- a/src/main/resources/templates/qna/updateForm.html +++ b/src/main/resources/templates/qna/updateForm.html @@ -79,11 +79,11 @@
        - +
        - +
        From 756b58db1b6c11fa8be0aabb91f75fe01f8c18c4 Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Fri, 31 Mar 2023 15:37:39 +0900 Subject: [PATCH 07/11] =?UTF-8?q?feat(mission5):=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=EA=B8=80=20=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cafe/controller/ArticleController.java | 15 ++++++++------- .../java/kr/codesqaud/cafe/domain/Article.java | 14 +++++++++++++- .../repository/JdbcTemplateArticleRepository.java | 4 +++- src/main/resources/templates/qna/updateForm.html | 6 ++++-- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java index 37772cde..dc70d297 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java +++ b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java @@ -34,11 +34,13 @@ public String registerArticle(Article article) { return "redirect:/"; } -// @PostMapping("/qna/update") -// public String updateArticle(Article artice) { -// articleService. -// return "redirect:/"; -// } + @PostMapping("/qna/{articleId}/update") + public String updateArticle(@PathVariable long articleId, Article article) { + article.setArticleId(articleId); + System.out.println(article); + articleService.updateArticle(article); + return "redirect:/"; + } @GetMapping("/") public String printArticleList(Model model) { @@ -62,8 +64,7 @@ public String editeArticle(@PathVariable long articleId, HttpSession httpSession Article writedArticle = articleService.findOneArticleById(articleId).orElseThrow(() -> new NullPointerException("해당하는 게시글이 없습니다.")); Member loginMember = (Member) httpSession.getAttribute("sessionedUser"); if (loginMember.getNickName().equals(writedArticle.getWriter())) { - model.addAttribute("title", writedArticle.getTitle()); - model.addAttribute("content", writedArticle.getContents()); + model.addAttribute("article", writedArticle); return "qna/updateForm"; } return "qna/edite_fail"; diff --git a/src/main/java/kr/codesqaud/cafe/domain/Article.java b/src/main/java/kr/codesqaud/cafe/domain/Article.java index 12cc6e26..be6c0a54 100644 --- a/src/main/java/kr/codesqaud/cafe/domain/Article.java +++ b/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; } @@ -69,4 +69,16 @@ public void setRegistrationDate(LocalDateTime registrationDate) { public String getFormattedRegistrationDate() { return formattedRegistrationDate; } + + @Override + public String toString() { + return "Article{" + + "articleId=" + articleId + + ", writer='" + writer + '\'' + + ", title='" + title + '\'' + + ", contents='" + contents + '\'' + + ", registrationDate=" + registrationDate + + ", formattedRegistrationDate='" + formattedRegistrationDate + '\'' + + '}'; + } } diff --git a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java index d0c04fec..10e36d51 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java @@ -2,6 +2,7 @@ import kr.codesqaud.cafe.domain.Article; import kr.codesqaud.cafe.domain.Member; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -57,7 +58,8 @@ public int getSize() { @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
        articleRowMapper() { diff --git a/src/main/resources/templates/qna/updateForm.html b/src/main/resources/templates/qna/updateForm.html index 15386840..4a303b8d 100644 --- a/src/main/resources/templates/qna/updateForm.html +++ b/src/main/resources/templates/qna/updateForm.html @@ -76,18 +76,20 @@
        - + {{#article}} +
        - +
        + {{/article}}
        From d53f9cc4176f9b7bfbe6394a1c65359fc5714e5a Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Fri, 31 Mar 2023 16:14:30 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix(mission5):=20=EC=83=88=EB=A1=9C?= =?UTF-8?q?=EC=9A=B4=20=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EC=8B=9C=20=EC=84=B8=EC=85=98=20=EA=B0=92=EC=9D=84=20=ED=86=B5?= =?UTF-8?q?=ED=95=B4=20writer=20=EB=93=B1=EB=A1=9D=ED=95=98=EC=97=AC=20NPE?= =?UTF-8?q?=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/codesqaud/cafe/controller/ArticleController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java index dc70d297..ae53e768 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java +++ b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java @@ -29,7 +29,9 @@ public String askQuestion(HttpSession httpSession) { } @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:/"; } @@ -37,7 +39,6 @@ public String registerArticle(Article article) { @PostMapping("/qna/{articleId}/update") public String updateArticle(@PathVariable long articleId, Article article) { article.setArticleId(articleId); - System.out.println(article); articleService.updateArticle(article); return "redirect:/"; } From bac2c2a1c25d512f8c92e0c3bb72731bd7d85693 Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Fri, 31 Mar 2023 17:13:36 +0900 Subject: [PATCH 09/11] =?UTF-8?q?feat(mission5):=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=EA=B8=80=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 로그인한 계정의 게시글을 삭제 시도할 경우 실패 페이지가 나옴 --- .../cafe/controller/ArticleController.java | 11 +++++++++++ .../cafe/repository/ArticleRepository.java | 2 +- .../repository/JdbcTemplateArticleRepository.java | 7 +++---- .../cafe/repository/MemoryArticleRepository.java | 2 +- .../kr/codesqaud/cafe/service/ArticleService.java | 4 ++++ src/main/resources/templates/qna/delete_fail.html | 13 +++++++++++++ src/main/resources/templates/qna/show.html | 2 +- 7 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/templates/qna/delete_fail.html diff --git a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java index ae53e768..45528dda 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java +++ b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java @@ -70,4 +70,15 @@ public String editeArticle(@PathVariable long articleId, HttpSession httpSession } return "qna/edite_fail"; } + + @DeleteMapping("/article/{articleId}/delete") + public String deleteArticle(@PathVariable long articleId, HttpSession httpSession) { + Article writedArticle = articleService.findOneArticleById(articleId).orElseThrow(() -> new NullPointerException("해당하는 게시글이 없습니다")); + Member loginMember = (Member) httpSession.getAttribute("sessionedUser"); + if (loginMember.getNickName().equals(writedArticle.getWriter())) { + articleService.deleteArticle(articleId); + return "redirect:/"; + } + return "qna/delete_fail"; + } } diff --git a/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java index 2bf1ff05..85e57c61 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/ArticleRepository.java @@ -10,7 +10,7 @@ public interface ArticleRepository { void saveArticle(Article article); Optional
        findOneArticleById(long id); List
        getArticles(); - void deleteArticle(Member member); + void deleteArticle(long articleId); int getSize(); void updateArticle(Article article); } diff --git a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java index 10e36d51..fc8243db 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/JdbcTemplateArticleRepository.java @@ -1,8 +1,6 @@ package kr.codesqaud.cafe.repository; import kr.codesqaud.cafe.domain.Article; -import kr.codesqaud.cafe.domain.Member; -import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -47,8 +45,9 @@ public List
        getArticles() { } @Override - public void deleteArticle(Member member) { - + public void deleteArticle(long articleId) { + String sql = "delete from article where articleId = ?"; + jdbcTemplate.update(sql, articleId); } @Override diff --git a/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java b/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java index 9702983c..4dac58bf 100644 --- a/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java +++ b/src/main/java/kr/codesqaud/cafe/repository/MemoryArticleRepository.java @@ -44,7 +44,7 @@ public void updateArticle(Article article) { } @Override - public void deleteArticle(Member member) { + public void deleteArticle(long articleId) { } diff --git a/src/main/java/kr/codesqaud/cafe/service/ArticleService.java b/src/main/java/kr/codesqaud/cafe/service/ArticleService.java index cfbbc6e3..4f6c88b7 100644 --- a/src/main/java/kr/codesqaud/cafe/service/ArticleService.java +++ b/src/main/java/kr/codesqaud/cafe/service/ArticleService.java @@ -34,4 +34,8 @@ public int getTotalNumberOfArticles() { public void updateArticle(Article article) { articleRepository.updateArticle(article); } + + public void deleteArticle(long articleId) { + articleRepository.deleteArticle(articleId); + } } diff --git a/src/main/resources/templates/qna/delete_fail.html b/src/main/resources/templates/qna/delete_fail.html new file mode 100644 index 00000000..314e0b56 --- /dev/null +++ b/src/main/resources/templates/qna/delete_fail.html @@ -0,0 +1,13 @@ +{{>user/header}} + + + +
        +
        +

        다른 사람의 글을 삭제할 수 없습니다!

        +
        + 홈으로 +
        +
        + + diff --git a/src/main/resources/templates/qna/show.html b/src/main/resources/templates/qna/show.html index 9bfee385..7df98569 100644 --- a/src/main/resources/templates/qna/show.html +++ b/src/main/resources/templates/qna/show.html @@ -103,7 +103,7 @@

        {{title}}

        수정
      • -
        +
        From 8f3dc214cddddd8135b474990631c01cf5ba7ec1 Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Fri, 31 Mar 2023 19:52:48 +0900 Subject: [PATCH 10/11] =?UTF-8?q?fix(mission5):=20=ED=94=BC=EB=93=9C?= =?UTF-8?q?=EB=B0=B1=20=EB=B0=98=EC=98=81-=20Optional=20orElse(null)?= =?UTF-8?q?=EC=9D=84=20orElseThrow()=EB=A1=9C=20=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 값이 null일 경우 EmptyResultDataAccessException이 발생하도록 수정함 --- .../java/kr/codesqaud/cafe/controller/ArticleController.java | 5 +++-- .../java/kr/codesqaud/cafe/controller/LoginController.java | 3 ++- .../java/kr/codesqaud/cafe/controller/UserController.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java index 45528dda..5a928c2b 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java +++ b/src/main/java/kr/codesqaud/cafe/controller/ArticleController.java @@ -3,6 +3,7 @@ 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.*; @@ -62,7 +63,7 @@ public String printDetailArticle(@PathVariable int articleId, HttpSession httpSe @GetMapping("/article/{articleId}/edite") public String editeArticle(@PathVariable long articleId, HttpSession httpSession, Model model) { - Article writedArticle = articleService.findOneArticleById(articleId).orElseThrow(() -> new NullPointerException("해당하는 게시글이 없습니다.")); + 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); @@ -73,7 +74,7 @@ public String editeArticle(@PathVariable long articleId, HttpSession httpSession @DeleteMapping("/article/{articleId}/delete") public String deleteArticle(@PathVariable long articleId, HttpSession httpSession) { - Article writedArticle = articleService.findOneArticleById(articleId).orElseThrow(() -> new NullPointerException("해당하는 게시글이 없습니다")); + Article writedArticle = articleService.findOneArticleById(articleId).orElseThrow(() -> new EmptyResultDataAccessException(1)); Member loginMember = (Member) httpSession.getAttribute("sessionedUser"); if (loginMember.getNickName().equals(writedArticle.getWriter())) { articleService.deleteArticle(articleId); diff --git a/src/main/java/kr/codesqaud/cafe/controller/LoginController.java b/src/main/java/kr/codesqaud/cafe/controller/LoginController.java index 0b15abb5..cd473506 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/LoginController.java +++ b/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:/"; diff --git a/src/main/java/kr/codesqaud/cafe/controller/UserController.java b/src/main/java/kr/codesqaud/cafe/controller/UserController.java index 447aaaba..9c7ec70d 100644 --- a/src/main/java/kr/codesqaud/cafe/controller/UserController.java +++ b/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"; } From b70e1203f8852e7112574e71c865efc13124acd8 Mon Sep 17 00:00:00 2001 From: kimdongmin Date: Fri, 31 Mar 2023 19:54:56 +0900 Subject: [PATCH 11/11] =?UTF-8?q?fix(mission5):=20=ED=94=BC=EB=93=9C?= =?UTF-8?q?=EB=B0=B1=20=EB=B0=98=EC=98=81=20-=20.DS=5FStore=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/.DS_Store diff --git a/src/main/.DS_Store b/src/main/.DS_Store deleted file mode 100644 index 90d39627b341cc0f9a09c9d28b2f04dd75757d18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy>8nu5I)*+Eg>l2Aw@C;0=gQFg#<=|EQ;d}9kNtKJ2ZhKS%$4d77fckgJD2x z`Z5_i2T1lVZJ(ge(cY1Ckl5SDR3C0)h2r> z&67p$-kCQMJxt<)bEYoULHfA$tw`$k-=T&>=?9}U3 zd#~=y=a%{G`S!u<)xcW>p=CwhRK`6k{liFwk+(M4qxsYNrO8F-WosBOSpdz97d zqBR4WfnPB|`-6>2=qk)4imd}1aRop$&@BXQ@#~LhlLOIJm`Owr3X`dbGL@+-22(c& zCev};Rq>fbnGQ^>jPt0KnYy7cb@5=f2nXg$)U9SfGw_gsqU=`a{D1lL`~Slv-O~(c z2L3Asn9=l_4J=8Wtt-XRS!<)7p^{KsCh;x>4RI7>EFHz0s6x_^S;30FU{O3jhEB