New version

Author: theshohidul

.gitignore

@@ -1,3 +1,6 @@
 docker/data
 __pycache__
-.idea
+.idea
+.DS_Store
+app/.DS_Store
+docker/.DS_Store

app/.DS_Store

@@ -1 +1,2 @@
-__pycache__
+__pycache__
+.DS_Store

app/.gitignore

@@ -1,11 +1,18 @@
 from fastapi import APIRouter
 
+from api.v1.auth.schemas.responses import TokenResponse
 from api.v1.auth.view import AuthView
+from api.v1.register.schemas.responses import UserNotFound
+from api.v1.shared.schemas.responses import ValidationErrorResponse
 
 auth_views = AuthView()
 
 auth_router = APIRouter(
-    responses={404: {"description": "Not found"}},
+    responses={
+        404: {"description": "Not found", "model": UserNotFound},
+        422: {"description": "Validation Error", "model": ValidationErrorResponse},
+    },
+
 )
 
 auth_router.add_api_route(
@@ -15,6 +22,7 @@
     description="User Authentication and create access token",
     name="Authentication-AccessToken",
     response_model_by_alias=False,
+    response_model=TokenResponse,
 )
 
 auth_router.add_api_route(
@@ -24,4 +32,5 @@
     description="Create access token from refresh token",
     name="Authentication-AccessToken-From-RefreshToken",
     response_model_by_alias=False,
+    response_model=TokenResponse,
 )

app/__pycache__/main.cpython-39.pyc

@@ -5,27 +5,27 @@
 
 class CustomUnauthorizedError(BaseAuthenticationError):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.UNAUTHORIZED.status_code
     status_type = ExceptionStatus.UNAUTHORIZED.name
     message = ExceptionStatus.UNAUTHORIZED.message
+    _status_code = ExceptionStatus.UNAUTHORIZED.status_code
 
 
 class CustomInvalidTokenError(BaseAuthenticationError):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.INVALID_TOKEN.status_code
     status_type = ExceptionStatus.INVALID_TOKEN.name
     message = ExceptionStatus.INVALID_TOKEN.message
+    _status_code = ExceptionStatus.INVALID_TOKEN.status_code
 
 
 class CustomDecodeTokenError(BaseAuthenticationError):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.UNPROCESSABLE_TOKEN.status_code
     status_type = ExceptionStatus.UNPROCESSABLE_TOKEN.name
     message = ExceptionStatus.UNPROCESSABLE_TOKEN.message
+    _status_code = ExceptionStatus.UNPROCESSABLE_TOKEN.status_code
 
 
 class CustomExpiredTokenError(BaseAuthenticationError):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.TOKEN_EXPIRED.status_code
     status_type = ExceptionStatus.TOKEN_EXPIRED.name
     message = ExceptionStatus.TOKEN_EXPIRED.message
+    _status_code = ExceptionStatus.TOKEN_EXPIRED.status_code

app/api/__pycache__/__init__.cpython-39.pyc

@@ -5,27 +5,27 @@
 
 class PasswordDoesNotMatchException(CustomException):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.PASSWORD_NOT_MATCHED.status_code
     status_type = ExceptionStatus.PASSWORD_NOT_MATCHED.name
     message = ExceptionStatus.PASSWORD_NOT_MATCHED.message
+    _status_code = ExceptionStatus.PASSWORD_NOT_MATCHED.status_code
 
 
 class InvalidTokenException(CustomException):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.INVALID_TOKEN.status_code
     status_type = ExceptionStatus.INVALID_TOKEN.name
     message = ExceptionStatus.INVALID_TOKEN.message
+    _status_code = ExceptionStatus.INVALID_TOKEN.status_code
 
 
 class DecodeTokenException(CustomException):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.UNPROCESSABLE_TOKEN.status_code
     status_type = ExceptionStatus.UNPROCESSABLE_TOKEN.name
     message = ExceptionStatus.UNPROCESSABLE_TOKEN.message
+    _status_code = ExceptionStatus.UNPROCESSABLE_TOKEN.status_code
 
 
 class ExpiredTokenException(CustomException):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.TOKEN_EXPIRED.status_code
     status_type = ExceptionStatus.TOKEN_EXPIRED.name
     message = ExceptionStatus.TOKEN_EXPIRED.message
+    _status_code = ExceptionStatus.TOKEN_EXPIRED.status_code

app/api/v1/__pycache__/__init__.cpython-39.pyc

@@ -21,7 +21,7 @@ class TokenPayload(BaseModel):
 
 class TokenResponse(BaseResponse):
     status: int = StatusType.SUCCESS.value
-    status_code: str = ResponseStatus.USER_LOGGED_IN.status_code
     status_type: str = ResponseStatus.USER_LOGGED_IN.name
     message: str = ResponseStatus.USER_LOGGED_IN.message
     data: TokenData
+    _status_code: str = ResponseStatus.USER_LOGGED_IN.status_code

app/api/v1/auth/__pycache__/__init__.cpython-39.pyc

@@ -25,7 +25,6 @@ def __init__(self, user_repository: UserRepository = UserRepository()):
 
     async def access(self, login_request: LoginRequest):
         user: UserModel = await self.user_repository.get_user_by_email(login_request.email)
-        print(user.name)
         if not user:
             raise UserNotFoundException
 

app/api/v1/auth/__pycache__/auth_backend.cpython-39.pyc

@@ -1,7 +1,7 @@
 from api.v1.auth.service import AuthService
+from core.utils import base_response_to_json_response
 from .schemas.requests import LoginRequest, RefreshTokenRequest
 from .schemas.responses import TokenData, TokenResponse
-from core.utils import make_response_from_model
 
 
 class AuthView:
@@ -10,16 +10,13 @@ def __init__(self, auth_service: AuthService = AuthService()):
 
     async def access(self, login_request: LoginRequest):
         token_data: TokenData = await self.auth_service.access(login_request)
-        return make_response_from_model(
-            TokenResponse(
+        return base_response_to_json_response(TokenResponse(
                 data=token_data
-            )
-        )
+            ))
 
     async def refresh(self, refresh_token_request: RefreshTokenRequest):
         token_data: TokenData = await self.auth_service.refresh(refresh_token_request)
-        return make_response_from_model(
-            TokenResponse(
+        return base_response_to_json_response(TokenResponse(
                 data=token_data
-            )
-        )
+            ))
+

app/api/v1/auth/__pycache__/routes.cpython-39.pyc

@@ -1,21 +1,24 @@
 from fastapi import APIRouter
 
-from api.v1.register.schemas.responses import UserRegisteredSuccessfully
+from api.v1.register.schemas.responses import UserRegisteredSuccessfully, DuplicateEmail
 from api.v1.register.view import RegisterView
+from api.v1.shared.schemas.responses import ValidationErrorResponse
 
 register_view = RegisterView()
 
 register_router = APIRouter(
     responses={
-        404: {"description": "Not found"},
+        209: {"description": "User Already Exists", "model": DuplicateEmail},
+        422: {"description": "Validation Error", "model": ValidationErrorResponse},
     },
 )
 
 register_router.add_api_route(
     "",
     register_view.register,
     methods=["POST"],
-    description="User Register",
-    name="Registration",
+    description="New user registration",
+    name="New user registration",
     response_model=UserRegisteredSuccessfully,
+    status_code=UserRegisteredSuccessfully().status_code,
 )

app/api/v1/auth/__pycache__/service.cpython-39.pyc

@@ -1,8 +1,16 @@
-from pydantic import BaseModel, EmailStr, validator, Field
+from enum import Enum
+
+from pydantic import BaseModel, EmailStr, Field
+
+
+class RolesEnum(str, Enum):
+    renter = 'renter'
+    landlord = 'landlord'
 
 
 class RegisterRequest(BaseModel):
-    name: str = Field(..., min_length=1, max_length=100)
+    name: str = Field(..., min_length=1, max_length=100, description="User full name")
     email: EmailStr
-    phone: str = Field(..., min_length=1, max_length=32)
-    password: str = Field(..., min_length=1, max_length=32)
+    phone: str = Field(..., min_length=4, max_length=32)
+    password: str = Field(..., min_length=8, max_length=32)
+    role: RolesEnum

app/api/v1/auth/__pycache__/view.cpython-39.pyc

@@ -4,7 +4,21 @@
 
 
 class UserRegisteredSuccessfully(BaseResponse):
-    status: int = StatusType.SUCCESS.value
-    status_code: str = ResponseStatus.USER_REGISTERED.status_code
+    status: str = StatusType.SUCCESS.value
     status_type: str = ResponseStatus.USER_REGISTERED.name
-    message: str = ResponseStatus.USER_REGISTERED.message
+    message: str = ResponseStatus.USER_REGISTERED.message
+    _status_code: int = ResponseStatus.USER_REGISTERED.status_code
+
+
+class UserNotFound(BaseResponse):
+    status: str = StatusType.ERROR.value
+    status_type: str = ResponseStatus.USER_NOT_FOUND.name
+    message: str = ResponseStatus.USER_NOT_FOUND.message
+    _status_code: int = ResponseStatus.USER_NOT_FOUND.status_code
+
+
+class DuplicateEmail(BaseResponse):
+    status = StatusType.ERROR.value
+    status_type = ResponseStatus.DUPLICATE_EMAIL.name
+    message = ResponseStatus.DUPLICATE_EMAIL.message
+    _status_code = ResponseStatus.DUPLICATE_EMAIL.status_code

app/api/v1/auth/routes.py

@@ -1,7 +1,7 @@
 from api.v1.register.service import RegisterService
+from core.utils import base_response_to_json_response
 from .schemas.requests import RegisterRequest
 from .schemas.responses import UserRegisteredSuccessfully
-from core.utils import make_response_from_model
 
 
 class RegisterView:
@@ -14,4 +14,4 @@ async def register(self, register_request: RegisterRequest):
         except Exception as exc:
             print(exc)
             raise
-        return make_response_from_model(UserRegisteredSuccessfully())
+        return base_response_to_json_response(UserRegisteredSuccessfully())

app/api/v1/auth/schemas/__pycache__/__init__.cpython-39.pyc

@@ -0,0 +1,15 @@
+from http import HTTPStatus
+from typing import List, Any
+
+from core.enums.status_type import StatusType
+from core.schemas.base import BaseResponse
+
+
+class ValidationErrorResponse(BaseResponse):
+    status: str = StatusType.ERROR.value
+    status_type: str = HTTPStatus.UNPROCESSABLE_ENTITY.name
+    message: str = HTTPStatus.UNPROCESSABLE_ENTITY.phrase
+    errors: List = {
+        'field_name': ["validation error message"],
+        'another_field_name': ["validation error message"]
+    }

app/api/v1/auth/schemas/__pycache__/errors.cpython-39.pyc

@@ -16,6 +16,9 @@
 
 
 class RoleModel(Base):
+    def __init__(self):
+        pass
+
     __tablename__ = "roles"
 
     id: int = Column(Integer, primary_key=True, autoincrement=True)
@@ -28,6 +31,9 @@ class RoleModel(Base):
 
 
 class UserModel(Base):
+    def __init__(self):
+        pass
+
     __tablename__ = "users"
 
     id: int = Column(Integer, primary_key=True, autoincrement=True)

app/api/v1/auth/schemas/__pycache__/exceptions.cpython-39.pyc

@@ -4,7 +4,7 @@
 from sqlalchemy.orm import joinedload, lazyload, contains_eager
 
 from core.db.db import database
-from .models import UserModel
+from .models import UserModel, RoleModel, user_roles_table
 from .schemas.requests import UserCreateSchema
 
 
@@ -13,8 +13,22 @@ def __init__(self, db=database):
         self.db = db
 
     async def create_user(self, user: UserCreateSchema):
-        query = insert(UserModel).values(**user.dict())
-        await self.db.execute(query)
+        await self.db.rollback()
+
+        user_dict = user.dict()
+        role_name = user.role
+        del user_dict["role"]
+
+        query = insert(UserModel).values(**user_dict)
+        user = await self.db.execute(query)
+
+        query = select(RoleModel).where(RoleModel.role == role_name)
+        role = await self.db.execute(query)
+        role = role.scalars().first()
+        if role:
+            query = insert(user_roles_table).values({'role_id': role.id, 'user_id': user.inserted_primary_key[0]})
+            await self.db.execute(query)
+
         return await self.db.commit()
 
     async def get_user_by_email(self, email: str):

app/api/v1/auth/schemas/__pycache__/requests.cpython-39.pyc

@@ -3,11 +3,15 @@
 
 from .view import UserView
 from ..shared.role_checker import CheckRole
+from ..shared.schemas.responses import ValidationErrorResponse
 
 user_views = UserView()
 
 user_router = APIRouter(
-    responses={404: {"description": "Not found"}},
+    responses={
+        404: {"description": "Not found"},
+        422: {"description": "Validation Error", "model": ValidationErrorResponse},
+    },
 )
 
 user_router.add_api_route(
@@ -17,5 +21,5 @@
     description="User",
     name="Get All Users",
     response_model_by_alias=False,
-    dependencies=[Depends(CheckRole(['Admin']))],
+    dependencies=[Depends(CheckRole(['landlord']))],
 )

app/api/v1/auth/schemas/__pycache__/responses.cpython-39.pyc

@@ -5,13 +5,13 @@
 
 class DuplicateEmailException(CustomException):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.DUPLICATE_EMAIL.status_code
     status_type = ExceptionStatus.DUPLICATE_EMAIL.name
     message = ExceptionStatus.DUPLICATE_EMAIL.message
+    _status_code = ExceptionStatus.DUPLICATE_EMAIL.status_code
 
 
 class UserNotFoundException(CustomException):
     status = StatusType.ERROR.value
-    status_code = ExceptionStatus.USER_NOT_FOUND.status_code
     status_type = ExceptionStatus.USER_NOT_FOUND.name
     message = ExceptionStatus.USER_NOT_FOUND.message
+    _status_code = ExceptionStatus.USER_NOT_FOUND.status_code

app/api/v1/auth/schemas/errors.py

@@ -6,3 +6,4 @@ class UserCreateSchema(BaseModel):
     email: EmailStr
     phone: str
     password: str
+    role: str

app/api/v1/auth/schemas/exceptions.py

@@ -23,6 +23,9 @@ async def custom_exception_handler(request: Request, exc: CustomException):
     @app_.exception_handler(RequestValidationError)
     async def validation_exception_handler(request: Request, exc: RequestValidationError):
         reformatted_message = defaultdict(list)
+        field_string = ''
+        msg = ''
+
         for pydantic_error in exc.errors():
             loc, msg, error_type = pydantic_error["loc"], pydantic_error["msg"], pydantic_error["type"]
 
@@ -34,7 +37,7 @@ async def validation_exception_handler(request: Request, exc: RequestValidationE
             reformatted_message[field_string].append(msg)
 
         return JSONResponse(
-            status_code=UnprocessableEntity.status_code,
+            status_code=UnprocessableEntity().status_code,
             content={
                 "status": UnprocessableEntity.status,
                 "status_type": UnprocessableEntity.status_type,