From 536923c00bc8db1ddd39e179f3edc98d0919e150 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Tue, 12 Mar 2024 01:00:17 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EA=B7=B8=EB=8B=88=EC=B2=98=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20-=20=EC=A1=B0=ED=9A=8C=ED=95=98=EB=8A=94?=
 =?UTF-8?q?=20=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0=20=EB=B3=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=83=EB=A7=8C=20=EC=A1=B0=ED=9A=8C=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatorAdminSignatureController.kt        |  9 +++++++-
 .../CreatorAdminSignatureRepository.kt        | 23 ++++++++++++++-----
 .../signature/CreatorAdminSignatureService.kt |  5 ++--
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureController.kt
index 40e93df..5fdafa1 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureController.kt
@@ -19,7 +19,14 @@ import org.springframework.web.multipart.MultipartFile
 @RequestMapping("/creator-admin/signature")
 class CreatorAdminSignatureController(private val service: CreatorAdminSignatureService) {
     @GetMapping
-    fun getSignatureCanList(pageable: Pageable) = ApiResponse.ok(data = service.getSignatureList(pageable))
+    fun getSignatureCanList(
+        pageable: Pageable,
+        @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?
+    ) = run {
+        if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
+
+        ApiResponse.ok(data = service.getSignatureList(pageable, memberId = member.id!!))
+    }
 
     @PostMapping
     fun createSignature(
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureRepository.kt
index 14c76ad..4442839 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureRepository.kt
@@ -9,9 +9,9 @@ import org.springframework.data.jpa.repository.JpaRepository
 interface CreatorAdminSignatureRepository : JpaRepository<SignatureCan, Long>, CreatorAdminSignatureQueryRepository
 
 interface CreatorAdminSignatureQueryRepository {
-    fun getSignatureListTotalCount(): Int
+    fun getSignatureListTotalCount(memberId: Long): Int
 
-    fun getSignatureList(imageHost: String, offset: Long, limit: Long): List<GetSignatureListItem>
+    fun getSignatureList(memberId: Long, imageHost: String, offset: Long, limit: Long): List<GetSignatureListItem>
 
     fun findSignatureByIdOrNull(id: Long, memberId: Long): SignatureCan?
 }
@@ -19,15 +19,23 @@ interface CreatorAdminSignatureQueryRepository {
 class CreatorAdminSignatureQueryRepositoryImpl(
     private val queryFactory: JPAQueryFactory
 ) : CreatorAdminSignatureQueryRepository {
-    override fun getSignatureListTotalCount(): Int {
+    override fun getSignatureListTotalCount(memberId: Long): Int {
         return queryFactory.select(signatureCan.id)
             .from(signatureCan)
-            .where(signatureCan.isActive.isTrue)
+            .where(
+                signatureCan.isActive.isTrue
+                    .and(signatureCan.creator.id.eq(memberId))
+            )
             .fetch()
             .size
     }
 
-    override fun getSignatureList(imageHost: String, offset: Long, limit: Long): List<GetSignatureListItem> {
+    override fun getSignatureList(
+        memberId: Long,
+        imageHost: String,
+        offset: Long,
+        limit: Long
+    ): List<GetSignatureListItem> {
         return queryFactory.select(
             QGetSignatureListItem(
                 signatureCan.id,
@@ -38,7 +46,10 @@ class CreatorAdminSignatureQueryRepositoryImpl(
         )
             .from(signatureCan)
             .innerJoin(signatureCan.creator, member)
-            .where(signatureCan.isActive.isTrue)
+            .where(
+                signatureCan.isActive.isTrue
+                    .and(signatureCan.creator.id.eq(memberId))
+            )
             .offset(offset)
             .limit(limit)
             .orderBy(signatureCan.id.desc())
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureService.kt
index 3cf754c..f1a637e 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/CreatorAdminSignatureService.kt
@@ -24,9 +24,10 @@ class CreatorAdminSignatureService(
     @Value("\${cloud.aws.cloud-front.host}")
     private val imageHost: String
 ) {
-    fun getSignatureList(pageable: Pageable): GetSignatureListResponse {
-        val totalCount = repository.getSignatureListTotalCount()
+    fun getSignatureList(pageable: Pageable, memberId: Long): GetSignatureListResponse {
+        val totalCount = repository.getSignatureListTotalCount(memberId = memberId)
         val items = repository.getSignatureList(
+            memberId = memberId,
             imageHost = imageHost,
             offset = pageable.offset,
             limit = pageable.pageSize.toLong()