Adding checksums to file attributes

fixes #4827 https://pulp.plan.io/issues/4827 Required PR: pulp/pulpcore#150 Required PR: pulp/pulpcore-plugin#102
daviddavis · May 23, 2019 · 721e755 · 721e755
1 parent 1a9c63c
commit 721e755
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pulp_file/app/serializers.py b/pulp_file/app/serializers.py
@@ -3,6 +3,7 @@
 from rest_framework import serializers
 
 from pulpcore.plugin.serializers import (
+    ContentChecksumSerializer,
     DetailRelatedField,
     PublicationDistributionSerializer,
     PublicationSerializer,
@@ -14,7 +15,7 @@
 from .models import FileContent, FileDistribution, FileRemote, FilePublication
 
 
-class FileContentSerializer(SingleArtifactContentSerializer):
+class FileContentSerializer(SingleArtifactContentSerializer, ContentChecksumSerializer):
     """
     Serializer for File Content.
     """
@@ -45,7 +46,7 @@ def validate(self, data):
     class Meta:
         fields = tuple(
             set(SingleArtifactContentSerializer.Meta.fields) - {'_relative_path'}
-        ) + ('relative_path',)
+        ) + ContentChecksumSerializer.Meta.fields + ('relative_path',)
         model = FileContent
 
 

diff --git a/pulp_file/app/viewsets.py b/pulp_file/app/viewsets.py
@@ -46,7 +46,7 @@ class FileContentViewSet(ContentViewSet):
     """
 
     endpoint_name = 'files'
-    queryset = FileContent.objects.all()
+    queryset = FileContent.objects.prefetch_related("_artifacts").all()
     serializer_class = FileContentSerializer
     filterset_class = FileContentFilter