diff --git a/apps/authentication/api/v1/api.py b/apps/authentication/api/v1/api.py index 280566a..7192d70 100644 --- a/apps/authentication/api/v1/api.py +++ b/apps/authentication/api/v1/api.py @@ -295,11 +295,17 @@ class OrganizationViewSet(ModelViewSet, DynamicSearchMixin): def get_organizations_by_province(self, request): """ list of organizations by province """ - if request.GET['province']: + if 'province' in request.GET.keys(): queryset = self.queryset.filter(province=int(request.GET['province'])) else: queryset = self.queryset.filter(province=request.user.province) + # if param self was in request, remove my organization from queryset + if 'self' in request.GET.keys(): + queryset = self.queryset.filter( + province=int(request.GET['province']) + ).exclude(user_organization__user=request.user) + filtered_query = self.filter_query(queryset) page = self.paginate_queryset(filtered_query.order_by('-create_date')) # paginate queryset