OpenConceptLab/ocl_issues#1579 | collection/source minimal versions s…

…erializers
OpenConceptLab · May 17, 2023 · 0dc1db0 · 0dc1db0
1 parent 6952c33
commit 0dc1db0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/core/collections/serializers.py b/core/collections/serializers.py
@@ -32,10 +32,15 @@ class CollectionVersionMinimalSerializer(ModelSerializer):
     version_url = CharField(source='uri')
     type = CharField(source='resource_version_type')
     short_code = CharField(source='mnemonic')
+    autoexpand = SerializerMethodField()
 
     class Meta:
         model = Collection
-        fields = ('id', 'version_url', 'type', 'short_code')
+        fields = ('id', 'version_url', 'type', 'short_code', 'released', 'autoexpand')
+
+    @staticmethod
+    def get_autoexpand(obj):
+        return obj.should_auto_expand
 
 
 class CollectionListSerializer(ModelSerializer):

diff --git a/core/collections/views.py b/core/collections/views.py
@@ -36,7 +36,8 @@
     CollectionVersionSummaryDetailSerializer, CollectionReferenceDetailSerializer, ExpansionSerializer,
     ExpansionDetailSerializer, ReferenceExpressionResolveSerializer, CollectionMinimalSerializer,
     CollectionSummaryFieldDistributionSerializer, CollectionSummaryVerboseSerializer,
-    CollectionVersionSummaryFieldDistributionSerializer, CollectionVersionSummaryVerboseSerializer)
+    CollectionVersionSummaryFieldDistributionSerializer, CollectionVersionSummaryVerboseSerializer,
+    CollectionVersionMinimalSerializer)
 from core.collections.utils import is_version_specified
 from core.common.constants import (
     HEAD, RELEASED_PARAM, PROCESSING_PARAM, OK_MESSAGE,
@@ -566,6 +567,8 @@ def get_serializer_class(self):
             return CollectionVersionDetailSerializer
         if self.request.method == 'POST':
             return CollectionCreateSerializer
+        if self.is_brief():
+            return CollectionVersionMinimalSerializer
 
         return CollectionVersionListSerializer
 

diff --git a/core/sources/serializers.py b/core/sources/serializers.py
@@ -33,7 +33,7 @@ class SourceVersionMinimalSerializer(ModelSerializer):
 
     class Meta:
         model = Source
-        fields = ('id', 'version_url', 'type', 'short_code')
+        fields = ('id', 'version_url', 'type', 'short_code', 'released')
 
 
 class SourceListSerializer(ModelSerializer):

diff --git a/core/sources/views.py b/core/sources/views.py
@@ -38,7 +38,7 @@
     SourceVersionListSerializer, SourceVersionExportSerializer, SourceSummaryDetailSerializer,
     SourceVersionSummaryDetailSerializer, SourceMinimalSerializer, SourceSummaryVerboseSerializer,
     SourceVersionSummaryVerboseSerializer, SourceSummaryFieldDistributionSerializer,
-    SourceVersionSummaryFieldDistributionSerializer)
+    SourceVersionSummaryFieldDistributionSerializer, SourceVersionMinimalSerializer)
 
 logger = logging.getLogger('oclapi')
 
@@ -227,6 +227,8 @@ def get_serializer_class(self):
             return SourceVersionDetailSerializer
         if self.request.method == 'POST':
             return SourceCreateSerializer
+        if self.is_brief():
+            return SourceVersionMinimalSerializer
 
         return SourceVersionListSerializer