src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt

@@ -85,7 +85,7 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository)
             }
             .map {
                 GetChargeStatusDetailResponse(
-                    memberId = it.memberId,
+                    accountId = it.accountId,
                     nickname = it.nickname,
                     method = it.method,
                     amount = if (paymentGateway == PaymentGateway.APPLE_IAP) {

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 memberId: Long,
+    val accountId: Long,
     val nickname: String,
     val method: String,
     val appleChargeAmount: Double,

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 memberId: Long,
+    val accountId: Long,
     val nickname: String,
     val method: String,
     val amount: Int,

src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt

@@ -149,12 +149,12 @@ class ExplorerQueryRepository(
             .distinct()
     }
 
-    fun getSearchChannel(channel: String, memberId: Long): List<Member> {
+    fun getSearchChannel(channel: String, accountId: Long): List<Member> {
         return queryFactory.selectFrom(member)
             .where(
                 member.nickname.containsIgnoreCase(channel)
                     .and(member.isActive.isTrue)
-                    .and(member.id.ne(memberId))
+                    .and(member.id.ne(accountId))
                     .and(member.role.eq(MemberRole.CREATOR))
             )
             .fetch()
@@ -266,8 +266,8 @@ class ExplorerQueryRepository(
                     },
                     account.tags
                         .asSequence()
-                        .filter { tag -> tag.tag.isActive }
+                        .filter { accountCounselorTag -> accountCounselorTag.tag.isActive }
-                        .map { tag -> tag.tag.tag }
+                        .map { accountCounselorTag -> accountCounselorTag.tag.tag }
                         .toList()
                 )
             }
@@ -313,8 +313,8 @@ class ExplorerQueryRepository(
                     },
                     it.tags
                         .asSequence()
-                        .filter { tag -> tag.tag.isActive }
+                        .filter { accountCounselorTag -> accountCounselorTag.tag.isActive }
-                        .map { tag -> tag.tag.tag }
+                        .map { accountCounselorTag -> accountCounselorTag.tag.tag }
                         .toList()
                 )
             }

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

@@ -42,7 +42,6 @@ import kr.co.vividnext.sodalive.member.Gender
 import kr.co.vividnext.sodalive.member.Member
 import kr.co.vividnext.sodalive.member.MemberRepository
 import kr.co.vividnext.sodalive.member.MemberRole
-import kr.co.vividnext.sodalive.member.block.BlockMemberRepository
 import kr.co.vividnext.sodalive.utils.generateFileName
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.domain.Pageable
@@ -64,7 +63,6 @@ class LiveRoomService(
     private val roomInfoRepository: LiveRoomInfoRedisRepository,
     private val roomCancelRepository: LiveRoomCancelRepository,
     private val kickOutService: LiveRoomKickOutService,
-    private val blockMemberRepository: BlockMemberRepository,
 
     private val useCanCalculateRepository: UseCanCalculateRepository,
     private val reservationRepository: LiveReservationRepository,
@@ -421,12 +419,6 @@ class LiveRoomService(
             throw SodaException("비밀번호가 일치하지 않습니다.\n다시 확인 후 입력해주세요.")
         }
 
-        val isBlocked = blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = room.member!!.id!!)
-        if (isBlocked) throw SodaException("${room.member!!.nickname}님의 요청으로 라이브에 입장할 수 없습니다.")
-
-        val kickOutCount = kickOutService.getKickOutCount(roomId = room.id!!, userId = member.id!!)
-        if (kickOutCount >= 2) throw SodaException("${room.member!!.nickname}님의 요청으로 라이브에 참여할 수 없습니다.")
-
         val lock = getOrCreateLock(memberId = member.id!!)
         lock.write {
             var roomInfo = roomInfoRepository.findByIdOrNull(request.roomId)

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 memberRepository: MemberRepository,
+    private val accountRepository: 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 = memberRepository.findByIdOrNull(request.userId)
+        val kickOutUser = accountRepository.findByIdOrNull(request.userId)
         if (kickOutUser != null) {
             roomInfo.removeSpeaker(kickOutUser)
             roomInfo.removeListener(kickOutUser)