Merge pull request dandi#2125 from dandi/nested-version-serializer

Prevent duplicate serialization of dandiset in detail view
kabilar · Jan 8, 2025 · c1d4288 · c1d4288
2 parents 991f342 + 1b8c3cf
commit c1d4288
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 31 deletions.
diff --git a/dandiapi/api/tests/test_dandiset.py b/dandiapi/api/tests/test_dandiset.py
@@ -365,13 +365,6 @@ def test_dandiset_rest_create(api_client, user):
             'asset_count': 0,
             'active_uploads': 0,
             'size': 0,
-            'dandiset': {
-                'identifier': DANDISET_ID_RE,
-                'created': TIMESTAMP_RE,
-                'modified': TIMESTAMP_RE,
-                'contact_person': 'Doe, John',
-                'embargo_status': 'OPEN',
-            },
             'status': 'Pending',
             'created': TIMESTAMP_RE,
             'modified': TIMESTAMP_RE,
@@ -459,13 +452,6 @@ def test_dandiset_rest_create_with_identifier(api_client, admin_user):
             'asset_count': 0,
             'active_uploads': 0,
             'size': 0,
-            'dandiset': {
-                'identifier': identifier,
-                'created': TIMESTAMP_RE,
-                'modified': TIMESTAMP_RE,
-                'contact_person': 'Doe, John',
-                'embargo_status': 'OPEN',
-            },
             'status': 'Pending',
             'created': TIMESTAMP_RE,
             'modified': TIMESTAMP_RE,
@@ -567,13 +553,6 @@ def test_dandiset_rest_create_with_contributor(api_client, admin_user):
             'asset_count': 0,
             'active_uploads': 0,
             'size': 0,
-            'dandiset': {
-                'identifier': identifier,
-                'created': TIMESTAMP_RE,
-                'modified': TIMESTAMP_RE,
-                'contact_person': 'Jane Doe',
-                'embargo_status': 'OPEN',
-            },
             'status': 'Pending',
             'created': TIMESTAMP_RE,
             'modified': TIMESTAMP_RE,
@@ -658,13 +637,6 @@ def test_dandiset_rest_create_embargoed(api_client, user):
             'asset_count': 0,
             'active_uploads': 0,
             'size': 0,
-            'dandiset': {
-                'identifier': DANDISET_ID_RE,
-                'created': TIMESTAMP_RE,
-                'modified': TIMESTAMP_RE,
-                'contact_person': 'Doe, John',
-                'embargo_status': 'EMBARGOED',
-            },
             'status': 'Pending',
             'created': TIMESTAMP_RE,
             'modified': TIMESTAMP_RE,
@@ -1142,7 +1114,7 @@ def test_dandiset_contact_person_malformed_contributors(api_client, draft_versio
         f'/api/dandisets/{draft_version.dandiset.identifier}/',
     )
 
-    assert results.data['draft_version']['dandiset']['contact_person'] == ''
+    assert results.data['contact_person'] == ''
 
 
 @pytest.mark.django_db

diff --git a/dandiapi/api/views/serializers.py b/dandiapi/api/views/serializers.py
@@ -100,6 +100,12 @@ class Meta:
     dandiset = DandisetSerializer()
     # name = serializers.SlugRelatedField(read_only=True, slug_field='name')
 
+    def __init__(self, *args, child_context=False, **kwargs):
+        if child_context:
+            del self.fields['dandiset']
+
+        super().__init__(*args, **kwargs)
+
 
 class DandisetVersionSerializer(serializers.ModelSerializer):
     """The version serializer nested within the Dandiset Serializer."""
@@ -174,8 +180,8 @@ class DandisetDetailSerializer(DandisetSerializer):
     class Meta(DandisetSerializer.Meta):
         fields = [*DandisetSerializer.Meta.fields, 'most_recent_published_version', 'draft_version']
 
-    most_recent_published_version = VersionSerializer(read_only=True)
-    draft_version = VersionSerializer(read_only=True)
+    most_recent_published_version = VersionSerializer(read_only=True, child_context=True)
+    draft_version = VersionSerializer(read_only=True, child_context=True)
 
 
 class DandisetQueryParameterSerializer(serializers.Serializer):