From cf03eae4ec0baae8affee1c0fd8209e6797cb797 Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 1 May 2024 12:23:09 +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=EC=8B=9C=EA=B7=B8=EB=8B=88?= =?UTF-8?q?=EC=B2=98=20-=20=EC=9E=AC=EC=83=9D=20=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D/=EC=88=98=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/signature/CreatorAdminSignatureController.kt | 7 +++++-- .../admin/signature/CreatorAdminSignatureRepository.kt | 1 + .../admin/signature/CreatorAdminSignatureService.kt | 9 +++++++-- .../creator/admin/signature/GetSignatureListResponse.kt | 1 + .../co/vividnext/sodalive/live/signature/SignatureCan.kt | 1 + 5 files changed, 15 insertions(+), 4 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 df3115d..22a3ed8 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 @@ -31,6 +31,7 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature @PostMapping fun createSignature( @RequestParam("can") can: Int, + @RequestParam("time") time: Int, @RequestParam("image") image: MultipartFile, @RequestParam("isAdult", required = false) isAdult: Boolean = false, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? @@ -38,7 +39,7 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature if (member == null) throw SodaException("로그인 정보를 확인해주세요.") ApiResponse.ok( - service.createSignature(can = can, image = image, isAdult = isAdult, memberId = member.id!!), + service.createSignature(can = can, time = time, image = image, isAdult = isAdult, memberId = member.id!!), "등록되었습니다." ) } @@ -47,13 +48,14 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature fun modifySignature( @RequestParam("id") id: Long, @RequestParam("can", required = false) can: Int?, + @RequestParam("time", required = false) time: Int?, @RequestParam("image", required = false) image: MultipartFile?, @RequestParam("isActive", required = false) isActive: Boolean?, @RequestParam("isAdult", required = false) isAdult: Boolean?, @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? ) = run { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - if (can == null && image == null && isActive == null && isAdult == null) { + if (can == null && time == null && image == null && isActive == null && isAdult == null) { throw SodaException("변경사항이 없습니다.") } @@ -61,6 +63,7 @@ class CreatorAdminSignatureController(private val service: CreatorAdminSignature service.modifySignature( id = id, can = can, + time = time, image = image, isActive = isActive, isAdult = isAdult, 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 7fcc302..da27d01 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 @@ -40,6 +40,7 @@ class CreatorAdminSignatureQueryRepositoryImpl( QGetSignatureListItem( signatureCan.id, signatureCan.can, + signatureCan.time, signatureCan.image.prepend("/").prepend(imageHost), signatureCan.isAdult, member.nickname 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 9c1f57c..b4192aa 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 @@ -37,11 +37,11 @@ class CreatorAdminSignatureService( } @Transactional - fun createSignature(can: Int, image: MultipartFile, memberId: Long, isAdult: Boolean) { + fun createSignature(can: Int, time: Int, image: MultipartFile, memberId: Long, isAdult: Boolean) { val member = memberRepository.findCreatorByIdOrNull(memberId = memberId) ?: throw SodaException("잘못된 접근입니다.") - val signatureCan = SignatureCan(can = can, isAdult = isAdult) + val signatureCan = SignatureCan(can = can, time = time, isAdult = isAdult) signatureCan.creator = member repository.save(signatureCan) @@ -61,6 +61,7 @@ class CreatorAdminSignatureService( fun modifySignature( id: Long, can: Int?, + time: Int?, image: MultipartFile?, isActive: Boolean?, memberId: Long, @@ -73,6 +74,10 @@ class CreatorAdminSignatureService( signatureCan.can = can } + if (time != null) { + signatureCan.time = time + } + if (isActive != null) { signatureCan.isActive = isActive } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/GetSignatureListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/GetSignatureListResponse.kt index 9c8028d..c5f019f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/GetSignatureListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/signature/GetSignatureListResponse.kt @@ -10,6 +10,7 @@ data class GetSignatureListResponse( data class GetSignatureListItem @QueryProjection constructor( val id: Long, val can: Int, + val time: Int, val image: String, val isAdult: Boolean, val nickname: String diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCan.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCan.kt index c9ee36f..108764e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCan.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCan.kt @@ -10,6 +10,7 @@ import javax.persistence.ManyToOne @Entity data class SignatureCan( var can: Int, + var time: Int = 7, var isAdult: Boolean = false, var isActive: Boolean = true ) : BaseEntity() {