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

Merge pull request 'test' (#124) from test into main 

Reviewed-on: #124
This commit is contained in:
klaus 2024-02-05 07:03:45 +00:00
parent 38ef6e5583 738d7fba2a
commit faf7aa06b6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
View File

@ -139,7 +139,7 @@ class MemberQueryRepositoryImpl(
.or(member.id.eq(4).and(member.pushToken.isNotNull)) .or(member.id.eq(4).and(member.pushToken.isNotNull))
if (isAuth) { if (isAuth) {
where = where.and(member.auth.isNotNull) where = where.and(auth.isNotNull)
} }
return queryFactory return queryFactory
@ -147,8 +147,8 @@ class MemberQueryRepositoryImpl(
.from(creatorFollowing) .from(creatorFollowing)
.innerJoin(creatorFollowing.creator, creator) .innerJoin(creatorFollowing.creator, creator)
.innerJoin(creatorFollowing.member, member) .innerJoin(creatorFollowing.member, member)
.innerJoin(member.notification, memberNotification) .innerJoin(creatorFollowing.member.notification, memberNotification)
.leftJoin(member.auth, auth) .leftJoin(creatorFollowing.member.auth, auth)
.where(where) .where(where)
.fetch() .fetch()
.toSet() .toSet()
@ -178,7 +178,7 @@ class MemberQueryRepositoryImpl(
.or(creatorFollowing.member.id.eq(4).and(member.pushToken.isNotNull)) .or(creatorFollowing.member.id.eq(4).and(member.pushToken.isNotNull))
if (isAuth) { if (isAuth) {
where = where.and(creatorFollowing.member.auth.isNotNull) where = where.and(auth.isNotNull)
} }
val followingMemberPushToken = queryFactory val followingMemberPushToken = queryFactory
@ -186,8 +186,8 @@ class MemberQueryRepositoryImpl(
.from(creatorFollowing) .from(creatorFollowing)
.innerJoin(creatorFollowing.creator, creator) .innerJoin(creatorFollowing.creator, creator)
.innerJoin(creatorFollowing.member, member) .innerJoin(creatorFollowing.member, member)
.innerJoin(member.notification, memberNotification) .innerJoin(creatorFollowing.member.notification, memberNotification)
.leftJoin(member.auth, auth) .leftJoin(creatorFollowing.member.auth, auth)
.where(where) .where(where)
.fetch() .fetch()
@ -204,15 +204,15 @@ class MemberQueryRepositoryImpl(
) )
if (isAuth) { if (isAuth) {
where = where.and(liveReservation.member.auth.isNotNull) where = where.and(auth.isNotNull)
} }
val reservationMemberPushToken = queryFactory val reservationMemberPushToken = queryFactory
.select(liveReservation.member.pushToken) .select(liveReservation.member.pushToken)
.from(liveReservation) .from(liveReservation)
.innerJoin(liveReservation.member, member) .innerJoin(liveReservation.member, member)
.innerJoin(member.notification, memberNotification) .innerJoin(liveReservation.member.notification, memberNotification)
.leftJoin(member.auth, auth) .leftJoin(liveReservation.member.auth, auth)
.where(where) .where(where)
.fetch() .fetch()
@ -243,7 +243,7 @@ class MemberQueryRepositoryImpl(
.or(member.id.eq(4).and(member.pushToken.isNotNull)) .or(member.id.eq(4).and(member.pushToken.isNotNull))
if (isAuth) { if (isAuth) {
where = where.and(member.auth.isNotNull) where = where.and(auth.isNotNull)
} }
return queryFactory return queryFactory