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

fix - optimize user relation list

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-09 10:10:22 +03:30
parent 6626624aff
commit 94ea57cc0f
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.local
View File

@@ -1,13 +1,13 @@
# Django secrets # Django secrets
SECRET_KEY=django-insecure-@0apn-lk85pfw=z00x2ib$w9#rwz8%2v4i_n^^9jz-m9b+y55* SECRET_KEY=django-insecure-@0apn-lk85pfw=z00x2ib$w9#rwz8%2v4i_n^^9jz-m9b+y55*
DEBUG=True DEBUG=False
ALLOWED_HOSTS=localhost,127.0.0.1,https://rasadyar.net/,https://localhost:9200,https://api.rasadyaar.net,https://api.dam.rasadyaar.net',https://dam.rasadyar.net',http://localhost:3000',http://192.168.88.130:3000',https://rasaddam-front.liara.run',ns0ck4ksk0koks8ksw0ss08g.31.7.78.133.sslip.io' # noqa ALLOWED_HOSTS=localhost,127.0.0.1,https://rasadyar.net/,https://localhost:9200,https://api.rasadyaar.net,https://api.dam.rasadyaar.net',https://dam.rasadyar.net',http://localhost:3000',http://192.168.88.130:3000',https://rasaddam-front.liara.run',ns0ck4ksk0koks8ksw0ss08g.31.7.78.133.sslip.io' # noqa
ENV_NAME=DEV ENV_NAME=DEV
# Database secrets # Database secrets
DB_HOST=31.7.78.133 DB_HOST=31.7.78.133
DB_PORT=14352 DB_PORT=14352
DB_NAME=Development DB_NAME=Production
DB_USERNAME=postgres DB_USERNAME=postgres
DB_PASSWORD=pfLIVXupbDetvFMt2gUvxLXUL9b4HIOHaPcKXsBEZ1i8zl0iLUjmhUfXlGfJKcTV DB_PASSWORD=pfLIVXupbDetvFMt2gUvxLXUL9b4HIOHaPcKXsBEZ1i8zl0iLUjmhUfXlGfJKcTV

2
apps/authorization/api/v1/api.py
View File

@@ -170,7 +170,7 @@ class UserRelationViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, D
queryset = self.get_queryset( queryset = self.get_queryset(
visibility_by_org_scope=True visibility_by_org_scope=True
) if org.free_visibility_by_scope else self.get_queryset() ) if org.free_visibility_by_scope else self.get_queryset()
print(queryset)
if role_param != '': if role_param != '':
queryset = queryset.filter(role_id=int(role_param)) queryset = queryset.filter(role_id=int(role_param))
else: else:

4
apps/authorization/api/v1/serializers.py
View File

@@ -145,9 +145,9 @@ class UserRelationSerializer(serializers.ModelSerializer):
if instance.user: if instance.user:
representation['user'] = auth_serializer.UserSerializer(instance.user).data representation['user'] = auth_serializer.UserSerializer(instance.user).data
if instance.organization: if instance.organization:
representation['organization'] = auth_serializer.OrganizationSerializer(instance.organization).data representation['organization'] = {"id": instance.organization.id, "name": instance.organization.name}
if instance.role: if instance.role:
representation['role'] = RoleSerializer(instance.role).data representation['role'] = {"id": instance.role.id, "name": instance.role.role_name}
if instance.permissions: # noqa if instance.permissions: # noqa
# set permissions by a default structure like: # set permissions by a default structure like:
# 'page permission':[element permissions] # 'page permission':[element permissions]

1
apps/core/api.py
View File

@@ -27,6 +27,7 @@ class BaseViewSet(RegionFilterMixin, viewsets.ModelViewSet):
if visibility_by_org_scope: if visibility_by_org_scope:
""" if organization has free visibility by scope, apply visibility filter """ """ if organization has free visibility by scope, apply visibility filter """
queryset = apply_visibility_filter(queryset, org) queryset = apply_visibility_filter(queryset, org)
print("ssssssssssssss")
return queryset return queryset
if user_relation.exists(): if user_relation.exists():

2
apps/core/pagination.py
View File

@@ -3,7 +3,7 @@ from rest_framework.response import Response
class CustomPageNumberPagination(PageNumberPagination): class CustomPageNumberPagination(PageNumberPagination):
page_size = 20 # default page_size = 5 # default
page_size_query_param = 'page_size' # set from client page_size_query_param = 'page_size' # set from client
max_page_size = 100 # maximum items to show max_page_size = 100 # maximum items to show
message = None message = None