mappings returns from/to-concept name resolved in separate field

core/mappings/documents.py

@@ -1,5 +1,6 @@
 from django_elasticsearch_dsl import Document, fields
 from django_elasticsearch_dsl.registries import registry
+from pydash import get
 
 from core.mappings.models import Mapping
 
@@ -46,7 +47,8 @@ class Django:
 
     @staticmethod
     def prepare_from_concept(instance):
-        return [instance.from_concept_url, instance.from_concept_code, instance.from_concept_name]
+        from_concept_name = get(instance, 'from_concept_name') or get(instance, 'from_concept.display_name')
+        return [instance.from_concept_url, instance.from_concept_code, from_concept_name]
 
     @staticmethod
     def prepare_to_concept(instance):

core/mappings/serializers.py

@@ -22,6 +22,8 @@ class MappingListSerializer(ModelSerializer):
     to_concept = ConceptListSerializer()
     from_source = SourceListSerializer()
     to_source = SourceListSerializer()
+    from_concept_name_resolved = CharField(source='from_concept.display_name', read_only=True)
+    to_concept_name_resolved = CharField(source='to_concept.display_name', read_only=True)
 
     class Meta:
         model = Mapping
@@ -33,7 +35,8 @@ class Meta:
             'to_source_owner', 'to_source_owner_type', 'to_source_url', 'to_source_name',
             'url', 'version', 'id', 'versioned_object_id', 'versioned_object_url',
             'is_latest_version', 'update_comment', 'version_url', 'uuid', 'version_created_on',
-            'from_source_version', 'to_source_version', 'from_concept', 'to_concept', 'from_source', 'to_source'
+            'from_source_version', 'to_source_version', 'from_concept', 'to_concept', 'from_source', 'to_source',
+            'from_concept_name_resolved', 'to_concept_name_resolved'
         )
 
     def __init__(self, *args, **kwargs):

core/mappings/views.py

@@ -82,7 +82,7 @@ def get_queryset(self):
             queryset = queryset.filter(is_latest_version=True)
         return queryset.select_related(
             'parent__organization', 'parent__user', 'from_concept__parent', 'to_concept__parent', 'to_source',
-            'versioned_object',
+            'versioned_object', 'from_source',
         )
 
     def get(self, request, *args, **kwargs):