Merge pull request #45 from IAMBH/jbh

🎨 양일 부스 필터 수정
LikeLion-at-DGU · Oct 10, 2023 · 5958531 · 5958531
2 parents 7bc2e11 + cd9fbad
commit 5958531
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/booth/views.py b/booth/views.py
@@ -15,12 +15,14 @@
 from .paginations import BoothPagination
 
 class BoothFilter(filters.FilterSet):
-    date = filters.NumberFilter(field_name='date')
+    # date = filters.NumberFilter(field_name='date')
+    start_date = filters.NumberFilter(field_name='start_date')
+    end_date = filters.NumberFilter(field_name='end_date')
     type = filters.MultipleChoiceFilter(field_name='type', choices=Booth.TYPE_CHOICES)
 
     class Meta:
         model = Booth
-        fields = ['location', 'type', 'date']
+        fields = ['location', 'type', 'start_date', 'end_date']
 
 class BoothViewSet(viewsets.GenericViewSet, mixins.ListModelMixin, mixins.RetrieveModelMixin):
 
@@ -32,7 +34,9 @@ class BoothViewSet(viewsets.GenericViewSet, mixins.ListModelMixin, mixins.Retrie
     def get_queryset(self):
         queryset = Booth.objects.annotate(
             like_cnt = Count('likes'),
-            date = Extract('start_at', 'day')
+            # date = Extract('end_at', 'day')
+            start_date = Extract('start_at', 'day'),
+            end_date = Extract('end_at', 'day')
         )
         return queryset