Additional fields to api/target_experiment_uploads endpoint (issue 1627)

viewer/filters.py

@@ -131,4 +131,10 @@ class Meta:
 class ExperimentUploadFilter(filters.FilterSet):
     class Meta:
         model = ExperimentUpload
-        fields = ("target", "project", "data_version_major", "data_version_minor")
+        fields = (
+            "target",
+            "project",
+            "committer",
+            "data_version_major",
+            "data_version_minor",
+        )

viewer/managers.py

@@ -413,3 +413,34 @@ def filter_qs(self):
 
     def by_target(self, target):
         return self.get_queryset().filter_qs().filter(target=target.id)
+
+
+class ExperimentUploadQueryset(QuerySet):
+    def annotated_qs(self):
+        ExperimentUpload = apps.get_model("viewer", "ExperimentUpload")
+        qs = ExperimentUpload.objects.prefetch_related(
+            "target",
+            "project",
+        ).annotate(
+            target_name=F("target__title"),
+            proposal_number=F("project__title"),
+            committer_name=F("committer__username"),
+        )
+
+        return qs
+
+
+class ExperimentUploadDataManager(Manager):
+    def get_queryset(self):
+        return ExperimentUploadQueryset(self.model, using=self._db)
+
+    def annotated_qs(self):
+        return (
+            self.get_queryset()
+            .annotated_qs()
+            .order_by(
+                'project',
+                'target__title',
+                'upload_version',
+            )
+        )

viewer/models.py

@@ -20,6 +20,7 @@
     CompoundDataManager,
     CompoundIdentifierDataManager,
     ExperimentDataManager,
+    ExperimentUploadDataManager,
     PoseDataManager,
     QuatAssemblyDataManager,
     SessionActionsDataManager,
@@ -199,6 +200,9 @@ class ExperimentUpload(models.Model):
     data_version_major = models.PositiveSmallIntegerField(default=0)
     data_version_minor = models.PositiveSmallIntegerField(default=0)
 
+    objects = models.Manager()
+    upload_manager = ExperimentUploadDataManager()
+
     def __str__(self) -> str:
         return f"{self.project}"
 

viewer/serializers.py

@@ -895,16 +895,35 @@ class Meta:
 
 
 class TargetExperimentReadSerializer(ValidateProjectMixin, serializers.ModelSerializer):
-    tarball = serializers.CharField()
+    tarball = serializers.SerializerMethodField()
+    target_name = serializers.CharField()
+    proposal_number = serializers.CharField()
+    committer_name = serializers.CharField()
+
+    def get_tarball(self, obj):
+        request = self.context.get('request')
+        path = (
+            Path(settings.MEDIA_URL)
+            .joinpath(settings.TARGET_LOADER_MEDIA_DIRECTORY)
+            .joinpath(obj.target.zip_archive.name)
+            .joinpath(obj.file.name)
+        )
+        if request:
+            return request.build_absolute_uri(path)
+        else:
+            return None
 
     class Meta:
         model = models.ExperimentUpload
         fields = (
             'target',
+            'target_name',
             'project',
+            'proposal_number',
             'tarball',
             'commit_datetime',
             'committer',
+            'committer_name',
             'task_id',
             'neighbourhood_transforms',
             'conformer_site_transforms',

viewer/views.py

@@ -17,9 +17,6 @@
 from dateutil.parser import parse
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.db.models import F, Value
-from django.db.models.fields import CharField
-from django.db.models.functions import Concat
 from django.http import FileResponse, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
@@ -1837,20 +1834,7 @@ def create(self, request, *args, **kwargs):
 
 
 class ExperimentUploadView(ISPyBSafeQuerySet):
-    queryset = models.ExperimentUpload.objects.annotate(
-        tarball=Concat(
-            Value(settings.TARGET_LOADER_MEDIA_DIRECTORY),
-            Value('/'),
-            F('target__zip_archive'),
-            Value('/'),
-            F('file'),
-            output_field=CharField(),
-        ),
-    ).order_by(
-        'project',
-        'target__title',
-        'upload_version',
-    )
+    queryset = models.ExperimentUpload.upload_manager.annotated_qs()
     serializer_class = serializers.TargetExperimentReadSerializer
     permission_class = [permissions.IsAuthenticated]
     filterset_class = filters.ExperimentUploadFilter