Skip to content

Fix: 부스 디테일에서 날짜 필터 제외 #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiyoon607 merged 1 commit into from
May 27, 2025
Merged

Fix: 부스 디테일에서 날짜 필터 제외 #245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions booth/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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,
Expand Down Expand Up @@ -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(
Expand All @@ -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",
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down