From 8d74ce6e0e89bc01b052b204f10e678651933787 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 2 Jun 2024 18:52:55 +0900 Subject: [PATCH 01/18] =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80=5F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 ++++ .../example/demo/Exception/ArticleExist.java | 7 +++ .../demo/Exception/ArticleNotFound.java | 7 +++ .../example/demo/Exception/BoardNotFound.java | 7 +++ .../example/demo/Exception/EmailExist.java | 7 +++ .../com/example/demo/Exception/ErrorCode.java | 29 ++++++++++ .../example/demo/Exception/ErrorResponse.java | 25 ++++++++ .../com/example/demo/Exception/FailBoard.java | 7 +++ .../example/demo/Exception/FailMember.java | 7 +++ .../Exception/GlobalExceptionHandler.java | 57 +++++++++++++++++++ .../demo/Exception/MemberNotFound.java | 7 +++ .../com/example/demo/Exception/NullExist.java | 7 +++ .../demo/repository/ArticleRepository.java | 5 ++ .../repository/ArticleRepositoryJdbc.java | 40 ++++++++++--- .../repository/ArticleRepositoryMemory.java | 11 ++++ .../demo/repository/BoardRepository.java | 1 + .../demo/repository/BoardRepositoryJdbc.java | 3 + .../repository/BoardRepositoryMemory.java | 1 + .../demo/repository/MemberRepository.java | 3 + .../demo/repository/MemberRepositoryJdbc.java | 17 +++++- .../repository/MemberRepositoryMemory.java | 6 ++ .../example/demo/service/ArticleService.java | 40 ++++++++++++- .../example/demo/service/BoardService.java | 15 ++++- .../example/demo/service/MemberService.java | 25 +++++++- src/main/resources/application.yml | 2 +- 25 files changed, 329 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/example/demo/Exception/ArticleExist.java create mode 100644 src/main/java/com/example/demo/Exception/ArticleNotFound.java create mode 100644 src/main/java/com/example/demo/Exception/BoardNotFound.java create mode 100644 src/main/java/com/example/demo/Exception/EmailExist.java create mode 100644 src/main/java/com/example/demo/Exception/ErrorCode.java create mode 100644 src/main/java/com/example/demo/Exception/ErrorResponse.java create mode 100644 src/main/java/com/example/demo/Exception/FailBoard.java create mode 100644 src/main/java/com/example/demo/Exception/FailMember.java create mode 100644 src/main/java/com/example/demo/Exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/example/demo/Exception/MemberNotFound.java create mode 100644 src/main/java/com/example/demo/Exception/NullExist.java diff --git a/build.gradle b/build.gradle index 728ec9c..3dfa9c8 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,12 @@ java { sourceCompatibility = '17' } +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + repositories { mavenCentral() } @@ -21,6 +27,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-jdbc' runtimeOnly 'com.mysql:mysql-connector-j' testImplementation 'org.springframework.boot:spring-boot-starter-test' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testCompileOnly 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' } tasks.named('test') { diff --git a/src/main/java/com/example/demo/Exception/ArticleExist.java b/src/main/java/com/example/demo/Exception/ArticleExist.java new file mode 100644 index 0000000..3063db5 --- /dev/null +++ b/src/main/java/com/example/demo/Exception/ArticleExist.java @@ -0,0 +1,7 @@ +package com.example.demo.Exception; + +public class ArticleExist extends RuntimeException{ + public ArticleExist(String message) { + super(message); + } +} diff --git a/src/main/java/com/example/demo/Exception/ArticleNotFound.java b/src/main/java/com/example/demo/Exception/ArticleNotFound.java new file mode 100644 index 0000000..ea6a3cd --- /dev/null +++ b/src/main/java/com/example/demo/Exception/ArticleNotFound.java @@ -0,0 +1,7 @@ +package com.example.demo.Exception; + +public class ArticleNotFound extends RuntimeException { + public ArticleNotFound(String message) { + super(message); + } +} diff --git a/src/main/java/com/example/demo/Exception/BoardNotFound.java b/src/main/java/com/example/demo/Exception/BoardNotFound.java new file mode 100644 index 0000000..c4ba385 --- /dev/null +++ b/src/main/java/com/example/demo/Exception/BoardNotFound.java @@ -0,0 +1,7 @@ +package com.example.demo.Exception; + +public class BoardNotFound extends RuntimeException { + public BoardNotFound(String message) { + super(message); + } +} diff --git a/src/main/java/com/example/demo/Exception/EmailExist.java b/src/main/java/com/example/demo/Exception/EmailExist.java new file mode 100644 index 0000000..6a985e3 --- /dev/null +++ b/src/main/java/com/example/demo/Exception/EmailExist.java @@ -0,0 +1,7 @@ +package com.example.demo.Exception; + +public class EmailExist extends RuntimeException { + public EmailExist(String message) { + super(message); + } +} diff --git a/src/main/java/com/example/demo/Exception/ErrorCode.java b/src/main/java/com/example/demo/Exception/ErrorCode.java new file mode 100644 index 0000000..1e9fb86 --- /dev/null +++ b/src/main/java/com/example/demo/Exception/ErrorCode.java @@ -0,0 +1,29 @@ +package com.example.demo.Exception; + +import lombok.Getter; + +@Getter +public enum ErrorCode { + + Article_Not_Found(404,"NOT_FOUND","게시물을 찾을 수 없습니다."), + Board_Not_Found(404,"NOT_FOUND","게시판을 찾을 수 없습니다."), + Member_Not_Found(404,"NOT_FOUND","사용자를 찾을 수 없습니다."), + + Email_Exist(409,"Exist","이미 이메일이 존재합니다."), + Fail_Member(400,"FAIL","사용자를 참조할 수 없습니다."), + Fail_Board(400,"FAIL","게시판을 참조할 수 없습니다."), + + Null_Exist(400,"NULL","빈(Null) 값이 존재합니다."), + + Remain_Article(400,"REMAIN","게시물이 남아있습니다."); + + private final int code_id; + private final String code; + private final String message; + + ErrorCode(int code_id, String code, String message) { + this.code_id = code_id; + this.code = code; + this.message = message; + } +} diff --git a/src/main/java/com/example/demo/Exception/ErrorResponse.java b/src/main/java/com/example/demo/Exception/ErrorResponse.java new file mode 100644 index 0000000..4f5d174 --- /dev/null +++ b/src/main/java/com/example/demo/Exception/ErrorResponse.java @@ -0,0 +1,25 @@ +package com.example.demo.Exception; + +import lombok.Getter; + +import java.time.LocalDateTime; + +@Getter +public class ErrorResponse { + private final LocalDateTime timestamp=LocalDateTime.now(); + private int code_id; + private String code; + private String message; + + public ErrorResponse(ErrorCode errorCode) { + this.code_id = errorCode.getCode_id(); + this.code = errorCode.getCode(); + this.message = errorCode.getMessage(); + } + + public ErrorResponse(ErrorCode errorCode, String message) { + this.code_id = errorCode.getCode_id(); + this.code = errorCode.getCode(); + this.message = message; + } +} diff --git a/src/main/java/com/example/demo/Exception/FailBoard.java b/src/main/java/com/example/demo/Exception/FailBoard.java new file mode 100644 index 0000000..d6b340b --- /dev/null +++ b/src/main/java/com/example/demo/Exception/FailBoard.java @@ -0,0 +1,7 @@ +package com.example.demo.Exception; + +public class FailBoard extends RuntimeException{ + public FailBoard(String message) { + super(message); + } +} diff --git a/src/main/java/com/example/demo/Exception/FailMember.java b/src/main/java/com/example/demo/Exception/FailMember.java new file mode 100644 index 0000000..df6406f --- /dev/null +++ b/src/main/java/com/example/demo/Exception/FailMember.java @@ -0,0 +1,7 @@ +package com.example.demo.Exception; + +public class FailMember extends RuntimeException{ + public FailMember(String message) { + super(message); + } +} diff --git a/src/main/java/com/example/demo/Exception/GlobalExceptionHandler.java b/src/main/java/com/example/demo/Exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..4b1d418 --- /dev/null +++ b/src/main/java/com/example/demo/Exception/GlobalExceptionHandler.java @@ -0,0 +1,57 @@ +package com.example.demo.Exception; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(ArticleNotFound.class) + public ResponseEntity handleArticleNotFound(ArticleNotFound articleNotFound) { + ErrorResponse response=new ErrorResponse(ErrorCode.Article_Not_Found); + return ResponseEntity.status(response.getCode_id()).body(response); + } + + @ExceptionHandler(BoardNotFound.class) + public ResponseEntity handleBoardNotFound(BoardNotFound boardNotFound) { + ErrorResponse response=new ErrorResponse(ErrorCode.Board_Not_Found); + return ResponseEntity.status(response.getCode_id()).body(response); + } + + @ExceptionHandler(MemberNotFound.class) + public ResponseEntity handleMemberNotFound(MemberNotFound memberNotFound) { + ErrorResponse response=new ErrorResponse(ErrorCode.Member_Not_Found); + return ResponseEntity.status(response.getCode_id()).body(response); + } + + @ExceptionHandler(EmailExist.class) + public ResponseEntity handleEmailExist(EmailExist emailExist) { + ErrorResponse response=new ErrorResponse(ErrorCode.Email_Exist); + return ResponseEntity.status(response.getCode_id()).body(response); + } + + @ExceptionHandler(FailMember.class) + public ResponseEntity handleFailMember(FailMember failMember) { + ErrorResponse response=new ErrorResponse(ErrorCode.Fail_Member); + return ResponseEntity.status(response.getCode_id()).body(response); + } + + @ExceptionHandler(FailBoard.class) + public ResponseEntity handleFailBoard(FailBoard failBoard) { + ErrorResponse response=new ErrorResponse(ErrorCode.Fail_Board); + return ResponseEntity.status(response.getCode_id()).body(response); + } + + @ExceptionHandler(NullExist.class) + public ResponseEntity handleNullExist(NullExist nullExist) { + ErrorResponse response=new ErrorResponse(ErrorCode.Null_Exist); + return ResponseEntity.status(response.getCode_id()).body(response); + } + + @ExceptionHandler(ArticleExist.class) + public ResponseEntity handleArticleExist(ArticleExist articleExist) { + ErrorResponse response=new ErrorResponse(ErrorCode.Remain_Article); + return ResponseEntity.status(response.getCode_id()).body(response); + } +} diff --git a/src/main/java/com/example/demo/Exception/MemberNotFound.java b/src/main/java/com/example/demo/Exception/MemberNotFound.java new file mode 100644 index 0000000..0524e25 --- /dev/null +++ b/src/main/java/com/example/demo/Exception/MemberNotFound.java @@ -0,0 +1,7 @@ +package com.example.demo.Exception; + +public class MemberNotFound extends RuntimeException { + public MemberNotFound(String message) { + super(message); + } +} diff --git a/src/main/java/com/example/demo/Exception/NullExist.java b/src/main/java/com/example/demo/Exception/NullExist.java new file mode 100644 index 0000000..1376950 --- /dev/null +++ b/src/main/java/com/example/demo/Exception/NullExist.java @@ -0,0 +1,7 @@ +package com.example.demo.Exception; + +public class NullExist extends RuntimeException{ + public NullExist(String message) { + super(message); + } +} diff --git a/src/main/java/com/example/demo/repository/ArticleRepository.java b/src/main/java/com/example/demo/repository/ArticleRepository.java index be3ebd4..cb06834 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepository.java +++ b/src/main/java/com/example/demo/repository/ArticleRepository.java @@ -1,6 +1,7 @@ package com.example.demo.repository; import java.util.List; +import java.util.Optional; import com.example.demo.domain.Article; @@ -19,4 +20,8 @@ public interface ArticleRepository { Article update(Article article); void deleteById(Long id); + + boolean existByAuthorId(Long authorId); + + boolean existByBoardId(Long boardId); } diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java b/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java index c9a272e..832e006 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java @@ -2,7 +2,10 @@ import java.sql.PreparedStatement; import java.util.List; +import java.util.Optional; +import com.example.demo.Exception.ArticleNotFound; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; @@ -59,10 +62,9 @@ public List
findAllByMemberId(Long memberId) { @Override public Article findById(Long id) { return jdbcTemplate.queryForObject(""" - SELECT id, board_id, author_id, title, content, created_date, modified_date - FROM article - WHERE id = ? - """, articleRowMapper, id); + SELECT id, board_id, author_id, title, content, created_date, modified_date + FROM article + WHERE id = ?""", articleRowMapper, id); } @Override @@ -73,7 +75,7 @@ public Article insert(Article article) { INSERT INTO article (board_id, author_id, title, content) VALUES (?, ?, ?, ?) """, - new String[]{"id"}); + new String[]{"id"}); ps.setLong(1, article.getBoardId()); ps.setLong(2, article.getAuthorId()); ps.setString(3, article.getTitle()); @@ -90,10 +92,10 @@ public Article update(Article article) { SET board_id = ?, title = ?, content = ? WHERE id = ? """, - article.getBoardId(), - article.getTitle(), - article.getContent(), - article.getId() + article.getBoardId(), + article.getTitle(), + article.getContent(), + article.getId() ); return findById(article.getId()); } @@ -105,4 +107,24 @@ public void deleteById(Long id) { WHERE id = ? """, id); } + + @Override + public boolean existByAuthorId(Long authorId) { + Integer count=jdbcTemplate.queryForObject(""" + SELECT COUNT(*) + FROM article + WhERE author_id=? + """,Integer.class,authorId); + return count !=null && count>0; + } + + @Override + public boolean existByBoardId(Long boardId) { + Integer count =jdbcTemplate.queryForObject(""" + SELECT COUNT(*) + FROM article + WHERE author_id=? + """,Integer.class,boardId); + return count !=null && count>0; + } } diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java b/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java index 13ba78b..a3145a7 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.concurrent.atomic.AtomicLong; import com.example.demo.domain.Article; @@ -67,4 +68,14 @@ public Article update(Article article) { public void deleteById(Long id) { articles.remove(id); } + + @Override + public boolean existByAuthorId(Long authorId) { + return false; + } + + @Override + public boolean existByBoardId(Long boardId) { + return false; + } } diff --git a/src/main/java/com/example/demo/repository/BoardRepository.java b/src/main/java/com/example/demo/repository/BoardRepository.java index cc2dfd0..40fa5f7 100644 --- a/src/main/java/com/example/demo/repository/BoardRepository.java +++ b/src/main/java/com/example/demo/repository/BoardRepository.java @@ -1,6 +1,7 @@ package com.example.demo.repository; import java.util.List; +import java.util.Optional; import com.example.demo.domain.Board; diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java b/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java index c4fd6f6..34b5da7 100644 --- a/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java @@ -2,7 +2,10 @@ import java.sql.PreparedStatement; import java.util.List; +import java.util.Optional; +import com.example.demo.Exception.BoardNotFound; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java b/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java index 8cf5ecf..ec125f5 100644 --- a/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.concurrent.atomic.AtomicLong; import com.example.demo.domain.Board; diff --git a/src/main/java/com/example/demo/repository/MemberRepository.java b/src/main/java/com/example/demo/repository/MemberRepository.java index 8e2ad14..9dc9d4e 100644 --- a/src/main/java/com/example/demo/repository/MemberRepository.java +++ b/src/main/java/com/example/demo/repository/MemberRepository.java @@ -1,6 +1,7 @@ package com.example.demo.repository; import java.util.List; +import java.util.Optional; import com.example.demo.domain.Member; @@ -15,4 +16,6 @@ public interface MemberRepository { Member update(Member member); void deleteById(Long id); + + boolean existByEmail(String email); } diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java b/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java index 30d2262..49836ca 100644 --- a/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java @@ -2,7 +2,10 @@ import java.sql.PreparedStatement; import java.util.List; +import java.util.Optional; +import com.example.demo.Exception.MemberNotFound; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; @@ -31,7 +34,7 @@ public MemberRepositoryJdbc(JdbcTemplate jdbcTemplate) { public List findAll() { return jdbcTemplate.query(""" SELECT id, name, email, password - FROM member + FROM members """, memberRowMapper); } @@ -72,8 +75,18 @@ public Member update(Member member) { @Override public void deleteById(Long id) { jdbcTemplate.update(""" - DELETE FROM member + DELETE FROM members WHERE id = ? """, id); } + + @Override + public boolean existByEmail(String email) { + Integer count=jdbcTemplate.queryForObject(""" + SELECT COUNT(*) + FROM members + WHERE email=? + """,Integer.class,email); + return count!=null&&count>0; + } } diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java b/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java index b4cf722..4ed2736 100644 --- a/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.concurrent.atomic.AtomicLong; import com.example.demo.domain.Member; @@ -49,4 +50,9 @@ public Member update(Member member) { public void deleteById(Long id) { members.remove(id); } + + @Override + public boolean existByEmail(String email) { + return false; + } } diff --git a/src/main/java/com/example/demo/service/ArticleService.java b/src/main/java/com/example/demo/service/ArticleService.java index 7f8610b..45efec5 100644 --- a/src/main/java/com/example/demo/service/ArticleService.java +++ b/src/main/java/com/example/demo/service/ArticleService.java @@ -2,6 +2,7 @@ import java.util.List; +import com.example.demo.Exception.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,8 +36,17 @@ public ArticleService( public ArticleResponse getById(Long id) { Article article = articleRepository.findById(id); + if (article == null) { + throw new ArticleNotFound("게시글을 찾을 수 없습니다."); + } Member member = memberRepository.findById(article.getAuthorId()); + if (member == null) { + throw new MemberNotFound("사용자를 찾을 수 없습니다."); + } Board board = boardRepository.findById(article.getBoardId()); + if (board == null) { + throw new BoardNotFound("게시판을 찾을 수 없습니다."); + } return ArticleResponse.of(article, member, board); } @@ -45,7 +55,13 @@ public List getByBoardId(Long boardId) { return articles.stream() .map(article -> { Member member = memberRepository.findById(article.getAuthorId()); + if (member == null) { + throw new MemberNotFound("사용자를 찾을 수 없습니다."); + } Board board = boardRepository.findById(article.getBoardId()); + if (board == null) { + throw new BoardNotFound("게시판을 찾을 수 없습니다."); + } return ArticleResponse.of(article, member, board); }) .toList(); @@ -53,25 +69,43 @@ public List getByBoardId(Long boardId) { @Transactional public ArticleResponse create(ArticleCreateRequest request) { + Member member = memberRepository.findById(request.authorId()); + if (member == null) { + throw new FailMember("사용자를 찾을 수 없습니다."); + } + Board board = boardRepository.findById(request.boardId()); + if (board == null) { + throw new FailBoard("게시판을 찾을 수 없습니다."); + } + Article article = new Article( request.authorId(), request.boardId(), request.title(), request.description() ); + Article saved = articleRepository.insert(article); - Member member = memberRepository.findById(saved.getAuthorId()); - Board board = boardRepository.findById(saved.getBoardId()); + return ArticleResponse.of(saved, member, board); } @Transactional public ArticleResponse update(Long id, ArticleUpdateRequest request) { + Board board = boardRepository.findById(request.boardId()); + if (board == null) { + throw new FailBoard("게시판을 찾을 수 없습니다."); + } + Article article = articleRepository.findById(id); + article.update(request.boardId(), request.title(), request.description()); Article updated = articleRepository.update(article); + Member member = memberRepository.findById(updated.getAuthorId()); - Board board = boardRepository.findById(article.getBoardId()); + if (member == null) { + throw new FailMember("사용자를 찾을 수 없습니다."); + } return ArticleResponse.of(article, member, board); } diff --git a/src/main/java/com/example/demo/service/BoardService.java b/src/main/java/com/example/demo/service/BoardService.java index ffff891..fb21d7d 100644 --- a/src/main/java/com/example/demo/service/BoardService.java +++ b/src/main/java/com/example/demo/service/BoardService.java @@ -2,6 +2,9 @@ import java.util.List; +import com.example.demo.Exception.ArticleExist; +import com.example.demo.Exception.BoardNotFound; +import com.example.demo.repository.ArticleRepositoryJdbc; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,9 +19,11 @@ public class BoardService { private final BoardRepository boardRepository; + private final ArticleRepositoryJdbc articleRepositoryJdbc; - public BoardService(BoardRepository boardRepository) { + public BoardService(BoardRepository boardRepository, ArticleRepositoryJdbc articleRepositoryJdbc) { this.boardRepository = boardRepository; + this.articleRepositoryJdbc = articleRepositoryJdbc; } public List getBoards() { @@ -29,6 +34,9 @@ public List getBoards() { public BoardResponse getBoardById(Long id) { Board board = boardRepository.findById(id); + if (board == null) { + throw new BoardNotFound("게시판을 찾을 수 없습니다."); + } return BoardResponse.from(board); } @@ -41,12 +49,17 @@ public BoardResponse createBoard(BoardCreateRequest request) { @Transactional public void deleteBoard(Long id) { + if (articleRepositoryJdbc.existByBoardId(id)) + throw new ArticleExist("게시물이 존재합니다."); boardRepository.deleteById(id); } @Transactional public BoardResponse update(Long id, BoardUpdateRequest request) { Board board = boardRepository.findById(id); + if (board == null) { + throw new BoardNotFound("게시판을 찾을 수 없습니다."); + } board.update(request.name()); Board updated = boardRepository.update(board); return BoardResponse.from(updated); diff --git a/src/main/java/com/example/demo/service/MemberService.java b/src/main/java/com/example/demo/service/MemberService.java index 04c1bc8..9c11570 100644 --- a/src/main/java/com/example/demo/service/MemberService.java +++ b/src/main/java/com/example/demo/service/MemberService.java @@ -1,7 +1,13 @@ package com.example.demo.service; import java.util.List; +import java.util.Objects; +import com.example.demo.Exception.ArticleExist; +import com.example.demo.Exception.EmailExist; +import com.example.demo.Exception.MemberNotFound; +import com.example.demo.repository.ArticleRepositoryJdbc; +import com.example.demo.repository.MemberRepositoryJdbc; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,13 +22,20 @@ public class MemberService { private final MemberRepository memberRepository; + private final MemberRepositoryJdbc memberRepositoryJdbc; + private final ArticleRepositoryJdbc articleRepositoryJdbc; - public MemberService(MemberRepository memberRepository) { + public MemberService(MemberRepository memberRepository, MemberRepositoryJdbc memberRepositoryJdbc, ArticleRepositoryJdbc articleRepositoryJdbc) { this.memberRepository = memberRepository; + this.memberRepositoryJdbc = memberRepositoryJdbc; + this.articleRepositoryJdbc = articleRepositoryJdbc; } public MemberResponse getById(Long id) { Member member = memberRepository.findById(id); + if (member == null) { + throw new MemberNotFound("사용자를 찾을 수 없습니다."); + } return MemberResponse.from(member); } @@ -43,12 +56,22 @@ public MemberResponse create(MemberCreateRequest request) { @Transactional public void delete(Long id) { + if (articleRepositoryJdbc.existByAuthorId(id)) { + throw new ArticleExist("게시물이 존재합니다."); + } memberRepository.deleteById(id); } @Transactional public MemberResponse update(Long id, MemberUpdateRequest request) { Member member = memberRepository.findById(id); + if(member == null) { + throw new MemberNotFound("사용자를 찾을 수 없습니다."); + } + if(member.getEmail().equals(request.email())&&memberRepositoryJdbc.existByEmail(request.email())) { + throw new EmailExist("이메일이 이미 존재합니다."); + } + member.update(request.name(), request.email()); memberRepository.update(member); return MemberResponse.from(member); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ff69a9e..4082171 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,5 +2,5 @@ spring: datasource: url: jdbc:mysql://localhost:3306/bcsd # 본인의 환경에 맞게 수정한다. username: root # 본인의 환경에 맞게 수정한다. - password: qwer1234 # 본인의 환경에 맞게 수정한다. + password: 1q2w3e4r! # 본인의 환경에 맞게 수정한다. driver-class-name: com.mysql.cj.jdbc.Driver From d6b153283983ffb6174d99a4df8f44a94a26858f Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 2 Jun 2024 22:33:10 +0900 Subject: [PATCH 02/18] =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=20=EA=B3=BC=EC=A0=9C=5F3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/Exception/GlobalExceptionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/Exception/GlobalExceptionHandler.java b/src/main/java/com/example/demo/Exception/GlobalExceptionHandler.java index 4b1d418..78fc3f8 100644 --- a/src/main/java/com/example/demo/Exception/GlobalExceptionHandler.java +++ b/src/main/java/com/example/demo/Exception/GlobalExceptionHandler.java @@ -17,7 +17,7 @@ public ResponseEntity handleArticleNotFound(ArticleNotFound artic public ResponseEntity handleBoardNotFound(BoardNotFound boardNotFound) { ErrorResponse response=new ErrorResponse(ErrorCode.Board_Not_Found); return ResponseEntity.status(response.getCode_id()).body(response); - } + } @ExceptionHandler(MemberNotFound.class) public ResponseEntity handleMemberNotFound(MemberNotFound memberNotFound) { From fb97f40c896634424d26d6f48115072f9e8697e5 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 2 Jun 2024 23:25:54 +0900 Subject: [PATCH 03/18] =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=20=EA=B3=BC=EC=A0=9C=5F4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/repository/ArticleRepository.java | 2 +- .../repository/ArticleRepositoryJdbc.java | 78 ++++++++++++------- .../repository/ArticleRepositoryMemory.java | 4 +- .../demo/repository/BoardRepository.java | 2 +- .../demo/repository/BoardRepositoryJdbc.java | 15 +++- .../repository/BoardRepositoryMemory.java | 4 +- .../demo/repository/MemberRepository.java | 2 +- .../demo/repository/MemberRepositoryJdbc.java | 26 +++++-- .../repository/MemberRepositoryMemory.java | 4 +- .../example/demo/service/ArticleService.java | 47 +++-------- .../example/demo/service/BoardService.java | 10 +-- .../example/demo/service/MemberService.java | 12 +-- 12 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/main/java/com/example/demo/repository/ArticleRepository.java b/src/main/java/com/example/demo/repository/ArticleRepository.java index cb06834..4c4bf13 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepository.java +++ b/src/main/java/com/example/demo/repository/ArticleRepository.java @@ -13,7 +13,7 @@ public interface ArticleRepository { List
findAllByMemberId(Long memberId); - Article findById(Long id); + Optional
findById(Long id); Article insert(Article article); diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java b/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java index 832e006..27200ae 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java @@ -5,7 +5,7 @@ import java.util.Optional; import com.example.demo.Exception.ArticleNotFound; -import org.springframework.dao.EmptyResultDataAccessException; +import com.example.demo.Exception.NullExist; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.GeneratedKeyHolder; @@ -24,13 +24,13 @@ public ArticleRepositoryJdbc(JdbcTemplate jdbcTemplate) { } private static final RowMapper
articleRowMapper = (rs, rowNum) -> new Article( - rs.getLong("id"), - rs.getLong("author_id"), - rs.getLong("board_id"), - rs.getString("title"), - rs.getString("content"), - rs.getTimestamp("created_date").toLocalDateTime(), - rs.getTimestamp("modified_date").toLocalDateTime() + rs.getLong("id"), + rs.getLong("author_id"), + rs.getLong("board_id"), + rs.getString("title"), + rs.getString("content"), + rs.getTimestamp("created_date").toLocalDateTime(), + rs.getTimestamp("modified_date").toLocalDateTime() ); @Override @@ -60,15 +60,33 @@ public List
findAllByMemberId(Long memberId) { } @Override - public Article findById(Long id) { - return jdbcTemplate.queryForObject(""" - SELECT id, board_id, author_id, title, content, created_date, modified_date - FROM article - WHERE id = ?""", articleRowMapper, id); + public Optional
findById(Long id) { + try { + Article article = jdbcTemplate.queryForObject(""" + SELECT id, board_id, author_id, title, content, created_date, modified_date + FROM article + WHERE id = ? + """, articleRowMapper, id); + return Optional.ofNullable(article); + } catch (Exception e) { + return Optional.empty(); + } } @Override public Article insert(Article article) { + if (article.getBoardId() == null) { + throw new NullExist("게시판 아이디가 존재하지 않습니다."); + } + if (article.getAuthorId() == null) { + throw new NullExist("사용자 아이디가 존재하지 않습니다."); + } + if (article.getTitle() == null) { + throw new NullExist("제목이 존재하지 않습니다."); + } + if (article.getContent() == null) { + throw new NullExist("내용이 존재하지 않습니다."); + } KeyHolder keyHolder = new GeneratedKeyHolder(); jdbcTemplate.update(con -> { PreparedStatement ps = con.prepareStatement(""" @@ -82,49 +100,49 @@ INSERT INTO article (board_id, author_id, title, content) ps.setString(4, article.getContent()); return ps; }, keyHolder); - return findById(keyHolder.getKey().longValue()); + return findById(keyHolder.getKey().longValue()).orElseThrow(()->new ArticleNotFound("게시글을 찾을 수 없습니다.")); } @Override public Article update(Article article) { jdbcTemplate.update(""" - UPDATE article - SET board_id = ?, title = ?, content = ? - WHERE id = ? - """, + UPDATE article + SET board_id = ?, title = ?, content = ? + WHERE id = ? + """, article.getBoardId(), article.getTitle(), article.getContent(), article.getId() ); - return findById(article.getId()); + return findById(article.getId()).orElseThrow(()-> new ArticleNotFound("게시글을 찾을 수 없습니다.")); } @Override public void deleteById(Long id) { jdbcTemplate.update(""" - DELETE FROM article - WHERE id = ? - """, id); + DELETE FROM article + WHERE id = ? + """, id); } @Override public boolean existByAuthorId(Long authorId) { Integer count=jdbcTemplate.queryForObject(""" - SELECT COUNT(*) - FROM article - WhERE author_id=? - """,Integer.class,authorId); + SELECT COUNT(*) + FROM article + WhERE author_id=? + """,Integer.class,authorId); return count !=null && count>0; } @Override public boolean existByBoardId(Long boardId) { Integer count =jdbcTemplate.queryForObject(""" - SELECT COUNT(*) - FROM article - WHERE author_id=? - """,Integer.class,boardId); + SELECT COUNT(*) + FROM article + WHERE author_id=? + """,Integer.class,boardId); return count !=null && count>0; } } diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java b/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java index a3145a7..0fb00f8 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java @@ -46,8 +46,8 @@ public List
findAllByMemberId(Long memberId) { } @Override - public Article findById(Long id) { - return articles.getOrDefault(id, null); + public Optional
findById(Long id) { + return Optional.ofNullable(articles.getOrDefault(id, null)); } @Override diff --git a/src/main/java/com/example/demo/repository/BoardRepository.java b/src/main/java/com/example/demo/repository/BoardRepository.java index 40fa5f7..e6a31d5 100644 --- a/src/main/java/com/example/demo/repository/BoardRepository.java +++ b/src/main/java/com/example/demo/repository/BoardRepository.java @@ -9,7 +9,7 @@ public interface BoardRepository { List findAll(); - Board findById(Long id); + Optional findById(Long id); Board insert(Board board); diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java b/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java index 34b5da7..68c04e6 100644 --- a/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java @@ -5,6 +5,7 @@ import java.util.Optional; import com.example.demo.Exception.BoardNotFound; +import com.example.demo.Exception.NullExist; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; @@ -37,16 +38,24 @@ public List findAll() { } @Override - public Board findById(Long id) { - return jdbcTemplate.queryForObject(""" + public Optional findById(Long id) { + try{ + Board board =jdbcTemplate.queryForObject(""" SELECT id, name FROM board WHERE id = ? """, boardRowMapper, id); + return Optional.ofNullable(board); + } catch(Exception e){ + return Optional.empty(); + } } @Override public Board insert(Board board) { + if (board.getName()==null) { + throw new NullExist("게시판의 이름이 존재하지 않습니다."); + } KeyHolder keyHolder = new GeneratedKeyHolder(); jdbcTemplate.update(con -> { PreparedStatement ps = con.prepareStatement(""" @@ -55,7 +64,7 @@ INSERT INTO board (name) VALUES (?) ps.setString(1, board.getName()); return ps; }, keyHolder); - return findById(keyHolder.getKey().longValue()); + return findById(keyHolder.getKey().longValue()).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); } @Override diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java b/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java index ec125f5..a9edf95 100644 --- a/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java @@ -29,8 +29,8 @@ public List findAll() { } @Override - public Board findById(Long id) { - return boards.getOrDefault(id, null); + public Optional findById(Long id) { + return Optional.ofNullable(boards.getOrDefault(id, null)); } @Override diff --git a/src/main/java/com/example/demo/repository/MemberRepository.java b/src/main/java/com/example/demo/repository/MemberRepository.java index 9dc9d4e..d47181c 100644 --- a/src/main/java/com/example/demo/repository/MemberRepository.java +++ b/src/main/java/com/example/demo/repository/MemberRepository.java @@ -9,7 +9,7 @@ public interface MemberRepository { List findAll(); - Member findById(Long id); + Optional findById(Long id); Member insert(Member member); diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java b/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java index 49836ca..7fc6f0a 100644 --- a/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java @@ -5,6 +5,7 @@ import java.util.Optional; import com.example.demo.Exception.MemberNotFound; +import com.example.demo.Exception.NullExist; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; @@ -39,37 +40,48 @@ public List findAll() { } @Override - public Member findById(Long id) { - return jdbcTemplate.queryForObject(""" + public Optional findById(Long id) { + try{ + Member member = jdbcTemplate.queryForObject(""" SELECT id, name, email, password - FROM member + FROM members WHERE id = ? """, memberRowMapper, id); + return Optional.ofNullable(member); + } catch(Exception e) { + return Optional.empty(); + } } @Override public Member insert(Member member) { + if (member.getName()==null) { + throw new NullExist("이름이 존재하지 않습니다."); + } + if (member.getEmail()==null) { + throw new NullExist("이메일이 존재하지 않습니다."); + } KeyHolder keyHolder = new GeneratedKeyHolder(); jdbcTemplate.update(con -> { PreparedStatement ps = con.prepareStatement(""" - INSERT INTO member (name, email, password) VALUES (?, ?, ?) + INSERT INTO members (name, email, password) VALUES (?, ?, ?) """, new String[]{"id"}); ps.setString(1, member.getName()); ps.setString(2, member.getEmail()); ps.setString(3, member.getPassword()); return ps; }, keyHolder); - return findById(keyHolder.getKey().longValue()); + return findById(keyHolder.getKey().longValue()).orElseThrow(()->new MemberNotFound("사용자를 찾을 수 없습니다.")); } @Override public Member update(Member member) { jdbcTemplate.update(""" - UPDATE member + UPDATE members SET name = ?, email = ? WHERE id = ? """, member.getName(), member.getEmail(), member.getId()); - return findById(member.getId()); + return findById(member.getId()).orElseThrow(()->new MemberNotFound("사용자를 찾을 수 없습니다.")); } @Override diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java b/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java index 4ed2736..207f046 100644 --- a/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java @@ -29,8 +29,8 @@ public List findAll() { } @Override - public Member findById(Long id) { - return members.getOrDefault(id, null); + public Optional findById(Long id) { + return Optional.ofNullable(members.getOrDefault(id, null)); } @Override diff --git a/src/main/java/com/example/demo/service/ArticleService.java b/src/main/java/com/example/demo/service/ArticleService.java index 45efec5..7cb74ce 100644 --- a/src/main/java/com/example/demo/service/ArticleService.java +++ b/src/main/java/com/example/demo/service/ArticleService.java @@ -35,18 +35,9 @@ public ArticleService( } public ArticleResponse getById(Long id) { - Article article = articleRepository.findById(id); - if (article == null) { - throw new ArticleNotFound("게시글을 찾을 수 없습니다."); - } - Member member = memberRepository.findById(article.getAuthorId()); - if (member == null) { - throw new MemberNotFound("사용자를 찾을 수 없습니다."); - } - Board board = boardRepository.findById(article.getBoardId()); - if (board == null) { - throw new BoardNotFound("게시판을 찾을 수 없습니다."); - } + Article article = articleRepository.findById(id).orElseThrow(() -> new ArticleNotFound("게시글을 찾을 수 없습니다.")); + Member member = memberRepository.findById(article.getAuthorId()).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); + Board board = boardRepository.findById(article.getBoardId()).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); return ArticleResponse.of(article, member, board); } @@ -54,14 +45,8 @@ public List getByBoardId(Long boardId) { List
articles = articleRepository.findAllByBoardId(boardId); return articles.stream() .map(article -> { - Member member = memberRepository.findById(article.getAuthorId()); - if (member == null) { - throw new MemberNotFound("사용자를 찾을 수 없습니다."); - } - Board board = boardRepository.findById(article.getBoardId()); - if (board == null) { - throw new BoardNotFound("게시판을 찾을 수 없습니다."); - } + Member member = memberRepository.findById(article.getAuthorId()).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); + Board board = boardRepository.findById(article.getBoardId()).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); return ArticleResponse.of(article, member, board); }) .toList(); @@ -69,14 +54,8 @@ public List getByBoardId(Long boardId) { @Transactional public ArticleResponse create(ArticleCreateRequest request) { - Member member = memberRepository.findById(request.authorId()); - if (member == null) { - throw new FailMember("사용자를 찾을 수 없습니다."); - } - Board board = boardRepository.findById(request.boardId()); - if (board == null) { - throw new FailBoard("게시판을 찾을 수 없습니다."); - } + Member member = memberRepository.findById(request.authorId()).orElseThrow(()->new FailMember("사용자를 찾을 수 없습니다.")); + Board board = boardRepository.findById(request.boardId()).orElseThrow(()->new FailBoard("게시판을 찾을 수 없습니다.")); Article article = new Article( request.authorId(), @@ -92,20 +71,14 @@ public ArticleResponse create(ArticleCreateRequest request) { @Transactional public ArticleResponse update(Long id, ArticleUpdateRequest request) { - Board board = boardRepository.findById(request.boardId()); - if (board == null) { - throw new FailBoard("게시판을 찾을 수 없습니다."); - } + Board board = boardRepository.findById(request.boardId()).orElseThrow(()->new FailBoard("게시판을 찾을 수 없습니다.")); - Article article = articleRepository.findById(id); + Article article=articleRepository.findById(id).orElseThrow(()->new ArticleNotFound("게시글을 찾을 수 없습니다.")); article.update(request.boardId(), request.title(), request.description()); Article updated = articleRepository.update(article); - Member member = memberRepository.findById(updated.getAuthorId()); - if (member == null) { - throw new FailMember("사용자를 찾을 수 없습니다."); - } + Member member = memberRepository.findById(updated.getAuthorId()).orElseThrow(()->new FailMember("사용자를 찾을 수 없습니다.")); return ArticleResponse.of(article, member, board); } diff --git a/src/main/java/com/example/demo/service/BoardService.java b/src/main/java/com/example/demo/service/BoardService.java index fb21d7d..e229770 100644 --- a/src/main/java/com/example/demo/service/BoardService.java +++ b/src/main/java/com/example/demo/service/BoardService.java @@ -33,10 +33,7 @@ public List getBoards() { } public BoardResponse getBoardById(Long id) { - Board board = boardRepository.findById(id); - if (board == null) { - throw new BoardNotFound("게시판을 찾을 수 없습니다."); - } + Board board = boardRepository.findById(id).orElseThrow(() -> new BoardNotFound("게시판을 찾을 수 없습니다.")); return BoardResponse.from(board); } @@ -56,10 +53,7 @@ public void deleteBoard(Long id) { @Transactional public BoardResponse update(Long id, BoardUpdateRequest request) { - Board board = boardRepository.findById(id); - if (board == null) { - throw new BoardNotFound("게시판을 찾을 수 없습니다."); - } + Board board = boardRepository.findById(id).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); board.update(request.name()); Board updated = boardRepository.update(board); return BoardResponse.from(updated); diff --git a/src/main/java/com/example/demo/service/MemberService.java b/src/main/java/com/example/demo/service/MemberService.java index 9c11570..758d88e 100644 --- a/src/main/java/com/example/demo/service/MemberService.java +++ b/src/main/java/com/example/demo/service/MemberService.java @@ -32,10 +32,7 @@ public MemberService(MemberRepository memberRepository, MemberRepositoryJdbc mem } public MemberResponse getById(Long id) { - Member member = memberRepository.findById(id); - if (member == null) { - throw new MemberNotFound("사용자를 찾을 수 없습니다."); - } + Member member = memberRepository.findById(id).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); return MemberResponse.from(member); } @@ -64,11 +61,8 @@ public void delete(Long id) { @Transactional public MemberResponse update(Long id, MemberUpdateRequest request) { - Member member = memberRepository.findById(id); - if(member == null) { - throw new MemberNotFound("사용자를 찾을 수 없습니다."); - } - if(member.getEmail().equals(request.email())&&memberRepositoryJdbc.existByEmail(request.email())) { + Member member = memberRepository.findById(id).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); + if(!member.getEmail().equals(request.email())&&memberRepositoryJdbc.existByEmail(request.email())) { throw new EmailExist("이메일이 이미 존재합니다."); } From 53203cca1d0bfcc50cb09ae15756b64caf9700f3 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Mon, 24 Jun 2024 20:20:00 +0900 Subject: [PATCH 04/18] =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=20=EA=B3=BC=EC=A0=9C=5F4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/.gitignore b/.gitignore index c2065bc..0bef347 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,176 @@ out/ ### VS Code ### .vscode/ + +# Created by https://www.toptal.com/developers/gitignore/api/windows,intellij,java +# Edit at https://www.toptal.com/developers/gitignore?templates=windows,intellij,java + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +# Azure Toolkit for IntelliJ plugin +# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij +.idea/**/azureSettings.xml + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +#비번 적힌 곳 +*.yml + +# End of https://www.toptal.com/developers/gitignore/api/windows,intellij,java \ No newline at end of file From 93d98312b9169345f46a66e9387e76a062b2a53c Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Mon, 24 Jun 2024 20:21:41 +0900 Subject: [PATCH 05/18] =?UTF-8?q?=EB=B9=84=EB=B2=88=20=EC=88=A8=EA=B9=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0bef347..785d85e 100644 --- a/.gitignore +++ b/.gitignore @@ -205,6 +205,6 @@ $RECYCLE.BIN/ *.lnk #비번 적힌 곳 -*.yml +src/main/resources/application.yml # End of https://www.toptal.com/developers/gitignore/api/windows,intellij,java \ No newline at end of file From aafcab87cb04381920283b0d6e42358a67bb7f47 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Mon, 24 Jun 2024 20:23:04 +0900 Subject: [PATCH 06/18] =?UTF-8?q?=EB=B9=84=EB=B2=88=20=EC=88=A8=EA=B9=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 785d85e..1c025ab 100644 --- a/.gitignore +++ b/.gitignore @@ -205,6 +205,6 @@ $RECYCLE.BIN/ *.lnk #비번 적힌 곳 -src/main/resources/application.yml +application.yml # End of https://www.toptal.com/developers/gitignore/api/windows,intellij,java \ No newline at end of file From bc661d9253fdc9a913ad68be633dd40594b8b4e9 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Mon, 24 Jun 2024 20:26:09 +0900 Subject: [PATCH 07/18] =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 0 bytes gradlew | 0 src/main/resources/application.yml | 6 ------ 3 files changed, 6 deletions(-) delete mode 100644 gradle/wrapper/gradle-wrapper.jar mode change 100755 => 100644 gradlew delete mode 100644 src/main/resources/application.yml diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e6441136f3d4ba8a0da8d277868979cfbc8ad796..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 Date: Mon, 24 Jun 2024 23:26:27 +0900 Subject: [PATCH 08/18] =?UTF-8?q?jpa=20=EC=9D=98=EC=A1=B4=EC=84=B1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 3dfa9c8..2a46d0f 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' runtimeOnly 'com.mysql:mysql-connector-j' testImplementation 'org.springframework.boot:spring-boot-starter-test' compileOnly 'org.projectlombok:lombok' From ace4f3818d282223a3152b9ac1fec8b234f1cdf4 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Mon, 24 Jun 2024 23:26:46 +0900 Subject: [PATCH 09/18] =?UTF-8?q?=EC=97=94=ED=8B=B0=ED=8B=B0=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/Article.java | 22 +++++++++++++++++++ .../java/com/example/demo/domain/Board.java | 12 ++++++++++ .../java/com/example/demo/domain/Member.java | 16 ++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/src/main/java/com/example/demo/domain/Article.java b/src/main/java/com/example/demo/domain/Article.java index e0183db..fe33ac1 100644 --- a/src/main/java/com/example/demo/domain/Article.java +++ b/src/main/java/com/example/demo/domain/Article.java @@ -1,15 +1,33 @@ package com.example.demo.domain; +import jakarta.persistence.*; + import java.time.LocalDateTime; +@Entity +@Table(name="article") public class Article { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + + @Column(name="author_id", nullable=false) private Long authorId; + + @Column(name="board_id", nullable=false) private Long boardId; + + @Column(name="title", nullable=false) private String title; + + @Column(name="content", nullable=false) private String content; + + @Column(name="created_date", nullable=false) private LocalDateTime createdAt; + + @Column(name="modified_date", nullable=false) private LocalDateTime modifiedAt; public Article( @@ -40,6 +58,10 @@ public Article(Long authorId, Long boardId, String title, String content) { this.modifiedAt = LocalDateTime.now(); } + public Article() { + + } + public void update(Long boardId, String title, String description) { this.boardId = boardId; this.title = title; diff --git a/src/main/java/com/example/demo/domain/Board.java b/src/main/java/com/example/demo/domain/Board.java index 992e2c6..b9c9814 100644 --- a/src/main/java/com/example/demo/domain/Board.java +++ b/src/main/java/com/example/demo/domain/Board.java @@ -1,8 +1,16 @@ package com.example.demo.domain; +import jakarta.persistence.*; + +@Entity +@Table(name="board") public class Board { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + + @Column(name="name", nullable=false) private String name; public Board(Long id, String name) { @@ -14,6 +22,10 @@ public Board(String name) { this.name = name; } + public Board() { + + } + public Long getId() { return id; } diff --git a/src/main/java/com/example/demo/domain/Member.java b/src/main/java/com/example/demo/domain/Member.java index fe80d6b..005b513 100644 --- a/src/main/java/com/example/demo/domain/Member.java +++ b/src/main/java/com/example/demo/domain/Member.java @@ -1,10 +1,22 @@ package com.example.demo.domain; +import jakarta.persistence.*; + +@Entity +@Table(name="members") public class Member { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + + @Column(name="name", nullable = false) private String name; + + @Column(name="email", nullable = false) private String email; + + @Column(name="password", nullable = false) private String password; public Member(Long id, String name, String email, String password) { @@ -20,6 +32,10 @@ public Member(String name, String email, String password) { this.password = password; } + public Member() { + + } + public void update(String name, String email) { this.name = name; this.email = email; From 06ce2641be347a4d4abb7ef2a325eea2edb8418d Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Tue, 25 Jun 2024 03:39:17 +0900 Subject: [PATCH 10/18] =?UTF-8?q?Jpa=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?= =?UTF-8?q?=EC=84=A0=EC=96=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/repository/ArticleRepositoryJpa.java | 68 +++++++++++++++++++ .../demo/repository/BoardRepositoryJpa.java | 42 ++++++++++++ .../demo/repository/MemberRepositoryJpa.java | 48 +++++++++++++ 3 files changed, 158 insertions(+) create mode 100644 src/main/java/com/example/demo/repository/ArticleRepositoryJpa.java create mode 100644 src/main/java/com/example/demo/repository/BoardRepositoryJpa.java create mode 100644 src/main/java/com/example/demo/repository/MemberRepositoryJpa.java diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryJpa.java b/src/main/java/com/example/demo/repository/ArticleRepositoryJpa.java new file mode 100644 index 0000000..b515fc7 --- /dev/null +++ b/src/main/java/com/example/demo/repository/ArticleRepositoryJpa.java @@ -0,0 +1,68 @@ +package com.example.demo.repository; + +import com.example.demo.domain.Article; +import jakarta.persistence.EntityManager; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public class ArticleRepositoryJpa implements ArticleRepository { + + private final EntityManager em; + + public ArticleRepositoryJpa(EntityManager em) { + this.em = em; + } + + @Override + public List
findAll() { + return em.createQuery("select a from Article a", Article.class).getResultList(); + } + + @Override + public List
findAllByBoardId(Long boardId) { + return em.createQuery("SELECT a from Article a where a.boardId=:boardId",Article.class).setParameter("boardId", boardId).getResultList(); + } + + @Override + public List
findAllByMemberId(Long memberId) { + return em.createQuery("select a from Article a where a.authorId=:memberId",Article.class).setParameter("memberId", memberId).getResultList(); + } + + @Override + public Optional
findById(Long id) { + return Optional.ofNullable(em.find(Article.class, id)); + } + + @Override + public Article insert(Article article) { + em.persist(article); + return article; + } + + @Override + public Article update(Article article) { + return em.merge(article); + } + + @Override + public void deleteById(Long id) { + Article article = em.find(Article.class, id); + if (article != null) { + em.remove(article); + } + } + + @Override + public boolean existByAuthorId(Long authorId) { + return false; + } + + @Override + public boolean existByBoardId(Long boardId) { + return false; + } + +} diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryJpa.java b/src/main/java/com/example/demo/repository/BoardRepositoryJpa.java new file mode 100644 index 0000000..6072ddb --- /dev/null +++ b/src/main/java/com/example/demo/repository/BoardRepositoryJpa.java @@ -0,0 +1,42 @@ +package com.example.demo.repository; + +import com.example.demo.domain.Board; +import jakarta.persistence.EntityManager; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public class BoardRepositoryJpa implements BoardRepository { + + private EntityManager em; + + public BoardRepositoryJpa(EntityManager em) { + this.em = em; + } + + public List findAll() { + return em.createQuery("select b from Board b", Board.class).getResultList(); + } + + public Optional findById(Long id) { + return Optional.ofNullable(em.find(Board.class, id)); + } + + public Board insert(Board board) { + em.persist(board); + return board; + } + + public Board update(Board board) { + return em.merge(board); + } + + public void deleteById(Long id) { + Board b = em.find(Board.class,id); + if(b!=null) { + em.remove(b); + } + } +} diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryJpa.java b/src/main/java/com/example/demo/repository/MemberRepositoryJpa.java new file mode 100644 index 0000000..bbc1056 --- /dev/null +++ b/src/main/java/com/example/demo/repository/MemberRepositoryJpa.java @@ -0,0 +1,48 @@ +package com.example.demo.repository; + +import com.example.demo.domain.Member; +import jakarta.persistence.EntityManager; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public class MemberRepositoryJpa implements MemberRepository { + + private EntityManager em; + + public MemberRepositoryJpa(EntityManager em) { + this.em = em; + } + + public List findAll() { + return em.createQuery("select m from Member m", Member.class).getResultList(); + } + + public Optional findById(Long id) { + return Optional.ofNullable(em.find(Member.class, id)); + } + + + public Member insert(Member member) { + em.persist(member); + return member; + } + + public Member update(Member member) { + return em.merge(member); + } + + public void deleteById(Long id) { + Member m=em.find(Member.class, id); + if (m!=null) { + em.remove(m); + } + } + + @Override + public boolean existByEmail(String email) { + return false; + } +} From 5dc73bf8a4ed16789a43434b352a6333c75389de Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Tue, 25 Jun 2024 03:46:53 +0900 Subject: [PATCH 11/18] =?UTF-8?q?Jdbc=20=EC=82=AC=EC=9A=A9=20=EC=A4=91?= =?UTF-8?q?=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/repository/ArticleRepositoryJdbc.java | 3 ++- .../java/com/example/demo/repository/BoardRepositoryJdbc.java | 3 ++- .../java/com/example/demo/repository/MemberRepositoryJdbc.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java b/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java index 27200ae..0a5494d 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java @@ -1,4 +1,4 @@ -package com.example.demo.repository; +/* package com.example.demo.repository; import java.sql.PreparedStatement; import java.util.List; @@ -146,3 +146,4 @@ SELECT COUNT(*) return count !=null && count>0; } } +*/ \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java b/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java index 68c04e6..407f0df 100644 --- a/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java @@ -1,4 +1,4 @@ -package com.example.demo.repository; +/* package com.example.demo.repository; import java.sql.PreparedStatement; import java.util.List; @@ -82,3 +82,4 @@ public Board update(Board board) { ); } } +*/ \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java b/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java index 7fc6f0a..86f76e2 100644 --- a/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java +++ b/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java @@ -1,4 +1,4 @@ -package com.example.demo.repository; +/* package com.example.demo.repository; import java.sql.PreparedStatement; import java.util.List; @@ -102,3 +102,4 @@ SELECT COUNT(*) return count!=null&&count>0; } } +*/ \ No newline at end of file From 83db988e62a1723f949395eb61e8950955722601 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Tue, 25 Jun 2024 03:46:58 +0900 Subject: [PATCH 12/18] =?UTF-8?q?Jdbc=20=EC=82=AC=EC=9A=A9=20=EC=A4=91?= =?UTF-8?q?=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/service/BoardService.java | 10 +++++----- .../com/example/demo/service/MemberService.java | 16 +++++++--------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/example/demo/service/BoardService.java b/src/main/java/com/example/demo/service/BoardService.java index e229770..909cc64 100644 --- a/src/main/java/com/example/demo/service/BoardService.java +++ b/src/main/java/com/example/demo/service/BoardService.java @@ -4,7 +4,7 @@ import com.example.demo.Exception.ArticleExist; import com.example.demo.Exception.BoardNotFound; -import com.example.demo.repository.ArticleRepositoryJdbc; +import com.example.demo.repository.ArticleRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -19,11 +19,11 @@ public class BoardService { private final BoardRepository boardRepository; - private final ArticleRepositoryJdbc articleRepositoryJdbc; + private final ArticleRepository articleRepository; - public BoardService(BoardRepository boardRepository, ArticleRepositoryJdbc articleRepositoryJdbc) { + public BoardService(BoardRepository boardRepository, ArticleRepository articleRepository) { this.boardRepository = boardRepository; - this.articleRepositoryJdbc = articleRepositoryJdbc; + this.articleRepository = articleRepository; } public List getBoards() { @@ -46,7 +46,7 @@ public BoardResponse createBoard(BoardCreateRequest request) { @Transactional public void deleteBoard(Long id) { - if (articleRepositoryJdbc.existByBoardId(id)) + if (articleRepository.existByBoardId(id)) throw new ArticleExist("게시물이 존재합니다."); boardRepository.deleteById(id); } diff --git a/src/main/java/com/example/demo/service/MemberService.java b/src/main/java/com/example/demo/service/MemberService.java index 758d88e..36ed573 100644 --- a/src/main/java/com/example/demo/service/MemberService.java +++ b/src/main/java/com/example/demo/service/MemberService.java @@ -6,8 +6,8 @@ import com.example.demo.Exception.ArticleExist; import com.example.demo.Exception.EmailExist; import com.example.demo.Exception.MemberNotFound; -import com.example.demo.repository.ArticleRepositoryJdbc; -import com.example.demo.repository.MemberRepositoryJdbc; +import com.example.demo.repository.ArticleRepository; +import com.example.demo.repository.MemberRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,13 +22,11 @@ public class MemberService { private final MemberRepository memberRepository; - private final MemberRepositoryJdbc memberRepositoryJdbc; - private final ArticleRepositoryJdbc articleRepositoryJdbc; + private final ArticleRepository articleRepository; - public MemberService(MemberRepository memberRepository, MemberRepositoryJdbc memberRepositoryJdbc, ArticleRepositoryJdbc articleRepositoryJdbc) { + public MemberService(MemberRepository memberRepository, ArticleRepository articleRepository) { this.memberRepository = memberRepository; - this.memberRepositoryJdbc = memberRepositoryJdbc; - this.articleRepositoryJdbc = articleRepositoryJdbc; + this.articleRepository = articleRepository; } public MemberResponse getById(Long id) { @@ -53,7 +51,7 @@ public MemberResponse create(MemberCreateRequest request) { @Transactional public void delete(Long id) { - if (articleRepositoryJdbc.existByAuthorId(id)) { + if (articleRepository.existByAuthorId(id)) { throw new ArticleExist("게시물이 존재합니다."); } memberRepository.deleteById(id); @@ -62,7 +60,7 @@ public void delete(Long id) { @Transactional public MemberResponse update(Long id, MemberUpdateRequest request) { Member member = memberRepository.findById(id).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); - if(!member.getEmail().equals(request.email())&&memberRepositoryJdbc.existByEmail(request.email())) { + if(!member.getEmail().equals(request.email())&&memberRepository.existByEmail(request.email())) { throw new EmailExist("이메일이 이미 존재합니다."); } From 951bd22f0a2d146c32b9e533736cc062a8e7edb2 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 30 Jun 2024 01:57:44 +0900 Subject: [PATCH 13/18] =?UTF-8?q?=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/Article.java | 66 ++++++------------- .../java/com/example/demo/domain/Board.java | 26 +++++--- .../java/com/example/demo/domain/Member.java | 29 ++++---- 3 files changed, 49 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/example/demo/domain/Article.java b/src/main/java/com/example/demo/domain/Article.java index fe33ac1..1318358 100644 --- a/src/main/java/com/example/demo/domain/Article.java +++ b/src/main/java/com/example/demo/domain/Article.java @@ -1,22 +1,28 @@ package com.example.demo.domain; import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; import java.time.LocalDateTime; @Entity @Table(name="article") +@Getter +@Setter public class Article { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name="author_id", nullable=false) - private Long authorId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "author_id", nullable = false) + private Member member; - @Column(name="board_id", nullable=false) - private Long boardId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "board_id", nullable = false) + private Board board; @Column(name="title", nullable=false) private String title; @@ -32,26 +38,26 @@ public class Article { public Article( Long id, - Long authorId, - Long boardId, + Member member, + Board board, String title, String content, LocalDateTime createdAt, LocalDateTime modifiedAt ) { this.id = id; - this.authorId = authorId; - this.boardId = boardId; + this.member = member; + this.board = board; this.title = title; this.content = content; this.createdAt = createdAt; this.modifiedAt = modifiedAt; } - public Article(Long authorId, Long boardId, String title, String content) { + public Article(Member member, Board board, String title, String content) { this.id = null; - this.authorId = authorId; - this.boardId = boardId; + this.member = member; + this.board = board; this.title = title; this.content = content; this.createdAt = LocalDateTime.now(); @@ -62,46 +68,12 @@ public Article() { } - public void update(Long boardId, String title, String description) { - this.boardId = boardId; + public void update(Board board, String title, String description) { + this.board = board; this.title = title; this.content = description; this.modifiedAt = LocalDateTime.now(); } - public void setId(Long id) { - this.id = id; - } - - public void setModifiedAt(LocalDateTime modifiedAt) { - this.modifiedAt = modifiedAt; - } - - public Long getId() { - return id; - } - - public Long getAuthorId() { - return authorId; - } - public Long getBoardId() { - return boardId; - } - - public String getTitle() { - return title; - } - - public String getContent() { - return content; - } - - public LocalDateTime getCreatedAt() { - return createdAt; - } - - public LocalDateTime getModifiedAt() { - return modifiedAt; - } } diff --git a/src/main/java/com/example/demo/domain/Board.java b/src/main/java/com/example/demo/domain/Board.java index b9c9814..bb9f8c6 100644 --- a/src/main/java/com/example/demo/domain/Board.java +++ b/src/main/java/com/example/demo/domain/Board.java @@ -1,9 +1,16 @@ package com.example.demo.domain; import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; @Entity @Table(name="board") +@Getter +@Setter public class Board { @Id @@ -13,6 +20,9 @@ public class Board { @Column(name="name", nullable=false) private String name; + @OneToMany(mappedBy = "board") + private List
articles=new ArrayList<>(); + public Board(Long id, String name) { this.id = id; this.name = name; @@ -26,19 +36,15 @@ public Board() { } - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; + public void update(String name) { + this.name = name; } - public String getName() { - return name; + public void addArticle(Article article) { + articles.add(article); } - public void update(String name) { - this.name = name; + public void removeArticle(Article article) { + articles.remove(article); } } diff --git a/src/main/java/com/example/demo/domain/Member.java b/src/main/java/com/example/demo/domain/Member.java index 005b513..67ddc87 100644 --- a/src/main/java/com/example/demo/domain/Member.java +++ b/src/main/java/com/example/demo/domain/Member.java @@ -1,9 +1,16 @@ package com.example.demo.domain; import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; @Entity @Table(name="members") +@Getter +@Setter public class Member { @Id @@ -19,6 +26,9 @@ public class Member { @Column(name="password", nullable = false) private String password; + @OneToMany(mappedBy = "author") + private List
articles = new ArrayList<>(); + public Member(Long id, String name, String email, String password) { this.id = id; this.name = name; @@ -41,23 +51,12 @@ public void update(String name, String email) { this.email = email; } - public void setId(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public String getName() { - return name; + public void addArticle(Article article) { + articles.add(article); } - public String getEmail() { - return email; + public void removeArticle(Article article) { + articles.remove(article); } - public String getPassword() { - return password; - } } From 91256e304151a8ffe3a95e3dc6aa40a4aebbb5cd Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 30 Jun 2024 02:10:13 +0900 Subject: [PATCH 14/18] =?UTF-8?q?=EC=95=88=EC=93=B0=EB=8A=94=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/{ => NotUse/Jdbc}/ArticleRepositoryJdbc.java | 0 .../repository/{ => NotUse/Jdbc}/BoardRepositoryJdbc.java | 0 .../repository/{ => NotUse/Jdbc}/MemberRepositoryJdbc.java | 0 .../repository/{ => NotUse/Jpa}/ArticleRepositoryJpa.java | 4 +++- .../demo/repository/{ => NotUse/Jpa}/BoardRepositoryJpa.java | 4 +++- .../demo/repository/{ => NotUse/Jpa}/MemberRepositoryJpa.java | 4 +++- .../{ => NotUse/memory}/ArticleRepositoryMemory.java | 4 +++- .../repository/{ => NotUse/memory}/BoardRepositoryMemory.java | 4 +++- .../{ => NotUse/memory}/MemberRepositoryMemory.java | 4 +++- 9 files changed, 18 insertions(+), 6 deletions(-) rename src/main/java/com/example/demo/repository/{ => NotUse/Jdbc}/ArticleRepositoryJdbc.java (100%) rename src/main/java/com/example/demo/repository/{ => NotUse/Jdbc}/BoardRepositoryJdbc.java (100%) rename src/main/java/com/example/demo/repository/{ => NotUse/Jdbc}/MemberRepositoryJdbc.java (100%) rename src/main/java/com/example/demo/repository/{ => NotUse/Jpa}/ArticleRepositoryJpa.java (94%) rename src/main/java/com/example/demo/repository/{ => NotUse/Jpa}/BoardRepositoryJpa.java (90%) rename src/main/java/com/example/demo/repository/{ => NotUse/Jpa}/MemberRepositoryJpa.java (91%) rename src/main/java/com/example/demo/repository/{ => NotUse/memory}/ArticleRepositoryMemory.java (95%) rename src/main/java/com/example/demo/repository/{ => NotUse/memory}/BoardRepositoryMemory.java (92%) rename src/main/java/com/example/demo/repository/{ => NotUse/memory}/MemberRepositoryMemory.java (93%) diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java b/src/main/java/com/example/demo/repository/NotUse/Jdbc/ArticleRepositoryJdbc.java similarity index 100% rename from src/main/java/com/example/demo/repository/ArticleRepositoryJdbc.java rename to src/main/java/com/example/demo/repository/NotUse/Jdbc/ArticleRepositoryJdbc.java diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java b/src/main/java/com/example/demo/repository/NotUse/Jdbc/BoardRepositoryJdbc.java similarity index 100% rename from src/main/java/com/example/demo/repository/BoardRepositoryJdbc.java rename to src/main/java/com/example/demo/repository/NotUse/Jdbc/BoardRepositoryJdbc.java diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java b/src/main/java/com/example/demo/repository/NotUse/Jdbc/MemberRepositoryJdbc.java similarity index 100% rename from src/main/java/com/example/demo/repository/MemberRepositoryJdbc.java rename to src/main/java/com/example/demo/repository/NotUse/Jdbc/MemberRepositoryJdbc.java diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryJpa.java b/src/main/java/com/example/demo/repository/NotUse/Jpa/ArticleRepositoryJpa.java similarity index 94% rename from src/main/java/com/example/demo/repository/ArticleRepositoryJpa.java rename to src/main/java/com/example/demo/repository/NotUse/Jpa/ArticleRepositoryJpa.java index b515fc7..1929746 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepositoryJpa.java +++ b/src/main/java/com/example/demo/repository/NotUse/Jpa/ArticleRepositoryJpa.java @@ -1,6 +1,7 @@ -package com.example.demo.repository; +/* package com.example.demo.repository.Jpa; import com.example.demo.domain.Article; +import com.example.demo.repository.ArticleRepository; import jakarta.persistence.EntityManager; import org.springframework.stereotype.Repository; @@ -66,3 +67,4 @@ public boolean existByBoardId(Long boardId) { } } +*/ \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryJpa.java b/src/main/java/com/example/demo/repository/NotUse/Jpa/BoardRepositoryJpa.java similarity index 90% rename from src/main/java/com/example/demo/repository/BoardRepositoryJpa.java rename to src/main/java/com/example/demo/repository/NotUse/Jpa/BoardRepositoryJpa.java index 6072ddb..64cacd2 100644 --- a/src/main/java/com/example/demo/repository/BoardRepositoryJpa.java +++ b/src/main/java/com/example/demo/repository/NotUse/Jpa/BoardRepositoryJpa.java @@ -1,6 +1,7 @@ -package com.example.demo.repository; +/* package com.example.demo.repository.Jpa; import com.example.demo.domain.Board; +import com.example.demo.repository.BoardRepository; import jakarta.persistence.EntityManager; import org.springframework.stereotype.Repository; @@ -40,3 +41,4 @@ public void deleteById(Long id) { } } } +*/ \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryJpa.java b/src/main/java/com/example/demo/repository/NotUse/Jpa/MemberRepositoryJpa.java similarity index 91% rename from src/main/java/com/example/demo/repository/MemberRepositoryJpa.java rename to src/main/java/com/example/demo/repository/NotUse/Jpa/MemberRepositoryJpa.java index bbc1056..368a53a 100644 --- a/src/main/java/com/example/demo/repository/MemberRepositoryJpa.java +++ b/src/main/java/com/example/demo/repository/NotUse/Jpa/MemberRepositoryJpa.java @@ -1,6 +1,7 @@ -package com.example.demo.repository; +/* package com.example.demo.repository.Jpa; import com.example.demo.domain.Member; +import com.example.demo.repository.MemberRepository; import jakarta.persistence.EntityManager; import org.springframework.stereotype.Repository; @@ -46,3 +47,4 @@ public boolean existByEmail(String email) { return false; } } +*/ \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java b/src/main/java/com/example/demo/repository/NotUse/memory/ArticleRepositoryMemory.java similarity index 95% rename from src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java rename to src/main/java/com/example/demo/repository/NotUse/memory/ArticleRepositoryMemory.java index 0fb00f8..b367bca 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/NotUse/memory/ArticleRepositoryMemory.java @@ -1,4 +1,4 @@ -package com.example.demo.repository; +/* package com.example.demo.repository.memory; import java.util.HashMap; import java.util.List; @@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicLong; import com.example.demo.domain.Article; +import com.example.demo.repository.ArticleRepository; public class ArticleRepositoryMemory implements ArticleRepository { @@ -79,3 +80,4 @@ public boolean existByBoardId(Long boardId) { return false; } } +*/ \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java b/src/main/java/com/example/demo/repository/NotUse/memory/BoardRepositoryMemory.java similarity index 92% rename from src/main/java/com/example/demo/repository/BoardRepositoryMemory.java rename to src/main/java/com/example/demo/repository/NotUse/memory/BoardRepositoryMemory.java index a9edf95..aad82d8 100644 --- a/src/main/java/com/example/demo/repository/BoardRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/NotUse/memory/BoardRepositoryMemory.java @@ -1,4 +1,4 @@ -package com.example.demo.repository; +/* package com.example.demo.repository.memory; import java.util.HashMap; import java.util.List; @@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicLong; import com.example.demo.domain.Board; +import com.example.demo.repository.BoardRepository; public class BoardRepositoryMemory implements BoardRepository { @@ -49,3 +50,4 @@ public Board update(Board board) { return boards.put(board.getId(), board); } } +*/ \ No newline at end of file diff --git a/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java b/src/main/java/com/example/demo/repository/NotUse/memory/MemberRepositoryMemory.java similarity index 93% rename from src/main/java/com/example/demo/repository/MemberRepositoryMemory.java rename to src/main/java/com/example/demo/repository/NotUse/memory/MemberRepositoryMemory.java index 207f046..8fb30a5 100644 --- a/src/main/java/com/example/demo/repository/MemberRepositoryMemory.java +++ b/src/main/java/com/example/demo/repository/NotUse/memory/MemberRepositoryMemory.java @@ -1,4 +1,4 @@ -package com.example.demo.repository; +/* package com.example.demo.repository.memory; import java.util.HashMap; import java.util.List; @@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicLong; import com.example.demo.domain.Member; +import com.example.demo.repository.MemberRepository; public class MemberRepositoryMemory implements MemberRepository { @@ -56,3 +57,4 @@ public boolean existByEmail(String email) { return false; } } +*/ \ No newline at end of file From 2ea82151d93b2a3e5245ffeca7c983126df146eb Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 30 Jun 2024 02:10:37 +0900 Subject: [PATCH 15/18] =?UTF-8?q?Jpa=20=EB=A6=AC=ED=8F=AC=EC=A7=80?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EC=83=81=EC=86=8D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/repository/ArticleRepository.java | 18 ++---------------- .../demo/repository/BoardRepository.java | 15 ++------------- .../demo/repository/MemberRepository.java | 17 ++--------------- 3 files changed, 6 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/example/demo/repository/ArticleRepository.java b/src/main/java/com/example/demo/repository/ArticleRepository.java index 4c4bf13..2034efa 100644 --- a/src/main/java/com/example/demo/repository/ArticleRepository.java +++ b/src/main/java/com/example/demo/repository/ArticleRepository.java @@ -1,27 +1,13 @@ package com.example.demo.repository; import java.util.List; -import java.util.Optional; import com.example.demo.domain.Article; +import org.springframework.data.jpa.repository.JpaRepository; -public interface ArticleRepository { - - List
findAll(); +public interface ArticleRepository extends JpaRepository { List
findAllByBoardId(Long boardId); List
findAllByMemberId(Long memberId); - - Optional
findById(Long id); - - Article insert(Article article); - - Article update(Article article); - - void deleteById(Long id); - - boolean existByAuthorId(Long authorId); - - boolean existByBoardId(Long boardId); } diff --git a/src/main/java/com/example/demo/repository/BoardRepository.java b/src/main/java/com/example/demo/repository/BoardRepository.java index e6a31d5..ea9a362 100644 --- a/src/main/java/com/example/demo/repository/BoardRepository.java +++ b/src/main/java/com/example/demo/repository/BoardRepository.java @@ -1,19 +1,8 @@ package com.example.demo.repository; -import java.util.List; -import java.util.Optional; - import com.example.demo.domain.Board; +import org.springframework.data.jpa.repository.JpaRepository; -public interface BoardRepository { - - List findAll(); - - Optional findById(Long id); - - Board insert(Board board); - - void deleteById(Long id); +public interface BoardRepository extends JpaRepository { - Board update(Board board); } diff --git a/src/main/java/com/example/demo/repository/MemberRepository.java b/src/main/java/com/example/demo/repository/MemberRepository.java index d47181c..257153b 100644 --- a/src/main/java/com/example/demo/repository/MemberRepository.java +++ b/src/main/java/com/example/demo/repository/MemberRepository.java @@ -1,21 +1,8 @@ package com.example.demo.repository; -import java.util.List; -import java.util.Optional; - import com.example.demo.domain.Member; +import org.springframework.data.jpa.repository.JpaRepository; -public interface MemberRepository { - - List findAll(); - - Optional findById(Long id); - - Member insert(Member member); - - Member update(Member member); - - void deleteById(Long id); +public interface MemberRepository extends JpaRepository { - boolean existByEmail(String email); } From c7ba58254a6327ed135aef0a878f491966e935d0 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 30 Jun 2024 02:15:23 +0900 Subject: [PATCH 16/18] =?UTF-8?q?Jpa=20=EB=A6=AC=ED=8F=AC=EC=A7=80?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EC=83=81=EC=86=8D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/repository/MemberRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/repository/MemberRepository.java b/src/main/java/com/example/demo/repository/MemberRepository.java index 257153b..eed4ae4 100644 --- a/src/main/java/com/example/demo/repository/MemberRepository.java +++ b/src/main/java/com/example/demo/repository/MemberRepository.java @@ -4,5 +4,5 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface MemberRepository extends JpaRepository { - + boolean existsByEmail(String email); } From dead0824154a48dc1406e13081b8771b39d8be1c Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 30 Jun 2024 02:30:57 +0900 Subject: [PATCH 17/18] =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/service/ArticleService.java | 33 ++++++++++++------- .../example/demo/service/BoardService.java | 6 ++-- .../example/demo/service/MemberService.java | 8 ++--- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/example/demo/service/ArticleService.java b/src/main/java/com/example/demo/service/ArticleService.java index 7cb74ce..2aee0fa 100644 --- a/src/main/java/com/example/demo/service/ArticleService.java +++ b/src/main/java/com/example/demo/service/ArticleService.java @@ -36,8 +36,8 @@ public ArticleService( public ArticleResponse getById(Long id) { Article article = articleRepository.findById(id).orElseThrow(() -> new ArticleNotFound("게시글을 찾을 수 없습니다.")); - Member member = memberRepository.findById(article.getAuthorId()).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); - Board board = boardRepository.findById(article.getBoardId()).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); + Member member = memberRepository.findById(article.getMember().getId()).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); + Board board = boardRepository.findById(article.getBoard().getId()).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); return ArticleResponse.of(article, member, board); } @@ -45,8 +45,8 @@ public List getByBoardId(Long boardId) { List
articles = articleRepository.findAllByBoardId(boardId); return articles.stream() .map(article -> { - Member member = memberRepository.findById(article.getAuthorId()).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); - Board board = boardRepository.findById(article.getBoardId()).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); + Member member = memberRepository.findById(article.getMember().getId()).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); + Board board = boardRepository.findById(article.getBoard().getId()).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); return ArticleResponse.of(article, member, board); }) .toList(); @@ -58,13 +58,16 @@ public ArticleResponse create(ArticleCreateRequest request) { Board board = boardRepository.findById(request.boardId()).orElseThrow(()->new FailBoard("게시판을 찾을 수 없습니다.")); Article article = new Article( - request.authorId(), - request.boardId(), - request.title(), - request.description() + member, + board, + request.title(), + request.description() ); - Article saved = articleRepository.insert(article); + member.addArticle(article); + board.addArticle(article); + + Article saved = articleRepository.save(article); return ArticleResponse.of(saved, member, board); } @@ -75,15 +78,21 @@ public ArticleResponse update(Long id, ArticleUpdateRequest request) { Article article=articleRepository.findById(id).orElseThrow(()->new ArticleNotFound("게시글을 찾을 수 없습니다.")); - article.update(request.boardId(), request.title(), request.description()); - Article updated = articleRepository.update(article); + article.update(board, request.title(), request.description()); + Article updated = articleRepository.save(article); - Member member = memberRepository.findById(updated.getAuthorId()).orElseThrow(()->new FailMember("사용자를 찾을 수 없습니다.")); + Member member = memberRepository.findById(updated.getMember().getId()).orElseThrow(()->new FailMember("사용자를 찾을 수 없습니다.")); return ArticleResponse.of(article, member, board); } @Transactional public void delete(Long id) { + Article article =articleRepository.findById(id).orElseThrow(()->new ArticleNotFound("게시글을 찾을 수 없습니다.")); + Member member =article.getMember(); + Board board = article.getBoard(); + + member.removeArticle(article); + board.removeArticle(article); articleRepository.deleteById(id); } } diff --git a/src/main/java/com/example/demo/service/BoardService.java b/src/main/java/com/example/demo/service/BoardService.java index 909cc64..d2cb05d 100644 --- a/src/main/java/com/example/demo/service/BoardService.java +++ b/src/main/java/com/example/demo/service/BoardService.java @@ -40,13 +40,13 @@ public BoardResponse getBoardById(Long id) { @Transactional public BoardResponse createBoard(BoardCreateRequest request) { Board board = new Board(request.name()); - Board saved = boardRepository.insert(board); + Board saved = boardRepository.save(board); return BoardResponse.from(saved); } @Transactional public void deleteBoard(Long id) { - if (articleRepository.existByBoardId(id)) + if (articleRepository.findAllByBoardId(id) !=null ) throw new ArticleExist("게시물이 존재합니다."); boardRepository.deleteById(id); } @@ -55,7 +55,7 @@ public void deleteBoard(Long id) { public BoardResponse update(Long id, BoardUpdateRequest request) { Board board = boardRepository.findById(id).orElseThrow(()->new BoardNotFound("게시판을 찾을 수 없습니다.")); board.update(request.name()); - Board updated = boardRepository.update(board); + Board updated = boardRepository.save(board); return BoardResponse.from(updated); } } diff --git a/src/main/java/com/example/demo/service/MemberService.java b/src/main/java/com/example/demo/service/MemberService.java index 36ed573..32a229a 100644 --- a/src/main/java/com/example/demo/service/MemberService.java +++ b/src/main/java/com/example/demo/service/MemberService.java @@ -43,7 +43,7 @@ public List getAll() { @Transactional public MemberResponse create(MemberCreateRequest request) { - Member member = memberRepository.insert( + Member member = memberRepository.save( new Member(request.name(), request.email(), request.password()) ); return MemberResponse.from(member); @@ -51,7 +51,7 @@ public MemberResponse create(MemberCreateRequest request) { @Transactional public void delete(Long id) { - if (articleRepository.existByAuthorId(id)) { + if (articleRepository.findAllByMemberId(id) !=null) { throw new ArticleExist("게시물이 존재합니다."); } memberRepository.deleteById(id); @@ -60,12 +60,12 @@ public void delete(Long id) { @Transactional public MemberResponse update(Long id, MemberUpdateRequest request) { Member member = memberRepository.findById(id).orElseThrow(()-> new MemberNotFound("사용자를 찾을 수 없습니다.")); - if(!member.getEmail().equals(request.email())&&memberRepository.existByEmail(request.email())) { + if(!member.getEmail().equals(request.email())&&memberRepository.existsByEmail(request.email())) { throw new EmailExist("이메일이 이미 존재합니다."); } member.update(request.name(), request.email()); - memberRepository.update(member); + memberRepository.save(member); return MemberResponse.from(member); } } From c9fd11b6090c8203b4441d0ce42aedfd5aff3d32 Mon Sep 17 00:00:00 2001 From: jybae1226 Date: Sun, 30 Jun 2024 02:42:46 +0900 Subject: [PATCH 18/18] =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/Member.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/domain/Member.java b/src/main/java/com/example/demo/domain/Member.java index 67ddc87..5ce4333 100644 --- a/src/main/java/com/example/demo/domain/Member.java +++ b/src/main/java/com/example/demo/domain/Member.java @@ -26,7 +26,7 @@ public class Member { @Column(name="password", nullable = false) private String password; - @OneToMany(mappedBy = "author") + @OneToMany(mappedBy = "member") private List
articles = new ArrayList<>(); public Member(Long id, String name, String email, String password) {