From 45dd517ecf93c1ba71bfcc850277db5301572c26 Mon Sep 17 00:00:00 2001 From: Fanilo-Nantenaina Date: Sat, 3 Jan 2026 11:27:36 +0300 Subject: [PATCH] refactor(models): rename request models to be more concise --- api.py | 12 ++++++------ routes/auth.py | 26 +++++++++++++------------- routes/sage_gateway.py | 4 ++-- schemas/__init__.py | 4 ++-- schemas/sage/sage_gateway.py | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/api.py b/api.py index ef0cd6e..629e85f 100644 --- a/api.py +++ b/api.py @@ -1572,7 +1572,7 @@ async def envoyer_devis_signature( raise HTTPException(500, str(e)) -class EmailBatchRequest(BaseModel): +class EmailBatch(BaseModel): destinataires: List[EmailStr] = Field(..., min_length=1, max_length=100) sujet: str = Field(..., min_length=1, max_length=500) corps_html: str = Field(..., min_length=1) @@ -1582,7 +1582,7 @@ class EmailBatchRequest(BaseModel): @app.post("/emails/send-batch", tags=["Emails"]) async def envoyer_emails_lot( - batch: EmailBatchRequest, session: AsyncSession = Depends(get_session) + batch: EmailBatch, session: AsyncSession = Depends(get_session) ): resultats = [] @@ -1779,7 +1779,7 @@ async def lire_facture_detail(numero: str): raise HTTPException(500, str(e)) -class RelanceFactureRequest(BaseModel): +class RelanceFacture(BaseModel): doc_id: str message_personnalise: Optional[str] = None @@ -1904,7 +1904,7 @@ templates_email_db = { @app.post("/factures/{id}/relancer", tags=["Factures"]) async def relancer_facture( id: str, - relance: RelanceFactureRequest, + relance: RelanceFacture, session: AsyncSession = Depends(get_session), ): try: @@ -2070,7 +2070,7 @@ class TemplateEmail(BaseModel): variables_disponibles: List[str] = [] -class TemplatePreviewRequest(BaseModel): +class TemplatePreview(BaseModel): template_id: str document_id: str type_document: TypeDocument @@ -2147,7 +2147,7 @@ async def supprimer_template(template_id: str): @app.post("/templates/emails/preview", tags=["Emails"]) -async def previsualiser_email(preview: TemplatePreviewRequest): +async def previsualiser_email(preview: TemplatePreview): if preview.template_id not in templates_email_db: raise HTTPException(404, f"Template {preview.template_id} introuvable") diff --git a/routes/auth.py b/routes/auth.py index 9b7d377..f5702a2 100644 --- a/routes/auth.py +++ b/routes/auth.py @@ -34,7 +34,7 @@ class RegisterRequest(BaseModel): prenom: str = Field(..., min_length=2, max_length=100) -class LoginRequest(BaseModel): +class Login(BaseModel): email: EmailStr password: str @@ -46,24 +46,24 @@ class TokenResponse(BaseModel): expires_in: int = 86400 -class RefreshTokenRequest(BaseModel): +class RefreshToken(BaseModel): refresh_token: str -class ForgotPasswordRequest(BaseModel): +class ForgotPassword(BaseModel): email: EmailStr -class ResetPasswordRequest(BaseModel): +class ResetPassword(BaseModel): token: str new_password: str = Field(..., min_length=8) -class VerifyEmailRequest(BaseModel): +class VerifyEmail(BaseModel): token: str -class ResendVerificationRequest(BaseModel): +class ResendVerification(BaseModel): email: EmailStr @@ -194,7 +194,7 @@ async def verify_email_get(token: str, session: AsyncSession = Depends(get_sessi @router.post("/verify-email") async def verify_email_post( - data: VerifyEmailRequest, session: AsyncSession = Depends(get_session) + data: VerifyEmail, session: AsyncSession = Depends(get_session) ): result = await session.execute( select(User).where(User.verification_token == data.token) @@ -228,7 +228,7 @@ async def verify_email_post( @router.post("/resend-verification") async def resend_verification( - data: ResendVerificationRequest, + data: ResendVerification, request: Request, session: AsyncSession = Depends(get_session), ): @@ -259,7 +259,7 @@ async def resend_verification( @router.post("/login", response_model=TokenResponse) async def login( - data: LoginRequest, request: Request, session: AsyncSession = Depends(get_session) + data: Login, request: Request, session: AsyncSession = Depends(get_session) ): ip = request.client.host if request.client else "unknown" user_agent = request.headers.get("user-agent", "unknown") @@ -362,7 +362,7 @@ async def login( @router.post("/refresh", response_model=TokenResponse) async def refresh_access_token( - data: RefreshTokenRequest, session: AsyncSession = Depends(get_session) + data: RefreshToken, session: AsyncSession = Depends(get_session) ): payload = decode_token(data.refresh_token) if not payload or payload.get("type") != "refresh": @@ -417,7 +417,7 @@ async def refresh_access_token( @router.post("/forgot-password") async def forgot_password( - data: ForgotPasswordRequest, + data: ForgotPassword, request: Request, session: AsyncSession = Depends(get_session), ): @@ -452,7 +452,7 @@ async def forgot_password( @router.post("/reset-password") async def reset_password( - data: ResetPasswordRequest, session: AsyncSession = Depends(get_session) + data: ResetPassword, session: AsyncSession = Depends(get_session) ): result = await session.execute(select(User).where(User.reset_token == data.token)) user = result.scalar_one_or_none() @@ -492,7 +492,7 @@ async def reset_password( @router.post("/logout") async def logout( - data: RefreshTokenRequest, + data: RefreshToken, session: AsyncSession = Depends(get_session), user: User = Depends(get_current_user), ): diff --git a/routes/sage_gateway.py b/routes/sage_gateway.py index cf21894..6b9db87 100644 --- a/routes/sage_gateway.py +++ b/routes/sage_gateway.py @@ -14,7 +14,7 @@ from schemas import ( SageGatewayResponse, SageGatewayList, SageGatewayHealthCheck, - SageGatewayTestRequest, + SageGatewayTest, SageGatewayStatsResponse, CurrentGatewayInfo, ) @@ -268,7 +268,7 @@ async def check_gateway_health( @router.post("/test", response_model=dict) async def test_gateway_config( - data: SageGatewayTestRequest, + data: SageGatewayTest, user: User = Depends(get_current_user), session: AsyncSession = Depends(get_session), ): diff --git a/schemas/__init__.py b/schemas/__init__.py index bb25f35..ececf1d 100644 --- a/schemas/__init__.py +++ b/schemas/__init__.py @@ -48,7 +48,7 @@ from schemas.sage.sage_gateway import ( SageGatewayResponse, SageGatewayList, SageGatewayHealthCheck, - SageGatewayTestRequest, + SageGatewayTest, SageGatewayStatsResponse, CurrentGatewayInfo, ) @@ -102,7 +102,7 @@ __all__ = [ "SageGatewayResponse", "SageGatewayList", "SageGatewayHealthCheck", - "SageGatewayTestRequest", + "SageGatewayTest", "SageGatewayStatsResponse", "CurrentGatewayInfo", ] diff --git a/schemas/sage/sage_gateway.py b/schemas/sage/sage_gateway.py index f4c1b58..e503641 100644 --- a/schemas/sage/sage_gateway.py +++ b/schemas/sage/sage_gateway.py @@ -132,7 +132,7 @@ class SageGatewayActivateRequest(BaseModel): gateway_id: str -class SageGatewayTestRequest(BaseModel): +class SageGatewayTest(BaseModel): gateway_url: str gateway_token: str