OpenConceptLab/ocl_issues#754 | refactored response attr names

OpenConceptLab · May 15, 2021 · 19a43cd · 19a43cd
1 parent fb84d30
commit 19a43cd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/core/common/mixins.py b/core/common/mixins.py
@@ -374,11 +374,11 @@ def collections_url(self):
 
 class SourceChildMixin:
     @property
-    def source_versions_associated_with(self):
+    def source_versions(self):
         return self.sources.exclude(version=HEAD).values_list('uri', flat=True)
 
     @property
-    def collection_versions_associated_with(self):
+    def collection_versions(self):
         return self.collection_set.exclude(version=HEAD).values_list('uri', flat=True)
 
     @property

diff --git a/core/concepts/serializers.py b/core/concepts/serializers.py
@@ -150,13 +150,13 @@ def get_mappings(self, obj):
 
 class ConceptVersionListSerializer(ConceptListSerializer):
     previous_version_url = CharField(read_only=True, source='prev_version_uri')
-    source_versions_associated_with = ListField(read_only=True)
-    collection_versions_associated_with = ListField(read_only=True)
+    source_versions = ListField(read_only=True)
+    collection_versions = ListField(read_only=True)
 
     class Meta:
         model = Concept
         fields = ConceptListSerializer.Meta.fields + (
-            'previous_version_url', 'source_versions_associated_with', 'collection_versions_associated_with'
+            'previous_version_url', 'source_versions', 'collection_versions'
         )
 
 
@@ -274,8 +274,8 @@ class ConceptVersionDetailSerializer(ModelSerializer):
     child_concepts = SerializerMethodField()
     parent_concept_urls = ListField(read_only=True)
     child_concept_urls = ListField(read_only=True)
-    source_versions_associated_with = ListField(read_only=True)
-    collection_versions_associated_with = ListField(read_only=True)
+    source_versions = ListField(read_only=True)
+    collection_versions = ListField(read_only=True)
 
     def __init__(self, *args, **kwargs):
         params = get(kwargs, 'context.request.query_params')
@@ -306,7 +306,7 @@ class Meta:
             'version', 'created_on', 'updated_on', 'version_created_on', 'version_created_by', 'update_comment',
             'is_latest_version', 'locale', 'url', 'owner_type', 'version_url', 'mappings', 'previous_version_url',
             'internal_reference_id', 'parent_concepts', 'child_concepts', 'parent_concept_urls', 'child_concept_urls',
-            'source_versions_associated_with', 'collection_versions_associated_with'
+            'source_versions', 'collection_versions'
         )
 
     def get_mappings(self, obj):

diff --git a/core/mappings/serializers.py b/core/mappings/serializers.py
@@ -73,13 +73,13 @@ def __init__(self, *args, **kwargs):
 
 class MappingVersionListSerializer(MappingListSerializer):
     previous_version_url = CharField(read_only=True, source='prev_version_uri')
-    source_versions_associated_with = ListField(read_only=True)
-    collection_versions_associated_with = ListField(read_only=True)
+    source_versions = ListField(read_only=True)
+    collection_versions = ListField(read_only=True)
 
     class Meta:
         model = Mapping
         fields = MappingListSerializer.Meta.fields + (
-            'previous_version_url', 'source_versions_associated_with', 'collection_versions_associated_with',
+            'previous_version_url', 'source_versions', 'collection_versions',
         )