Commit 7af92f38 authored by deepdey's avatar deepdey

feat: add api to add new user as admin

parent 873f02d5
...@@ -303,6 +303,35 @@ class Register(Resource): ...@@ -303,6 +303,35 @@ class Register(Resource):
error=e.normalized_messages(), error=e.normalized_messages(),
) )
except Exception as e:
logger.error(traceback.format_exc())
return prepare_api_response(EXCEPTION_CODE, str(e))
@ns.route('/add', methods=['POST'])
class AddUser(Resource):
@ns.doc(security=SECURITY)
@ns.expect(*add_user_payload())
@ns.response(*add_user_response())
@sanitized()
@fetch_user()
def post(self, user_id: int):
try:
validator = AddUserValidator()
payload: dict = validator.load(request.get_json())
add_new_user(payload, user_id)
return prepare_api_response(SUCCESS_CODE, INSERT_SUCCESS_MESSAGE)
except ValidationError as e:
return prepare_api_response(
VALIDATION_ERROR_CODE,
VALIDATION_ERROR_MESSAGE,
error=e.normalized_messages(),
)
except Exception as e: except Exception as e:
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
return prepare_api_response(EXCEPTION_CODE, str(e)) return prepare_api_response(EXCEPTION_CODE, str(e))
\ No newline at end of file
...@@ -29,9 +29,7 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None: ...@@ -29,9 +29,7 @@ def get_user_by_id_for_admin(admin_id: int, user_id: int) -> ORM.User | None:
).first() ).first()
else: else:
# return all user data for super admin # return all user data for super admin
return ORM.User.query.filter( return ORM.User.query.filter(ORM.User.id == user_id).first()
ORM.User.id == user_id
).first()
def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]: def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
...@@ -41,9 +39,7 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]: ...@@ -41,9 +39,7 @@ def get_user_list_for_project_admin(admin_id: int) -> List[ORM.User]:
raise Exception('User not found for mapped apiKey') raise Exception('User not found for mapped apiKey')
if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value: if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
return ORM.User.query.filter( return ORM.User.query.filter(ORM.User.project_id == admin_user.project_id).all()
ORM.User.project_id == admin_user.project_id
).all()
else: else:
# return all user data for super admin # return all user data for super admin
return ORM.User.query.all() return ORM.User.query.all()
...@@ -130,3 +126,59 @@ def register_new_user(user_info: dict) -> int: ...@@ -130,3 +126,59 @@ def register_new_user(user_info: dict) -> int:
db.session.add(new_user) db.session.add(new_user)
db.session.commit() db.session.commit()
return new_user.id return new_user.id
def add_new_user(user_info: dict, admin_id: int) -> int:
admin_user: ORM.User | None = get_user_by_id(admin_id)
if not admin_user:
raise Exception('User not found for mapped apiKey')
role_type_info = ORM.RoleType.query.filter_by(
id=user_info.get('role_type_id')
).first()
if not role_type_info:
raise Exception('Role type not found')
if admin_user.role_type.role_name != RoleTypeEnum.SUPER_ADMIN.value:
if user_info.get('project_id') != admin_user.project_id:
raise Exception('You are not authorized to perform this action')
if role_type_info.role_name in [
RoleTypeEnum.SUPER_ADMIN.value,
RoleTypeEnum.PROJECT_ADMIN.value,
]:
raise Exception('You are not authorized to map this role type')
existing_user_info: ORM.User | None = ORM.User.query.filter_by(
username=user_info.get('username')
).first()
if existing_user_info:
raise Exception('User already exists with this username')
existing_user_info: ORM.User | None = ORM.User.query.filter_by(
email=user_info.get('email')
).first()
if existing_user_info:
raise Exception('User already exists with this email')
existing_user_info: ORM.User | None = ORM.User.query.filter_by(
phone_number=user_info.get('phone_number')
).first()
if existing_user_info:
raise Exception('User already exists with this phone number')
user_info['password'] = bcrypt.generate_password_hash(
user_info.get('password')
).decode('utf-8')
user_info['created_by'] = admin_user.id
new_user = ORM.User(**user_info)
db.session.add(new_user)
db.session.commit()
return new_user.id
...@@ -63,3 +63,24 @@ def register_payload() -> list: ...@@ -63,3 +63,24 @@ def register_payload() -> list:
}, },
) )
return [payload] return [payload]
def add_user_payload() -> list:
payload = api.model(
'Register Payload',
{
'username': fields.String(required=True),
'name': fields.String(required=True),
'password': fields.String(required=True),
'organization': fields.String(required=True),
'project_id': fields.Integer(required=True),
'role_type_id': fields.Integer(required=True),
'gstin': fields.String(required=False),
'email': fields.String(required=True),
'phone_number': fields.String(required=True),
'email_verified': fields.Boolean(default=False),
'phone_verified': fields.Boolean(default=False),
'status': fields.String(default='ACTIVE'),
},
)
return [payload]
...@@ -96,4 +96,7 @@ def register_response() -> any: ...@@ -96,4 +96,7 @@ def register_response() -> any:
code=SUCCESS_CODE, code=SUCCESS_CODE,
message=INSERT_SUCCESS_MESSAGE, message=INSERT_SUCCESS_MESSAGE,
model_name='register Response', model_name='register Response',
) )
\ No newline at end of file
def add_user_response() -> any:
return register_response()
\ No newline at end of file
...@@ -30,4 +30,18 @@ class RegisterValidator(Schema): ...@@ -30,4 +30,18 @@ class RegisterValidator(Schema):
phone_number = fields.String(required=True, validate=validate.Regexp(r'^[0-9]{10}$')) phone_number = fields.String(required=True, validate=validate.Regexp(r'^[0-9]{10}$'))
email_verified = fields.Boolean(default=False) email_verified = fields.Boolean(default=False)
phone_verified = fields.Boolean(default=False) phone_verified = fields.Boolean(default=False)
status = fields.String(default='ACTIVE')
class AddUserValidator(Schema):
username = fields.String(required=True, validate=validate.Length(min=1, max=255))
name = fields.String(required=True, validate=validate.Length(min=1, max=255))
password = fields.String(required=True, validate=validate.Length(min=6, max=16))
organization = fields.String()
project_id = fields.Integer(required=True, validate=validate.Range(min=1))
role_type_id = fields.Integer(required=True, validate=validate.Range(min=1))
gstin = fields.String(required=False)
email = fields.String(required=True, validate=validate.Email())
phone_number = fields.String(required=True, validate=validate.Regexp(r'^[0-9]{10}$'))
email_verified = fields.Boolean(default=False)
phone_verified = fields.Boolean(default=False)
status = fields.String(default='ACTIVE') status = fields.String(default='ACTIVE')
\ No newline at end of file
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