From 4e7fa3d6ef6924e103083e5aa5cf734709bf61c6 Mon Sep 17 00:00:00 2001 From: javad Date: Tue, 23 Jan 2024 10:44:11 +0330 Subject: [PATCH] fix get_user_workspace util Func --- .idea/workspace.xml | 8 ++------ utils/get_user_workspace.py | 7 +++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5ffcd2b..1de547b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,11 +3,7 @@ - - - - - + diff --git a/utils/get_user_workspace.py b/utils/get_user_workspace.py index 3297b5e..623c8e8 100644 --- a/utils/get_user_workspace.py +++ b/utils/get_user_workspace.py @@ -2,12 +2,15 @@ from apps.workspace.models import Workspace as WorkspaceModel from apps.cuser.models import CuserRole as CuserRoleModel from apps.customer.models import CustomerResponsible as CustomerResponsibleModel, Customer as CustomerModel + def get_user_workspace(request) -> WorkspaceModel: jwt_payload = request.auth.payload cuser_role_uuid = jwt_payload.get('cuser_role_uuid') # use_redis cuser_role = CuserRoleModel.objects.get(uuid=cuser_role_uuid) - role_type_name = cuser_role.role_type.role_name_en + + return cuser_role.sys_ws + '''role_type_name = cuser_role.role_type.role_name_en if role_type_name == 'workspace_operator': operator = CustomerResponsibleModel.objects.get(cuser_role=cuser_role) @@ -15,7 +18,7 @@ def get_user_workspace(request) -> WorkspaceModel: return workspace else: customer = CustomerModel.objects.get(cuser_role=cuser_role) - return customer.sys_ws + return customer.sys_ws''' def get_user_workspace_uuid(request) -> str: