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

Merge pull request '콘텐츠 댓글 푸시 대상자' (#246) from test into main 

Reviewed-on: #246
This commit is contained in:
klaus 2024-12-03 15:54:34 +00:00
parent b735e861d0 f503492bf9
commit e334d1e5d9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentRepository.kt
View File

@ -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,9 +221,8 @@ class AudioContentCommentQueryRepositoryImpl(
member.container member.container
) )
) )
.from(audioContentComment) .from(audioContent)
.innerJoin(audioContentComment.audioContent, audioContent) .innerJoin(audioContent.member, member)
.innerJoin(audioContentComment.member, member)
.where(where) .where(where)
.fetch() .fetch()
} }