Refactoring method names

core/collections/models.py

@@ -1073,7 +1073,7 @@ def index_concepts(self):
             else:
                 task = None
                 try:
-                    task = Task.make_new(
+                    task = Task.new(
                         queue='indexing', user=get_current_authorized_user() or self.updated_by,
                         name=index_expansion_concepts.__name__
                     )
@@ -1089,7 +1089,7 @@ def index_mappings(self):
             else:
                 task = None
                 try:
-                    task = Task.make_new(
+                    task = Task.new(
                         queue='indexing', user=get_current_authorized_user() or self.updated_by,
                         name=index_expansion_mappings.__name__
                     )

core/collections/views.py

@@ -838,7 +838,7 @@ def post(self, request, *args, **kwargs):  # pylint: disable=unused-argument
         expansion = self.get_object()
         user = self.request.user
         task_func = index_expansion_concepts if self.resource == 'concepts' else index_expansion_mappings
-        task = Task.make_new(queue='indexing', user=user, name=task_func.__name__)
+        task = Task.new(queue='indexing', user=user, name=task_func.__name__)
         try:
             task_func.apply_async((expansion.id,), task_id=task.id, queue=task.queue)
         except AlreadyQueued:
@@ -1143,7 +1143,7 @@ class CollectionVersionExportView(ConceptContainerExportMixin, CollectionVersion
 
     def handle_export_version(self):
         version = self.get_object()
-        task = Task.make_new(queue='default', user=self.request.user, name=export_collection.__name__)
+        task = Task.new(queue='default', user=self.request.user, name=export_collection.__name__)
         try:
             export_collection.apply_async((version.id,), task_id=task.id, queue=task.queue)
             return status.HTTP_202_ACCEPTED

core/common/models.py

@@ -435,7 +435,7 @@ def update_mappings_count(self, sync=False):
                 job = update_collection_active_mappings_count
             if job:
                 from core.tasks.models import Task
-                task = Task.make_new(
+                task = Task.new(
                     name=job.__name__, queue='concurrent', user=(get_current_authorized_user() or self.updated_by)
                 )
                 job.apply_async((self.id,), task_id=task.id, queue='concurrent')
@@ -456,7 +456,7 @@ def update_concepts_count(self, sync=False):
                 job = update_collection_active_concepts_count
             if job:
                 from core.tasks.models import Task
-                task = Task.make_new(
+                task = Task.new(
                     name=job.__name__, queue='concurrent', user=(get_current_authorized_user() or self.updated_by)
                 )
                 job.apply_async((self.id,), task_id=task.id, queue='concurrent')
@@ -692,7 +692,7 @@ def persist_new_version(cls, obj, user=None, **kwargs):
             seed_children_to_new_version(obj.resource_type.lower(), obj.id, not is_test_mode, sync)
         else:
             from core.tasks.models import Task
-            task = Task.make_new(queue='default', user=user, name=seed_children_to_new_version.__name__)
+            task = Task.new(queue='default', user=user, name=seed_children_to_new_version.__name__)
             seed_children_to_new_version.apply_async(
                 (obj.resource_type.lower(), obj.id, True, sync), task_id=task.id, queue='default')
 
@@ -736,7 +736,7 @@ def persist_changes(cls, obj, updated_by, original_schema, **kwargs):
 
             if queue_schema_update_task:
                 from core.tasks.models import Task
-                task = Task.make_new(queue='default', user=updated_by, name=update_validation_schema.__name__)
+                task = Task.new(queue='default', user=updated_by, name=update_validation_schema.__name__)
                 update_validation_schema.apply_async(
                     (obj.app_name, obj.id, target_schema), task_id=task.id, queue='default')
             if should_reindex_resources:

core/common/tasks.py

@@ -355,7 +355,7 @@ def seed_children_to_new_version(self, resource, obj_id, export=True, sync=False
                 instance.cascade_children_to_expansion(index=index, sync=sync)
 
             if export:
-                task = Task.make_new(queue='default', username=instance.updated_by, name=export_task.__name__)
+                task = Task.new(queue='default', username=instance.updated_by, name=export_task.__name__)
                 export_task.apply_async((obj_id,), queue=task.queue, task_id=task.id)
                 if autoexpand:
                     instance.index_children()

core/common/utils.py

@@ -465,7 +465,7 @@ def get_queue_task_names(import_queue, username, **kwargs):
         queue_id = 'bulk_import_' + str(random.randrange(0, BULK_IMPORT_QUEUES_COUNT))
 
     from core.tasks.models import Task
-    return Task.make_new(queue=queue_id, username=username, import_queue=import_queue, **kwargs)
+    return Task.new(queue=queue_id, username=username, import_queue=import_queue, **kwargs)
 
 
 def drop_version(expression):

core/concepts/views.py

@@ -357,7 +357,7 @@ def destroy(self, request, *args, **kwargs):
 
         if is_hard_delete_requested:
             if self.is_async_requested():
-                task = Task.make_new(queue='default', user=request.user, name=delete_concept.__name__)
+                task = Task.new(queue='default', user=request.user, name=delete_concept.__name__)
                 delete_concept.apply_async((concept.id,), queue=task.queue, task_id=task.id)
                 return Response(status=status.HTTP_204_NO_CONTENT)
             concept.delete()
@@ -725,7 +725,7 @@ def post(request):
         concept_map = request.data
         if not concept_map:
             return Response(status=status.HTTP_400_BAD_REQUEST)
-        task = Task.make_new(queue='default', user=request.user, name=make_hierarchy.__name__)
+        task = Task.new(queue='default', user=request.user, name=make_hierarchy.__name__)
         result = make_hierarchy.apply_async((concept_map,), queue=task.queue, task_id=task.id)
 
         return Response(

core/indexes/views.py

@@ -23,7 +23,7 @@ def post(self, request):
         apps = request.data.get('apps', None)
         if apps:
             apps = apps.split(',')
-        task = Task.make_new(queue='indexing', user=request.user, name=self.task.__name__)
+        task = Task.new(queue='indexing', user=request.user, name=self.task.__name__)
         result = self.task.apply_async((apps,), queue=task.queue, task_id=task.id)
 
         return Response(
@@ -77,7 +77,7 @@ def post(self, _, resource):
         if get(settings, 'TEST_MODE', False):
             batch_index_resources(resource, filters, update_indexed)
         else:
-            task = Task.make_new(queue='indexing', user=self.request.user, name=batch_index_resources.__name__)
+            task = Task.new(queue='indexing', user=self.request.user, name=batch_index_resources.__name__)
             batch_index_resources.apply_async((resource, filters, update_indexed), queue=task.queue, task_id=task.id)
 
         return Response(status=status.HTTP_202_ACCEPTED)

core/reports/views.py

@@ -39,7 +39,7 @@ class ResourcesReportJobView(APIView):  # pragma: no cover
         )
     )
     def post(request):
-        task = Task.make_new(queue='default', user=request.user, name=resources_report.__name__)
+        task = Task.new(queue='default', user=request.user, name=resources_report.__name__)
         resources_report.apply_async(
             (request.data.get('start_date'), request.data.get('end_date')), queue=task.queue, task_id=task.id)
 

core/sources/views.py

@@ -328,7 +328,7 @@ def get_object(self, queryset=None):
 
     def post(self, request, *args, **kwargs):  # pylint: disable=unused-argument
         source = self.get_object()
-        task = Task.make_new(queue='indexing', user=request.user, name=index_source_concepts.__name__)
+        task = Task.new(queue='indexing', user=request.user, name=index_source_concepts.__name__)
         try:
             index_source_concepts.apply_async((source.id,), queue=task.queue, task_id=task.id)
         except AlreadyQueued:
@@ -352,7 +352,7 @@ def get_object(self, queryset=None):
 
     def post(self, request, *args, **kwargs):  # pylint: disable=unused-argument
         source = self.get_object()
-        task = Task.make_new(queue='indexing', user=request.user, name=index_source_mappings.__name__)
+        task = Task.new(queue='indexing', user=request.user, name=index_source_mappings.__name__)
         try:
             index_source_mappings.apply_async((source.id,), queue=task.queue, task_id=task.id)
         except AlreadyQueued:
@@ -500,7 +500,7 @@ class SourceVersionExportView(ConceptContainerExportMixin, SourceVersionBaseView
 
     def handle_export_version(self):
         version = self.get_object()
-        task = Task.make_new(queue='default', user=self.request.user, name=export_source.__name__)
+        task = Task.new(queue='default', user=self.request.user, name=export_source.__name__)
         try:
             export_source.apply_async((version.id,), queue=task.queue, task_id=task.id)
             return status.HTTP_202_ACCEPTED

core/tasks/mixins.py

@@ -29,7 +29,7 @@ def perform_task(self, task_func, task_args, queue='default', is_default_async=F
         else:
             celery_task = None
             try:
-                celery_task = Task.make_new(queue, self.request.user, name=task_func.__name__)
+                celery_task = Task.new(queue, self.request.user, name=task_func.__name__)
                 task_func.apply_async(task_args, task_id=celery_task.id)
             except AlreadyQueued:
                 if celery_task:

core/tasks/models.py

@@ -180,13 +180,13 @@ def on_success(cls, retval, task_id, args, kwargs):
     def child_tasks(self):
         return Task.objects.filter(id__in=self.children)
 
-    def child_tasks_unfinished(self):
+    def children_still_playing(self):
         return self.child_tasks.exclude(state__in=(SUCCESS, FAILURE, REVOKED))
 
     def revoke(self):
         result = AsyncResult(self.id)
-        for child_task in self.child_tasks_unfinished():
-            child_task.revoke()
+        for child in self.children_still_playing():
+            child.revoke()
 
         app.control.revoke(self.id, terminate=True, signal='SIGKILL')
         celery_once_key = get_bulk_import_celery_once_lock_key(result)
@@ -224,7 +224,7 @@ def parse_bulk_import_task_id(task_id):
         return task
 
     @classmethod
-    def make_new(cls, queue='default', user=None, username=None, import_queue=None, **kwargs):
+    def new(cls, queue='default', user=None, username=None, import_queue=None, **kwargs):
         if not user and username:
             from core.users.models import UserProfile
             user = UserProfile.objects.filter(username=username).first()