Fixed package serialization so it displays content checksums.

closes #8002 https://pulp.plan.io/issues/8002 [notest] [nocoverage]
pulp · Dec 18, 2020 · e149107 · e149107
1 parent b37b180
commit e149107
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 58 deletions.
diff --git a/CHANGES/8002.bugfix b/CHANGES/8002.bugfix
@@ -0,0 +1 @@
+Fixed content serialization so it displays content checksums.
diff --git a/pulp_rpm/app/serializers/custom_metadata.py b/pulp_rpm/app/serializers/custom_metadata.py
@@ -20,10 +20,13 @@ class RepoMetadataFileSerializer(SingleArtifactContentUploadSerializer, ContentC
     relative_path = serializers.CharField(help_text=_("Relative path of the file."))
 
     class Meta:
-        fields = SingleArtifactContentUploadSerializer.Meta.fields + (
-            "data_type",
-            "checksum_type",
-            "checksum",
-            "sha256",
+        fields = (
+            ContentChecksumSerializer.Meta.fields
+            + SingleArtifactContentUploadSerializer.Meta.fields
+            + (
+                "data_type",
+                "checksum_type",
+                "checksum",
+            )
         )
         model = RepoMetadataFile
diff --git a/pulp_rpm/app/serializers/modulemd.py b/pulp_rpm/app/serializers/modulemd.py
@@ -50,16 +50,19 @@ class ModulemdSerializer(SingleArtifactContentUploadSerializer, ContentChecksumS
     )
 
     class Meta:
-        fields = SingleArtifactContentUploadSerializer.Meta.fields + (
-            "name",
-            "stream",
-            "version",
-            "context",
-            "arch",
-            "artifacts",
-            "dependencies",
-            "packages",
-            "sha256",
+        fields = (
+            ContentChecksumSerializer.Meta.fields
+            + SingleArtifactContentUploadSerializer.Meta.fields
+            + (
+                "name",
+                "stream",
+                "version",
+                "context",
+                "arch",
+                "artifacts",
+                "dependencies",
+                "packages",
+            )
         )
         model = Modulemd
 
@@ -74,10 +77,13 @@ class ModulemdDefaultsSerializer(SingleArtifactContentUploadSerializer, ContentC
     profiles = serializers.JSONField(help_text=_("Default profiles for modulemd streams."))
 
     class Meta:
-        fields = SingleArtifactContentUploadSerializer.Meta.fields + (
-            "module",
-            "stream",
-            "profiles",
-            "sha256",
+        fields = (
+            ContentChecksumSerializer.Meta.fields
+            + SingleArtifactContentUploadSerializer.Meta.fields
+            + (
+                "module",
+                "stream",
+                "profiles",
+            )
         )
         model = ModulemdDefaults
diff --git a/pulp_rpm/app/serializers/package.py b/pulp_rpm/app/serializers/package.py
@@ -264,44 +264,47 @@ def deferred_validate(self, data):
         return data
 
     class Meta:
-        fields = SingleArtifactContentUploadSerializer.Meta.fields + (
-            "name",
-            "epoch",
-            "version",
-            "release",
-            "arch",
-            "pkgId",
-            "checksum_type",
-            "summary",
-            "description",
-            "url",
-            "changelogs",
-            "files",
-            "requires",
-            "provides",
-            "conflicts",
-            "obsoletes",
-            "suggests",
-            "enhances",
-            "recommends",
-            "sha256",
-            "supplements",
-            "location_base",
-            "location_href",
-            "rpm_buildhost",
-            "rpm_group",
-            "rpm_license",
-            "rpm_packager",
-            "rpm_sourcerpm",
-            "rpm_vendor",
-            "rpm_header_start",
-            "rpm_header_end",
-            "is_modular",
-            "size_archive",
-            "size_installed",
-            "size_package",
-            "time_build",
-            "time_file",
+        fields = (
+            ContentChecksumSerializer.Meta.fields
+            + SingleArtifactContentUploadSerializer.Meta.fields
+            + (
+                "name",
+                "epoch",
+                "version",
+                "release",
+                "arch",
+                "pkgId",
+                "checksum_type",
+                "summary",
+                "description",
+                "url",
+                "changelogs",
+                "files",
+                "requires",
+                "provides",
+                "conflicts",
+                "obsoletes",
+                "suggests",
+                "enhances",
+                "recommends",
+                "supplements",
+                "location_base",
+                "location_href",
+                "rpm_buildhost",
+                "rpm_group",
+                "rpm_license",
+                "rpm_packager",
+                "rpm_sourcerpm",
+                "rpm_vendor",
+                "rpm_header_start",
+                "rpm_header_end",
+                "is_modular",
+                "size_archive",
+                "size_installed",
+                "size_package",
+                "time_build",
+                "time_file",
+            )
         )
         model = Package