From 15c2ecfebbfd73254eeae60b2b1667dfd2536bfe Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Mon, 27 Oct 2025 12:14:48 +0330 Subject: [PATCH] fix bug of dont show my user --- apps/core/api.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/core/api.py b/apps/core/api.py index ec28883..3479589 100644 --- a/apps/core/api.py +++ b/apps/core/api.py @@ -1,6 +1,6 @@ from rest_framework import viewsets -from apps.authentication.mixins.region_filter import RegionFilterMixin +from apps.authentication.mixins.region_filter import RegionFilterMixin, get_organization_by_user from apps.core.models import MobileTest, SystemConfig from apps.core.serializers import MobileTestSerializer, SystemConfigSerializer @@ -15,20 +15,22 @@ class BaseViewSet(RegionFilterMixin, viewsets.ModelViewSet): queryset = super().get_queryset() request = self.request user = request.user - user_relation = user.user_relation.all() + org = get_organization_by_user(user) + user_relation = user.user_relation.filter(organization=org) if self.request.method.lower() == 'get' and not self.kwargs.get('pk'): queryset = self.filter_by_region(queryset, org=True) print(queryset) - if not user_relation.first().role.type.key == 'ADM': - model_name = queryset.model.__name__.lower() + if user_relation.exists(): + if not user_relation.first().role.type.key == 'ADM': + model_name = queryset.model.__name__.lower() - if model_name == 'user': - queryset = queryset.exclude(id=user.id) + if model_name == 'userrelations': # noqa + queryset = queryset.exclude(id=user_relation.first().id) - elif model_name == 'organization': - queryset = queryset.exclude(id=user_relation.first().organization.id) + elif model_name == 'organization': + queryset = queryset.exclude(id=user_relation.first().organization.id) return queryset