diff --git a/src/main/java/com/study/joiner/JoinerApplication.java b/src/main/java/com/study/joiner/JoinerApplication.java index 7199134..e8370cd 100644 --- a/src/main/java/com/study/joiner/JoinerApplication.java +++ b/src/main/java/com/study/joiner/JoinerApplication.java @@ -2,8 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @SpringBootApplication +@EnableJpaAuditing public class JoinerApplication { public static void main(String[] args) { diff --git a/src/main/java/com/study/joiner/domain/user/Board.java b/src/main/java/com/study/joiner/domain/user/Board.java index 363ef2d..f0a77d5 100644 --- a/src/main/java/com/study/joiner/domain/user/Board.java +++ b/src/main/java/com/study/joiner/domain/user/Board.java @@ -45,7 +45,7 @@ public class Board extends BaseTimeEntity { @Column(length = 100, nullable = false) private String title; - @Column(length = 255, nullable = false) + @Lob private String content; @Enumerated(EnumType.STRING) diff --git a/src/main/java/com/study/joiner/service/BoardService.java b/src/main/java/com/study/joiner/service/BoardService.java index 4400bd1..105ff57 100644 --- a/src/main/java/com/study/joiner/service/BoardService.java +++ b/src/main/java/com/study/joiner/service/BoardService.java @@ -37,8 +37,7 @@ public void addBoard(SocialUser user, BoardDto boardDto) { public Page getBoardList(int pageNum, Pageable pageable) { pageable = PageRequest.of(pageNum, pageable.getPageSize()); Page boardList = boardRepository.findAllDesc(pageable); - Page boardDtos = boardList.map(BoardDto::new); - return boardDtos; + return boardList.map(BoardDto::new); } @Transactional(readOnly = true) diff --git a/src/main/java/com/study/joiner/web/BoardController.java b/src/main/java/com/study/joiner/web/BoardController.java index 97d5c07..643a119 100644 --- a/src/main/java/com/study/joiner/web/BoardController.java +++ b/src/main/java/com/study/joiner/web/BoardController.java @@ -9,6 +9,7 @@ import com.study.joiner.service.BoardService; import com.study.joiner.web.dto.BoardDto; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -21,6 +22,7 @@ @RequiredArgsConstructor @Controller +@Slf4j public class BoardController { private final BoardService boardService; private final UserRepository userRepository; @@ -67,17 +69,11 @@ public String detail(@PathVariable Long id, @LoginUser SessionUser user, Model m return "view/detail"; } - // 글 수정 조회 - @GetMapping("/edit/{id}") - public String userBoardEdit(@PathVariable Long id, @LoginUser SessionUser user, Model model) { - BoardDto boardDto = boardService.getEditBoard(id, user.getEmail()); - return "view/edit"; - } - // 글 수정 처리 - @PutMapping("/edit/{id}") + @GetMapping("/edit/{id}") public String userBoardUpdate(@PathVariable Long id, @LoginUser SessionUser user, @ModelAttribute BoardDto boardDto) { SocialUser socialUser = userRepository.findByEmailFetchBL(user.getEmail()).orElseThrow(); + log.info("boardDto = {}", boardDto); boardService.updateBoard(id, socialUser, boardDto); return "view/detail"; } diff --git a/src/main/java/com/study/joiner/web/IndexController.java b/src/main/java/com/study/joiner/web/IndexController.java index 83fde22..ebe9bc0 100644 --- a/src/main/java/com/study/joiner/web/IndexController.java +++ b/src/main/java/com/study/joiner/web/IndexController.java @@ -36,6 +36,24 @@ public class IndexController { private final UserRepository userRepository; // 메인페이지 -- 완 +// @GetMapping("/") +// public String index(Model model, @LoginUser SessionUser user, +// @RequestParam(value="page", defaultValue = "0") int pageNum, +// @PageableDefault(size = 9) Pageable pageable) { +// Page boardList = boardService.getBoardList(pageNum, pageable); +// int startPage = Math.max(1, boardList.getPageable().getPageNumber() - 4); +// int endPage = Math.min(boardList.getTotalPages(), boardList.getPageable().getPageNumber() + 4); +// model.addAttribute("startPage", startPage); +// model.addAttribute("endPage", endPage); +//// model.addAttribute("previous", pageable.previousOrFirst().getPageNumber()); +//// model.addAttribute("next", pageable.next().getPageNumber()); +// model.addAttribute("boardList", boardList); +// if(user != null) { +// model.addAttribute("user", user); +// } +// return "index"; +// } + @GetMapping("/") public String index(Model model, @LoginUser SessionUser user) { // Page boardList = boardService.getBoardList(pageNum, pageable); diff --git a/src/main/java/com/study/joiner/web/dto/BoardDto.java b/src/main/java/com/study/joiner/web/dto/BoardDto.java index 453f69a..e1eae39 100644 --- a/src/main/java/com/study/joiner/web/dto/BoardDto.java +++ b/src/main/java/com/study/joiner/web/dto/BoardDto.java @@ -26,6 +26,7 @@ public class BoardDto { private String content; private SocialUser socialUser; private List commentList; + private Long writerId; public BoardDto(Board entity) { this.id = entity.getId(); @@ -40,6 +41,7 @@ public BoardDto(Board entity) { this.content = entity.getContent(); this.socialUser = entity.getSocialUser(); this.commentList = entity.getCommentList(); + this.writerId = entity.getSocialUser().getId(); } public Board toEntity() { diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 5c2d278..699c3f9 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -5,7 +5,7 @@ - Together + Joiner diff --git a/src/main/resources/templates/view/board.html b/src/main/resources/templates/view/board.html index d87962b..6450f8e 100644 --- a/src/main/resources/templates/view/board.html +++ b/src/main/resources/templates/view/board.html @@ -5,139 +5,134 @@ - Together + Document - + + +
+

모집에 필요한 정보를 입력해주세요

+
+ +
+
+ +
-
-
-
-

프로젝트에 대해 설명해주세요

-
+
+ + +
-
- +
+ + +
- +
+ + +
-
- -
+
+ + +
+ +
+ + +
+ +
+ +
- +
+ + +
+

프로젝트에 대해 설명해주세요

+
+
+ - - + + } ); + \ No newline at end of file diff --git a/src/main/resources/templates/view/detail.html b/src/main/resources/templates/view/detail.html index b88472e..d0b74e3 100644 --- a/src/main/resources/templates/view/detail.html +++ b/src/main/resources/templates/view/detail.html @@ -5,9 +5,10 @@ - Together + Document +