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

라이브 방 - 크리에이터 입장 가능 설정 추가 #179

Merged
klaus merged 5 commits from test into main 2024-05-14 12:09:53 +00:00
Conversation 0 Commits 5 Files Changed 9 +22 -3
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ae4a790236 - Show all commits

19
src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt
View File

@ -24,6 +24,7 @@ interface LiveRoomQueryRepository {
offset: Long,
limit: Long,
timezone: String,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom>
@ -32,6 +33,7 @@ interface LiveRoomQueryRepository {
date: LocalDateTime,
offset: Long,
limit: Long,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom>
@ -56,6 +58,7 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L
offset: Long,
limit: Long,
timezone: String,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -69,7 +72,10 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L
}
if (isCreator) {
where = where.and(liveRoom.isAvailableJoinCreator.isTrue)
where = where.and(
liveRoom.isAvailableJoinCreator.isTrue
.or(liveRoom.member.id.eq(memberId))
)
}
return queryFactory
@ -92,6 +98,7 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L
date: LocalDateTime,
offset: Long,
limit: Long,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -109,7 +116,10 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L
}
if (isCreator) {
where = where.and(liveRoom.isAvailableJoinCreator.isTrue)
where = where.and(
liveRoom.isAvailableJoinCreator.isTrue
.or(liveRoom.member.id.eq(memberId))
)
}
return queryFactory
@ -146,7 +156,10 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L
}
if (isCreator) {
where = where.and(liveRoom.isAvailableJoinCreator.isTrue)
where = where.and(
liveRoom.isAvailableJoinCreator.isTrue
.or(liveRoom.member.id.eq(memberId))
)
}
return queryFactory

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

@ -121,6 +121,7 @@ class LiveRoomService(
getLiveRoomListNow(
pageable,
timezone,
memberId = member.id!!,
isCreator = member.role == MemberRole.CREATOR,
isAdult = member.auth != null
)
@ -129,6 +130,7 @@ class LiveRoomService(
dateString,
pageable,
timezone,
memberId = member.id!!,
isCreator = member.role == MemberRole.CREATOR,
isAdult = member.auth != null
)
@ -196,6 +198,7 @@ class LiveRoomService(
private fun getLiveRoomListNow(
pageable: Pageable,
timezone: String,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -203,6 +206,7 @@ class LiveRoomService(
offset = pageable.offset,
limit = pageable.pageSize.toLong(),
timezone = timezone,
memberId = memberId,
isCreator = isCreator,
isAdult = isAdult
)
@ -212,6 +216,7 @@ class LiveRoomService(
dateString: String,
pageable: Pageable,
timezone: String,
memberId: Long,
isCreator: Boolean,
isAdult: Boolean
): List<LiveRoom> {
@ -225,6 +230,7 @@ class LiveRoomService(
date = date,
offset = pageable.offset,
limit = pageable.pageSize.toLong(),
memberId = memberId,
isCreator = isCreator,
isAdult = isAdult
)