Merge pull request #126 from MUIT-UMC/develop

[merge] 250216 / 28th deploy
MUIT-UMC · Feb 16, 2025 · 17973cf · 17973cf
2 parents f7f6f9c + 8b460e0
commit 17973cf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/muit/backend/controller/MusicalController.java b/src/main/java/muit/backend/controller/MusicalController.java
@@ -31,7 +31,7 @@ public class MusicalController {
     public ApiResponse<MusicalResponseDTO.MusicalResultDTO> getMusical(@RequestHeader("Authorization") String accessToken,
                                                                        @PathVariable("musicalId") Long musicalId) {
         Member member = memberService.getMemberByToken(accessToken);
-        return ApiResponse.onSuccess(musicalService.getMusical(musicalId));
+        return ApiResponse.onSuccess(musicalService.getMusical(musicalId, member));
     }
 
 
@@ -123,4 +123,5 @@ public ApiResponse<MusicalResponseDTO.MusicalHomeDTO> likeCancelMusicals(@Reques
         return ApiResponse.onSuccess(musicalService.likeCancelMusical(member, musicalId));
     }
 
+
 }
diff --git a/src/main/java/muit/backend/converter/MusicalConverter.java b/src/main/java/muit/backend/converter/MusicalConverter.java
@@ -67,7 +67,7 @@ public static MusicalRequestDTO.MusicalCreateDTO convertKopisDTOToMusicalCreateD
                 .build();
     }
 
-    public static MusicalResponseDTO.MusicalResultDTO toMusicalResultDTO(Musical musical, EventResponseDTO.EventResultListDTO eventResultListDTO, Double rating) {
+    public static MusicalResponseDTO.MusicalResultDTO toMusicalResultDTO(Musical musical, EventResponseDTO.EventResultListDTO eventResultListDTO, Double rating, Boolean isLike) {
 
         return MusicalResponseDTO.MusicalResultDTO.builder()
                 .bgImg(musical.getBgImg())
@@ -76,6 +76,7 @@ public static MusicalResponseDTO.MusicalResultDTO toMusicalResultDTO(Musical mus
                 .storyDescription(musical.getDescription())
                 .id(musical.getId())
                 .name(musical.getName())
+                .isLike(isLike)
                 .score(rating)
                 .posterUrl(musical.getPosterUrl())
                 .place(musical.getPlace())

diff --git a/src/main/java/muit/backend/dto/musicalDTO/MusicalResponseDTO.java b/src/main/java/muit/backend/dto/musicalDTO/MusicalResponseDTO.java
@@ -33,6 +33,7 @@ public static class MusicalResultDTO{
 
         private Long id;
         private String name;
+        private Boolean isLike;
         private Double score;
         private String posterUrl;
         private String place;

diff --git a/src/main/java/muit/backend/service/musicalService/MusicalService.java b/src/main/java/muit/backend/service/musicalService/MusicalService.java
@@ -13,7 +13,7 @@
 public interface MusicalService {
 
     //특정 뮤지컬 조회
-    public MusicalResponseDTO.MusicalResultDTO getMusical(Long musicId);
+    public MusicalResponseDTO.MusicalResultDTO getMusical(Long musicId, Member member);
 
     //뮤지컬 생성
     public void createMusical(String kopisMusicalId);

diff --git a/src/main/java/muit/backend/service/musicalService/MusicalServiceImpl.java b/src/main/java/muit/backend/service/musicalService/MusicalServiceImpl.java
@@ -58,7 +58,7 @@ public class MusicalServiceImpl implements MusicalService {
     private final LikesRepository likesRepository;
 
     @Override
-    public MusicalResponseDTO.MusicalResultDTO getMusical(Long musicalId) {
+    public MusicalResponseDTO.MusicalResultDTO getMusical(Long musicalId, Member member) {
         //뮤지컬 유효성 검사
         Musical musical = musicalRepository.findById(musicalId)
                 .orElseThrow(() -> new GeneralException(ErrorStatus.MUSICAL_NOT_FOUND));
@@ -75,8 +75,13 @@ public MusicalResponseDTO.MusicalResultDTO getMusical(Long musicalId) {
         }
         rating = Math.round(10*rating/posts.size())/10.0;
 
+        Boolean isLike = false;
+        Likes likes = likesRepository.findByMemberIdAndMusicalId(member.getId(),musicalId);
+        if (likes!=null) {
+            isLike = true;
+        }
 
-        return MusicalConverter.toMusicalResultDTO(musical, eventResultListDTO, rating);
+        return MusicalConverter.toMusicalResultDTO(musical, eventResultListDTO, rating, isLike);
 
     }