Added IdentificationTaskQuerySet.browsable

Author: epou

api/views.py

@@ -540,42 +540,7 @@ class IdentificationTaskViewSet(RetrieveModelMixin, ListModelMixin, GenericNoMob
     lookup_url_kwarg = 'observation_uuid'
 
     def get_queryset(self):
-        qs = super().get_queryset()
-        user = self.request.user
-
-        view_archived_perm = '%(app_label)s.view_archived_identificationtasks' % {
-            'app_label': IdentificationTask._meta.app_label,
-        }
-        # Exclude archived tasks unless user is a full User and has permission
-        if not user.has_perm(view_archived_perm):
-            qs = qs.exclude(status=IdentificationTask.Status.ARCHIVED)
-
-        view_perm = '%(app_label)s.view_%(model_name)s' % {
-            'app_label': IdentificationTask._meta.app_label,
-            'model_name': IdentificationTask._meta.model_name
-        }
-        has_view_perm = user.has_perm(view_perm)
-
-        user_role = user
-        if isinstance(user, User):
-            user_role = UserStat.objects.filter(user=user).first()
-        has_role_view_perm = user_role and user_role.has_role_permission_by_model(action='view', model=IdentificationTask, country=None)
-
-        if has_view_perm or has_role_view_perm:
-            return qs
-
-        if isinstance(user, User):
-            # If user is a regular User, filter by their own tasks
-            qs_annotated = qs.annotated_by(users=[user])
-        else:
-            qs_annotated = qs.none()
-
-        # Filter by countries if user has region-specific permissions
-        countries = user_role.get_countries_with_permissions(action='view', model=IdentificationTask) if user_role else []
-        if countries:
-            return qs_annotated | qs.filter(report__country__in=countries)
-
-        return qs_annotated
+        return super().get_queryset().browsable(user=self.request.user)
 
     @extend_schema(
         request=None,

tigacrafting/managers.py

@@ -1,5 +1,5 @@
 from datetime import timedelta
-from typing import Optional, List
+from typing import Optional, List, Union
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -309,6 +309,48 @@ def _assignable(self, state: bool = True) -> QuerySet:
             )
         )
 
+    # OTHER QUERYSETS
+    def browsable(self, user: Union[User, 'tigaserver_app.TigaUser']) -> QuerySet:
+        from tigacrafting.models import IdentificationTask, UserStat
+
+        view_archived_perm = '%(app_label)s.view_archived_identificationtasks' % {
+            'app_label': IdentificationTask._meta.app_label,
+        }
+        qs = self
+        # Exclude archived tasks unless user is a full User and has permission
+        if not user.has_perm(view_archived_perm):
+            qs = qs.exclude(status=IdentificationTask.Status.ARCHIVED)
+
+        view_perm = '%(app_label)s.view_%(model_name)s' % {
+            'app_label': IdentificationTask._meta.app_label,
+            'model_name': IdentificationTask._meta.model_name
+        }
+        has_view_perm = user.has_perm(view_perm)
+
+        user_role = user
+        if isinstance(user, User):
+            try:
+                user_role = user.userstat
+            except UserStat.DoesNotExist:
+                user_role = None
+        has_role_view_perm = user_role and user_role.has_role_permission_by_model(action='view', model=IdentificationTask, country=None)
+
+        if has_view_perm or has_role_view_perm:
+            return qs
+
+        if isinstance(user, User):
+            # If user is a regular User, filter by their own tasks
+            qs_annotated = qs.annotated_by(users=[user])
+        else:
+            qs_annotated = qs.none()
+
+        # Filter by countries if user has region-specific permissions
+        countries = user_role.get_countries_with_permissions(action='view', model=IdentificationTask) if user_role else []
+        if countries:
+            return qs_annotated | qs.filter(report__country__in=countries)
+
+        return qs_annotated
+
 IdentificationTaskManager = models.Manager.from_queryset(IdentificationTaskQuerySet)
 
 class ExpertReportAnnotationQuerySet(models.QuerySet):