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

fix - soft delete in quota binary tree & CO level of show organizations

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-01 10:12:58 +03:30
parent 364a15acf8
commit fc67266d64
6 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/authentication/api/v1/api.py
View File

@@ -332,17 +332,24 @@ class OrganizationViewSet(BaseViewSet, SoftDeleteMixin, ModelViewSet, DynamicSea
def get_organizations_by_province(self, request):
""" list of organizations by province """
if 'province' in request.GET.keys():
queryset = self.get_queryset(show_my_org=True).filter(province=int(request.GET['province']))
else:
queryset = self.get_queryset().filter(province=request.user.province)
org = get_organization_by_user(request.user)
if 'exclude' in request.GET.keys():
queryset = queryset.exclude(type__key=request.GET['exclude'])
# if user organization activity is on country level show all
# else show by province
if org.field_of_activity != 'CO':
if 'province' in request.GET.keys():
queryset = self.get_queryset(show_my_org=True).filter(province=int(request.GET['province']))
else:
queryset = self.get_queryset().filter(province=request.user.province)
if 'exclude' in request.GET.keys():
queryset = queryset.exclude(type__key=request.GET['exclude'])
else:
queryset = self.get_queryset()
filtered_query = self.filter_query(queryset)
page = self.paginate_queryset(filtered_query.order_by('-create_date')) # paginate queryset
page = self.paginate_queryset(filtered_query.order_by('-modify_date')) # paginate queryset
if page is not None:
serializer = self.serializer_class(page, many=True)