From 5673aeb15d9cd8dea3de3fb296715365422a6133 Mon Sep 17 00:00:00 2001
From: jiyoon607 <jiyoon607@naver.com>
Date: Tue, 27 May 2025 11:39:34 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20=EB=B6=80=EC=8A=A4=20=EB=94=94=ED=85=8C?=
 =?UTF-8?q?=EC=9D=BC=EC=97=90=EC=84=9C=20=EB=82=A0=EC=A7=9C=20=ED=95=84?=
 =?UTF-8?q?=ED=84=B0=20=EC=A0=9C=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 booth/views.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/booth/views.py b/booth/views.py
index 882eeb7..e0b67bd 100644
--- a/booth/views.py
+++ b/booth/views.py
@@ -30,7 +30,6 @@ def get_serializer_class(self):
         return BoothDetailSerializer 
     
     def get_queryset(self):
-        today = timezone.now().date()
         # '운영중 - 대기중지 - 운영전 - 운영종료' + 가나다 순서로 정렬
         queryset = Booth.objects.all().annotate(
             operating_status_order=Case(
@@ -40,13 +39,14 @@ def get_queryset(self):
                 When(operating_status='finished', then=Value(4)),
                 output_field=IntegerField()
             )
-        ).filter(booth_start_time__date=today)  # 오늘 부스만
+        )
         return queryset.order_by('operating_status_order', 'booth_name')
 
     # 부스 목록 조회
     def list(self, request, *args, **kwargs):
         try:
-            queryset = self.get_queryset().filter(is_GDGbooth=False)
+            today = timezone.now().date()
+            queryset = self.get_queryset().filter(is_GDGbooth=False, booth_start_time__date=today)
             serializer = self.get_serializer(queryset, many=True)
             return custom_response(
                 data=serializer.data,
@@ -166,7 +166,6 @@ def get_serializer_class(self):
         return BoothWaitingDetailSerializer 
     
     def get_queryset(self):
-        today = timezone.now().date()
         # '운영중 - 대기중지 - 운영전 - 운영종료' + 가나다 순서로 정렬
         queryset = Booth.objects.all().annotate(
             operating_status_order=Case(
@@ -176,11 +175,12 @@ def get_queryset(self):
                 When(operating_status='finished', then=Value(4)),
                 output_field=IntegerField()
             )
-        ).filter(booth_start_time__date=today)  # 오늘 부스만
+        )
         return queryset.order_by('operating_status_order', 'booth_name')
     
     # 부스 목록 - 대기 정보 조회
     def list(self, request, *args, **kwargs):
+        today = timezone.now().date()
         if not request.user or not request.user.is_authenticated:
             return Response({
                 "status": "error",
@@ -189,7 +189,7 @@ def list(self, request, *args, **kwargs):
                 "data": None
             }, status=status.HTTP_401_UNAUTHORIZED)
         try:
-            queryset = self.get_queryset().filter(is_GDGbooth=False)
+            queryset = self.get_queryset().filter(is_GDGbooth=False, booth_start_time__date=today)
             serializer = self.get_serializer(queryset, many=True)
             return custom_response(
                 data=serializer.data,
@@ -331,14 +331,14 @@ def get_serializer_class(self):
         return GDGBoothDetailSerializer 
     
     def get_queryset(self):
-        today = timezone.now().date()
-        queryset = Booth.objects.all().filter(booth_start_time__date=today)  # 오늘 부스만
+        queryset = Booth.objects.all()
         return queryset.order_by('booth_name')
 
     # 부스 목록 조회
     def list(self, request, *args, **kwargs):
+        today = timezone.now().date()
         try:
-            queryset = self.get_queryset().filter(is_GDGbooth=True)
+            queryset = self.get_queryset().filter(is_GDGbooth=True, booth_start_time__date=today)
             serializer = self.get_serializer(queryset, many=True)
             return custom_response(
                 data=serializer.data,