Merge pull request #427 from Team-Ampersand/426-return-the-current-nu…

…mber-of-likes

좋아요, 좋아요 취소 시 현재 좋아요 수 반환

src/main/kotlin/com/dotori/v2/domain/like/entity/Like.kt → src/main/kotlin/com/dotori/v2/domain/music/domain/entity/MusicLike.kt

@@ -1,4 +1,4 @@
-package com.dotori.v2.domain.like.entity
+package com.dotori.v2.domain.music.domain.entity
 
 import javax.persistence.Column
 import javax.persistence.Entity
@@ -9,7 +9,7 @@ import javax.persistence.Table
 
 @Entity
 @Table(name = "likes")
-class Like (
+class MusicLike (
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "like_id")

src/main/kotlin/com/dotori/v2/domain/music/domain/repository/MusicLikeRepository.kt

@@ -0,0 +1,14 @@
+package com.dotori.v2.domain.music.domain.repository
+
+import com.dotori.v2.domain.music.domain.entity.MusicLike
+import feign.Param
+import javax.persistence.LockModeType
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Lock
+import org.springframework.data.jpa.repository.Query
+
+interface MusicLikeRepository : JpaRepository<MusicLike, Long> {
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("select l from MusicLike l where l.memberId = :memberId and l.musicId = :musicId")
+    fun findByMemberIdAndMusicId(@Param("memberId") memberId: Long, @Param("musicId") musicId: Long): MusicLike?
+}

src/main/kotlin/com/dotori/v2/domain/music/presentation/admin/AdminMusicController.kt

@@ -1,6 +1,7 @@
 package com.dotori.v2.domain.music.presentation.admin
 
 import com.dotori.v2.domain.music.presentation.data.res.MusicListResDto
+import com.dotori.v2.domain.music.presentation.data.res.MusicLikeCountResDto
 import com.dotori.v2.domain.music.service.DeleteMusicService
 import com.dotori.v2.domain.music.service.FindMusicsService
 import com.dotori.v2.domain.music.service.ToggleMusicLikeService
@@ -32,7 +33,6 @@ 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))
 }

src/main/kotlin/com/dotori/v2/domain/music/presentation/councillor/CouncillorMusicController.kt

@@ -2,6 +2,7 @@ package com.dotori.v2.domain.music.presentation.councillor
 
 import com.dotori.v2.domain.music.presentation.data.req.ApplyMusicReqDto
 import com.dotori.v2.domain.music.presentation.data.res.MusicListResDto
+import com.dotori.v2.domain.music.presentation.data.res.MusicLikeCountResDto
 import com.dotori.v2.domain.music.service.ApplyMusicService
 import com.dotori.v2.domain.music.service.DeleteMusicService
 import com.dotori.v2.domain.music.service.FindMusicsService
@@ -41,7 +42,6 @@ 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))
 }

src/main/kotlin/com/dotori/v2/domain/music/presentation/data/res/MusicLikeCountResDto.kt

@@ -0,0 +1,5 @@
+package com.dotori.v2.domain.music.presentation.data.res
+
+data class MusicLikeCountResDto(
+    private val likeCount: Int
+)

src/main/kotlin/com/dotori/v2/domain/music/presentation/developer/DeveloperMusicController.kt

@@ -2,6 +2,7 @@ package com.dotori.v2.domain.music.presentation.developer
 
 import com.dotori.v2.domain.music.presentation.data.req.ApplyMusicReqDto
 import com.dotori.v2.domain.music.presentation.data.res.MusicListResDto
+import com.dotori.v2.domain.music.presentation.data.res.MusicLikeCountResDto
 import com.dotori.v2.domain.music.service.ApplyMusicService
 import com.dotori.v2.domain.music.service.DeleteMusicService
 import com.dotori.v2.domain.music.service.FindMusicsService
@@ -41,7 +42,6 @@ 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))
 }

src/main/kotlin/com/dotori/v2/domain/music/presentation/member/MemberMusicController.kt

@@ -2,6 +2,7 @@ package com.dotori.v2.domain.music.presentation.member
 
 import com.dotori.v2.domain.music.presentation.data.req.ApplyMusicReqDto
 import com.dotori.v2.domain.music.presentation.data.res.MusicListResDto
+import com.dotori.v2.domain.music.presentation.data.res.MusicLikeCountResDto
 import com.dotori.v2.domain.music.service.ApplyMusicService
 import com.dotori.v2.domain.music.service.DeleteMyMusicService
 import com.dotori.v2.domain.music.service.FindMusicsService
@@ -41,7 +42,6 @@ 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))
 }

src/main/kotlin/com/dotori/v2/domain/music/service/ToggleMusicLikeService.kt

@@ -1,5 +1,7 @@
 package com.dotori.v2.domain.music.service
 
+import com.dotori.v2.domain.music.presentation.data.res.MusicLikeCountResDto
+
 interface ToggleMusicLikeService {
-    fun execute(musicId: Long)
+    fun execute(musicId: Long) : MusicLikeCountResDto
 }

src/main/kotlin/com/dotori/v2/domain/music/service/impl/ToggleMusicLikeServiceImpl.kt

@@ -1,11 +1,12 @@
 package com.dotori.v2.domain.music.service.impl
 
-import com.dotori.v2.domain.like.entity.Like
-import com.dotori.v2.domain.like.repository.LikeRepository
+import com.dotori.v2.domain.music.domain.entity.MusicLike
+import com.dotori.v2.domain.music.domain.repository.MusicLikeRepository
 import com.dotori.v2.domain.member.domain.entity.Member
 import com.dotori.v2.domain.music.domain.entity.Music
 import com.dotori.v2.domain.music.domain.repository.MusicRepository
 import com.dotori.v2.domain.music.exception.MusicNotFoundException
+import com.dotori.v2.domain.music.presentation.data.res.MusicLikeCountResDto
 import com.dotori.v2.domain.music.service.ToggleMusicLikeService
 import com.dotori.v2.global.util.UserUtil
 import org.springframework.data.repository.findByIdOrNull
@@ -15,19 +16,23 @@ import org.springframework.transaction.annotation.Transactional
 @Service
 @Transactional(readOnly = false, rollbackFor = [Exception::class])
 class ToggleMusicLikeServiceImpl(
-    private val likeRepository: LikeRepository,
+    private val musicLikeRepository: MusicLikeRepository,
     private val musicRepository: MusicRepository,
     private val userUtil: UserUtil
 ): ToggleMusicLikeService {
-    override fun execute(musicId: Long) {
+    override fun execute(musicId: Long) : MusicLikeCountResDto {
         val member = userUtil.fetchCurrentUser()
         val music: Music = musicRepository.findByIdOrNull(musicId) ?: throw MusicNotFoundException()
 
         updateLike(music, member)
+
+        return MusicLikeCountResDto (
+            likeCount = music.likeCount
+        )
     }
 
     private fun updateLike(music: Music, member: Member) {
-        val like = likeRepository.findByMemberIdAndMusicId(member.id, music.id)
+        val like = musicLikeRepository.findByMemberIdAndMusicId(member.id, music.id)
 
         if (like == null) {
             saveLike(music, member)
@@ -37,16 +42,16 @@ class ToggleMusicLikeServiceImpl(
     }
 
     private fun saveLike(music: Music, member: Member) {
-        val like = Like (
+        val musicLike = MusicLike (
             musicId = music.id,
             memberId = member.id
         )
-        likeRepository.save(like)
+        musicLikeRepository.save(musicLike)
         music.plusLikeCount()
     }
 
     private fun deleteLike (likeId: Long, music: Music) {
-        likeRepository.deleteById(likeId)
+        musicLikeRepository.deleteById(likeId)
         music.minusLikeCount()
     }