From e41ec1c91c081fc1f00a2740e8046ed3b0d28310 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 30 May 2024 01:01:54 +0900 Subject: [PATCH] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=8B=9C=EA=B7=B8?= =?UTF-8?q?=EB=8B=88=EC=B2=98=20=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20-=20=EB=93=B1=EB=A1=9D=EC=88=9C,=20=EC=BA=94=20?= =?UTF-8?q?=EB=82=AE=EC=9D=80=20=EC=88=9C,=20=EC=BA=94=20=EB=86=92?= =?UTF-8?q?=EC=9D=80=20=EC=88=9C=20=EC=A0=95=EB=A0=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatorAdminSignatureController.kt | 4 ++- .../CreatorAdminSignatureRepository.kt | 26 +++++++++++++++++-- .../signature/CreatorAdminSignatureService.kt | 8 +++++- .../live/signature/SignatureCanSortType.kt | 5 ++++ 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCanSortType.kt 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 22a3ed8..40f67ed 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 @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.creator.admin.signature import kr.co.vividnext.sodalive.common.ApiResponse import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.live.signature.SignatureCanSortType import kr.co.vividnext.sodalive.member.Member import org.springframework.data.domain.Pageable import org.springframework.security.access.prepost.PreAuthorize @@ -21,11 +22,12 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature @GetMapping fun getSignatureCanList( pageable: Pageable, + @RequestParam("sort-type", required = false) sortType: SignatureCanSortType = SignatureCanSortType.NEWEST, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? ) = run { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - ApiResponse.ok(data = service.getSignatureList(pageable, memberId = member.id!!)) + ApiResponse.ok(data = service.getSignatureList(pageable, sortType, memberId = member.id!!)) } @PostMapping 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 da27d01..9dd2c9e 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 @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.creator.admin.signature import com.querydsl.jpa.impl.JPAQueryFactory import kr.co.vividnext.sodalive.live.signature.QSignatureCan.signatureCan import kr.co.vividnext.sodalive.live.signature.SignatureCan +import kr.co.vividnext.sodalive.live.signature.SignatureCanSortType import kr.co.vividnext.sodalive.member.QMember.member import org.springframework.data.jpa.repository.JpaRepository @@ -11,7 +12,13 @@ interface CreatorAdminSignatureRepository : JpaRepository, C interface CreatorAdminSignatureQueryRepository { fun getSignatureListTotalCount(memberId: Long): Int - fun getSignatureList(memberId: Long, imageHost: String, offset: Long, limit: Long): List + fun getSignatureList( + memberId: Long, + sortType: SignatureCanSortType, + imageHost: String, + offset: Long, + limit: Long + ): List fun findSignatureByIdOrNull(id: Long, memberId: Long): SignatureCan? } @@ -32,10 +39,25 @@ class CreatorAdminSignatureQueryRepositoryImpl( override fun getSignatureList( memberId: Long, + sortType: SignatureCanSortType, imageHost: String, offset: Long, limit: Long ): List { + val orderBy = when (sortType) { + SignatureCanSortType.CAN_HIGH -> { + signatureCan.can.desc() + } + + SignatureCanSortType.CAN_LOW -> { + signatureCan.can.asc() + } + + else -> { + signatureCan.id.desc() + } + } + return queryFactory.select( QGetSignatureListItem( signatureCan.id, @@ -54,7 +76,7 @@ class CreatorAdminSignatureQueryRepositoryImpl( ) .offset(offset) .limit(limit) - .orderBy(signatureCan.id.desc()) + .orderBy(orderBy) .fetch() } 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 71bf228..6aee5be 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 @@ -4,6 +4,7 @@ import com.amazonaws.services.s3.model.ObjectMetadata import kr.co.vividnext.sodalive.aws.s3.S3Uploader import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.live.signature.SignatureCan +import kr.co.vividnext.sodalive.live.signature.SignatureCanSortType import kr.co.vividnext.sodalive.member.MemberRepository import kr.co.vividnext.sodalive.utils.generateFileName import org.springframework.beans.factory.annotation.Value @@ -24,10 +25,15 @@ class CreatorAdminSignatureService( @Value("\${cloud.aws.cloud-front.host}") private val imageHost: String ) { - fun getSignatureList(pageable: Pageable, memberId: Long): GetSignatureListResponse { + fun getSignatureList( + pageable: Pageable, + sortType: SignatureCanSortType, + memberId: Long + ): GetSignatureListResponse { val totalCount = repository.getSignatureListTotalCount(memberId = memberId) val items = repository.getSignatureList( memberId = memberId, + sortType = sortType, imageHost = imageHost, offset = pageable.offset, limit = pageable.pageSize.toLong() diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCanSortType.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCanSortType.kt new file mode 100644 index 0000000..93799e5 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCanSortType.kt @@ -0,0 +1,5 @@ +package kr.co.vividnext.sodalive.live.signature + +enum class SignatureCanSortType { + NEWEST, CAN_HIGH, CAN_LOW +}