Feat/remove result from list endpoint

gateway/api/repositories/jobs.py

@@ -2,6 +2,8 @@
 Repository implementation for Job model
 """
 import logging
+from typing import List
+from django.db.models import Q
 from api.models import Job
 
 logger = logging.getLogger("gateway")
@@ -29,3 +31,51 @@ def get_job_by_id(self, job_id: str) -> Job:
             logger.info("Job [%s] was not found", id)
 
         return result_queryset
+
+    def get_user_jobs(self, user, ordering="-created") -> List[Job]:
+        """
+        Retrieves jobs created by a specific user.
+
+        Args:
+            user (User): The user whose jobs are to be retrieved.
+            ordering (str, optional): The field to order the results by. Defaults to "-created".
+
+        Returns:
+            List[Jobs]: a list of Jobs
+        """
+        user_criteria = Q(author=user)
+        return Job.objects.filter(user_criteria).order_by(ordering)
+
+    def get_user_jobs_with_provider(self, user, ordering="-created") -> List[Job]:
+        """
+        Retrieves jobs created by a specific user that have an associated provider.
+
+        Args:
+            user (User): The user whose jobs are to be retrieved.
+            ordering (str, optional): The field to order the results by. Defaults to "-created".
+
+        Returns:
+            List[Jobs]: a list of Jobs
+        """
+        user_criteria = Q(author=user)
+        provider_exists_criteria = ~Q(program__provider=None)
+        return Job.objects.filter(user_criteria & provider_exists_criteria).order_by(
+            ordering
+        )
+
+    def get_user_jobs_without_provider(self, user, ordering="-created") -> List[Job]:
+        """
+        Retrieves jobs created by a specific user that do not have an associated provider.
+
+        Args:
+            user (User): The user whose jobs are to be retrieved.
+            ordering (str, optional): The field to order the results by. Defaults to "-created".
+
+        Returns:
+            List[Job]: A queryset of Job objects without a provider.
+        """
+        user_criteria = Q(author=user)
+        provider_not_exists_criteria = Q(program__provider=None)
+        return Job.objects.filter(
+            user_criteria & provider_not_exists_criteria
+        ).order_by(ordering)

gateway/api/views/jobs.py

@@ -7,8 +7,6 @@
 import logging
 import os
 
-from django.db.models import Q
-
 # pylint: disable=duplicate-code
 from opentelemetry import trace
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
@@ -89,18 +87,14 @@ def get_queryset(self):
         type_filter = self.request.query_params.get("filter")
         if type_filter:
             if type_filter == TypeFilter.CATALOG:
-                user_criteria = Q(author=self.request.user)
-                provider_exists_criteria = ~Q(program__provider=None)
-                return Job.objects.filter(
-                    user_criteria & provider_exists_criteria
-                ).order_by("-created")
+                return self.jobs_repository.get_user_jobs_with_provider(
+                    self.request.user
+                )
             if type_filter == TypeFilter.SERVERLESS:
-                user_criteria = Q(author=self.request.user)
-                provider_not_exists_criteria = Q(program__provider=None)
-                return Job.objects.filter(
-                    user_criteria & provider_not_exists_criteria
-                ).order_by("-created")
-        return Job.objects.filter(author=self.request.user).order_by("-created")
+                return self.jobs_repository.get_user_jobs_without_provider(
+                    self.request.user
+                )
+        return self.jobs_repository.get_user_jobs(self.request.user)
 
     def retrieve(self, request, pk=None):  # pylint: disable=unused-argument
         """Get job:"""
@@ -141,14 +135,14 @@ def list(self, request):
         tracer = trace.get_tracer("gateway.tracer")
         ctx = TraceContextTextMapPropagator().extract(carrier=request.headers)
         with tracer.start_as_current_span("gateway.job.list", context=ctx):
-            queryset = self.filter_queryset(self.get_queryset())
+            queryset = self.get_queryset()
 
             page = self.paginate_queryset(queryset)
             if page is not None:
-                serializer = self.get_serializer(page, many=True)
+                serializer = self.get_serializer_job_without_result(page, many=True)
                 return self.get_paginated_response(serializer.data)
 
-            serializer = self.get_serializer(queryset, many=True)
+            serializer = self.get_serializer_job_without_result(queryset, many=True)
         return Response(serializer.data)
 
     @action(methods=["POST"], detail=True)

gateway/tests/api/test_job.py

@@ -36,9 +36,7 @@ def test_job_list(self):
         self.assertEqual(
             jobs_response.data.get("results")[0].get("status"), "SUCCEEDED"
         )
-        self.assertEqual(
-            jobs_response.data.get("results")[0].get("result"), '{"somekey":1}'
-        )
+        self.assertEqual(jobs_response.data.get("results")[0].get("result"), None)
 
     def test_job_catalog_list(self):
         """Tests job list authorized."""
@@ -50,9 +48,7 @@ def test_job_catalog_list(self):
         self.assertEqual(jobs_response.status_code, status.HTTP_200_OK)
         self.assertEqual(jobs_response.data.get("count"), 1)
         self.assertEqual(jobs_response.data.get("results")[0].get("status"), "QUEUED")
-        self.assertEqual(
-            jobs_response.data.get("results")[0].get("result"), '{"somekey":1}'
-        )
+        self.assertEqual(jobs_response.data.get("results")[0].get("result"), None)
 
     def test_job_serverless_list(self):
         """Tests job list authorized."""
@@ -63,15 +59,6 @@ def test_job_serverless_list(self):
         )
         self.assertEqual(jobs_response.status_code, status.HTTP_200_OK)
         self.assertEqual(jobs_response.data.get("count"), 2)
-        job_status = jobs_response.data.get("results")[0].get("status")
-        if job_status == "SUCCEEDED":
-            self.assertEqual(
-                jobs_response.data.get("results")[0].get("result"), '{"somekey":1}'
-            )
-        elif job_status == "QUEUED":
-            self.assertEqual(
-                jobs_response.data.get("results")[0].get("result"), '{"somekey":2}'
-            )
 
     def test_job_detail(self):
         """Tests job detail authorized."""