OpenConceptLab/ocl_issues#2092 | Making sure collection expansion indexing triggers

Author: snyaggarwal

core/collections/models.py

@@ -1166,7 +1166,7 @@ def apply_parameters(self, queryset, is_concept_queryset):
     def index_concepts(self):
         if self.concepts.exists():
             if get(settings, 'TEST_MODE', False):
-                index_expansion_concepts(self.id)
+                index_expansion_concepts(self.id, self.concepts.count())
             else:
                 task = None
                 try:
@@ -1175,15 +1175,15 @@ def index_concepts(self):
                         name=index_expansion_concepts.__name__
                     )
                     index_expansion_concepts.apply_async(
-                        (self.id, ), task_id=task.id, queue=task.queue, persist_args=True)
+                        (self.id, self.concepts.count(), ), task_id=task.id, queue=task.queue, persist_args=True)
                 except AlreadyQueued:
                     if task:
                         task.delete()
 
     def index_mappings(self):
         if self.mappings.exists():
             if get(settings, 'TEST_MODE', False):
-                index_expansion_mappings(self.id)
+                index_expansion_mappings(self.id, self.mappings.count())
             else:
                 task = None
                 try:
@@ -1192,7 +1192,7 @@ def index_mappings(self):
                         name=index_expansion_mappings.__name__
                     )
                     index_expansion_mappings.apply_async(
-                        (self.id, ), task_id=task.id, queue=task.queue, persist_args=True)
+                        (self.id, self.mappings.count()), task_id=task.id, queue=task.queue, persist_args=True)
                 except AlreadyQueued:
                     if task:
                         task.delete()

core/common/tasks.py

@@ -559,7 +559,7 @@ def batch_index_resources(resource, filters, update_indexed=False):
     ignore_result=True, autoretry_for=(Exception, WorkerLostError, ), retry_kwargs={'max_retries': 2, 'countdown': 2},
     acks_late=True, reject_on_worker_lost=True, base=QueueOnceCustomTask
 )
-def index_expansion_concepts(expansion_id):
+def index_expansion_concepts(expansion_id, count=None):  # pylint: disable=unused-argument
     from core.collections.models import Expansion
     expansion = Expansion.objects.filter(id=expansion_id).first()
     if expansion:
@@ -571,7 +571,7 @@ def index_expansion_concepts(expansion_id):
     ignore_result=True, autoretry_for=(Exception, WorkerLostError, ), retry_kwargs={'max_retries': 2, 'countdown': 2},
     acks_late=True, reject_on_worker_lost=True, base=QueueOnceCustomTask
 )
-def index_expansion_mappings(expansion_id):
+def index_expansion_mappings(expansion_id, count=None):
     from core.collections.models import Expansion
     expansion = Expansion.objects.filter(id=expansion_id).first()
     if expansion: