fixing concepts mappings queryset for direct/in-direct

OpenConceptLab · Sep 14, 2020 · 16e1a14 · 16e1a14
1 parent 645b2d2
commit 16e1a14
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/concepts/models.py b/core/concepts/models.py
@@ -479,10 +479,10 @@ def index_all():
         return errors
 
     def get_unidirectional_mappings(self):
-        return self.mappings_from.filter(parent=self.parent, id=F('versioned_object_id'))
+        return self.get_latest_version().mappings_from.filter(parent=self.parent, id=F('versioned_object_id'))
 
     def get_indirect_mappings(self):
-        return self.mappings_to.filter(parent=self.parent, id=F('versioned_object_id'))
+        return self.get_latest_version().mappings_to.filter(parent=self.parent, id=F('versioned_object_id'))
 
     def get_bidirectional_mappings(self):
         queryset = self.get_unidirectional_mappings() | self.get_indirect_mappings()

diff --git a/core/concepts/serializers.py b/core/concepts/serializers.py
@@ -169,10 +169,10 @@ class Meta:
         )
 
     def get_mappings(self, obj):
-        if self.include_direct_mappings:
-            return MappingDetailSerializer(obj.get_unidirectional_mappings(), many=True).data
         if self.include_indirect_mappings:
             return MappingDetailSerializer(obj.get_bidirectional_mappings(), many=True).data
+        if self.include_direct_mappings:
+            return MappingDetailSerializer(obj.get_unidirectional_mappings(), many=True).data
 
         return []
 

diff --git a/core/mappings/models.py b/core/mappings/models.py
@@ -135,7 +135,7 @@ def to_source_owner_mnemonic(self):
 
     @property
     def to_source_owner_type(self):
-        return get(self.get_to_source(), 'owner_type')
+        return get(self.get_to_source(), 'parent.resource_type')
 
     @property
     def to_source_shorthand(self):