Рефакторинг структуры проекта: перемещение функций и логики работы с базой данных в новый файл helpers_bff.py. Обновлены импорты в fill_db.py и main.py для использования новых функций. Удалены устаревшие функции и классы из main.py, улучшена организация кода.

2025-06-08 21:23:26 +03:00
parent 155d1002fc
commit 6e804953c0
4 changed files with 267 additions and 249 deletions
--- a/sql_models.py
+++ b/sql_models.py
@@ -0,0 +1,93 @@
+from typing import Optional
+from datetime import datetime
+import uuid
+from sqlmodel import SQLModel, Field
+
+class Company(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    name: str
+    commission: float  # процент комиссии
+    key: str = Field(index=True, unique=True)
+    create_dttm: datetime = Field(default_factory=datetime.utcnow)
+    update_dttm: datetime = Field(default_factory=datetime.utcnow)
+    auto_approve_transactions: bool = Field(default=False)
+
+class TgAgent(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    tg_id: int = Field(index=True, unique=True)
+    chat_id: Optional[int] = None
+    phone: Optional[str] = None
+    name: Optional[str] = None
+    login: Optional[str] = None
+    hash: Optional[str] = None
+    company_id: int = Field(foreign_key="company.id")
+    create_dttm: datetime = Field(default_factory=datetime.utcnow)
+    update_dttm: datetime = Field(default_factory=datetime.utcnow)
+
+class Ref(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    tg_agent_id: int = Field(foreign_key="tgagent.id")
+    ref: str
+    description: Optional[str] = None
+    create_dttm: datetime = Field(default_factory=datetime.utcnow)
+    update_dttm: datetime = Field(default_factory=datetime.utcnow)
+
+class Sale(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    cost: float
+    crediting: float  # сколько начислено за продажу
+    ref: int = Field(foreign_key="ref.id")
+    sale_id: str
+    company_id: int = Field(foreign_key="company.id")
+    create_dttm: datetime = Field(default_factory=datetime.utcnow)
+    update_dttm: datetime = Field(default_factory=datetime.utcnow)
+
+class AgentTransaction(SQLModel, table=True):
+    __tablename__ = "agent_transactions"
+    id: Optional[int] = Field(default=None, primary_key=True)
+    tg_agent_id: int = Field(foreign_key="tgagent.id")
+    amount: float
+    status: str
+    transaction_group: uuid.UUID = Field(default_factory=uuid.uuid4)
+    create_dttm: datetime = Field(default_factory=datetime.utcnow)
+    update_dttm: datetime = Field(default_factory=datetime.utcnow)
+
+class PartnerTransaction(SQLModel, table=True):
+    __tablename__ = "partner_transactions"
+    id: Optional[int] = Field(default=None, primary_key=True)
+    company_id: int = Field(foreign_key="company.id")
+    type: str
+    amount: float
+    status: str
+    transaction_group: uuid.UUID
+    agent_transaction_id: Optional[int] = Field(default=None, foreign_key="agent_transactions.id")
+    create_dttm: datetime = Field(default_factory=datetime.utcnow)
+    update_dttm: datetime = Field(default_factory=datetime.utcnow)
+
+class CompanyBalance(SQLModel, table=True):
+    __tablename__ = "company_balances"
+    id: Optional[int] = Field(default=None, primary_key=True)
+    company_id: int = Field(foreign_key="company.id", unique=True)
+    available_balance: float = Field(default=0.0)
+    pending_balance: float = Field(default=0.0)
+    updated_dttm: datetime = Field(default_factory=datetime.utcnow)
+
+class AgentBalance(SQLModel, table=True):
+    __tablename__ = "agent_balances"
+    id: Optional[int] = Field(default=None, primary_key=True)
+    tg_agent_id: int = Field(foreign_key="tgagent.id", unique=True)
+    available_balance: float = Field(default=0.0)
+    frozen_balance: float = Field(default=0.0)
+    updated_dttm: datetime = Field(default_factory=datetime.utcnow)
+
+class Account(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    login: str = Field(index=True, unique=True)
+    password_hash: str  
+    firstName: Optional[str] = None
+    surname: Optional[str] = None
+    phone: Optional[str] = None
+    email: Optional[str] = None
+    company_id: int = Field(foreign_key="company.id")
+    create_dttm: datetime = Field(default_factory=datetime.utcnow)
+    update_dttm: datetime = Field(default_factory=datetime.utcnow)