Skip to content

Revert "댓글 기능 구현" #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mylazysundaycat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "댓글 기능 구현" #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions src/main/java/com/cnusw/balancetalk/domain/comment/controller/CommentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
3 changes: 1 addition & 2 deletions src/main/java/com/cnusw/balancetalk/domain/comment/entity/Comment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ public class Comment extends BaseTimeEntity {
@OneToMany(mappedBy = "comment")
private List<CommentLikes> likes = new ArrayList<>();

@OneToMany(mappedBy = "comment")
private List<CommentDislikes> dislikes = new ArrayList<>();
private long dislikes;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "game_id")
Expand Down
36 changes: 0 additions & 36 deletions src/main/java/com/cnusw/balancetalk/domain/comment/entity/CommentDislikes.java
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/java/com/cnusw/balancetalk/domain/comment/repository/CommentDislikesRepository.java
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions src/main/java/com/cnusw/balancetalk/domain/comment/service/CommentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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<CommentDislikes> 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");
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/cnusw/balancetalk/domain/game/entity/Game.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,7 +28,7 @@
public class Game extends BaseTimeEntity {

@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "game_id")
private Long id;

Expand Down
7 changes: 2 additions & 5 deletions src/main/java/com/cnusw/balancetalk/domain/member/entity/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -37,7 +37,7 @@
public class Member extends BaseTimeEntity {

@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "member_id")
private Long id;

Expand Down Expand Up @@ -66,9 +66,6 @@ public class Member extends BaseTimeEntity {
@OneToMany(mappedBy = "member")
private List<CommentLikes> commentLikes = new ArrayList<>();

@OneToMany(mappedBy = "member")
private List<CommentDislikes> commentDislikes = new ArrayList<>();

@OneToOne(mappedBy = "member")
private Vote vote;

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/cnusw/balancetalk/domain/option/entity/Option.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,7 +24,7 @@
public class Option {

@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "option_id")
private Long id;

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/cnusw/balancetalk/domain/vote/entity/Vote.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -22,7 +23,7 @@
public class Vote {

@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "vote_id")
private Long id;

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down