Compare commits
No commits in common. "e334d1e5d9ef07dc5a373538c1477d5f2a72f83d" and "b735e861d00c893bd6aed840fc140976348f320c" have entirely different histories.
e334d1e5d9
...
b735e861d0
|
@ -191,13 +191,13 @@ class AudioContentCommentQueryRepositoryImpl(
|
||||||
): List<FindPushTokenByContentIdAndCommentParentIdMyMemberIdResponse> {
|
): List<FindPushTokenByContentIdAndCommentParentIdMyMemberIdResponse> {
|
||||||
var where = audioContent.id.eq(contentId)
|
var where = audioContent.id.eq(contentId)
|
||||||
.and(member.id.ne(myMemberId))
|
.and(member.id.ne(myMemberId))
|
||||||
|
.and(audioContentComment.isActive.isTrue)
|
||||||
|
|
||||||
if (commentParentId != null) {
|
if (commentParentId != null) {
|
||||||
where = where.and(
|
where = where.and(
|
||||||
audioContentComment.parent.id.eq(commentParentId)
|
audioContentComment.parent.id.eq(commentParentId)
|
||||||
.or(audioContentComment.id.eq(commentParentId))
|
.or(audioContentComment.id.eq(commentParentId))
|
||||||
)
|
)
|
||||||
.and(audioContentComment.isActive.isTrue)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val response = if (commentParentId != null) {
|
val response = if (commentParentId != null) {
|
||||||
|
@ -221,8 +221,9 @@ class AudioContentCommentQueryRepositoryImpl(
|
||||||
member.container
|
member.container
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.from(audioContent)
|
.from(audioContentComment)
|
||||||
.innerJoin(audioContent.member, member)
|
.innerJoin(audioContentComment.audioContent, audioContent)
|
||||||
|
.innerJoin(audioContentComment.member, member)
|
||||||
.where(where)
|
.where(where)
|
||||||
.fetch()
|
.fetch()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue