Renamed project filter query parameter to project_id for Project Summary entities

ami/jobs/views.py

@@ -3,11 +3,13 @@
 from django.db.models.query import QuerySet
 from django.forms import IntegerField
 from django.utils import timezone
+from drf_spectacular.utils import extend_schema
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
 from ami.main.api.views import DefaultViewSet
 from ami.utils.fields import url_boolean_param
+from ami.utils.requests import get_active_project, project_id_doc_param
 
 from .models import Job, JobState, MLJob
 from .serializers import JobListSerializer, JobSerializer
@@ -35,7 +37,6 @@ class JobViewSet(DefaultViewSet):
     """
 
     queryset = Job.objects.select_related(
-        "project",
         "deployment",
         "pipeline",
         "source_image_collection",
@@ -128,7 +129,9 @@ def perform_create(self, serializer):
 
     def get_queryset(self) -> QuerySet:
         jobs = super().get_queryset()
-
+        project = get_active_project(self.request)
+        if project:
+            jobs = jobs.filter(project=project)
         cutoff_hours = IntegerField(required=False, min_value=0).clean(
             self.request.query_params.get("cutoff_hours", Job.FAILED_CUTOFF_HOURS)
         )
@@ -138,3 +141,7 @@ def get_queryset(self) -> QuerySet:
             status=JobState.failed_states(),
             updated_at__lt=cutoff_datetime,
         )
+
+    @extend_schema(parameters=[project_id_doc_param])
+    def list(self, request, *args, **kwargs):
+        return super().list(request, *args, **kwargs)

ami/main/api/serializers.py

@@ -503,7 +503,7 @@ def get_occurrence_images(self, obj):
 
         # request = self.context.get("request")
         # project_id = request.query_params.get("project") if request else None
-        project_id = self.context["request"].query_params["project"]
+        project_id = self.context["request"].query_params["project_id"]
         classification_threshold = get_active_classification_threshold(self.context["request"])
 
         return obj.occurrence_images(

ami/main/api/views.py

@@ -138,7 +138,6 @@ class DeploymentViewSet(DefaultViewSet):
     """
 
     queryset = Deployment.objects.select_related("project", "device", "research_site")
-    filterset_fields = ["project"]
     ordering_fields = [
         "created_at",
         "updated_at",
@@ -161,7 +160,9 @@ def get_serializer_class(self):
 
     def get_queryset(self) -> QuerySet:
         qs = super().get_queryset()
-
+        project = get_active_project(self.request)
+        if project:
+            qs = qs.filter(project=project)
         num_example_captures = 10
         if self.action == "retrieve":
             qs = qs.prefetch_related(
@@ -205,6 +206,10 @@ def sync(self, _request, pk=None) -> Response:
         else:
             raise api_exceptions.ValidationError(detail="Deployment must have a data source to sync captures from")
 
+    @extend_schema(parameters=[project_id_doc_param])
+    def list(self, request, *args, **kwargs):
+        return super().list(request, *args, **kwargs)
+
 
 class EventViewSet(DefaultViewSet):
     """
@@ -213,7 +218,7 @@ class EventViewSet(DefaultViewSet):
 
     queryset = Event.objects.all()
     serializer_class = EventSerializer
-    filterset_fields = ["deployment", "project"]
+    filterset_fields = ["deployment"]
     ordering_fields = [
         "created_at",
         "updated_at",
@@ -238,6 +243,9 @@ def get_serializer_class(self):
 
     def get_queryset(self) -> QuerySet:
         qs: QuerySet = super().get_queryset()
+        project = get_active_project(self.request)
+        if project:
+            qs = qs.filter(project=project)
         qs = qs.filter(deployment__isnull=False)
         qs = qs.annotate(
             duration=models.F("end") - models.F("start"),
@@ -364,6 +372,10 @@ def timeline(self, request, pk=None):
         )
         return Response(serializer.data)
 
+    @extend_schema(parameters=[project_id_doc_param])
+    def list(self, request, *args, **kwargs):
+        return super().list(request, *args, **kwargs)
+
 
 class SourceImageViewSet(DefaultViewSet):
     """
@@ -565,7 +577,8 @@ def get_queryset(self) -> QuerySet:
         classification_threshold = get_active_classification_threshold(self.request)
         query_set: QuerySet = super().get_queryset()
         project = get_active_project(self.request)
-        query_set = query_set.filter(project=project)
+        if project:
+            query_set = query_set.filter(project=project)
         queryset = query_set.with_occurrences_count(
             classification_threshold=classification_threshold
         ).with_taxa_count(  # type: ignore
@@ -910,7 +923,6 @@ class OccurrenceViewSet(DefaultViewSet):
     filterset_fields = [
         "event",
         "deployment",
-        "project",
         "determination__rank",
         "detections__source_image",
     ]
@@ -940,7 +952,10 @@ def get_serializer_class(self):
             return OccurrenceSerializer
 
     def get_queryset(self) -> QuerySet:
+        project = get_active_project(self.request)
         qs = super().get_queryset()
+        if project:
+            qs = qs.filter(project=project)
         qs = qs.select_related(
             "determination",
             "deployment",
@@ -968,6 +983,10 @@ def get_queryset(self) -> QuerySet:
 
         return qs
 
+    @extend_schema(parameters=[project_id_doc_param])
+    def list(self, request, *args, **kwargs):
+        return super().list(request, *args, **kwargs)
+
 
 class TaxonViewSet(DefaultViewSet):
     """
@@ -1049,7 +1068,10 @@ def filter_taxa_by_observed(self, queryset: QuerySet) -> tuple[QuerySet, bool]:
         """
 
         occurrence_id = self.request.query_params.get("occurrence")
-        project_id = self.request.query_params.get("project") or self.request.query_params.get("occurrences__project")
+        project_id = self.request.query_params.get("project") or self.request.query_params.get(
+            "occurrences__project"
+        )  # @TBD
+        project_id = self.request.query_params.get("project_id")
         deployment_id = self.request.query_params.get("deployment") or self.request.query_params.get(
             "occurrences__deployment"
         )
@@ -1187,6 +1209,10 @@ def get_queryset(self) -> QuerySet:
 
         return qs
 
+    @extend_schema(parameters=[project_id_doc_param])
+    def list(self, request, *args, **kwargs):
+        return super().list(request, *args, **kwargs)
+
     # def retrieve(self, request: Request, *args, **kwargs) -> Response:
     #     """
     #     Override the serializer to include the recursive occurrences count
@@ -1374,7 +1400,8 @@ class SiteViewSet(DefaultViewSet):
     def get_queryset(self) -> QuerySet:
         query_set: QuerySet = super().get_queryset()
         project = get_active_project(self.request)
-        query_set = query_set.filter(project=project)
+        if project:
+            query_set = query_set.filter(project=project)
         return query_set
 
     @extend_schema(parameters=[project_id_doc_param])
@@ -1399,7 +1426,8 @@ class DeviceViewSet(DefaultViewSet):
     def get_queryset(self) -> QuerySet:
         query_set: QuerySet = super().get_queryset()
         project = get_active_project(self.request)
-        query_set = query_set.filter(project=project)
+        if project:
+            query_set = query_set.filter(project=project)
         return query_set
 
     @extend_schema(parameters=[project_id_doc_param])

ami/main/tests.py

@@ -549,7 +549,7 @@ def setUp(self) -> None:
     def test_occurrences_for_project(self):
         # Test that occurrences are specific to each project
         for project in [self.project_one, self.project_two]:
-            response = self.client.get(f"/api/v2/occurrences/?project={project.pk}")
+            response = self.client.get(f"/api/v2/occurrences/?project_id={project.pk}")
             self.assertEqual(response.status_code, 200)
             self.assertEqual(response.json()["count"], Occurrence.objects.filter(project=project).count())
 
@@ -592,7 +592,7 @@ def _test_taxa_for_project(self, project: Project):
         """
         from ami.main.models import Taxon
 
-        response = self.client.get(f"/api/v2/taxa/?project={project.pk}")
+        response = self.client.get(f"/api/v2/taxa/?project_id={project.pk}")
         self.assertEqual(response.status_code, 200)
         project_occurred_taxa = Taxon.objects.filter(occurrences__project=project).distinct()
         # project_any_taxa = Taxon.objects.filter(projects=project)

ami/ml/views.py

@@ -43,7 +43,8 @@ class PipelineViewSet(DefaultViewSet):
     def get_queryset(self) -> QuerySet:
         query_set: QuerySet = super().get_queryset()
         project = get_active_project(self.request)
-        query_set = query_set.filter(projects=project)
+        if project:
+            query_set = query_set.filter(projects=project)
         return query_set
 
     @extend_schema(parameters=[project_id_doc_param])