Compare commits

..

No commits in common. "536923c00bc8db1ddd39e179f3edc98d0919e150" and "48706f0bd572513de49e3e5963dc8541eeff1b07" have entirely different histories.

3 changed files with 9 additions and 29 deletions

View File

@ -19,14 +19,7 @@ import org.springframework.web.multipart.MultipartFile
@RequestMapping("/creator-admin/signature") @RequestMapping("/creator-admin/signature")
class CreatorAdminSignatureController(private val service: CreatorAdminSignatureService) { class CreatorAdminSignatureController(private val service: CreatorAdminSignatureService) {
@GetMapping @GetMapping
fun getSignatureCanList( fun getSignatureCanList(pageable: Pageable) = ApiResponse.ok(data = service.getSignatureList(pageable))
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 @PostMapping
fun createSignature( fun createSignature(

View File

@ -9,9 +9,9 @@ import org.springframework.data.jpa.repository.JpaRepository
interface CreatorAdminSignatureRepository : JpaRepository<SignatureCan, Long>, CreatorAdminSignatureQueryRepository interface CreatorAdminSignatureRepository : JpaRepository<SignatureCan, Long>, CreatorAdminSignatureQueryRepository
interface CreatorAdminSignatureQueryRepository { interface CreatorAdminSignatureQueryRepository {
fun getSignatureListTotalCount(memberId: Long): Int fun getSignatureListTotalCount(): Int
fun getSignatureList(memberId: Long, imageHost: String, offset: Long, limit: Long): List<GetSignatureListItem> fun getSignatureList(imageHost: String, offset: Long, limit: Long): List<GetSignatureListItem>
fun findSignatureByIdOrNull(id: Long, memberId: Long): SignatureCan? fun findSignatureByIdOrNull(id: Long, memberId: Long): SignatureCan?
} }
@ -19,23 +19,15 @@ interface CreatorAdminSignatureQueryRepository {
class CreatorAdminSignatureQueryRepositoryImpl( class CreatorAdminSignatureQueryRepositoryImpl(
private val queryFactory: JPAQueryFactory private val queryFactory: JPAQueryFactory
) : CreatorAdminSignatureQueryRepository { ) : CreatorAdminSignatureQueryRepository {
override fun getSignatureListTotalCount(memberId: Long): Int { override fun getSignatureListTotalCount(): Int {
return queryFactory.select(signatureCan.id) return queryFactory.select(signatureCan.id)
.from(signatureCan) .from(signatureCan)
.where( .where(signatureCan.isActive.isTrue)
signatureCan.isActive.isTrue
.and(signatureCan.creator.id.eq(memberId))
)
.fetch() .fetch()
.size .size
} }
override fun getSignatureList( override fun getSignatureList(imageHost: String, offset: Long, limit: Long): List<GetSignatureListItem> {
memberId: Long,
imageHost: String,
offset: Long,
limit: Long
): List<GetSignatureListItem> {
return queryFactory.select( return queryFactory.select(
QGetSignatureListItem( QGetSignatureListItem(
signatureCan.id, signatureCan.id,
@ -46,10 +38,7 @@ class CreatorAdminSignatureQueryRepositoryImpl(
) )
.from(signatureCan) .from(signatureCan)
.innerJoin(signatureCan.creator, member) .innerJoin(signatureCan.creator, member)
.where( .where(signatureCan.isActive.isTrue)
signatureCan.isActive.isTrue
.and(signatureCan.creator.id.eq(memberId))
)
.offset(offset) .offset(offset)
.limit(limit) .limit(limit)
.orderBy(signatureCan.id.desc()) .orderBy(signatureCan.id.desc())

View File

@ -24,10 +24,9 @@ class CreatorAdminSignatureService(
@Value("\${cloud.aws.cloud-front.host}") @Value("\${cloud.aws.cloud-front.host}")
private val imageHost: String private val imageHost: String
) { ) {
fun getSignatureList(pageable: Pageable, memberId: Long): GetSignatureListResponse { fun getSignatureList(pageable: Pageable): GetSignatureListResponse {
val totalCount = repository.getSignatureListTotalCount(memberId = memberId) val totalCount = repository.getSignatureListTotalCount()
val items = repository.getSignatureList( val items = repository.getSignatureList(
memberId = memberId,
imageHost = imageHost, imageHost = imageHost,
offset = pageable.offset, offset = pageable.offset,
limit = pageable.pageSize.toLong() limit = pageable.pageSize.toLong()
@ -36,7 +35,6 @@ class CreatorAdminSignatureService(
return GetSignatureListResponse(totalCount, items) return GetSignatureListResponse(totalCount, items)
} }
@Transactional
fun createSignature(can: Int, image: MultipartFile, memberId: Long) { fun createSignature(can: Int, image: MultipartFile, memberId: Long) {
val member = memberRepository.findCreatorByIdOrNull(memberId = memberId) val member = memberRepository.findCreatorByIdOrNull(memberId = memberId)
?: throw SodaException("잘못된 접근입니다.") ?: throw SodaException("잘못된 접근입니다.")