klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

account -> member

This commit is contained in:
Klaus 2023-08-07 14:46:31 +09:00
parent 872e84baf1
commit 6ff38decab
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) {

2
src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt
View File

@ -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,

2
src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt
View File

@ -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,

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

@ -149,12 +149,12 @@ class ExplorerQueryRepository(
.distinct()
}
fun getSearchChannel(channel: String, accountId: Long): List<Member> {
fun getSearchChannel(channel: String, memberId: Long): List<Member> {
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()
)
}

4
src/main/kotlin/kr/co/vividnext/sodalive/live/room/kickout/LiveRoomKickOutService.kt
View File

@ -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)