From 498d9c4893e669958e6a12059dfca5cc3aaabe11 Mon Sep 17 00:00:00 2001 From: Klaus <klaus@vividnext.co.kr> Date: Mon, 21 Aug 2023 03:15:04 +0900 Subject: [PATCH] =?UTF-8?q?=ED=91=B8=EC=8B=9C=20=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20-=20=ED=91=B8=EC=8B=9C=20=ED=86=A0?= =?UTF-8?q?=ED=81=B0=20!=3D=20null=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/member/MemberRepository.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt index 5a92a07..45fa78e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt @@ -80,6 +80,7 @@ class MemberQueryRepositoryImpl( var where = member.isActive.isTrue .and(member.email.notIn("admin@sodalive.net")) .and(member.container.eq(container)) + .and(member.pushToken.isNotNull) if (isAuth) { where = where.and(member.auth.isNotNull) @@ -113,6 +114,7 @@ class MemberQueryRepositoryImpl( blockMemberRepository.getBlockedMemberList(creatorId) ) ) + .and(creatorFollowing.member.pushToken.isNotNull) if (isAuth) { where = where.and(member.auth.isNotNull) @@ -149,6 +151,7 @@ class MemberQueryRepositoryImpl( blockMemberRepository.getBlockedMemberList(creatorId) ) ) + .and(creatorFollowing.member.pushToken.isNotNull) if (isAuth) { where = where.and(member.auth.isNotNull) @@ -177,7 +180,10 @@ class MemberQueryRepositoryImpl( ) .from(message) .innerJoin(message.recipient, member) - .where(message.id.eq(messageId)) + .where( + message.id.eq(messageId) + .and(member.pushToken.isNotNull) + ) .fetchFirst() } @@ -188,6 +194,7 @@ class MemberQueryRepositoryImpl( var where = member.isActive.isTrue .and(member.email.notIn("admin@sodalive.net")) .and(member.id.`in`(*recipients.toTypedArray())) + .and(member.pushToken.isNotNull) if (isAuth) { where = where.and(member.auth.isNotNull)