From 226ada0eda25a5bfeaa2712b45ce2847d64b79af Mon Sep 17 00:00:00 2001 From: youngjae Date: Sun, 12 Aug 2018 03:18:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?generatedValue=20strategy=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20socialType=20isEquals=EB=B3=80=EA=B2=BD,=20BoardSe?= =?UTF-8?q?rvice=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/web/controller/BoardController.java | 2 +- src/main/java/com/web/domain/Board.java | 12 ++---------- src/main/java/com/web/domain/User.java | 10 ++-------- src/main/java/com/web/domain/enums/SocialType.java | 2 +- src/main/java/com/web/service/BoardService.java | 6 ++++-- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/web/controller/BoardController.java b/src/main/java/com/web/controller/BoardController.java index 63c4f58..a662e4a 100644 --- a/src/main/java/com/web/controller/BoardController.java +++ b/src/main/java/com/web/controller/BoardController.java @@ -26,7 +26,7 @@ public BoardController(BoardService boardService) { @GetMapping({"", "/"}) public String board(@RequestParam(value = "idx", defaultValue = "0") Long idx, Model model) { - model.addAttribute("board", boardService.findBoardByIdx(idx)); + model.addAttribute("board", boardService.findBoardByIdx(idx).orElse(null)); return "/board/form"; } diff --git a/src/main/java/com/web/domain/Board.java b/src/main/java/com/web/domain/Board.java index f5078b1..ff9f08c 100644 --- a/src/main/java/com/web/domain/Board.java +++ b/src/main/java/com/web/domain/Board.java @@ -5,15 +5,7 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import javax.persistence.*; import lombok.Builder; import lombok.Getter; @@ -30,7 +22,7 @@ public class Board implements Serializable { @Id @Column - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idx; @Column diff --git a/src/main/java/com/web/domain/User.java b/src/main/java/com/web/domain/User.java index 8933985..3e41759 100644 --- a/src/main/java/com/web/domain/User.java +++ b/src/main/java/com/web/domain/User.java @@ -5,13 +5,7 @@ import java.io.Serializable; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import lombok.Builder; import lombok.Getter; @@ -28,7 +22,7 @@ public class User implements Serializable { @Id @Column - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long idx; @Column diff --git a/src/main/java/com/web/domain/enums/SocialType.java b/src/main/java/com/web/domain/enums/SocialType.java index 1a99061..0c0795e 100644 --- a/src/main/java/com/web/domain/enums/SocialType.java +++ b/src/main/java/com/web/domain/enums/SocialType.java @@ -17,6 +17,6 @@ public enum SocialType { public String getValue() { return name; } public boolean isEquals(String authority) { - return this.name.equals(authority); + return this.getRoleType().equals(authority); } } diff --git a/src/main/java/com/web/service/BoardService.java b/src/main/java/com/web/service/BoardService.java index 34f5ffd..0a38353 100644 --- a/src/main/java/com/web/service/BoardService.java +++ b/src/main/java/com/web/service/BoardService.java @@ -8,6 +8,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import java.util.Optional; + /** * Created by KimYJ on 2017-07-13. */ @@ -25,8 +27,8 @@ public Page findBoardList(Pageable pageable) { return boardRepository.findAll(pageable); } - public Board findBoardByIdx(Long idx) { - return boardRepository.getOne(idx); + public Optional findBoardByIdx(Long idx) { + return boardRepository.findById(idx); } } From ae5d67865b60c2f12d58512ef618d49aa1bd6fcd Mon Sep 17 00:00:00 2001 From: youngjae Date: Sun, 12 Aug 2018 03:20:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?UserArgumentResolver=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/web/resolver/UserArgumentResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/web/resolver/UserArgumentResolver.java b/src/main/java/com/web/resolver/UserArgumentResolver.java index 7afab54..73c217d 100644 --- a/src/main/java/com/web/resolver/UserArgumentResolver.java +++ b/src/main/java/com/web/resolver/UserArgumentResolver.java @@ -70,9 +70,9 @@ private User getUser(User user, HttpSession session) { } private User convertUser(String authority, Map map) { - if(FACEBOOK.isEquals(authority)) return getModernUser(FACEBOOK, map); - else if(GOOGLE.isEquals(authority)) return getModernUser(GOOGLE, map); - else if(KAKAO.isEquals(authority)) return getKaKaoUser(map); + if(FACEBOOK.getValue().equals(authority)) return getModernUser(FACEBOOK, map); + else if(GOOGLE.getValue().equals(authority)) return getModernUser(GOOGLE, map); + else if(KAKAO.getValue().equals(authority)) return getKaKaoUser(map); return null; }