Commit fd35a3ca authored by deepdey's avatar deepdey

feat: add user registration api

parent ad0bc218
......@@ -31,7 +31,6 @@ class User(db.Model, CustomSerializerMixin):
updated_at = db.Column(db.DATETIME, onupdate=datetime.now)
created_by = db.Column(db.BigInteger)
updated_by = db.Column(db.BigInteger)
is_deleted = db.Column(db.Boolean, default=False)
user_roles = db.relationship('UserRoleMap')
role_type = db.relationship('RoleType')
......
......@@ -279,3 +279,30 @@ class MapRole(Resource):
except Exception as e:
logger.error(traceback.format_exc())
return prepare_api_response(EXCEPTION_CODE, str(e))
@ns.route('/register', methods=['POST'])
class Register(Resource):
@ns.expect(*register_payload())
@ns.response(*register_response())
@sanitized()
def post(self):
try:
validator = RegisterValidator()
payload: dict = validator.load(request.get_json())
register_new_user(payload)
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:
logger.error(traceback.format_exc())
return prepare_api_response(EXCEPTION_CODE, str(e))
\ No newline at end of file
from typing import List
from app import orm as ORM
from app import db
from app import db, bcrypt
from app.app_config.constant import RoleTypeEnum
......@@ -85,10 +85,49 @@ def map_user_role(admin_id: int, user_id: int, role_id: int) -> None:
user_role_map.updated_by = admin_user.id
else:
user_role_map = ORM.UserRoleMap(
user_id=user_id,
role_id=role_id,
created_by=admin_user.id
user_id=user_id, role_id=role_id, created_by=admin_user.id
)
db.session.add(user_role_map)
db.session.commit()
def register_new_user(user_info: dict) -> int:
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')
role_type_info = ORM.RoleType.query.filter_by(
role_name=RoleTypeEnum.PROJECT_USER.value
).first()
if not role_type_info:
raise Exception('Role type not found')
user_info['role_type_id'] = role_type_info.id
user_info['password'] = bcrypt.generate_password_hash(
user_info.get('password')
).decode('utf-8')
new_user = ORM.User(**user_info)
db.session.add(new_user)
db.session.commit()
return new_user.id
......@@ -13,9 +13,7 @@ def login_payload() -> list:
def otp_payload() -> list:
payload = api.model(
'OTP Payload', {'email': fields.String}
)
payload = api.model('OTP Payload', {'email': fields.String})
return [payload]
......@@ -28,6 +26,7 @@ def otp_verify_payload() -> list:
return [payload]
def get_user_payload() -> list:
parser = api.parser()
......@@ -35,6 +34,7 @@ def get_user_payload() -> list:
return [parser]
def map_user_role_payload() -> list:
parser = api.parser()
......@@ -42,3 +42,24 @@ def map_user_role_payload() -> list:
parser.add_argument('role_id', required=True, type=int, location='args')
return [parser]
def register_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),
'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]
......@@ -28,8 +28,7 @@ USER_RESPONSE_MODEL: any = api.model(
'created_at': fields.DateTime,
'created_by': fields.Integer,
'updated_at': fields.DateTime,
'updated_by': fields.Integer,
'is_deleted': fields.Boolean,
'updated_by': fields.Integer
},
)
......@@ -91,3 +90,10 @@ def map_user_role_response() -> any:
message='Role mapped Successfully',
model_name='roleMap Response'
)
def register_response() -> any:
return prepare_swagger_response(
code=SUCCESS_CODE,
message=INSERT_SUCCESS_MESSAGE,
model_name='register Response',
)
\ No newline at end of file
......@@ -18,3 +18,16 @@ class GetUserValidator(Schema):
class MapUserRoleValidator(Schema):
user_id = fields.Integer(required=True, validate=validate.Range(min=1))
role_id = fields.Integer(required=True, validate=validate.Range(min=1))
class RegisterValidator(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))
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')
\ No newline at end of file
......@@ -20,7 +20,6 @@ CREATE TABLE IF NOT EXISTS webomagic_user (
phone_verified BOOLEAN DEFAULT false,
email_verified BOOLEAN DEFAULT false,
status VARCHAR(20) NOT NULL,
is_deleted BOOLEAN DEFAULT false,
created_at TIMESTAMP NOT NULL DEFAULT now(),
created_by BIGINT,
updated_at TIMESTAMP,
......
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