Merge pull request #364 from MuckRock/363-addon-run-event

Add event to addon run serializer

Author: eyeseast

documentcloud/addons/serializers.py

@@ -139,6 +139,7 @@ class Meta:
         fields = [
             "uuid",
             "addon",
+            "event",
             "user",
             "status",
             "progress",
@@ -158,13 +159,17 @@ class Meta:
         extra_kwargs = {
             "uuid": {"read_only": True},
             "addon": {"queryset": AddOn.objects.none()},
+            "event": {"read_only": True},
             "user": {"read_only": True},
             "status": {"read_only": True},
             "file_name": {"write_only": True},
             "created_at": {"read_only": True},
             "updated_at": {"read_only": True},
         }
-        expandable_fields = {"addon": ("documentcloud.addons.AddOnSerializer", {})}
+        expandable_fields = {
+            "addon": ("documentcloud.addons.AddOnSerializer", {}),
+            "event": ("documentcloud.addons.AddOnEventSerializer", {}),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

documentcloud/addons/views.py

@@ -490,7 +490,7 @@ class AddOnRunViewSet(FlexFieldsModelViewSet):
     serializer_class = AddOnRunSerializer
     queryset = AddOnRun.objects.none()
     lookup_field = "uuid"
-    permit_list_expands = ["addon"]
+    permit_list_expands = ["addon", "event"]
     filter_backends = [filters.OrderingFilter, DjangoFilterBackend]
     ordering_fields = ["created_at"]
     ordering = ["-created_at"]
@@ -712,6 +712,8 @@ def get_queryset(self):
         queryset = AddOnRun.objects.get_viewable(self.request.user)
         if is_expanded(self.request, "addon"):
             queryset = queryset.select_related("addon")
+        if is_expanded(self.request, "event"):
+            queryset = queryset.select_related("event")
         return queryset
 
     def perform_create(self, serializer):