From 5bfcbe912624988859b407edb5fff84192bb78a6 Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Wed, 9 Oct 2024 00:25:00 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=B0=A9=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20-=20=EB=B3=B8=EC=9D=B8=EC=9D=B8=EC=A6=9D?=
 =?UTF-8?q?=EC=9D=84=20=ED=96=88=EB=8D=94=EB=9D=BC=EB=8F=84=2019=EA=B8=88?=
 =?UTF-8?q?=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=B3=B4=EA=B8=B0=EB=A5=BC=20?=
 =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94=20=ED=95=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EC=9C=BC=EB=A9=B4=2019=EA=B8=88=20=EB=9D=BC=EC=9D=B4=EB=B8=8C?=
 =?UTF-8?q?=EA=B0=80=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sodalive/live/room/LiveRoomController.kt         | 12 +++++++++++-
 .../vividnext/sodalive/live/room/LiveRoomService.kt  |  7 ++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomController.kt
index 43ab9f6..02029a5 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomController.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomController.kt
@@ -33,12 +33,22 @@ class LiveRoomController(
         @RequestParam timezone: String,
         @RequestParam dateString: String? = null,
         @RequestParam status: LiveRoomStatus,
+        @RequestParam("isAdultContentVisible", required = false) isAdultContentVisible: Boolean? = null,
         @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member?,
         pageable: Pageable
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(service.getRoomList(dateString, status, pageable, member, timezone))
+        ApiResponse.ok(
+            service.getRoomList(
+                dateString,
+                status,
+                isAdultContentVisible ?: true,
+                pageable,
+                member,
+                timezone
+            )
+        )
     }
 
     @PostMapping
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
index 2de3e07..bad1a6d 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
@@ -113,6 +113,7 @@ class LiveRoomService(
     fun getRoomList(
         dateString: String?,
         status: LiveRoomStatus,
+        isAdultContentVisible: Boolean,
         pageable: Pageable,
         member: Member,
         timezone: String
@@ -123,7 +124,7 @@ class LiveRoomService(
                 timezone,
                 memberId = member.id!!,
                 isCreator = member.role == MemberRole.CREATOR,
-                isAdult = member.auth != null
+                isAdult = member.auth != null && isAdultContentVisible
             )
         } else if (dateString != null) {
             getLiveRoomListReservationWithDate(
@@ -132,14 +133,14 @@ class LiveRoomService(
                 timezone,
                 memberId = member.id!!,
                 isCreator = member.role == MemberRole.CREATOR,
-                isAdult = member.auth != null
+                isAdult = member.auth != null && isAdultContentVisible
             )
         } else {
             getLiveRoomListReservationWithoutDate(
                 timezone,
                 isCreator = member.role == MemberRole.CREATOR,
                 memberId = member.id!!,
-                isAdult = member.auth != null
+                isAdult = member.auth != null && isAdultContentVisible
             )
         }