Add public activity filters (#1292)

* Update dev container image versions * Improve public activity filtering
karrot-dev · Mar 18, 2024 · e1e790d · e1e790d
1 parent 1d3d9e6
commit e1e790d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/karrot/activities/api.py b/karrot/activities/api.py
@@ -264,7 +264,7 @@ class PublicActivityViewSet(
     mixins.ListModelMixin,
 ):
     serializer_class = PublicActivitySerializer
-    queryset = ActivityModel.objects.is_public().exclude_disabled()
+    queryset = ActivityModel.objects.is_public().exclude_disabled().filter(place__archived_at__isnull=True)
     filter_backends = (
         filters.DjangoFilterBackend,
         OrderingFilter,

diff --git a/karrot/activities/filters.py b/karrot/activities/filters.py
@@ -30,6 +30,17 @@ class Meta:
 class PublicActivitiesFilter(filters.FilterSet):
     group = filters.NumberFilter(field_name="place__group")
     date = ISODateTimeRangeFromToRangeFilter(field_name="date", lookup_expr="overlap")
+    place = filters.NumberFilter(field_name="place")
+    activity_type = filters.NumberFilter(field_name="activity_type")
+
+    class Meta:
+        model = Activity
+        fields = [
+            "group",
+            "date",
+            "place",
+            "activity_type",
+        ]
 
 
 def place_status_queryset(request):