src/main/kotlin/kr/co/vividnext/sodalive/fcm/FcmService.kt

@@ -21,40 +21,38 @@ class FcmService {
         messageId: Long? = null,
         contentId: Long? = null
     ) {
-        if (tokens.isNotEmpty()) {
+        val multicastMessage = MulticastMessage.builder()
-            logger.info("os: $container")
+            .addAllTokens(tokens)
-            val multicastMessage = MulticastMessage.builder()
-                .addAllTokens(tokens)
 
-            if (container == "ios") {
+        if (container == "ios") {
-                multicastMessage
+            multicastMessage
-                    .setNotification(
+                .setNotification(
-                        Notification.builder()
+                    Notification.builder()
-                            .setTitle(title)
+                        .setTitle(title)
-                            .setBody(message)
+                        .setBody(message)
-                            .build()
+                        .build()
-                    )
+                )
-            } else {
+        } else {
-                multicastMessage
+            multicastMessage
-                    .putData("title", title)
+                .putData("title", title)
-                    .putData("message", message)
+                .putData("message", message)
-            }
-
-            if (roomId != null) {
-                multicastMessage.putData("room_id", roomId.toString())
-            }
-
-            if (messageId != null) {
-                multicastMessage.putData("message_id", messageId.toString())
-            }
-
-            if (contentId != null) {
-                multicastMessage.putData("content_id", contentId.toString())
-            }
-
-            val response = FirebaseMessaging.getInstance().sendEachForMulticast(multicastMessage.build())
-            logger.info("보내기 성공: ${response.successCount}")
-            logger.info("보내기 실패: ${response.failureCount}")
         }
+
+        if (roomId != null) {
+            multicastMessage.putData("room_id", roomId.toString())
+        }
+
+        if (messageId != null) {
+            multicastMessage.putData("message_id", messageId.toString())
+        }
+
+        if (contentId != null) {
+            multicastMessage.putData("content_id", contentId.toString())
+        }
+
+        val response = FirebaseMessaging.getInstance().sendEachForMulticast(multicastMessage.build())
+        logger.info("os: $container")
+        logger.info("보내기 성공: ${response.successCount}")
+        logger.info("보내기 실패: ${response.failureCount}")
     }
 }

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

@@ -301,7 +301,6 @@ class LiveRoomService(
             channelName = room.channelName,
             beginDateTime = beginDateTime.format(DateTimeFormatter.ofPattern("yyyy.MM.dd E hh:mm a")),
             isPaid = false,
-            isAdult = room.isAdult,
             isPrivateRoom = room.type == LiveRoomType.PRIVATE,
             password = room.password
         )

src/main/kotlin/kr/co/vividnext/sodalive/live/room/detail/GetRoomDetailResponse.kt

@@ -9,7 +9,6 @@ data class GetRoomDetailResponse(
     val title: String,
     val notice: String,
     var isPaid: Boolean,
-    val isAdult: Boolean,
     val isPrivateRoom: Boolean,
     val password: String?,
     val tags: List<String>,

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

@@ -80,7 +80,6 @@ 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)
@@ -114,7 +113,6 @@ class MemberQueryRepositoryImpl(
                     blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
-            .and(creatorFollowing.member.pushToken.isNotNull)
 
         if (isAuth) {
             where = where.and(member.auth.isNotNull)
@@ -151,7 +149,6 @@ class MemberQueryRepositoryImpl(
                     blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
-            .and(creatorFollowing.member.pushToken.isNotNull)
 
         if (isAuth) {
             where = where.and(member.auth.isNotNull)
@@ -180,10 +177,7 @@ class MemberQueryRepositoryImpl(
             )
             .from(message)
             .innerJoin(message.recipient, member)
-            .where(
+            .where(message.id.eq(messageId))
-                message.id.eq(messageId)
-                    .and(member.pushToken.isNotNull)
-            )
             .fetchFirst()
     }
 
@@ -194,7 +188,6 @@ 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)