refactor code

onadata/apps/logger/tasks.py

@@ -7,6 +7,7 @@
 from django.core.cache import cache
 from django.contrib.auth import get_user_model
 from django.db import DatabaseError
+from multidb.pinning import use_master
 
 from onadata.apps.logger.models import Entity, EntityList, Project
 from onadata.celeryapp import app
@@ -34,14 +35,15 @@ def set_entity_list_perms_async(entity_list_id):
     Args:
         pk (int): Primary key for EntityList
     """
-    try:
-        entity_list = EntityList.objects.get(pk=entity_list_id)
+    with use_master:
+        try:
+            entity_list = EntityList.objects.get(pk=entity_list_id)
 
-    except EntityList.DoesNotExist as err:
-        logger.exception(err)
-        return
+        except EntityList.DoesNotExist as err:
+            logger.exception(err)
+            return
 
-    set_project_perms_to_object(entity_list, entity_list.project)
+        set_project_perms_to_object(entity_list, entity_list.project)
 
 
 @app.task(retry_backoff=3, autoretry_for=(DatabaseError, ConnectionError))
@@ -69,18 +71,19 @@ def delete_entities_bulk_async(entity_pks: list[int], username: str | None = Non
         entity_pks (list(int)): Primary keys of Entities to be deleted
         username (str): Username of the user initiating the delete
     """
-    entity_qs = Entity.objects.filter(pk__in=entity_pks, deleted_at__isnull=True)
-    deleted_by = None
+    with use_master:
+        entity_qs = Entity.objects.filter(pk__in=entity_pks, deleted_at__isnull=True)
+        deleted_by = None
 
-    try:
-        if username is not None:
-            deleted_by = User.objects.get(username=username)
+        try:
+            if username is not None:
+                deleted_by = User.objects.get(username=username)
 
-    except User.DoesNotExist as exc:
-        logger.exception(exc)
+        except User.DoesNotExist as exc:
+            logger.exception(exc)
 
-    else:
-        soft_delete_entities_bulk(entity_qs, deleted_by)
+        else:
+            soft_delete_entities_bulk(entity_qs, deleted_by)
 
 
 @app.task(retry_backoff=3, autoretry_for=(DatabaseError, ConnectionError))

onadata/libs/utils/logger_tools.py

@@ -1113,7 +1113,6 @@ def update_entity_from_instance(
     return entity
 
 
-@use_master
 def soft_delete_entities_bulk(entity_qs: QuerySet[Entity], deleted_by=None) -> None:
     """Soft delete Entities in bulk
 
@@ -1125,7 +1124,6 @@ def soft_delete_entities_bulk(entity_qs: QuerySet[Entity], deleted_by=None) -> N
         entity.soft_delete(deleted_by)
 
 
-@use_master
 def create_or_update_entity_from_instance(instance: Instance) -> None:
     """Create or Update Entity from Instance
 
@@ -1223,7 +1221,6 @@ def _dec_elist_num_entities_cache(pk: int) -> None:
         cache.decr(counter_cache_key)
 
 
-@use_master
 def inc_elist_num_entities(pk: int) -> None:
     """Increment EntityList `num_entities` counter
 
@@ -1248,7 +1245,6 @@ def inc_elist_num_entities(pk: int) -> None:
             _inc_elist_num_entities_db(pk)
 
 
-@use_master
 def dec_elist_num_entities(pk: int) -> None:
     """Decrement EntityList `num_entities` counter
 

onadata/libs/utils/project_utils.py

@@ -314,7 +314,6 @@ def propagate_project_permissions(
                 )
 
 
-@use_master
 def set_project_perms_to_object(obj: Any, project: Project) -> None:
     """Apply project permissions to an object