From 95f943d16fc108c6d0d47b832f48dce86fb61dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=EC=98=88=EC=A7=80=28Gwon=20ye=20ji=29?= <101305955+mylazysundaycat@users.noreply.github.com> Date: Sat, 28 Oct 2023 16:58:34 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"=EB=8C=93=EA=B8=80=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comment/controller/CommentController.java | 17 +-------- .../domain/comment/entity/Comment.java | 3 +- .../comment/entity/CommentDislikes.java | 36 ------------------ .../repository/CommentDislikesRepository.java | 16 -------- .../comment/service/CommentService.java | 37 ------------------- .../balancetalk/domain/game/entity/Game.java | 3 +- .../domain/member/entity/Member.java | 7 +--- .../domain/option/entity/Option.java | 3 +- .../balancetalk/domain/vote/entity/Vote.java | 3 +- src/main/resources/application-dev.yml | 2 +- 10 files changed, 11 insertions(+), 116 deletions(-) delete mode 100644 src/main/java/com/cnusw/balancetalk/domain/comment/entity/CommentDislikes.java delete mode 100644 src/main/java/com/cnusw/balancetalk/domain/comment/repository/CommentDislikesRepository.java diff --git a/src/main/java/com/cnusw/balancetalk/domain/comment/controller/CommentController.java b/src/main/java/com/cnusw/balancetalk/domain/comment/controller/CommentController.java index b7025e0..3d341a6 100644 --- a/src/main/java/com/cnusw/balancetalk/domain/comment/controller/CommentController.java +++ b/src/main/java/com/cnusw/balancetalk/domain/comment/controller/CommentController.java @@ -39,23 +39,8 @@ public CommentResponse makeComment( return CommentResponse.of(comment); } - @PostMapping("/comment/{id}/likes") + @PostMapping("/comment/{id}/like") public void likeComment(@PathVariable Long id, HttpServletRequest request) { commentService.likeComment(id, request); } - - @GetMapping("/comment/{id}/likes") - public long getLikesCount(@PathVariable Long id) { - return commentService.getLikesCount(id); - } - - @PostMapping("/comment/{id}/dislikes") - public void dislikeComment(@PathVariable Long id, HttpServletRequest request) { - commentService.dislikeComment(id, request); - } - - @GetMapping("/comment/{id}/dislikes") - public long getDislikesCount(@PathVariable Long id) { - return commentService.getDislikesCount(id); - } } diff --git a/src/main/java/com/cnusw/balancetalk/domain/comment/entity/Comment.java b/src/main/java/com/cnusw/balancetalk/domain/comment/entity/Comment.java index 004d796..2ee8ab1 100644 --- a/src/main/java/com/cnusw/balancetalk/domain/comment/entity/Comment.java +++ b/src/main/java/com/cnusw/balancetalk/domain/comment/entity/Comment.java @@ -40,8 +40,7 @@ public class Comment extends BaseTimeEntity { @OneToMany(mappedBy = "comment") private List likes = new ArrayList<>(); - @OneToMany(mappedBy = "comment") - private List dislikes = new ArrayList<>(); + private long dislikes; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "game_id") diff --git a/src/main/java/com/cnusw/balancetalk/domain/comment/entity/CommentDislikes.java b/src/main/java/com/cnusw/balancetalk/domain/comment/entity/CommentDislikes.java deleted file mode 100644 index d011231..0000000 --- a/src/main/java/com/cnusw/balancetalk/domain/comment/entity/CommentDislikes.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cnusw.balancetalk.domain.comment.entity; - -import com.cnusw.balancetalk.domain.member.entity.Member; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor(access = AccessLevel.PRIVATE) -@Builder -@Getter -public class CommentDislikes { - - @Id @GeneratedValue - @Column(name = "comment_dislikes_id") - private Long id; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "comment_id") - private Comment comment; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "member_id") - private Member member; -} diff --git a/src/main/java/com/cnusw/balancetalk/domain/comment/repository/CommentDislikesRepository.java b/src/main/java/com/cnusw/balancetalk/domain/comment/repository/CommentDislikesRepository.java deleted file mode 100644 index 417b6f8..0000000 --- a/src/main/java/com/cnusw/balancetalk/domain/comment/repository/CommentDislikesRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cnusw.balancetalk.domain.comment.repository; - -import java.util.Optional; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import com.cnusw.balancetalk.domain.comment.entity.Comment; -import com.cnusw.balancetalk.domain.comment.entity.CommentDislikes; -import com.cnusw.balancetalk.domain.member.entity.Member; - -public interface CommentDislikesRepository extends JpaRepository { - - @Query("select cdl from CommentDislikes cdl where cdl.member = :member and cdl.comment = :comment") - Optional findByMemberAndComment(Member member, Comment comment); -} diff --git a/src/main/java/com/cnusw/balancetalk/domain/comment/service/CommentService.java b/src/main/java/com/cnusw/balancetalk/domain/comment/service/CommentService.java index 8b53879..1339422 100644 --- a/src/main/java/com/cnusw/balancetalk/domain/comment/service/CommentService.java +++ b/src/main/java/com/cnusw/balancetalk/domain/comment/service/CommentService.java @@ -3,9 +3,7 @@ import com.cnusw.balancetalk.domain.comment.repository.dto.request.CommentRequest; import com.cnusw.balancetalk.domain.comment.repository.dto.response.CommentResponse; import com.cnusw.balancetalk.domain.comment.entity.Comment; -import com.cnusw.balancetalk.domain.comment.entity.CommentDislikes; import com.cnusw.balancetalk.domain.comment.entity.CommentLikes; -import com.cnusw.balancetalk.domain.comment.repository.CommentDislikesRepository; import com.cnusw.balancetalk.domain.comment.repository.CommentLikesRepository; import com.cnusw.balancetalk.domain.comment.repository.CommentRepository; import com.cnusw.balancetalk.domain.member.repository.MemberRepository; @@ -30,7 +28,6 @@ public class CommentService { private final CommentRepository commentRepository; private final CommentLikesRepository commentLikesRepository; - private final CommentDislikesRepository commentDislikesRepository; private final GameRepository gameRepository; private final MemberRepository memberRepository; @@ -79,40 +76,6 @@ public void likeComment(Long commentId, HttpServletRequest request) { commentLikesRepository.save(commentLikes); } - public long getLikesCount(Long commentId) { - return commentRepository.findById(commentId) - .orElseThrow() - .getLikes() - .size(); - } - - public void dislikeComment(Long commentId, HttpServletRequest request) { - String memberEmail = extractEmailFromToken(extractToken(request)); - Member member = memberRepository.findByEmail(memberEmail) - .orElseThrow(); - - Comment comment = commentRepository.findById(commentId) - .orElseThrow(); - - Optional byMember = commentDislikesRepository.findByMemberAndComment(member, comment); - if (byMember.isPresent()) { - return; - } - - CommentDislikes commentDislikes = CommentDislikes.builder() - .member(member) - .comment(comment) - .build(); - commentDislikesRepository.save(commentDislikes); - } - - public long getDislikesCount(Long commentId) { - return commentRepository.findById(commentId) - .orElseThrow() - .getDislikes() - .size(); - } - // 요청 헤더에서 토큰 추출 private String extractToken(HttpServletRequest request) { String bearerToken = request.getHeader("Authorization"); diff --git a/src/main/java/com/cnusw/balancetalk/domain/game/entity/Game.java b/src/main/java/com/cnusw/balancetalk/domain/game/entity/Game.java index c872a7b..9b2fdc4 100644 --- a/src/main/java/com/cnusw/balancetalk/domain/game/entity/Game.java +++ b/src/main/java/com/cnusw/balancetalk/domain/game/entity/Game.java @@ -13,6 +13,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; @@ -27,7 +28,7 @@ public class Game extends BaseTimeEntity { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "game_id") private Long id; diff --git a/src/main/java/com/cnusw/balancetalk/domain/member/entity/Member.java b/src/main/java/com/cnusw/balancetalk/domain/member/entity/Member.java index 6a4e88d..8fe0a1d 100644 --- a/src/main/java/com/cnusw/balancetalk/domain/member/entity/Member.java +++ b/src/main/java/com/cnusw/balancetalk/domain/member/entity/Member.java @@ -5,7 +5,6 @@ import org.springframework.security.crypto.password.PasswordEncoder; -import com.cnusw.balancetalk.domain.comment.entity.CommentDislikes; import com.cnusw.balancetalk.domain.comment.entity.CommentLikes; import com.cnusw.balancetalk.domain.member.dto.request.MemberJoinRequest; import com.cnusw.balancetalk.domain.comment.entity.Comment; @@ -19,6 +18,7 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; @@ -37,7 +37,7 @@ public class Member extends BaseTimeEntity { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "member_id") private Long id; @@ -66,9 +66,6 @@ public class Member extends BaseTimeEntity { @OneToMany(mappedBy = "member") private List commentLikes = new ArrayList<>(); - @OneToMany(mappedBy = "member") - private List commentDislikes = new ArrayList<>(); - @OneToOne(mappedBy = "member") private Vote vote; diff --git a/src/main/java/com/cnusw/balancetalk/domain/option/entity/Option.java b/src/main/java/com/cnusw/balancetalk/domain/option/entity/Option.java index 5e79923..e3923dc 100644 --- a/src/main/java/com/cnusw/balancetalk/domain/option/entity/Option.java +++ b/src/main/java/com/cnusw/balancetalk/domain/option/entity/Option.java @@ -7,6 +7,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; @@ -23,7 +24,7 @@ public class Option { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "option_id") private Long id; diff --git a/src/main/java/com/cnusw/balancetalk/domain/vote/entity/Vote.java b/src/main/java/com/cnusw/balancetalk/domain/vote/entity/Vote.java index 7cb727a..9bfcadf 100644 --- a/src/main/java/com/cnusw/balancetalk/domain/vote/entity/Vote.java +++ b/src/main/java/com/cnusw/balancetalk/domain/vote/entity/Vote.java @@ -7,6 +7,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; @@ -22,7 +23,7 @@ public class Vote { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "vote_id") private Long id; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 23b94e0..5622aba 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -16,7 +16,7 @@ spring: database: h2 database-platform: org.hibernate.dialect.H2Dialect hibernate: - ddl-auto: create + ddl-auto: update properties: hibernate: format_sql: true