Commit 40db2db0 authored by deepdey's avatar deepdey

chore: update role crud restrictions

parent b23cf6d1
......@@ -8,6 +8,7 @@ from app.app_config.response_code import *
from app.app_config.response_message import *
from app.app_config.swagger_config import SECURITY
from app.decorators.sanitizer import sanitized
from app.decorators.user_fetcher import fetch_user
from app.routes import api
from app.routes.role.role_payload import *
......@@ -32,12 +33,13 @@ class AddRole(Resource):
@ns.expect(*add_role_payload())
@ns.response(*add_role_response())
@sanitized()
def post(self):
@fetch_user()
def post(self, user_id: int):
try:
validator = AddRoleValidator()
payload: dict = validator.load(request.get_json())
role_id: int = add_role(payload)
role_id: int = add_role(payload, user_id)
return prepare_api_response(SUCCESS_CODE, INSERT_SUCCESS_MESSAGE)
......@@ -60,12 +62,13 @@ class UpdateRole(Resource):
@ns.expect(*update_role_payload())
@ns.response(*update_role_response())
@sanitized()
def patch(self):
@fetch_user()
def patch(self, user_id: int):
try:
validator = UpdateRoleValidator()
payload: dict = validator.load(request.get_json())
updated: bool = update_role(payload)
updated: bool = update_role(payload, user_id)
if not updated:
return prepare_api_response(
......@@ -92,12 +95,13 @@ class GetRole(Resource):
@ns.expect(*get_role_payload())
@ns.response(*get_role_response())
@sanitized()
def get(self):
@fetch_user()
def get(self, user_id: int):
try:
validator = GetRoleValidator()
arguments: dict = validator.load(request.args)
role_info: ORM.Role | None = get_role_by_id(arguments['id'])
role_info: ORM.Role | None = get_role_by_id(arguments['id'], user_id)
if role_info is None:
return prepare_api_response(404, 'Role not found')
......@@ -121,13 +125,14 @@ class GetRole(Resource):
@ns.route('/get-all', methods=['GET'])
class GetAllRole(Resource):
class GetAllRoles(Resource):
@ns.doc(security=SECURITY)
@ns.response(*get_role_list_response())
def get(self):
@fetch_user()
def get(self, user_id: int):
try:
roles_list = get_role_list()
roles_list = get_role_list(user_id)
return prepare_api_response(
SUCCESS_CODE,
......
from typing import List
from app import orm as ORM
from app import db
from app.app_config.constant import RoleTypeEnum
from app.routes.user.user_dao_service import get_user_by_id
def get_role_by_rolename_and_roletype(
rolename: str,
roletype: int
rolename: str, roletype: int, project_id: int
) -> ORM.Role | None:
return ORM.Role.query.filter_by(
role_name=rolename, role_type=roletype, is_deleted=False).first()
role_name=rolename, role_type=roletype, project_id=project_id, is_deleted=False
).first()
def add_role(role: dict) -> int | None:
def add_role(role: dict, user_id: int) -> int | None:
try:
user_info: ORM.User | None = get_user_by_id(user_id)
if not user_info:
raise Exception('User not found for mapped apiKey')
if user_info.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
if role.get('project_id') != user_info.project_id:
raise Exception(
'You have no permission to create role for this project'
)
existing_role: ORM.Role | None = get_role_by_rolename_and_roletype(
role.get('role_name'), role.get('role_type_id')
role.get('role_name'), role.get('role_type_id'), role.get('project_id')
)
if existing_role:
raise Exception('role_name already exists')
raise Exception('role_name already exists for this project')
role_model = ORM.Role(
role_type_id=role.get('role_type_id'),
role_name=role.get('role_name'),
project_id=role.get('project_id')
project_id=role.get('project_id'),
created_by=user_id,
)
db.session.add(role_model)
db.session.flush([role_model])
db.session.commit()
return role_model.id
except Exception as e:
......@@ -37,31 +52,34 @@ def add_role(role: dict) -> int | None:
raise e
def get_role_by_id(id: int) -> ORM.Role | None:
return ORM.Role.query.filter_by(id=id, is_deleted=False).first()
def get_role_list() -> List[ORM.Role] | list:
return ORM.Role.query.filter_by(is_deleted=False).all()
def update_role(role: dict) -> bool:
def update_role(role: dict, user_id: int) -> bool:
try:
role_info: ORM.Role = get_role_by_id(role.get('id'), is_deleted=False)
if role_info is None:
return False
user_info: ORM.User | None = get_user_by_id(user_id)
if not user_info:
raise Exception('User not found for mapped apiKey')
if user_info.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
if role_info.project_id != user_info.project_id:
raise Exception(
'You have no permission to create role for this project'
)
existing_role: ORM.Role | None = get_role_by_rolename_and_roletype(
role.get('role_name'), role.get('role_type_id')
role.get('role_name'), role.get('role_type_id'), role.get('project_id')
)
if existing_role and existing_role.id != role_info.id:
raise Exception('rolename already exists')
role_info.role_type_id = role.get('role_type_id')
role_info.role_name = role.get('role_name')
role_info.project_id = role.get('project_id')
# TODO: in future if we update role type then user role type also need to be updated
db.session.commit()
return True
......@@ -69,3 +87,32 @@ def update_role(role: dict) -> bool:
except Exception as e:
db.session.rollback()
raise e
def get_role_by_id(id: int, user_id: int) -> ORM.Role | None:
user_info: ORM.User | None = get_user_by_id(user_id)
if not user_info:
raise Exception('User not found for mapped apiKey')
if user_info.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
return ORM.Role.query.filter_by(
id=id, is_deleted=False, project_id=user_info.project_id
).first()
return ORM.Role.query.filter_by(id=id, is_deleted=False).first()
def get_role_list(user_id: int) -> List[ORM.Role] | list:
user_info: ORM.User | None = get_user_by_id(user_id)
if not user_info:
raise Exception('User not found for mapped apiKey')
if user_info.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
return ORM.Role.query.filter_by(
is_deleted=False, project_id=user_info.project_id
).all()
return ORM.Role.query.filter_by(is_deleted=False).all()
......@@ -17,9 +17,7 @@ def update_role_payload() -> list:
payload = api.model('updateRole Payload', {
'id': fields.Integer,
'role_type_id': fields.Integer,
'role_name': fields.String,
'project_id': fields.Integer
'role_name': fields.String
})
return [payload]
......
......@@ -4,12 +4,12 @@ from marshmallow import Schema, fields, validate
class AddRoleValidator(Schema):
role_name = fields.String(required=True, validate=validate.Length(min=1))
project_id = fields.Integer(required=True, validate=validate.Range(min=1))
role_type_id = fields.Integer(required=True, validate=validate.Range(min=1))
class UpdateRoleValidator(Schema):
id = fields.Integer(required=True, validate=validate.Range(min=1))
role_name = fields.String(required=True, validate=validate.Length(min=1))
project_id = fields.Integer(required=True, validate=validate.Range(min=1))
class GetRoleValidator(Schema):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment