MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug of filter_by_region for models that had no relation to region but has user relation

Browse Source
This commit is contained in:
Mojtaba-z
2025-10-27 12:01:00 +03:30
parent a20c7cf38b
commit 80a70638f1
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/authentication/mixins/region_filter.py
View File

@@ -17,22 +17,32 @@ class RegionFilterMixin:
organization = get_organization_by_user(self.request.user) # noqa organization = get_organization_by_user(self.request.user) # noqa
if city_id: if city_id:
queryset = queryset.filter(city_id=id(city_id)) if hasattr(queryset.model, 'city_id'):
queryset = queryset.filter(city_id=id(city_id))
elif hasattr(queryset.model, 'user'):
queryset = queryset.filter(user__city=organization.city)
elif province_id: elif province_id:
if hasattr(queryset.model, 'province_id'): if hasattr(queryset.model, 'province_id'):
queryset = queryset.filter(province_id=id(province_id)) queryset = queryset.filter(province_id=id(province_id))
elif hasattr(queryset.model, 'user'):
queryset = queryset.filter(user__province=organization.city)
# filter by organization type region # filter by organization type region
if org: if org:
scope = organization.activity_fields scope = organization.field_of_activity
print(scope)
if scope == 'CI': if scope == 'CI':
queryset = queryset.filter(city=organization.city) if hasattr(queryset.model, 'city_id'):
queryset = queryset.filter(city=organization.city)
elif hasattr(queryset.model, 'user'):
queryset = queryset.filter(user__city=organization.city)
elif scope == 'PR': elif scope == 'PR':
if hasattr(queryset.model, 'province_id'): if hasattr(queryset.model, 'province_id'):
queryset = queryset.filter(province=organization.province) queryset = queryset.filter(province=organization.province)
elif hasattr(queryset.model, 'user'):
queryset = queryset.filter(user__province=organization.city)
# if organization is admin of system # if organization is admin of system
elif scope == 'CO': elif scope == 'CO':

1
apps/core/api.py
View File

@@ -19,6 +19,7 @@ class BaseViewSet(RegionFilterMixin, viewsets.ModelViewSet):
if self.request.method.lower() == 'get' and not self.kwargs.get('pk'): if self.request.method.lower() == 'get' and not self.kwargs.get('pk'):
queryset = self.filter_by_region(queryset, org=True) queryset = self.filter_by_region(queryset, org=True)
print(queryset)
if not user_relation.first().role.type.key == 'ADM': if not user_relation.first().role.type.key == 'ADM':
model_name = queryset.model.__name__.lower() model_name = queryset.model.__name__.lower()