diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt index 1cb97c9..811e4bd 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt @@ -85,7 +85,7 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository) } .map { GetChargeStatusDetailResponse( - accountId = it.accountId, + memberId = it.memberId, nickname = it.nickname, method = it.method, amount = if (paymentGateway == PaymentGateway.APPLE_IAP) { diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt index 2d94030..fcfa0d9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt @@ -3,7 +3,7 @@ package kr.co.vividnext.sodalive.admin.charge import com.querydsl.core.annotations.QueryProjection data class GetChargeStatusDetailQueryDto @QueryProjection constructor( - val accountId: Long, + val memberId: Long, val nickname: String, val method: String, val appleChargeAmount: Double, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt index 0d8ae2f..430b6f8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt @@ -1,7 +1,7 @@ package kr.co.vividnext.sodalive.admin.charge data class GetChargeStatusDetailResponse( - val accountId: Long, + val memberId: Long, val nickname: String, val method: String, val amount: Int, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt index eb29c23..33fb311 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt @@ -149,12 +149,12 @@ class ExplorerQueryRepository( .distinct() } - fun getSearchChannel(channel: String, accountId: Long): List { + fun getSearchChannel(channel: String, memberId: Long): List { return queryFactory.selectFrom(member) .where( member.nickname.containsIgnoreCase(channel) .and(member.isActive.isTrue) - .and(member.id.ne(accountId)) + .and(member.id.ne(memberId)) .and(member.role.eq(MemberRole.CREATOR)) ) .fetch() @@ -266,8 +266,8 @@ class ExplorerQueryRepository( }, account.tags .asSequence() - .filter { accountCounselorTag -> accountCounselorTag.tag.isActive } - .map { accountCounselorTag -> accountCounselorTag.tag.tag } + .filter { tag -> tag.tag.isActive } + .map { tag -> tag.tag.tag } .toList() ) } @@ -313,8 +313,8 @@ class ExplorerQueryRepository( }, it.tags .asSequence() - .filter { accountCounselorTag -> accountCounselorTag.tag.isActive } - .map { accountCounselorTag -> accountCounselorTag.tag.tag } + .filter { tag -> tag.tag.isActive } + .map { tag -> tag.tag.tag } .toList() ) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutService.kt index 0ee28c6..b193a82 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutService.kt @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service class LiveRoomKickOutService( private val roomInfoRepository: LiveRoomInfoRedisRepository, private val repository: LiveRoomKickOutRedisRepository, - private val accountRepository: MemberRepository, + private val memberRepository: MemberRepository, private val roomRepository: LiveRoomRepository, @Value("\${cloud.aws.cloud-front.host}") @@ -43,7 +43,7 @@ class LiveRoomKickOutService( liveRoomKickOut.kickOut(request.userId) repository.save(liveRoomKickOut) - val kickOutUser = accountRepository.findByIdOrNull(request.userId) + val kickOutUser = memberRepository.findByIdOrNull(request.userId) if (kickOutUser != null) { roomInfo.removeSpeaker(kickOutUser) roomInfo.removeListener(kickOutUser)