refactor(database): fix enum imports and update sqlalchemy queries

This commit is contained in:
Fanilo-Nantenaina 2026-01-02 18:00:01 +03:00
parent 2e8d247603
commit 512bb366dc
4 changed files with 7 additions and 7 deletions

View file

@ -15,7 +15,7 @@ from database.models.user import User
from database.models.email import EmailLog
from database.models.signature import SignatureLog
from database.models.sage_config import SageGatewayConfig
from database.Enum.status import (
from database.enum.status import (
StatutEmail,
StatutSignature,
)

View file

@ -8,7 +8,7 @@ from sqlalchemy import (
)
from datetime import datetime
from database.models.generic_model import Base
from database.Enum.status import StatutEmail
from database.enum.status import StatutEmail
class EmailLog(Base):

View file

@ -9,7 +9,7 @@ from sqlalchemy import (
)
from datetime import datetime
from database.models.generic_model import Base
from database.Enum.status import StatutSignature
from database.enum.status import StatutSignature
class SignatureLog(Base):

View file

@ -6,7 +6,7 @@ import httpx
from datetime import datetime
from typing import Optional, Tuple, List
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy import select, update, and_
from sqlalchemy import false, select, true, update, and_
import logging
from config import settings
@ -55,7 +55,7 @@ class SageGatewayService:
and_(
SageGatewayConfig.id == gateway_id,
SageGatewayConfig.user_id == user_id,
SageGatewayConfig.is_deleted,
# SageGatewayConfig.is_deleted.is_(false()),
)
)
)
@ -67,7 +67,7 @@ class SageGatewayService:
query = select(SageGatewayConfig).where(SageGatewayConfig.user_id == user_id)
if not include_deleted:
query = query.where(SageGatewayConfig.is_deleted)
query = query.where(SageGatewayConfig.is_deleted.is_(false()))
query = query.order_by(
SageGatewayConfig.is_active.desc(),
@ -167,7 +167,7 @@ class SageGatewayService:
and_(
SageGatewayConfig.user_id == user_id,
SageGatewayConfig.is_active,
SageGatewayConfig.is_deleted,
SageGatewayConfig.is_deleted.is_(true()),
)
)
)