Adding mapping serializer tests

OpenConceptLab · Jul 12, 2023 · 91c89a4 · 91c89a4
1 parent b245841
commit 91c89a4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/core/integration_tests/tests_mappings.py b/core/integration_tests/tests_mappings.py
@@ -47,10 +47,29 @@ def test_get_200(self):
 
         collection.add_expressions({'expressions': [mapping.uri]}, collection.created_by)
 
+        response = self.client.get(collection.mappings_url + '?includeReferences=true', format='json')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data), 1)
+        self.assertEqual(len(response.data[0]['references']), 1)
+        self.assertEqual(response.data[0]['references'][0]['expression'], mapping.uri)
+        self.assertEqual(response.data[0]['references'][0]['uri'], collection.references.first().uri)
+
         response = self.client.get(collection.mappings_url, format='json')
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data), 1)
+        self.assertEqual(response.data[0]['references'], [collection.references.first().uri])
+
+        response = self.client.get(
+            mapping.parent.mappings_url + '?lookupConcepts=true',
+            format='json'
+        )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data), 1)
+        self.assertEqual(response.data[0]['from_concept']['id'], mapping.from_concept.mnemonic)
+        self.assertEqual(response.data[0]['to_concept']['id'], mapping.to_concept.mnemonic)
 
     def test_post_400(self):
         source = UserSourceFactory(user=self.user)

diff --git a/core/mappings/serializers.py b/core/mappings/serializers.py
@@ -22,6 +22,7 @@ class AbstractMappingSerializer(AbstractResourceSerializer):
     to_concept = SerializerMethodField()
     from_source = SourceListSerializer()
     to_source = SourceListSerializer()
+    references = SerializerMethodField()
 
     class Meta:
         abstract = True
@@ -105,7 +106,6 @@ class MappingListSerializer(AbstractMappingSerializer):
     to_concept_name_resolved = CharField(source='to_concept.display_name', read_only=True)
     to_concept_code = EncodedDecodedCharField(required=False)
     from_concept_code = EncodedDecodedCharField(required=False)
-    references = SerializerMethodField()
     sort_weight = FloatField(required=False, allow_null=True)
 
     class Meta:
@@ -141,13 +141,10 @@ def __init__(self, *args, **kwargs):
         self.include_source_versions = self.query_params.get(INCLUDE_SOURCE_VERSIONS) in TRUTHY
         self.include_collection_versions = self.query_params.get(INCLUDE_COLLECTION_VERSIONS) in TRUTHY
 
-        try:
-            if not self.include_source_versions:
-                self.fields.pop('source_versions', None)
-            if not self.include_collection_versions:
-                self.fields.pop('collection_versions', None)
-        except:  # pylint: disable=bare-except
-            pass
+        if not self.include_source_versions:
+            self.fields.pop('source_versions', None)
+        if not self.include_collection_versions:
+            self.fields.pop('collection_versions', None)
 
         super().__init__(*args, **kwargs)