diff --git a/alembic/versions/3f455aaf9065_update_user_model_from_is_super_admin_.py b/alembic/versions/3f455aaf9065_update_user_model_from_is_super_admin_.py new file mode 100644 index 000000000..1a82ccf2a --- /dev/null +++ b/alembic/versions/3f455aaf9065_update_user_model_from_is_super_admin_.py @@ -0,0 +1,32 @@ +"""update user model from is_super_admin to is_superadmin + +Revision ID: 3f455aaf9065 +Revises: ff92a0037698 +Create Date: 2024-08-10 03:45:26.585225 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '3f455aaf9065' +down_revision: Union[str, None] = 'ff92a0037698' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('is_superadmin', sa.Boolean(), server_default=sa.text('false'), nullable=True)) + op.drop_column('users', 'is_super_admin') + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('is_super_admin', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=True)) + op.drop_column('users', 'is_superadmin') + # ### end Alembic commands ### diff --git a/api/utils/db_validators.py b/api/utils/db_validators.py index 1a3469bad..b80202c89 100644 --- a/api/utils/db_validators.py +++ b/api/utils/db_validators.py @@ -18,7 +18,7 @@ def check_model_existence(db: Session, model, id): def check_user_in_org(user: User, organization: Organization): """Checks if a user is a member of an organization""" - if user not in organization.users and not user.is_super_admin: + if user not in organization.users and not user.is_superadmin: raise HTTPException( status_code=status.HTTP_400_BAD_REQUEST, detail="You are not a member of this organization", diff --git a/api/utils/dependencies.py b/api/utils/dependencies.py index 4b4100f7b..c1e540504 100644 --- a/api/utils/dependencies.py +++ b/api/utils/dependencies.py @@ -48,7 +48,7 @@ def get_current_user( def get_super_admin(db: Session = Depends(get_db), token: str = Depends(oauth2_scheme)): user = get_current_user(db, token) - if not user.is_super_admin: + if not user.is_superadmin: logger.error("User is not a super admin") raise HTTPException( status_code=status.HTTP_403_FORBIDDEN, diff --git a/api/utils/pagination.py b/api/utils/pagination.py index cc212427b..daf99ee3b 100644 --- a/api/utils/pagination.py +++ b/api/utils/pagination.py @@ -96,7 +96,7 @@ def paginated_response( results, exclude={ 'password', - 'is_super_admin', + 'is_superadmin', 'is_deleted', 'is_active' } diff --git a/api/utils/success_response.py b/api/utils/success_response.py index 3048bf2d8..321c13a37 100644 --- a/api/utils/success_response.py +++ b/api/utils/success_response.py @@ -16,3 +16,18 @@ def success_response(status_code: int, message: str, data: Optional[dict] = None response_data["data"] = data return JSONResponse(status_code=status_code, content=jsonable_encoder(response_data)) + + +def auth_response(status_code: int, message: str, access_token: str, data: Optional[dict] = None): + '''Returns a JSON response for successful auth responses''' + + response_data = { + "status_code": status_code, + "message": message, + "access_token": access_token + } + + if data is not None: + response_data["data"] = data + + return JSONResponse(status_code=status_code, content=jsonable_encoder(response_data)) diff --git a/api/v1/models/product.py b/api/v1/models/product.py index 9328543b7..e56acc123 100644 --- a/api/v1/models/product.py +++ b/api/v1/models/product.py @@ -47,7 +47,8 @@ class Product(BaseTableModel): ) archived = Column(Boolean, default=False) filter_status = Column( - SQLAlchemyEnum(ProductFilterStatusEnum), default=ProductFilterStatusEnum.active) + SQLAlchemyEnum(ProductFilterStatusEnum), default=ProductFilterStatusEnum.active + ) variants = relationship( "ProductVariant", back_populates="product", cascade="all, delete-orphan" diff --git a/api/v1/models/user.py b/api/v1/models/user.py index b33da7f5f..509e25417 100644 --- a/api/v1/models/user.py +++ b/api/v1/models/user.py @@ -16,7 +16,7 @@ class User(BaseTableModel): last_name = Column(String, nullable=True) avatar_url = Column(String, nullable=True) is_active = Column(Boolean, server_default=text("true")) - is_super_admin = Column(Boolean, server_default=text("false")) + is_superadmin = Column(Boolean, server_default=text("false")) is_deleted = Column(Boolean, server_default=text("false")) is_verified = Column(Boolean, server_default=text("false")) diff --git a/api/v1/routes/auth.py b/api/v1/routes/auth.py index 2de798942..a9e4a798f 100644 --- a/api/v1/routes/auth.py +++ b/api/v1/routes/auth.py @@ -5,7 +5,7 @@ from sqlalchemy.orm import Session from api.core.dependencies.email_sender import send_email -from api.utils.success_response import success_response +from api.utils.success_response import auth_response, success_response from api.utils.send_mail import send_magic_link from api.v1.models import User from api.v1.schemas.user import Token @@ -21,7 +21,7 @@ auth = APIRouter(prefix="/auth", tags=["Authentication"]) -@auth.post("/register", status_code=status.HTTP_201_CREATED, response_model=success_response) +@auth.post("/register", status_code=status.HTTP_201_CREATED, response_model=auth_response) def register(background_tasks: BackgroundTasks, response: Response, user_schema: UserCreate, db: Session = Depends(get_db)): '''Endpoint for a user to register their account''' @@ -29,8 +29,10 @@ def register(background_tasks: BackgroundTasks, response: Response, user_schema: user = user_service.create(db=db, schema=user_schema) # create an organization for the user - org = CreateUpdateOrganization(name=f"{user.first_name}'s Organization", - email=user.email) + org = CreateUpdateOrganization( + name=f"{user.first_name}'s Organization", + email=user.email + ) user_org = organization_service.create(db=db, schema=org, user=user) # Create access and refresh tokens @@ -49,18 +51,15 @@ def register(background_tasks: BackgroundTasks, response: Response, user_schema: } ) - response = JSONResponse( + response = auth_response( status_code=201, - content={ - 'status_code': 201, - 'message': 'User created successfully', - 'access_token': access_token, - 'data': { - 'user': jsonable_encoder( - user, - exclude=['password', 'is_super_admin', 'is_deleted', 'is_verified', 'updated_at'] - ) - } + message='User created successfully', + access_token=access_token, + data={ + 'user': jsonable_encoder( + user, + exclude=['password', 'is_deleted', 'is_verified', 'updated_at'] + ) } ) @@ -77,7 +76,7 @@ def register(background_tasks: BackgroundTasks, response: Response, user_schema: return response -@auth.post(path="/register-super-admin", status_code=status.HTTP_201_CREATED) +@auth.post(path="/register-super-admin", status_code=status.HTTP_201_CREATED, response_model=auth_response) def register_as_super_admin(user: UserCreate, db: Session = Depends(get_db)): """Endpoint for super admin creation""" @@ -87,18 +86,15 @@ def register_as_super_admin(user: UserCreate, db: Session = Depends(get_db)): access_token = user_service.create_access_token(user_id=user.id) refresh_token = user_service.create_refresh_token(user_id=user.id) - response = JSONResponse( + response = auth_response( status_code=201, - content={ - 'status_code': 201, - 'message': 'User created successfully', - 'access_token': access_token, - 'data': { - 'user': jsonable_encoder( - user, - exclude=['password', 'is_super_admin', 'is_deleted', 'is_verified', 'updated_at'] - ) - } + message='User created successfully', + access_token=access_token, + data={ + 'user': jsonable_encoder( + user, + exclude=['password', 'is_deleted', 'is_verified', 'updated_at'] + ) } ) @@ -115,7 +111,7 @@ def register_as_super_admin(user: UserCreate, db: Session = Depends(get_db)): return response -@auth.post("/login", status_code=status.HTTP_200_OK, response_model=success_response) +@auth.post("/login", status_code=status.HTTP_200_OK, response_model=auth_response) def login(login_request: LoginRequest, db: Session = Depends(get_db)): """Endpoint to log in a user""" @@ -128,18 +124,15 @@ def login(login_request: LoginRequest, db: Session = Depends(get_db)): access_token = user_service.create_access_token(user_id=user.id) refresh_token = user_service.create_refresh_token(user_id=user.id) - response = JSONResponse( + response = auth_response( status_code=200, - content={ - 'status_code': 200, - 'message': 'Login successful', - 'access_token': access_token, - 'data': { - 'user': jsonable_encoder( - user, - exclude=['password', 'is_super_admin', 'is_deleted', 'is_verified', 'updated_at'] - ) - } + message='Login successful', + access_token=access_token, + data={ + 'user': jsonable_encoder( + user, + exclude=['password', 'is_deleted', 'is_verified', 'updated_at'] + ) } ) @@ -186,13 +179,10 @@ def refresh_access_token( current_refresh_token=current_refresh_token ) - response = success_response( + response = auth_response( status_code=200, - message="Tokens refreshed successfully", - data={ - "access_token": access_token, - "token_type": "bearer", - }, + message='Login successful', + access_token=access_token ) # Add refresh token to cookies @@ -228,7 +218,7 @@ async def request_signin_token( ) -@auth.post("/verify-token", status_code=status.HTTP_200_OK) +@auth.post("/verify-token", status_code=status.HTTP_200_OK, response_model=auth_response) async def verify_signin_token( token_schema: TokenRequest, db: Session = Depends(get_db) ): @@ -240,13 +230,17 @@ async def verify_signin_token( access_token = user_service.create_access_token(user_id=user.id) refresh_token = user_service.create_refresh_token(user_id=user.id) - response = success_response( + + response = auth_response( status_code=200, - message="Sign in successful", + message='Login successful', + access_token=access_token, data={ - "access_token": access_token, - "token_type": "bearer", - }, + 'user': jsonable_encoder( + user, + exclude=['password', 'is_deleted', 'is_verified', 'updated_at'] + ) + } ) # Add refresh token to cookies @@ -262,23 +256,36 @@ async def verify_signin_token( return response -# Verify Magic Link -@auth.post("/verify-magic-link") +# TODO: Fix magic link authentication +@auth.post("/magic-link", status_code=status.HTTP_200_OK) +def request_magic_link( + request: MagicLinkRequest, response: Response, db: Session = Depends(get_db) +): + user = user_service.fetch_by_email(db=db, email=request.email) + access_token = user_service.create_access_token(user_id=user.id) + send_magic_link(user.email, access_token) + + response = success_response( + status_code=200, message=f"Magic link sent to {user.email}" + ) + return response + + +@auth.post("/magic-link/verify") async def verify_magic_link(token_schema: Token, db: Session = Depends(get_db)): user, access_token = AuthService.verify_magic_token(token_schema.access_token, db) refresh_token = user_service.create_refresh_token(user_id=user.id) - response = success_response( + response = auth_response( status_code=200, message='Login successful', + access_token=access_token, data={ - 'access_token': access_token, - 'token_type': 'bearer', 'user': jsonable_encoder( - user, - exclude=['password', 'is_super_admin', 'is_deleted', 'is_verified', 'updated_at'] - ), + user, + exclude=['password', 'is_deleted', 'is_verified', 'updated_at'] + ) } ) @@ -293,19 +300,3 @@ async def verify_magic_link(token_schema: Token, db: Session = Depends(get_db)): ) return response - - - - -@auth.post("/request-magic-link", status_code=status.HTTP_200_OK) -def request_magic_link( - request: MagicLinkRequest, response: Response, db: Session = Depends(get_db) -): - user = user_service.fetch_by_email(db=db, email=request.email) - access_token = user_service.create_access_token(user_id=user.id) - send_magic_link(user.email, access_token) - - response = success_response( - status_code=200, message=f"Magic link sent to {user.email}" - ) - return response diff --git a/api/v1/routes/faq.py b/api/v1/routes/faq.py index 724c07b52..a30964c21 100644 --- a/api/v1/routes/faq.py +++ b/api/v1/routes/faq.py @@ -15,11 +15,7 @@ @faq.get("", response_model=success_response, status_code=200) -async def get_all_faqs( - db: Session = Depends(get_db), - # limit: int = 10, - # skip: int = 0, -): +async def get_all_faqs(db: Session = Depends(get_db),): """Endpoint to get all FAQs""" faqs = faq_service.fetch_all(db=db) @@ -30,13 +26,6 @@ async def get_all_faqs( data=jsonable_encoder(faqs), ) - # return paginated_response( - # db=db, - # model=FAQ, - # limit=limit, - # skip=skip, - # ) - @faq.post("", response_model=success_response, status_code=201) async def create_faq( @@ -80,7 +69,7 @@ async def update_faq( return success_response( data=jsonable_encoder(faq), - message="Successfully created FAQ", + message="FAQ created successfully", status_code=status.HTTP_200_OK, ) @@ -96,6 +85,6 @@ async def delete_faq( faq_service.delete(db, faq_id=id) return success_response( - message="Successfully deleted FAQ", + message="FAQ successfully deleted", status_code=200, ) diff --git a/api/v1/routes/google_login.py b/api/v1/routes/google_login.py index a3552295b..da0aac448 100644 --- a/api/v1/routes/google_login.py +++ b/api/v1/routes/google_login.py @@ -10,6 +10,7 @@ from api.db.database import get_db from api.core.dependencies.google_oauth_config import google_oauth +from api.v1.schemas.organization import CreateUpdateOrganization from api.v1.services.google_oauth import GoogleOauthServices from api.utils.success_response import success_response from api.v1.schemas.google_oauth import OAuthToken @@ -49,7 +50,7 @@ async def google_login(background_tasks: BackgroundTasks, token_request: OAuthTo "data": { "user": jsonable_encoder( user, - exclude=['password', 'is_super_admin', 'is_deleted', 'is_verified', 'updated_at'] + exclude=['password', 'is_superadmin', 'is_deleted', 'is_verified', 'updated_at'] ) } } diff --git a/api/v1/routes/permissions/roles.py b/api/v1/routes/permissions/roles.py index 65a555021..0722af674 100644 --- a/api/v1/routes/permissions/roles.py +++ b/api/v1/routes/permissions/roles.py @@ -40,7 +40,7 @@ def create_built_in_role_endpoint( db: Session = Depends(get_db), current_user: User = Depends(user_service.get_current_super_admin), ): # Only super admin can create - if not current_user.is_super_admin: + if not current_user.is_superadmin: raise HTTPException( status_code=status.HTTP_403_FORBIDDEN, detail="Only super admins can create built-in roles.", @@ -169,7 +169,7 @@ def update_builtin_role_endpoint( db: Session = Depends(get_db), current_user: User = Depends(user_service.get_current_super_admin) ): - if not current_user.is_super_admin: + if not current_user.is_superadmin: raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Only super admins can update built-in roles.") # Ensure it's a built-in role role_update.is_builtin = True diff --git a/api/v1/routes/user.py b/api/v1/routes/user.py index 7819cc5f7..821f81721 100644 --- a/api/v1/routes/user.py +++ b/api/v1/routes/user.py @@ -32,7 +32,6 @@ def get_current_user_details( current_user, exclude=[ "password", - "is_super_admin", "is_deleted", "is_verified", "updated_at", @@ -81,7 +80,7 @@ def update_current_user( message='User Updated Successfully', data= jsonable_encoder( user, - exclude=['password', 'is_super_admin', 'is_deleted', 'is_verified', 'updated_at', 'created_at', 'is_active'] + exclude=['password', 'is_deleted', 'is_verified', 'updated_at', 'created_at', 'is_active'] ) ) @@ -100,7 +99,7 @@ def update_user( message='User Updated Successfully', data= jsonable_encoder( user, - exclude=['password', 'is_super_admin', 'is_deleted', 'is_verified', 'updated_at', 'created_at', 'is_active'] + exclude=['password', 'is_superadmin', 'is_deleted', 'is_verified', 'updated_at', 'created_at', 'is_active'] ) ) @@ -138,7 +137,7 @@ async def get_users( is_active: Optional[bool] = Query(None), is_deleted: Optional[bool] = Query(None), is_verified: Optional[bool] = Query(None), - is_super_admin: Optional[bool] = Query(None) + is_superadmin: Optional[bool] = Query(None) ): """ Retrieves all users. @@ -150,7 +149,7 @@ async def get_users( is_active: boolean to filter active users is_deleted: boolean to filter deleted users is_verified: boolean to filter verified users - is_super_admin: boolean to filter users that are super admin + is_superadmin: boolean to filter users that are super admin Returns: UserData """ @@ -158,7 +157,7 @@ async def get_users( 'is_active': is_active, 'is_deleted': is_deleted, 'is_verified': is_verified, - 'is_super_admin': is_super_admin, + 'is_superadmin': is_superadmin, } return user_service.fetch_all(db, page, per_page, **query_params) @@ -224,6 +223,6 @@ def get_user_by_id( message='User retrieved successfully', data = jsonable_encoder( user, - exclude=['password', 'is_super_admin', 'is_deleted', 'is_verified', 'updated_at', 'created_at', 'is_active'] + exclude=['password', 'is_superadmin', 'is_deleted', 'is_verified', 'updated_at', 'created_at', 'is_active'] ) ) diff --git a/api/v1/schemas/user.py b/api/v1/schemas/user.py index 809d561d3..af4713662 100644 --- a/api/v1/schemas/user.py +++ b/api/v1/schemas/user.py @@ -22,7 +22,6 @@ class UserCreate(BaseModel): password: str first_name: str last_name: str - admin_secret: Optional[str] = None @field_validator("password") @classmethod @@ -41,6 +40,7 @@ class UserUpdate(BaseModel): first_name : Optional[str] = None last_name : Optional[str] = None email : Optional[str] = None + class UserData(BaseModel): """ Schema for users to be returned to superadmin @@ -52,14 +52,12 @@ class UserData(BaseModel): is_active: bool is_deleted: bool is_verified: bool - is_super_admin: bool + is_superadmin: bool created_at: datetime updated_at: datetime - model_config = ConfigDict(from_attributes=True) - class AllUsersResponse(BaseModel): """ Schema for all users @@ -83,7 +81,7 @@ class AdminCreateUser(BaseModel): is_active: bool = False is_deleted: bool = False is_verified: bool = False - is_super_admin: bool = False + is_superadmin: bool = False model_config = ConfigDict(from_attributes=True) diff --git a/api/v1/services/analytics.py b/api/v1/services/analytics.py index 5645e64b3..de6c40fd8 100644 --- a/api/v1/services/analytics.py +++ b/api/v1/services/analytics.py @@ -43,7 +43,7 @@ def get_analytics_line_chart(self, token: Annotated[OAuth2, Depends(oauth2_schem user: object = user_service.get_current_user(access_token=token, db=db) # check if the analytics-line-data is for org admin - if not user.is_super_admin: + if not user.is_superadmin: user_organization: object = (db.query(user_organization_association) .filter_by(user_id=user.id).first()) if not user_organization: @@ -58,7 +58,7 @@ def get_analytics_line_chart(self, token: Annotated[OAuth2, Depends(oauth2_schem message: str = 'Successfully retrieved line-charts' # check if user is a super admin - elif user.is_super_admin: + elif user.is_superadmin: data = self.get_line_chart_data(db) message: str = 'Successfully retrieved line-charts for super_admin' @@ -141,7 +141,7 @@ def get_analytics_summary(self, token: Annotated[OAuth2, Depends(oauth2_scheme)] """ user: object = user_service.get_current_user(access_token=token, db=db) - if user.is_super_admin: + if user.is_superadmin: data = self.get_summary_data_super_admin(db, start_date, end_date) message = "Admin Statistics Fetched" else: diff --git a/api/v1/services/user.py b/api/v1/services/user.py index ecbdb963f..fbe44f97c 100644 --- a/api/v1/services/user.py +++ b/api/v1/services/user.py @@ -133,8 +133,6 @@ def fetch_by_email(self, db: Session, email): def create(self, db: Session, schema: user.UserCreate): """Creates a new user""" - del schema.admin_secret - if db.query(User).filter(User.email == schema.email).first(): raise HTTPException( status_code=400, @@ -205,8 +203,6 @@ def super_admin_create_user( def create_admin(self, db: Session, schema: user.UserCreate): """Creates a new admin""" - del schema.admin_secret - if db.query(User).filter(User.email == schema.email).first(): raise HTTPException( status_code=400, @@ -223,23 +219,26 @@ def create_admin(self, db: Session, schema: user.UserCreate): db.refresh(user) # Set user to super admin - user.is_super_admin = True + user.is_superadmin = True db.commit() return user def update(self, db: Session, current_user: User, schema: user.UserUpdate, id=None): """Function to update a User""" + # Get user from access token if provided, otherwise fetch user by id if db.query(User).filter(User.email == schema.email).first(): raise HTTPException( status_code=400, detail="User with this email or username already exists", ) - if current_user.is_super_admin and id is not None: - user = self.fetch(db=db, id=id) - else: - user = self.fetch(db=db, id=current_user.id) + + user = (self.fetch(db=db, id=id) + if current_user.is_superadmin and id is not None + else self.fetch(db=db, id=current_user.id) + ) + update_data = schema.dict(exclude_unset=True) for key, value in update_data.items(): setattr(user, key, value) @@ -467,7 +466,7 @@ def get_current_super_admin( ): """Get the current super admin""" user = self.get_current_user(db=db, access_token=token) - if not user.is_super_admin: + if not user.is_superadmin: raise HTTPException( status_code=403, detail="You do not have permission to access this resource", diff --git a/main.py b/main.py index f75185f1d..c13eb6496 100644 --- a/main.py +++ b/main.py @@ -25,7 +25,12 @@ async def lifespan(app: FastAPI): yield -app = FastAPI(lifespan=lifespan) +app = FastAPI( + lifespan=lifespan, + title="HNG Boilerplate", + description="A boilerplate for creating an API using FastAPI and SQLAlchemy", + version="1.0.0", +) # Set up email templates and css static files email_templates = Jinja2Templates(directory='api/core/dependencies/email/templates') diff --git a/requirements.txt b/requirements.txt index e2b1267d6..c03d6bba9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -104,7 +104,7 @@ typing_extensions==4.12.2 urllib3==2.2.2 uuid7==0.1.0 uvicorn==0.30.3 -# uvloop==0.19.0 +uvloop==0.19.0 virtualenv==20.26.3 watchfiles==0.22.0 webencodings==0.5.1 diff --git a/scripts/seed.py b/scripts/seed.py index 4224a13bd..1ee06d7b3 100644 --- a/scripts/seed.py +++ b/scripts/seed.py @@ -78,7 +78,7 @@ first_name="Admin", last_name="User", is_active=True, - is_super_admin=True, + is_superadmin=True, is_deleted=False, is_verified=True, ) diff --git a/scripts/seed3.py b/scripts/seed3.py index 536f976f0..b137deb0b 100644 --- a/scripts/seed3.py +++ b/scripts/seed3.py @@ -25,7 +25,7 @@ first_name="Admin", last_name="User", is_active=True, - is_super_admin=True, + is_superadmin=True, is_deleted=False, is_verified=True, ) @@ -41,7 +41,7 @@ first_name=fake.file_name(), last_name=fake.last_name(), is_active=True, - is_super_admin=True, + is_superadmin=True, is_deleted=False, is_verified=True, ) diff --git a/seed.py b/seed.py index 15b5a05d7..b4423180c 100644 --- a/seed.py +++ b/seed.py @@ -13,7 +13,7 @@ first_name="Habeeb", last_name="Habeeb", is_active=True, - is_super_admin=True, + is_superadmin=True, is_deleted=False, is_verified=True, ) diff --git a/tests/v1/activity_logs/test_delete_activity_log.py b/tests/v1/activity_logs/test_delete_activity_log.py index b5b22c914..75a0ab3fb 100644 --- a/tests/v1/activity_logs/test_delete_activity_log.py +++ b/tests/v1/activity_logs/test_delete_activity_log.py @@ -20,7 +20,7 @@ def mock_user_service(): """Fixture to mock the user service.""" mock_user_service = MagicMock() mock_user_service.create_access_token.return_value = "mocked_access_token" - mock_user_service.get_current_super_admin = MagicMock(return_value=MagicMock(is_super_admin=True)) + mock_user_service.get_current_super_admin = MagicMock(return_value=MagicMock(is_superadmin=True)) return mock_user_service def test_delete_activity_log(mock_db_session, mock_user_service): diff --git a/tests/v1/activity_logs/test_get_a_user_activity_logs.py b/tests/v1/activity_logs/test_get_a_user_activity_logs.py index aad04ec30..997c7ffd8 100644 --- a/tests/v1/activity_logs/test_get_a_user_activity_logs.py +++ b/tests/v1/activity_logs/test_get_a_user_activity_logs.py @@ -34,7 +34,7 @@ def mock_user_service(): yield mock_service -def create_mock_user(mock_user_service, mock_db_session, is_super_admin=True): +def create_mock_user(mock_user_service, mock_db_session, is_superadmin=True): """Create a mock user in the mock database session.""" mock_user = User( id=str(uuid7()), @@ -43,7 +43,7 @@ def create_mock_user(mock_user_service, mock_db_session, is_super_admin=True): first_name='Test', last_name='User', is_active=True, - is_super_admin=is_super_admin, + is_superadmin=is_superadmin, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -98,7 +98,7 @@ def test_get_all_activity_logs_with_data(mock_user_service, mock_db_session): def test_get_all_activity_logs_non_super_admin(mock_user_service, mock_db_session): """Test for fetching all activity logs as a non-super admin user.""" mock_user = create_mock_user( - mock_user_service, mock_db_session, is_super_admin=False) + mock_user_service, mock_db_session, is_superadmin=False) access_token = user_service.create_access_token(user_id=str(uuid7())) response = client.get(ACTIVITY_LOGS_ENDPOINT, headers={ 'Authorization': f'Bearer {access_token}'}) diff --git a/tests/v1/activity_logs/test_get_all_logs.py b/tests/v1/activity_logs/test_get_all_logs.py index 0b2e1c583..48593f50c 100644 --- a/tests/v1/activity_logs/test_get_all_logs.py +++ b/tests/v1/activity_logs/test_get_all_logs.py @@ -34,7 +34,7 @@ def mock_user_service(): yield mock_service -def create_mock_user(mock_user_service, mock_db_session, is_super_admin=True): +def create_mock_user(mock_user_service, mock_db_session, is_superadmin=True): """Create a mock user in the mock database session.""" mock_user = User( id=str(uuid7()), @@ -43,7 +43,7 @@ def create_mock_user(mock_user_service, mock_db_session, is_super_admin=True): first_name='Test', last_name='User', is_active=True, - is_super_admin=is_super_admin, + is_superadmin=is_superadmin, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -98,7 +98,7 @@ def test_get_all_activity_logs_with_data(mock_user_service, mock_db_session): def test_get_all_activity_logs_non_super_admin(mock_user_service, mock_db_session): """Test for fetching all activity logs as a non-super admin user.""" mock_user = create_mock_user( - mock_user_service, mock_db_session, is_super_admin=False) + mock_user_service, mock_db_session, is_superadmin=False) access_token = user_service.create_access_token(user_id=str(uuid7())) response = client.get(ACTIVITY_LOGS_ENDPOINT, headers={ 'Authorization': f'Bearer {access_token}'}) diff --git a/tests/v1/analytics/test_analytics_summary.py b/tests/v1/analytics/test_analytics_summary.py index d9237d1dc..882d39a43 100644 --- a/tests/v1/analytics/test_analytics_summary.py +++ b/tests/v1/analytics/test_analytics_summary.py @@ -28,12 +28,12 @@ def mock_oauth2_scheme(mocker): @pytest.fixture def mock_get_current_user_super_admin(mocker): - return mocker.patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_super_admin=True, id="super_admin_id")) + return mocker.patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_superadmin=True, id="super_admin_id")) @pytest.fixture def mock_get_current_user_user(mocker): - return mocker.patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_super_admin=False, id="user_id", organization_id="org_id")) + return mocker.patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_superadmin=False, id="user_id", organization_id="org_id")) @pytest.fixture diff --git a/tests/v1/analytics/test_line_chart_data.py b/tests/v1/analytics/test_line_chart_data.py index 6cf97afe9..e628c5f43 100644 --- a/tests/v1/analytics/test_line_chart_data.py +++ b/tests/v1/analytics/test_line_chart_data.py @@ -39,7 +39,7 @@ def test_get_analytics_line_chart_super_admin(mock_db, mock_user_service, mock_o """ # Arrange mock_user = MagicMock() - mock_user.is_super_admin = True + mock_user.is_superadmin = True mock_user_service.return_value = mock_user mock_db.query.return_value.filter_by.return_value.first.return_value = None @@ -60,7 +60,7 @@ def test_get_analytics_line_chart_non_super_admin(mock_db, mock_user_service, mo """ # Arrange mock_user = MagicMock() - mock_user.is_super_admin = False + mock_user.is_superadmin = False mock_user_service.return_value = mock_user mock_user_organization = MagicMock() @@ -82,7 +82,7 @@ def test_get_analytics_line_chart_no_org(mock_db, mock_user_service, mock_oauth2 """ # Arrange mock_user = MagicMock() - mock_user.is_super_admin = False + mock_user.is_superadmin = False mock_user_service.return_value = mock_user mock_db.query.return_value.filter_by.return_value.first.return_value = None diff --git a/tests/v1/auth/test_magic_link.py b/tests/v1/auth/test_magic_link.py index f906dd957..30f9a7285 100644 --- a/tests/v1/auth/test_magic_link.py +++ b/tests/v1/auth/test_magic_link.py @@ -11,7 +11,7 @@ client = TestClient(app) -MAGIC_ENDPOINT = '/api/v1/auth/request-magic-link' +MAGIC_ENDPOINT = '/api/v1/auth/magic-link' @pytest.fixture @@ -45,7 +45,7 @@ def test_request_magic_link(mock_user_service, mock_db_session): first_name='Test', last_name='User', is_active=False, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/auth/test_signin.py b/tests/v1/auth/test_signin.py index 39d4919eb..b4cbe677d 100644 --- a/tests/v1/auth/test_signin.py +++ b/tests/v1/auth/test_signin.py @@ -41,7 +41,7 @@ def test_user_login(db_session_mock): first_name='Test', last_name='User', is_active=False, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/auth/test_token_auth.py b/tests/v1/auth/test_token_auth.py index a46559a20..c931fc224 100644 --- a/tests/v1/auth/test_token_auth.py +++ b/tests/v1/auth/test_token_auth.py @@ -40,4 +40,4 @@ def test_verify_signin_token(client, db_session_mock): response = client.post("/api/v1/auth/verify-token", json={"email": "user@example.com", "token": "123456"}) assert response.status_code == 200 - assert "access_token" in response.json()["data"] + assert "access_token" in response.json() diff --git a/tests/v1/auth/test_verify_magic_link.py b/tests/v1/auth/test_verify_magic_link.py index 074c73b5a..4d28add5c 100644 --- a/tests/v1/auth/test_verify_magic_link.py +++ b/tests/v1/auth/test_verify_magic_link.py @@ -32,7 +32,7 @@ def create_mock_user(mock_db_session): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -44,7 +44,7 @@ def test_verify_magic_link(client, db_session_mock): user = create_mock_user(db_session_mock) token = user_service.create_access_token(user_id=user.id) - response = client.post("/api/v1/auth/verify-magic-link", json={ + response = client.post("/api/v1/auth/magic-link/verify", json={ "access_token": token, "token_type": "access" }) @@ -52,5 +52,5 @@ def test_verify_magic_link(client, db_session_mock): data = response.json() print(data) assert data['message'] == 'Login successful' - assert data['data']['access_token'] == token + assert data['access_token'] == token diff --git a/tests/v1/billing_plan/test_billing_plan.py b/tests/v1/billing_plan/test_billing_plan.py index 0fd185658..6690e2d37 100644 --- a/tests/v1/billing_plan/test_billing_plan.py +++ b/tests/v1/billing_plan/test_billing_plan.py @@ -41,7 +41,7 @@ def create_mock_user(mock_user_service, mock_db_session): first_name="Test", last_name="User", is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/billing_plan/test_delete_billing_plan.py b/tests/v1/billing_plan/test_delete_billing_plan.py index 5e31cb6af..70b942702 100644 --- a/tests/v1/billing_plan/test_delete_billing_plan.py +++ b/tests/v1/billing_plan/test_delete_billing_plan.py @@ -41,7 +41,7 @@ def create_mock_user(mock_user_service, mock_db_session): first_name="Test", last_name="User", is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/billing_plan/test_get_billing_plan.py b/tests/v1/billing_plan/test_get_billing_plan.py index 150ec67d7..8e29c3c14 100644 --- a/tests/v1/billing_plan/test_get_billing_plan.py +++ b/tests/v1/billing_plan/test_get_billing_plan.py @@ -37,7 +37,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/billing_plan/test_update_billing_plan.py b/tests/v1/billing_plan/test_update_billing_plan.py index 3374f4254..a1164115b 100644 --- a/tests/v1/billing_plan/test_update_billing_plan.py +++ b/tests/v1/billing_plan/test_update_billing_plan.py @@ -41,7 +41,7 @@ def create_mock_user(mock_user_service, mock_db_session): first_name="Test", last_name="User", is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/blog/delete_blog_test.py b/tests/v1/blog/delete_blog_test.py index 61f5dcbad..305e95bef 100644 --- a/tests/v1/blog/delete_blog_test.py +++ b/tests/v1/blog/delete_blog_test.py @@ -18,7 +18,7 @@ def mock_get_db(): def mock_get_current_super_admin(): - return User(id="1", is_super_admin=True) + return User(id="1", is_superadmin=True) @pytest.fixture def db_session_mock(): diff --git a/tests/v1/dashboard/test_get_products.py b/tests/v1/dashboard/test_get_products.py index 4f994a38e..91f9aa081 100644 --- a/tests/v1/dashboard/test_get_products.py +++ b/tests/v1/dashboard/test_get_products.py @@ -38,7 +38,7 @@ def test_user(): first_name="test", last_name="user", is_active=True, - is_super_admin=True + is_superadmin=True ) @pytest.fixture() diff --git a/tests/v1/email_template/test_add_email_template.py b/tests/v1/email_template/test_add_email_template.py index 68d0cce00..7ac92c08a 100644 --- a/tests/v1/email_template/test_add_email_template.py +++ b/tests/v1/email_template/test_add_email_template.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -36,7 +36,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/email_template/test_delete_template.py b/tests/v1/email_template/test_delete_template.py index ac6144315..884a2528b 100644 --- a/tests/v1/email_template/test_delete_template.py +++ b/tests/v1/email_template/test_delete_template.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), deleted_at=datetime.now(timezone.utc) ) @@ -36,7 +36,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/email_template/test_fetch_all_templates.py b/tests/v1/email_template/test_fetch_all_templates.py index bbfa808ae..c61861a03 100644 --- a/tests/v1/email_template/test_fetch_all_templates.py +++ b/tests/v1/email_template/test_fetch_all_templates.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -36,7 +36,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/email_template/test_get_single_template.py b/tests/v1/email_template/test_get_single_template.py index 69522f803..3c47c2b5e 100644 --- a/tests/v1/email_template/test_get_single_template.py +++ b/tests/v1/email_template/test_get_single_template.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -36,7 +36,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/email_template/test_update_template.py b/tests/v1/email_template/test_update_template.py index d7d7909ac..49ecf94f9 100644 --- a/tests/v1/email_template/test_update_template.py +++ b/tests/v1/email_template/test_update_template.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -36,7 +36,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/faq/create_faq_test.py b/tests/v1/faq/create_faq_test.py index 01b7ff110..c233a9ef7 100644 --- a/tests/v1/faq/create_faq_test.py +++ b/tests/v1/faq/create_faq_test.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -36,7 +36,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/faq/delete_faq_test.py b/tests/v1/faq/delete_faq_test.py index 37c915765..82744fc04 100644 --- a/tests/v1/faq/delete_faq_test.py +++ b/tests/v1/faq/delete_faq_test.py @@ -23,7 +23,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/faq/get_single_faq_test.py b/tests/v1/faq/get_single_faq_test.py index 7aff0c23d..ff97d900e 100644 --- a/tests/v1/faq/get_single_faq_test.py +++ b/tests/v1/faq/get_single_faq_test.py @@ -23,7 +23,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/faq/update_faq_test.py b/tests/v1/faq/update_faq_test.py index 0a0f4832d..a6a938108 100644 --- a/tests/v1/faq/update_faq_test.py +++ b/tests/v1/faq/update_faq_test.py @@ -23,7 +23,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/invitation/test_delete_all_invitations.py b/tests/v1/invitation/test_delete_all_invitations.py index acbc3bb94..209f6373d 100644 --- a/tests/v1/invitation/test_delete_all_invitations.py +++ b/tests/v1/invitation/test_delete_all_invitations.py @@ -63,7 +63,7 @@ def test_delete_all_invite_forbidden(self, client): app.dependency_overrides[get_db] = mock_db app.dependency_overrides[oauth2_scheme] = mock_oauth - with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_super_admin=False)) as cu: + with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_superadmin=False)) as cu: response = client.delete(DELETE_ENDPOINT) assert response.status_code == 403 assert response.json()['message'] == 'You do not have permission to access this resource' diff --git a/tests/v1/invitation/test_delete_invitation.py b/tests/v1/invitation/test_delete_invitation.py index 9f01222b0..6d0d48883 100644 --- a/tests/v1/invitation/test_delete_invitation.py +++ b/tests/v1/invitation/test_delete_invitation.py @@ -66,7 +66,7 @@ def test_delete_invite_forbidden(self, client): app.dependency_overrides[get_db] = mock_db app.dependency_overrides[oauth2_scheme] = mock_oauth - with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_super_admin=False)) as cu: + with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_superadmin=False)) as cu: response = client.delete(DELETE_ENDPOINT) assert response.status_code == 403 assert response.json()['message'] == 'You do not have permission to access this resource' diff --git a/tests/v1/job/test_add_jobs.py b/tests/v1/job/test_add_jobs.py index 2c1fe89d0..5747173fa 100644 --- a/tests/v1/job/test_add_jobs.py +++ b/tests/v1/job/test_add_jobs.py @@ -105,7 +105,7 @@ def test_add_jobs_forbidden(self, client): # from api.v1.services.user import user_service - with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_super_admin=False)) as cu: + with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_superadmin=False)) as cu: response = client.post("/api/v1/jobs", json=test_job) assert response.status_code == 403 assert response.json()['message'] == 'You do not have permission to access this resource' diff --git a/tests/v1/job/test_create_job_application.py b/tests/v1/job/test_create_job_application.py index 32e9e773a..de880d50c 100644 --- a/tests/v1/job/test_create_job_application.py +++ b/tests/v1/job/test_create_job_application.py @@ -25,7 +25,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/job/test_delete_jobs.py b/tests/v1/job/test_delete_jobs.py index dc5f179ec..cf9d5ff1a 100644 --- a/tests/v1/job/test_delete_jobs.py +++ b/tests/v1/job/test_delete_jobs.py @@ -22,7 +22,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/job/test_update_jobs.py b/tests/v1/job/test_update_jobs.py index 8db04541f..cf773b876 100644 --- a/tests/v1/job/test_update_jobs.py +++ b/tests/v1/job/test_update_jobs.py @@ -22,7 +22,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/job_application/test_fetch_all_applications.py b/tests/v1/job_application/test_fetch_all_applications.py index dc23fad37..7576b8429 100644 --- a/tests/v1/job_application/test_fetch_all_applications.py +++ b/tests/v1/job_application/test_fetch_all_applications.py @@ -41,7 +41,7 @@ def test_admin(): first_name="test", last_name="user", is_active=True, - is_super_admin=True + is_superadmin=True ) # Test Job diff --git a/tests/v1/newsletter/delete_newsletter_test.py b/tests/v1/newsletter/delete_newsletter_test.py index 6f345ad38..a0fb46ce8 100644 --- a/tests/v1/newsletter/delete_newsletter_test.py +++ b/tests/v1/newsletter/delete_newsletter_test.py @@ -66,7 +66,7 @@ def override_get_current_super_admin(): first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/newsletter/test_update_newsletter.py b/tests/v1/newsletter/test_update_newsletter.py index 5541fd0f3..4559f1dc1 100644 --- a/tests/v1/newsletter/test_update_newsletter.py +++ b/tests/v1/newsletter/test_update_newsletter.py @@ -20,7 +20,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/notification_settings/test_create_notification_settings.py b/tests/v1/notification_settings/test_create_notification_settings.py index 119945f59..3eb0e39b3 100644 --- a/tests/v1/notification_settings/test_create_notification_settings.py +++ b/tests/v1/notification_settings/test_create_notification_settings.py @@ -20,7 +20,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/notification_settings/test_get_user_notification_settings.py b/tests/v1/notification_settings/test_get_user_notification_settings.py index f6938652b..fc5bca215 100644 --- a/tests/v1/notification_settings/test_get_user_notification_settings.py +++ b/tests/v1/notification_settings/test_get_user_notification_settings.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/notification_settings/test_update_user_notification_settings.py b/tests/v1/notification_settings/test_update_user_notification_settings.py index d379fe371..e847c0774 100644 --- a/tests/v1/notification_settings/test_update_user_notification_settings.py +++ b/tests/v1/notification_settings/test_update_user_notification_settings.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/organization/create_organization_test.py b/tests/v1/organization/create_organization_test.py index 32aab995d..65ad8dd43 100644 --- a/tests/v1/organization/create_organization_test.py +++ b/tests/v1/organization/create_organization_test.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name="Test", last_name="User", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/organization/organization_update_test.py b/tests/v1/organization/organization_update_test.py index fc6db86c5..61aac622e 100644 --- a/tests/v1/organization/organization_update_test.py +++ b/tests/v1/organization/organization_update_test.py @@ -20,7 +20,7 @@ def mock_get_current_user(): first_name="Test", last_name="User", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/organization/test_export_user_data.py b/tests/v1/organization/test_export_user_data.py index 8651b2fd3..750c66e0f 100644 --- a/tests/v1/organization/test_export_user_data.py +++ b/tests/v1/organization/test_export_user_data.py @@ -24,7 +24,7 @@ def mock_get_current_user(): first_name="Test", last_name="User", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -38,7 +38,7 @@ def mock_get_current_admin(): first_name="Admin", last_name="User", is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/organization/test_get_organisation_users.py b/tests/v1/organization/test_get_organisation_users.py index 24525da91..c6ab3e4ce 100644 --- a/tests/v1/organization/test_get_organisation_users.py +++ b/tests/v1/organization/test_get_organisation_users.py @@ -23,7 +23,7 @@ def mock_get_current_user(): first_name="Test", last_name="User", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/privacy_policies/create_privacy_test.py b/tests/v1/privacy_policies/create_privacy_test.py index b5ca4e2c1..fe03b995c 100644 --- a/tests/v1/privacy_policies/create_privacy_test.py +++ b/tests/v1/privacy_policies/create_privacy_test.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -36,7 +36,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/privacy_policies/delete_privacy_test.py b/tests/v1/privacy_policies/delete_privacy_test.py index 7c83c528a..a0cca7193 100644 --- a/tests/v1/privacy_policies/delete_privacy_test.py +++ b/tests/v1/privacy_policies/delete_privacy_test.py @@ -22,7 +22,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -36,7 +36,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/privacy_policies/update_privacy_test.py b/tests/v1/privacy_policies/update_privacy_test.py index b3c002557..1e5137c80 100644 --- a/tests/v1/privacy_policies/update_privacy_test.py +++ b/tests/v1/privacy_policies/update_privacy_test.py @@ -37,7 +37,7 @@ def mock_get_current_user(): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -51,7 +51,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/product/test_new_product_category.py b/tests/v1/product/test_new_product_category.py index 1da11fbe8..02149a4d0 100644 --- a/tests/v1/product/test_new_product_category.py +++ b/tests/v1/product/test_new_product_category.py @@ -38,7 +38,7 @@ def mock_get_current_user(): first_name="Test", last_name="User", is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/product/test_product_comment.py b/tests/v1/product/test_product_comment.py index b268db552..d4060198f 100644 --- a/tests/v1/product/test_product_comment.py +++ b/tests/v1/product/test_product_comment.py @@ -39,7 +39,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/product/update_product_test.py b/tests/v1/product/update_product_test.py index f8f5273ac..2a9278a2e 100644 --- a/tests/v1/product/update_product_test.py +++ b/tests/v1/product/update_product_test.py @@ -39,7 +39,7 @@ def mock_jwt_decode(mocker): @pytest.fixture def mock_get_current_user(mocker): - user = User(id="user_id", is_super_admin=False) + user = User(id="user_id", is_superadmin=False) mock = mocker.patch("api.utils.dependencies.get_current_user", return_value=user) return mock diff --git a/tests/v1/product_comment/test_create_product_comment.py b/tests/v1/product_comment/test_create_product_comment.py index 42fe01dac..35b30f1c5 100644 --- a/tests/v1/product_comment/test_create_product_comment.py +++ b/tests/v1/product_comment/test_create_product_comment.py @@ -25,7 +25,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/product_comment/test_update_product_comment.py b/tests/v1/product_comment/test_update_product_comment.py index ebd37803c..670a44a00 100644 --- a/tests/v1/product_comment/test_update_product_comment.py +++ b/tests/v1/product_comment/test_update_product_comment.py @@ -25,7 +25,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/profile/test_upload_profile_image.py b/tests/v1/profile/test_upload_profile_image.py index a017b9537..da3f38c9d 100644 --- a/tests/v1/profile/test_upload_profile_image.py +++ b/tests/v1/profile/test_upload_profile_image.py @@ -40,7 +40,7 @@ def create_mock_user(mock_user_service, mock_db_session): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/profile/test_user_profile.py b/tests/v1/profile/test_user_profile.py index 2d264b1f8..cca0b30db 100644 --- a/tests/v1/profile/test_user_profile.py +++ b/tests/v1/profile/test_user_profile.py @@ -40,7 +40,7 @@ def create_mock_user(mock_user_service, mock_db_session): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/profile/user_update_profile_test.py b/tests/v1/profile/user_update_profile_test.py index f1da7c73e..05f9bbc9c 100644 --- a/tests/v1/profile/user_update_profile_test.py +++ b/tests/v1/profile/user_update_profile_test.py @@ -40,7 +40,7 @@ def mock_jwt_decode(mocker): @pytest.fixture def mock_get_current_user(mocker): - user = User(id="user_id", is_super_admin=False) + user = User(id="user_id", is_superadmin=False) mock = mocker.patch("api.utils.dependencies.get_current_user", return_value=user) return mock diff --git a/tests/v1/roles_permissions/permissions_test.py b/tests/v1/roles_permissions/permissions_test.py index ede76aafd..5dfcd1ed9 100644 --- a/tests/v1/roles_permissions/permissions_test.py +++ b/tests/v1/roles_permissions/permissions_test.py @@ -158,7 +158,7 @@ def test_deleteuser(mock_db_session): first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/roles_permissions/test_get_roles.py b/tests/v1/roles_permissions/test_get_roles.py index d2eefe9b6..f5de03902 100644 --- a/tests/v1/roles_permissions/test_get_roles.py +++ b/tests/v1/roles_permissions/test_get_roles.py @@ -28,7 +28,7 @@ def mock_db_session(mocker): app.dependency_overrides = {} -def create_mock_user(mock_db_session, user_id, is_super_admin=False): +def create_mock_user(mock_db_session, user_id, is_superadmin=False): mock_user = User( id=user_id, email="testuser@gmail.com", @@ -36,7 +36,7 @@ def create_mock_user(mock_db_session, user_id, is_super_admin=False): first_name="Test", last_name="User", is_active=True, - is_super_admin=is_super_admin, + is_superadmin=is_superadmin, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -56,7 +56,7 @@ def create_mock_role(mock_db_session, role_name, org_id): @pytest.fixture def access_token(mock_db_session): user_id = str(uuid7()) - create_mock_user(mock_db_session, user_id, is_super_admin=True) + create_mock_user(mock_db_session, user_id, is_superadmin=True) access_token = user_service.create_access_token(user_id) return access_token diff --git a/tests/v1/roles_permissions/test_role_permissions.py b/tests/v1/roles_permissions/test_role_permissions.py index b53c70fe8..efcd7d001 100644 --- a/tests/v1/roles_permissions/test_role_permissions.py +++ b/tests/v1/roles_permissions/test_role_permissions.py @@ -27,7 +27,7 @@ def mock_db_session(mocker): yield mock_db app.dependency_overrides = {} -def create_mock_user(mock_db_session, user_id, is_super_admin=False): +def create_mock_user(mock_db_session, user_id, is_superadmin=False): mock_user = User( id=user_id, email="testuser@gmail.com", @@ -35,7 +35,7 @@ def create_mock_user(mock_db_session, user_id, is_super_admin=False): first_name="Test", last_name="User", is_active=True, - is_super_admin=is_super_admin, + is_superadmin=is_superadmin, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -53,7 +53,7 @@ def create_mock_role(mock_db_session, role_name): @pytest.fixture def access_token(mock_db_session): user_id = str(uuid7()) - create_mock_user(mock_db_session, user_id, is_super_admin=True) + create_mock_user(mock_db_session, user_id, is_superadmin=True) access_token = user_service.create_access_token(user_id) return access_token @@ -72,7 +72,7 @@ def create_role(mock_db_session): def test_update_role_permissions(mock_db_session, access_token, create_permissions): # Simulate login - create_user = create_mock_user(mock_db_session, str(uuid7()), is_super_admin=True) + create_user = create_mock_user(mock_db_session, str(uuid7()), is_superadmin=True) create_role = create_mock_role(mock_db_session, "test_role") permission_ids = [perm.id for perm in create_permissions] @@ -90,7 +90,7 @@ def test_update_role_permissions(mock_db_session, access_token, create_permissio def test_update_role_permissions_role_not_found(mock_db_session, access_token, create_permissions): # Simulate login - create_user = create_mock_user(mock_db_session, str(uuid7()), is_super_admin=True) + create_user = create_mock_user(mock_db_session, str(uuid7()), is_superadmin=True) permission_ids = [perm.id for perm in create_permissions] non_existent_role_id = str(uuid7()) diff --git a/tests/v1/roles_permissions/test_update_builtin_role.py b/tests/v1/roles_permissions/test_update_builtin_role.py index d4287b31f..e206389a4 100644 --- a/tests/v1/roles_permissions/test_update_builtin_role.py +++ b/tests/v1/roles_permissions/test_update_builtin_role.py @@ -26,7 +26,7 @@ def mock_db_session(mocker): yield mock_db app.dependency_overrides = {} -def create_mock_user(mock_db_session, user_id, is_super_admin=False): +def create_mock_user(mock_db_session, user_id, is_superadmin=False): mock_user = User( id=user_id, email="testuser@gmail.com", @@ -34,7 +34,7 @@ def create_mock_user(mock_db_session, user_id, is_super_admin=False): first_name="Test", last_name="User", is_active=True, - is_super_admin=is_super_admin, + is_superadmin=is_superadmin, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -49,7 +49,7 @@ def create_mock_role(mock_db_session, role_id, role_name, is_builtin=True): @pytest.fixture def access_token(mock_db_session): user_id = str(uuid7()) - create_mock_user(mock_db_session, user_id, is_super_admin=True) + create_mock_user(mock_db_session, user_id, is_superadmin=True) access_token = user_service.create_access_token(user_id) return access_token diff --git a/tests/v1/roles_permissions/test_update_custom_role.py b/tests/v1/roles_permissions/test_update_custom_role.py index 232f8f0db..2b4d9696d 100644 --- a/tests/v1/roles_permissions/test_update_custom_role.py +++ b/tests/v1/roles_permissions/test_update_custom_role.py @@ -26,7 +26,7 @@ def mock_db_session(mocker): yield mock_db app.dependency_overrides = {} -def create_mock_user(mock_db_session, user_id, is_super_admin=False): +def create_mock_user(mock_db_session, user_id, is_superadmin=False): mock_user = User( id=user_id, email="testuser@gmail.com", @@ -34,7 +34,7 @@ def create_mock_user(mock_db_session, user_id, is_super_admin=False): first_name="Test", last_name="User", is_active=True, - is_super_admin=is_super_admin, + is_superadmin=is_superadmin, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -49,7 +49,7 @@ def create_mock_role(mock_db_session, role_id, role_name, is_builtin=False): @pytest.fixture def access_token(mock_db_session): user_id = str(uuid7()) - create_mock_user(mock_db_session, user_id, is_super_admin=True) + create_mock_user(mock_db_session, user_id, is_superadmin=True) access_token = user_service.create_access_token(user_id) return access_token diff --git a/tests/v1/roles_permissions/test_update_perms.py b/tests/v1/roles_permissions/test_update_perms.py index f78f70f35..8177ec648 100644 --- a/tests/v1/roles_permissions/test_update_perms.py +++ b/tests/v1/roles_permissions/test_update_perms.py @@ -36,7 +36,7 @@ def mock_superuser(): first_name="Super", last_name="User", is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/squeeze_page/test_create_squeeze.py b/tests/v1/squeeze_page/test_create_squeeze.py index 7fad68d22..2b088adf1 100644 --- a/tests/v1/squeeze_page/test_create_squeeze.py +++ b/tests/v1/squeeze_page/test_create_squeeze.py @@ -63,7 +63,7 @@ def create_mock_super_admin(_): id=str(uuid7()), email="user1@example.com", password=user_service.hash_password("P@ssw0rd"), - is_super_admin=True, + is_superadmin=True, ) diff --git a/tests/v1/squeeze_page/test_delete_squeeze.py b/tests/v1/squeeze_page/test_delete_squeeze.py index af41aad4a..d299f3425 100644 --- a/tests/v1/squeeze_page/test_delete_squeeze.py +++ b/tests/v1/squeeze_page/test_delete_squeeze.py @@ -22,7 +22,7 @@ def mock_get_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/squeeze_page/test_fetch_squeeze.py b/tests/v1/squeeze_page/test_fetch_squeeze.py index dbd033093..7c63336fd 100644 --- a/tests/v1/squeeze_page/test_fetch_squeeze.py +++ b/tests/v1/squeeze_page/test_fetch_squeeze.py @@ -52,7 +52,7 @@ def create_mock_super_admin(_): id=str(uuid7()), email="user1@example.com", password=user_service.hash_password("P@ssw0rd"), - is_super_admin=True, + is_superadmin=True, ) diff --git a/tests/v1/superadmin/test_delete_team_by_id.py b/tests/v1/superadmin/test_delete_team_by_id.py index 1cac3a7b3..10351673c 100755 --- a/tests/v1/superadmin/test_delete_team_by_id.py +++ b/tests/v1/superadmin/test_delete_team_by_id.py @@ -66,7 +66,7 @@ def override_get_current_super_admin(): first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -89,7 +89,7 @@ def create_dummy_mock_user(mock_user_service: UserService, mock_db_session: Sess first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -143,7 +143,7 @@ def test_non_admin_access( first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/superadmin/test_get_contact.py b/tests/v1/superadmin/test_get_contact.py index 2ea5c9191..d0b13068c 100644 --- a/tests/v1/superadmin/test_get_contact.py +++ b/tests/v1/superadmin/test_get_contact.py @@ -27,7 +27,7 @@ def test_admin(): return User( id="admin_id", # Ensure the admin has an ID email="admin@example.com", - is_super_admin=True, + is_superadmin=True, ) diff --git a/tests/v1/superadmin/test_get_team_member_by_id.py b/tests/v1/superadmin/test_get_team_member_by_id.py index 75ae0c087..5cb939c4c 100644 --- a/tests/v1/superadmin/test_get_team_member_by_id.py +++ b/tests/v1/superadmin/test_get_team_member_by_id.py @@ -65,7 +65,7 @@ def override_get_current_super_admin(): first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -88,7 +88,7 @@ def create_dummy_mock_user(mock_user_service: UserService, mock_db_session: Sess first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -142,7 +142,7 @@ def test_non_admin_access( first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/superadmin/test_superadmin.py b/tests/v1/superadmin/test_superadmin.py index 4b288e628..63cad8a00 100644 --- a/tests/v1/superadmin/test_superadmin.py +++ b/tests/v1/superadmin/test_superadmin.py @@ -62,7 +62,7 @@ def override_get_current_super_admin(): first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -85,7 +85,7 @@ def create_dummy_mock_user(mock_user_service: UserService, mock_db_session: Sess first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -117,7 +117,7 @@ def test_non_admin_access( first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/superadmin/test_update_team_member.py b/tests/v1/superadmin/test_update_team_member.py index b299bbe90..73c7fa5e9 100644 --- a/tests/v1/superadmin/test_update_team_member.py +++ b/tests/v1/superadmin/test_update_team_member.py @@ -74,7 +74,7 @@ def override_get_current_super_admin(): first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -97,7 +97,7 @@ def create_dummy_mock_user(mock_user_service: UserService, mock_db_session: Sess first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -178,7 +178,7 @@ def test_non_admin_access( first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/team/test_add_team_member.py b/tests/v1/team/test_add_team_member.py index c2630ea56..440be7565 100644 --- a/tests/v1/team/test_add_team_member.py +++ b/tests/v1/team/test_add_team_member.py @@ -116,7 +116,7 @@ def test_add_members_forbidden(self, client): app.dependency_overrides[get_db] = mock_db app.dependency_overrides[oauth2_scheme] = mock_oauth - with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_super_admin=False)) as cu: + with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_superadmin=False)) as cu: response = client.post("/api/v1/teams", json=test_member) assert response.status_code == 403 assert response.json()[ diff --git a/tests/v1/team/test_get_all_team_members.py b/tests/v1/team/test_get_all_team_members.py index 313117cb6..6e385380e 100644 --- a/tests/v1/team/test_get_all_team_members.py +++ b/tests/v1/team/test_get_all_team_members.py @@ -96,7 +96,7 @@ def test_get_all_team_members_forbidden(self, client): app.dependency_overrides[get_db] = mock_db app.dependency_overrides[oauth2_scheme] = mock_oauth - with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_super_admin=False)) as cu: + with patch('api.v1.services.user.user_service.get_current_user', return_value=MagicMock(is_superadmin=False)) as cu: response = client.get("/api/v1/teams") assert response.status_code == 403 assert response.json()[ diff --git a/tests/v1/terms_and_conditions/test_create_terms_and_conditions.py b/tests/v1/terms_and_conditions/test_create_terms_and_conditions.py index a59287e63..7c663449b 100644 --- a/tests/v1/terms_and_conditions/test_create_terms_and_conditions.py +++ b/tests/v1/terms_and_conditions/test_create_terms_and_conditions.py @@ -18,7 +18,7 @@ def mock_db(): @pytest.fixture def mock_current_user(): user = Mock() - user.is_super_admin = True + user.is_superadmin = True user.id = 1 return user diff --git a/tests/v1/terms_and_conditions/test_delete_terms_and_conditions.py b/tests/v1/terms_and_conditions/test_delete_terms_and_conditions.py index 52d9b5cb4..b9c6c564b 100644 --- a/tests/v1/terms_and_conditions/test_delete_terms_and_conditions.py +++ b/tests/v1/terms_and_conditions/test_delete_terms_and_conditions.py @@ -20,7 +20,7 @@ def mock_get_current_super_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/terms_and_conditions/test_update_terms_and_conditions.py b/tests/v1/terms_and_conditions/test_update_terms_and_conditions.py index 4ee9538bc..3fa33d603 100644 --- a/tests/v1/terms_and_conditions/test_update_terms_and_conditions.py +++ b/tests/v1/terms_and_conditions/test_update_terms_and_conditions.py @@ -38,7 +38,7 @@ def create_mock_super_admin(_): id=str(uuid7()), email="user@example.com", password=user_service.hash_password("P@ssw0rd"), - is_super_admin=True, + is_superadmin=True, ) def create_mock_terms_and_conditions(_): diff --git a/tests/v1/testimonial/test_fetch_single_testimonial.py b/tests/v1/testimonial/test_fetch_single_testimonial.py index d31cb9aed..6955ba562 100644 --- a/tests/v1/testimonial/test_fetch_single_testimonial.py +++ b/tests/v1/testimonial/test_fetch_single_testimonial.py @@ -43,7 +43,7 @@ def create_mock_user(mock_user_service, mock_db_session): first_name='Test', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) diff --git a/tests/v1/testimonial/test_testimonial_delete.py b/tests/v1/testimonial/test_testimonial_delete.py index a0dc0fe77..2a2d5b669 100644 --- a/tests/v1/testimonial/test_testimonial_delete.py +++ b/tests/v1/testimonial/test_testimonial_delete.py @@ -43,13 +43,13 @@ def mock_current_admin(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) yield mock_admin -def create_mock_user(mock_user_service, mock_db_session, is_super_admin=True): +def create_mock_user(mock_user_service, mock_db_session, is_superadmin=True): """Create a mock user in the mock database session.""" mock_user = User( @@ -59,7 +59,7 @@ def create_mock_user(mock_user_service, mock_db_session, is_super_admin=True): first_name='Test', last_name='User', is_active=True, - is_super_admin=is_super_admin, + is_superadmin=is_superadmin, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -69,7 +69,7 @@ def create_mock_user(mock_user_service, mock_db_session, is_super_admin=True): def create_testimonial(mock_user_service, mock_db_session): """Create a mock testimonial in the mock database session.""" - mock_user = create_mock_user(mock_user_service, mock_db_session, is_super_admin=True) + mock_user = create_mock_user(mock_user_service, mock_db_session, is_superadmin=True) mock_testimonial = Testimonial( id=str(uuid7()), content='Product is good', diff --git a/tests/v1/topic/test_topic.py b/tests/v1/topic/test_topic.py index d30cf7beb..d7b6464f6 100644 --- a/tests/v1/topic/test_topic.py +++ b/tests/v1/topic/test_topic.py @@ -27,7 +27,7 @@ def test_user(): first_name=fake.first_name, last_name=fake.last_name, is_active=True, - is_super_admin=True, + is_superadmin=True, is_deleted=False, is_verified=True, ) diff --git a/tests/v1/user/test_get_all_users.py b/tests/v1/user/test_get_all_users.py index ebd574188..84166cfb6 100644 --- a/tests/v1/user/test_get_all_users.py +++ b/tests/v1/user/test_get_all_users.py @@ -44,7 +44,7 @@ def mock_superadmin(): @pytest.fixture def mock_token_verification(): with patch("api.v1.services.user.UserService.verify_access_token") as mock: - mock.return_value = MagicMock(id="superadmin_id", is_super_admin=True) + mock.return_value = MagicMock(id="superadmin_id", is_superadmin=True) yield mock def test_get_all_users(mock_db_session, user_service_mock, mock_superadmin, mock_token_verification): @@ -59,10 +59,10 @@ def test_get_all_users(mock_db_session, user_service_mock, mock_superadmin, mock User(id='admin_id', email='admin@email.com', first_name='admin', last_name='admin', password='super_admin', created_at=created_at, updated_at=updated_at, is_active=True, is_deleted=False, - is_verified=True, is_super_admin=False), + is_verified=True, is_superadmin=False), User(id='user_id', email='user@email.com', first_name='admin', last_name='admin', password='my_password', created_at=created_at, updated_at=updated_at, is_active=True, is_deleted=False, - is_verified=True, is_super_admin=False) + is_verified=True, is_superadmin=False) ] (mock_db_session @@ -89,7 +89,7 @@ def test_get_all_users(mock_db_session, user_service_mock, mock_superadmin, mock is_active=True, is_deleted=False, is_verified=True, - is_super_admin=False, + is_superadmin=False, created_at=user.created_at, updated_at=updated_at ) for user in mock_users] @@ -118,7 +118,7 @@ def test_get_all_users(mock_db_session, user_service_mock, mock_superadmin, mock 'is_active': True, 'is_deleted': False, 'is_verified': True, - 'is_super_admin': False, + 'is_superadmin': False, 'created_at': mock_users[0].created_at.isoformat(), 'updated_at': updated_at.isoformat() }, @@ -130,7 +130,7 @@ def test_get_all_users(mock_db_session, user_service_mock, mock_superadmin, mock 'is_active': True, 'is_deleted': False, 'is_verified': True, - 'is_super_admin': False, + 'is_superadmin': False, 'created_at': mock_users[1].created_at.isoformat(), 'updated_at': updated_at.isoformat() } diff --git a/tests/v1/user/test_get_current_user_organizations.py b/tests/v1/user/test_get_current_user_organizations.py index 194f34e4c..8d586ac55 100644 --- a/tests/v1/user/test_get_current_user_organizations.py +++ b/tests/v1/user/test_get_current_user_organizations.py @@ -27,7 +27,7 @@ def mock_get_current_user(): first_name='Admin', last_name='User', is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), organizations=[org1, org2] diff --git a/tests/v1/user/test_get_users_by_role.py b/tests/v1/user/test_get_users_by_role.py index ecc2a191c..c74308eaa 100644 --- a/tests/v1/user/test_get_users_by_role.py +++ b/tests/v1/user/test_get_users_by_role.py @@ -46,7 +46,7 @@ def test_get_user_by_role(mock_db_session): first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/user/test_getuser.py b/tests/v1/user/test_getuser.py index d6da6d362..d13baf762 100644 --- a/tests/v1/user/test_getuser.py +++ b/tests/v1/user/test_getuser.py @@ -40,7 +40,7 @@ def test_get_user(mock_db_session): first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/user/test_superadmin_create_user.py b/tests/v1/user/test_superadmin_create_user.py index 697589d3e..5c2db7f38 100644 --- a/tests/v1/user/test_superadmin_create_user.py +++ b/tests/v1/user/test_superadmin_create_user.py @@ -44,7 +44,7 @@ def mock_superadmin(): @pytest.fixture def mock_token_verification(): with patch("api.v1.services.user.UserService.verify_access_token") as mock: - mock.return_value = MagicMock(id="superadmin_id", is_super_admin=True) + mock.return_value = MagicMock(id="superadmin_id", is_superadmin=True) yield mock def test_superadmin_create_user(mock_superadmin, mock_token_verification, @@ -62,7 +62,7 @@ def test_superadmin_create_user(mock_superadmin, mock_token_verification, is_active=True, is_deleted=False, is_verified=True, - is_super_admin=False, + is_superadmin=False, created_at=created_at.isoformat(), updated_at=updated_at.isoformat() ) @@ -73,7 +73,7 @@ def test_superadmin_create_user(mock_superadmin, mock_token_verification, user_request = {'email': 'new_user1@email.com', 'first_name': 'new_user', 'last_name': 'new_user', 'password': 'new_user_password', 'is_active': True, 'is_deleted': False, - 'is_verified': True, 'is_super_admin': False, 'created_at': created_at.isoformat(), + 'is_verified': True, 'is_superadmin': False, 'created_at': created_at.isoformat(), 'updated_at': updated_at.isoformat() } (mock_db_session.query.return_value @@ -118,7 +118,7 @@ def test_superadmin_create_user(mock_superadmin, mock_token_verification, 'is_active': True, 'is_deleted': False, 'is_verified': True, - 'is_super_admin': False, + 'is_superadmin': False, 'created_at': created_at.isoformat(), 'updated_at': updated_at.isoformat() } diff --git a/tests/v1/user/test_updateuser.py b/tests/v1/user/test_updateuser.py index 27009f4eb..1a342fb22 100644 --- a/tests/v1/user/test_updateuser.py +++ b/tests/v1/user/test_updateuser.py @@ -54,7 +54,7 @@ def test_update_user(mock_db_session): first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -66,7 +66,7 @@ def test_update_user(mock_db_session): first_name="AdminTest", last_name="User", is_active=False, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) @@ -105,7 +105,7 @@ def test_current_user_update(mock_db_session): first_name="Mr", last_name="Dummy", is_active=True, - is_super_admin=True, + is_superadmin=True, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), ) diff --git a/tests/v1/user/user_deactivation_test.py b/tests/v1/user/user_deactivation_test.py index 47692cd55..3bb29aec0 100644 --- a/tests/v1/user/user_deactivation_test.py +++ b/tests/v1/user/user_deactivation_test.py @@ -44,7 +44,7 @@ def create_mock_user(mock_user_service, mock_db_session): first_name="Test", last_name="User", is_active=True, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc) ) @@ -125,7 +125,7 @@ def test_user_inactive(mock_user_service, mock_db_session): first_name="Test", last_name="User", is_active=False, - is_super_admin=False, + is_superadmin=False, created_at=datetime.now(timezone.utc), updated_at=datetime.now(timezone.utc), )