Merge pull request #432 from Team-Ampersand/431-add-music-like-check

Music 조회할 때 좋아요 유무 반환
Team-Ampersand · Sep 19, 2024 · 4c2220f · 4c2220f
2 parents 70327e2 + 7015786
commit 4c2220f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/src/main/kotlin/com/dotori/v2/domain/music/presentation/admin/AdminMusicController.kt b/src/main/kotlin/com/dotori/v2/domain/music/presentation/admin/AdminMusicController.kt
@@ -37,9 +37,8 @@ class AdminMusicController(
             .run { ResponseEntity.status(HttpStatus.NO_CONTENT).build() }
 
     @PatchMapping("/{music_id}/like")
-    fun toggleMusicLike(@PathVariable("music_id") musicId: Long): ResponseEntity<Void> =
-        toggleMusicLikeService.execute(musicId)
-            .run { ResponseEntity.status(HttpStatus.OK).build() }
+    fun toggleMusicLike(@PathVariable("music_id") musicId: Long): ResponseEntity<MusicLikeCountResDto> =
+        ResponseEntity.status(HttpStatus.OK).body(toggleMusicLikeService.execute(musicId))
 
     @GetMapping("/like")
     fun findMusicRank(

diff --git a/...in/kotlin/com/dotori/v2/domain/music/presentation/councillor/CouncillorMusicController.kt b/...in/kotlin/com/dotori/v2/domain/music/presentation/councillor/CouncillorMusicController.kt
@@ -45,9 +45,8 @@ class CouncillorMusicController(
             .run { ResponseEntity.status(HttpStatus.NO_CONTENT).build() }
 
     @PatchMapping("/{music_id}/like")
-    fun toggleMusicLike(@PathVariable("music_id") musicId: Long): ResponseEntity<Void> =
-        toggleMusicLikeService.execute(musicId)
-            .run { ResponseEntity.status(HttpStatus.OK).build() }
+    fun toggleMusicLike(@PathVariable("music_id") musicId: Long): ResponseEntity<MusicLikeCountResDto> =
+        ResponseEntity.status(HttpStatus.OK).body(toggleMusicLikeService.execute(musicId))
 
     @GetMapping("/like")
     fun findMusicRank(

diff --git a/src/main/kotlin/com/dotori/v2/domain/music/presentation/data/res/MusicRankResDto.kt b/src/main/kotlin/com/dotori/v2/domain/music/presentation/data/res/MusicRankResDto.kt
@@ -12,5 +12,6 @@ data class MusicRankResDto(
     val email: String,
     val createdTime: LocalDateTime,
     val stuNum: String,
-    val likeCount: Int
+    val likeCount: Int,
+    val memberLikeCheck: Boolean
 )
diff --git a/...main/kotlin/com/dotori/v2/domain/music/presentation/developer/DeveloperMusicController.kt b/...main/kotlin/com/dotori/v2/domain/music/presentation/developer/DeveloperMusicController.kt
@@ -45,9 +45,8 @@ class DeveloperMusicController(
             .run { ResponseEntity.status(HttpStatus.NO_CONTENT).build() }
 
     @PatchMapping("/{music_id}/like")
-    fun toggleMusicLike(@PathVariable("music_id") musicId: Long): ResponseEntity<Void> =
-        toggleMusicLikeService.execute(musicId)
-            .run { ResponseEntity.status(HttpStatus.OK).build() }
+    fun toggleMusicLike(@PathVariable("music_id") musicId: Long): ResponseEntity<MusicLikeCountResDto> =
+        ResponseEntity.status(HttpStatus.OK).body(toggleMusicLikeService.execute(musicId))
 
     @GetMapping("/like")
     fun findMusicRank(

diff --git a/src/main/kotlin/com/dotori/v2/domain/music/presentation/member/MemberMusicController.kt b/src/main/kotlin/com/dotori/v2/domain/music/presentation/member/MemberMusicController.kt
@@ -45,9 +45,8 @@ class MemberMusicController(
             .run { ResponseEntity.status(HttpStatus.NO_CONTENT).build() }
 
     @PatchMapping("/{music_id}/like")
-    fun toggleMusicLike(@PathVariable("music_id") musicId: Long): ResponseEntity<Void> =
-        toggleMusicLikeService.execute(musicId)
-            .run { ResponseEntity.status(HttpStatus.OK).build() }
+    fun toggleMusicLike(@PathVariable("music_id") musicId: Long): ResponseEntity<MusicLikeCountResDto> =
+        ResponseEntity.status(HttpStatus.OK).body(toggleMusicLikeService.execute(musicId))
 
     @GetMapping("/like")
     fun findMusicRank(

diff --git a/src/main/kotlin/com/dotori/v2/domain/music/service/impl/FindMusicRankServiceImpl.kt b/src/main/kotlin/com/dotori/v2/domain/music/service/impl/FindMusicRankServiceImpl.kt
@@ -1,17 +1,22 @@
 package com.dotori.v2.domain.music.service.impl
 
+import com.dotori.v2.domain.music.domain.entity.Music
+import com.dotori.v2.domain.music.domain.repository.MusicLikeRepository
 import com.dotori.v2.domain.music.domain.repository.MusicRepository
 import com.dotori.v2.domain.music.presentation.data.res.MusicRankListResDto
 import com.dotori.v2.domain.music.presentation.data.res.MusicRankResDto
 import com.dotori.v2.domain.music.service.FindMusicRankService
+import com.dotori.v2.global.util.UserUtil
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.time.LocalDate
 
 @Service
-@Transactional(readOnly = true)
+@Transactional
 class FindMusicRankServiceImpl(
-    private val musicRepository: MusicRepository
+    private val musicRepository: MusicRepository,
+    private val musicLikeRepository: MusicLikeRepository,
+    private val userUtil: UserUtil
 ) : FindMusicRankService {
 
     override fun execute(date: LocalDate): MusicRankListResDto {
@@ -27,7 +32,8 @@ class FindMusicRankServiceImpl(
                     email = music.member.email,
                     createdTime = music.createdDate,
                     stuNum = music.member.stuNum,
-                    likeCount = music.likeCount
+                    likeCount = music.likeCount,
+                    memberLikeCheck = checkLike(music)
                 )
             }
 
@@ -36,4 +42,10 @@ class FindMusicRankServiceImpl(
         )
     }
 
+    private fun checkLike(music: Music): Boolean {
+        val member = userUtil.fetchCurrentUser()
+
+        return musicLikeRepository.findByMemberIdAndMusicId(member.id, music.id) != null
+    }
+
 }