OpenConceptLab/ocl_issues#857 | Source/collection child max updated a…

…t to select only updated_at field
OpenConceptLab · Jul 29, 2021 · bd07d32 · bd07d32
1 parent c31da3e
commit bd07d32
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/core/common/models.py b/core/common/models.py
@@ -364,14 +364,14 @@ def active_mappings(self):
     def last_concept_update(self):
         updated_at = None
         if self.concepts.exists():
-            updated_at = self.concepts.latest('updated_at').updated_at
+            updated_at = self.concepts.only('updated_at').latest('updated_at').updated_at
         return updated_at
 
     @property
     def last_mapping_update(self):
         updated_at = None
         if self.mappings.exists():
-            updated_at = self.mappings.latest('updated_at').updated_at
+            updated_at = self.mappings.only('updated_at').latest('updated_at').updated_at
         return updated_at
 
     @property

diff --git a/core/concepts/serializers.py b/core/concepts/serializers.py
@@ -255,7 +255,8 @@ class Meta:
             'owner', 'owner_type', 'owner_url', 'display_name', 'display_locale', 'names', 'descriptions',
             'created_on', 'updated_on', 'versions_url', 'version', 'extras', 'parent_id', 'name', 'type',
             'update_comment', 'version_url', 'mappings', 'updated_by', 'created_by', 'internal_reference_id',
-            'parent_concept_urls', 'child_concept_urls', 'parent_concepts', 'child_concepts', 'hierarchy_path'
+            'parent_concept_urls', 'child_concept_urls', 'parent_concepts', 'child_concepts', 'hierarchy_path',
+            'public_can_view',
         )
 
     def get_mappings(self, obj):

diff --git a/core/integration_tests/tests_concepts.py b/core/integration_tests/tests_concepts.py
@@ -95,6 +95,7 @@ def test_post_201(self):
                 'created_by',
                 'internal_reference_id',
                 'hierarchy_path',
+                'public_can_view',
             ]
         )
 
@@ -197,7 +198,8 @@ def test_put_200(self):
              'updated_by',
              'created_by',
              'internal_reference_id',
-             'hierarchy_path']
+             'hierarchy_path',
+             'public_can_view']
         )
 
         version = Concept.objects.last()

diff --git a/core/mappings/serializers.py b/core/mappings/serializers.py
@@ -125,6 +125,7 @@ class Meta:
         fields = MappingListSerializer.Meta.fields + (
             'type', 'uuid', 'extras', 'created_on', 'updated_on',
             'created_by', 'updated_by', 'parent_id', 'internal_reference_id',
+            'public_can_view',
         )
 
     def create(self, validated_data):