Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public enum ErrorStatus implements BaseErrorCode {
MUSIC_NOT_FOUND(HttpStatus.BAD_REQUEST, "MUSIC400", "음원을 찾을 수 없습니다."),

LIKE_NOT_FOUND(HttpStatus.BAD_REQUEST, "LIKE400", "해당 좋아요를 찾을 수 없습니다."),
LIKE_ALREADY_EXIST(HttpStatus.BAD_REQUEST, "LIKE401", "이미 좋아요 목록에 추가된 음원입니다."),

EMAIL_SEND_ERROR(HttpStatus.BAD_REQUEST, "EMAIL400", "메일 발송에 실패하였습니다."),
EMAIL_CODE_ERROR(HttpStatus.BAD_REQUEST, "EMAIL401", "유효한 코드가 아닙니다.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static LikeResponseDTO.addLikeResponseDTO toLikeResponseDTO(MusicLike lik
return LikeResponseDTO.addLikeResponseDTO
.builder()
.musicId(like.getMusic().getId())
.like(like)
.musicLikeId(like.getId())
.build();
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/umc/codeplay/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import lombok.*;

import com.fasterxml.jackson.annotation.JsonIgnore;
import umc.codeplay.domain.common.BaseEntity;
import umc.codeplay.domain.enums.Role;
import umc.codeplay.domain.enums.SocialStatus;
Expand Down Expand Up @@ -43,5 +44,6 @@ public void encodePassword(String password) {
private String profileUrl;

@OneToMany(mappedBy = "member", cascade = CascadeType.ALL)
@JsonIgnore
private List<MusicLike> likeList = new ArrayList<>();
}
2 changes: 2 additions & 0 deletions src/main/java/umc/codeplay/domain/Music.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import lombok.*;

import com.fasterxml.jackson.annotation.JsonIgnore;
import umc.codeplay.domain.common.BaseEntity;
import umc.codeplay.domain.mapping.MusicLike;

Expand All @@ -30,5 +31,6 @@ public class Music extends BaseEntity {
private String musicUrl;

@OneToMany(mappedBy = "music", cascade = CascadeType.ALL)
@JsonIgnore
private List<MusicLike> likeList = new ArrayList<>();
}
4 changes: 1 addition & 3 deletions src/main/java/umc/codeplay/dto/LikeResponseDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import umc.codeplay.domain.mapping.MusicLike;

public class LikeResponseDTO {

@Getter
Expand All @@ -15,7 +13,7 @@ public class LikeResponseDTO {
@NoArgsConstructor
public static class addLikeResponseDTO {
Long musicId;
MusicLike like;
Long musicLikeId;
}

@Getter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@

public interface MusicLikeRepository extends JpaRepository<MusicLike, Long> {
Optional<MusicLike> findByMemberAndMusic(Member member, Music music);

boolean existsByMemberAndMusic(Member member, Music music);
}
5 changes: 5 additions & 0 deletions src/main/java/umc/codeplay/service/LikeService.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ public MusicLike addLike(String username, LikeRequestDTO.addLikeRequestDTO reque
.findByEmail(username)
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));

// 중복 좋아요 방지
if (musicLikeRepository.existsByMemberAndMusic(member, music)) {
throw new GeneralException(ErrorStatus.LIKE_ALREADY_EXIST);
}

MusicLike newLike = MusicLikeConverter.toMusicLike(member, music);
return musicLikeRepository.save(newLike);
}
Expand Down
Loading