Source/Collection | summary | optimizing queryset to get count

OpenConceptLab · Jun 26, 2021 · 5be98b8 · 5be98b8
1 parent 53502e6
commit 5be98b8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/core/common/models.py b/core/common/models.py
@@ -333,11 +333,11 @@ def is_openmrs_schema(self):
 
     @property
     def active_concepts(self):
-        return self.concepts.filter(retired=False, is_active=True).distinct('versioned_object_id').count()
+        return self.concepts.filter(retired=False, is_active=True).count()
 
     @property
     def active_mappings(self):
-        return self.mappings.filter(retired=False, is_active=True).distinct('versioned_object_id').count()
+        return self.mappings.filter(retired=False, is_active=True).count()
 
     @property
     def last_concept_update(self):

diff --git a/core/sources/models.py b/core/sources/models.py
@@ -180,3 +180,17 @@ def hierarchy(self, offset=0, limit=100):
             offset=offset,
             limit=limit
         )
+
+    @property
+    def active_concepts(self):
+        queryset = self.concepts.filter(retired=False, is_active=True)
+        if self.is_head:
+            queryset = queryset.filter(is_latest_version=True)
+        return queryset.count()
+
+    @property
+    def active_mappings(self):
+        queryset = self.mappings.filter(retired=False, is_active=True)
+        if self.is_head:
+            queryset = queryset.filter(is_latest_version=True)
+        return queryset.count()