src/main/kotlin/kr/co/vividnext/sodalive/admin/live/signature/AdminAdminSignatureCanRepository.kt

@@ -1,35 +0,0 @@
-package kr.co.vividnext.sodalive.admin.live.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.member.QMember.member
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface AdminAdminSignatureCanRepository : JpaRepository<SignatureCan, Long>, AdminSignatureCanQueryRepository
-
-interface AdminSignatureCanQueryRepository {
-    fun getSignatureCanList(imageHost: String, offset: Long, limit: Long): List<GetSignatureCanListResponse>
-}
-
-class AdminSignatureCanQueryRepositoryImpl(
-    private val queryFactory: JPAQueryFactory
-) : AdminSignatureCanQueryRepository {
-    override fun getSignatureCanList(imageHost: String, offset: Long, limit: Long): List<GetSignatureCanListResponse> {
-        return queryFactory.select(
-            QGetSignatureCanListResponse(
-                signatureCan.id,
-                signatureCan.can,
-                signatureCan.image.prepend("/").prepend(imageHost),
-                member.nickname
-            )
-        )
-            .from(signatureCan)
-            .innerJoin(signatureCan.creator, member)
-            .where(signatureCan.isActive.isTrue)
-            .offset(offset)
-            .limit(limit)
-            .orderBy(signatureCan.id.desc())
-            .fetch()
-    }
-}

src/main/kotlin/kr/co/vividnext/sodalive/admin/live/signature/AdminSignatureCanController.kt

@@ -1,47 +0,0 @@
-package kr.co.vividnext.sodalive.admin.live.signature
-
-import kr.co.vividnext.sodalive.common.ApiResponse
-import kr.co.vividnext.sodalive.common.SodaException
-import org.springframework.data.domain.Pageable
-import org.springframework.security.access.prepost.PreAuthorize
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.PutMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
-import org.springframework.web.bind.annotation.RestController
-import org.springframework.web.multipart.MultipartFile
-
-@RestController
-@PreAuthorize("hasRole('ADMIN')")
-@RequestMapping("/admin/live/signature-can")
-class AdminSignatureCanController(private val service: AdminSignatureCanService) {
-    @GetMapping
-    fun getSignatureCanList(pageable: Pageable) = ApiResponse.ok(data = service.getSignatureCanList(pageable))
-
-    @PostMapping
-    fun createSignatureCan(
-        @RequestParam("can") can: Int,
-        @RequestParam("image") image: MultipartFile,
-        @RequestParam("creator_id") creatorId: Long
-    ) = ApiResponse.ok(
-        service.createSignatureCan(can = can, creatorId = creatorId, image = image),
-        "등록되었습니다."
-    )
-
-    @PutMapping
-    fun modifySignatureCan(
-        @RequestParam("id") id: Long,
-        @RequestParam("image") image: MultipartFile?,
-        @RequestParam("isActive") isActive: Boolean?
-    ) = run {
-        if (image == null && isActive == null) {
-            throw SodaException("변경사항이 없습니다.")
-        }
-
-        ApiResponse.ok(
-            service.modifySignatureCan(id = id, image = image, isActive = isActive),
-            "수정되었습니다."
-        )
-    }
-}

src/main/kotlin/kr/co/vividnext/sodalive/admin/live/signature/AdminSignatureCanService.kt

@@ -1,80 +0,0 @@
-package kr.co.vividnext.sodalive.admin.live.signature
-
-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.member.MemberRepository
-import kr.co.vividnext.sodalive.utils.generateFileName
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.data.domain.Pageable
-import org.springframework.data.repository.findByIdOrNull
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-import org.springframework.web.multipart.MultipartFile
-
-@Service
-class AdminSignatureCanService(
-    private val repository: AdminAdminSignatureCanRepository,
-    private val memberRepository: MemberRepository,
-
-    private val s3Uploader: S3Uploader,
-
-    @Value("\${cloud.aws.s3.bucket}")
-    private val bucket: String,
-    @Value("\${cloud.aws.cloud-front.host}")
-    private val imageHost: String
-) {
-    fun getSignatureCanList(pageable: Pageable): List<GetSignatureCanListResponse> {
-        return repository.getSignatureCanList(
-            imageHost = imageHost,
-            offset = pageable.offset,
-            limit = pageable.pageSize.toLong()
-        )
-    }
-
-    @Transactional
-    fun createSignatureCan(can: Int, creatorId: Long, image: MultipartFile) {
-        if (creatorId < 1) throw SodaException("올바른 크리에이터를 선택해 주세요.")
-
-        val creator = memberRepository.findCreatorByIdOrNull(memberId = creatorId)
-            ?: throw SodaException("올바른 크리에이터를 선택해 주세요.")
-
-        val signatureCan = SignatureCan(can = can)
-        signatureCan.creator = creator
-
-        val metadata = ObjectMetadata()
-        metadata.contentLength = image.size
-        val imagePath = s3Uploader.upload(
-            inputStream = image.inputStream,
-            bucket = bucket,
-            filePath = "signature_can/${signatureCan.id}/${generateFileName()}",
-            metadata = metadata
-        )
-
-        signatureCan.image = imagePath
-    }
-
-    @Transactional
-    fun modifySignatureCan(id: Long, image: MultipartFile?, isActive: Boolean?) {
-        val signatureCan = repository.findByIdOrNull(id = id)
-            ?: throw SodaException("잘못된 요청입니다.")
-
-        if (isActive != null) {
-            signatureCan.isActive = isActive
-        }
-
-        if (image != null) {
-            val metadata = ObjectMetadata()
-            metadata.contentLength = image.size
-            val imagePath = s3Uploader.upload(
-                inputStream = image.inputStream,
-                bucket = bucket,
-                filePath = "signature_can/${signatureCan.id}/${generateFileName()}",
-                metadata = metadata
-            )
-
-            signatureCan.image = imagePath
-        }
-    }
-}

src/main/kotlin/kr/co/vividnext/sodalive/admin/live/signature/GetSignatureCanListResponse.kt

@@ -1,10 +0,0 @@
-package kr.co.vividnext.sodalive.admin.live.signature
-
-import com.querydsl.core.annotations.QueryProjection
-
-data class GetSignatureCanListResponse @QueryProjection constructor(
-    val id: Long,
-    val can: Int,
-    val image: String,
-    val nickname: String
-)

src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt

@@ -43,7 +43,6 @@ import kr.co.vividnext.sodalive.live.room.menu.LiveRoomMenuService
 import kr.co.vividnext.sodalive.live.room.menu.UpdateLiveMenuRequest
 import kr.co.vividnext.sodalive.live.room.visit.LiveRoomVisitService
 import kr.co.vividnext.sodalive.live.roulette.NewRouletteRepository
-import kr.co.vividnext.sodalive.live.signature.SignatureCanRepository
 import kr.co.vividnext.sodalive.live.tag.LiveTagRepository
 import kr.co.vividnext.sodalive.member.Gender
 import kr.co.vividnext.sodalive.member.Member
@@ -77,7 +76,6 @@ class LiveRoomService(
     private val roomCancelRepository: LiveRoomCancelRepository,
     private val kickOutService: LiveRoomKickOutService,
     private val blockMemberRepository: BlockMemberRepository,
-    private val signatureCanRepository: SignatureCanRepository,
 
     private val applicationEventPublisher: ApplicationEventPublisher,
     private val useCanCalculateRepository: UseCanCalculateRepository,
@@ -972,7 +970,7 @@ class LiveRoomService(
     }
 
     @Transactional
-    fun donation(request: LiveRoomDonationRequest, member: Member): String? {
+    fun donation(request: LiveRoomDonationRequest, member: Member) {
         val room = repository.findByIdOrNull(request.roomId)
             ?: throw SodaException("해당하는 라이브가 없습니다.")
 
@@ -1005,12 +1003,6 @@ class LiveRoomService(
                 roomInfoRepository.save(roomInfo)
             }
         }
-
-        return signatureCanRepository.findImageByCreatorIdAndCan(
-            creatorId = host.id!!,
-            can = request.can,
-            imageHost = cloudFrontHost
-        )
     }
 
     @Transactional

src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCan.kt

@@ -1,20 +0,0 @@
-package kr.co.vividnext.sodalive.live.signature
-
-import kr.co.vividnext.sodalive.common.BaseEntity
-import kr.co.vividnext.sodalive.member.Member
-import javax.persistence.Entity
-import javax.persistence.FetchType
-import javax.persistence.JoinColumn
-import javax.persistence.ManyToOne
-
-@Entity
-data class SignatureCan(
-    val can: Int,
-    var isActive: Boolean = false
-) : BaseEntity() {
-    var image: String? = null
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "creator_id", nullable = false)
-    var creator: Member? = null
-}

src/main/kotlin/kr/co/vividnext/sodalive/live/signature/SignatureCanRepository.kt

@@ -1,25 +0,0 @@
-package kr.co.vividnext.sodalive.live.signature
-
-import com.querydsl.jpa.impl.JPAQueryFactory
-import kr.co.vividnext.sodalive.live.signature.QSignatureCan.signatureCan
-import org.springframework.data.jpa.repository.JpaRepository
-
-interface SignatureCanRepository : JpaRepository<SignatureCan, Long>, SignatureCanQueryRepository
-
-interface SignatureCanQueryRepository {
-    fun findImageByCreatorIdAndCan(creatorId: Long, can: Int, imageHost: String): String?
-}
-
-class SignatureCanQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : SignatureCanQueryRepository {
-    override fun findImageByCreatorIdAndCan(creatorId: Long, can: Int, imageHost: String): String? {
-        return queryFactory
-            .select(signatureCan.image.prepend("/").prepend(imageHost))
-            .from(signatureCan)
-            .where(
-                signatureCan.creator.id.eq(creatorId)
-                    .and(signatureCan.can.eq(can))
-                    .and(signatureCan.isActive.isTrue)
-            )
-            .fetchFirst()
-    }
-}