first commit

Author: MikhailPI1

backend/my_app_api/models/__init__.py

@@ -1,6 +1,8 @@
 from .base import Base, BaseDbModel
 from .db import *
-from .db_temp import *
+from .db_editor import *
 
-
-__all__ = ["Base", "BaseDbModel", "FinesData", "Evacuations", "EvacuationRoute", "TrafficLight", "FinesDataTemp", "EvacuationsTemp", "EvacuationRouteTemp", "TrafficLightTemp", "User"]
+__all__ = [
+    "Base", "BaseDbModel", "FinesData", "Evacuations", "EvacuationRoute", 
+    "TrafficLight", "User", "Template", "StatsDBRegistry", "Document",
+]

backend/my_app_api/models/base.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
 import re
+import pandas as pd
+from typing import List, Dict, Any
 
-from sqlalchemy import not_
+from sqlalchemy import not_, inspect
 from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import Query, Session, as_declarative, declared_attr
 
@@ -14,7 +16,7 @@ class Base:
     """Base class for all database entities"""
 
     @declared_attr
-    def __tablename__(cls) -> str:  # pylint: disable=no-self-argument
+    def __tablename__(cls) -> str:
         """Generate database table name automatically.
         Convert CamelCase class name to snake_case db table name.
         """
@@ -26,6 +28,19 @@ def __repr__(self):
             attrs.append(f"{c.name}={getattr(self, c.name)}")
         return "{}({})".format(c.__class__.__name__, ', '.join(attrs))
 
+    @classmethod
+    def get_column_names(cls) -> List[str]:
+        """Get all column names for the model"""
+        return [column.name for column in cls.__table__.columns]
+    
+    @classmethod
+    def from_csv_row(cls, row: Dict[str, Any]) -> Dict[str, Any]:
+        """Convert CSV row to model-compatible dictionary"""
+        result = {}
+        for column in cls.__table__.columns:
+            if column.name in row:
+                result[column.name] = row[column.name]
+        return result
 
 class BaseDbModel(Base):
     __abstract__ = True
@@ -37,6 +52,7 @@ def create(cls, *, session: Session, **kwargs) -> BaseDbModel:
         session.flush()
         return obj
 
+
     @classmethod
     def query(cls, *, with_deleted: bool = False, session: Session) -> Query:
         """Get all objects with soft deletes"""

backend/my_app_api/models/db.py

@@ -1,17 +1,19 @@
 from __future__ import annotations
 
+import uuid
 import datetime
 from enum import Enum
+from typing import List
 
-from sqlalchemy import  Boolean, Date, Integer, String, Text, Numeric, Enum, DateTime
+from sqlalchemy import  Boolean, Date, Integer, String, Text, Numeric, Enum as SQLEnum, DateTime, UUID, ARRAY, ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from .base import BaseDbModel
+from .db_editor import Document
 
 
 
 class Role(str, Enum):
-    USER: str = "user"
     EDITOR: str = "editor"
     ADMIN: str = "admin"
 
@@ -20,12 +22,15 @@ class User(BaseDbModel):
     __tablename__ = 'user'
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    first_name: Mapped[str] = mapped_column(String, nullable=False)
-    last_name: Mapped[str] = mapped_column(String, nullable=False)
-    middle_name: Mapped[str] = mapped_column(String, nullable=True)
-    created_at: Mapped[datetime.datetime] = mapped_column(DateTime, default=datetime.now)
-
-    rule: Mapped[User] = mapped_column(Enum(Role, native_enum=False), nullable=False)
+    first_name: Mapped[str] = mapped_column(String(100), nullable=False)  # Добавлена длина
+    last_name: Mapped[str] = mapped_column(String(100), nullable=False)
+    middle_name: Mapped[str] = mapped_column(String(100), nullable=True)  # Добавлена длина
+    user_login: Mapped[str] = mapped_column(String(50), nullable=False, unique=True)
+    password_hashed: Mapped[str] = mapped_column(String(255), nullable=False)
+    is_active: Mapped[bool] = mapped_column(Boolean, default=True)
+    role: Mapped[Role] = mapped_column(SQLEnum(Role, native_enum=False), nullable=False)
+
+    documents: Mapped[List["Document"]] = relationship("Document", back_populates="uploaded_by")
 
 
 class FinesData(BaseDbModel):
@@ -42,34 +47,32 @@ class FinesData(BaseDbModel):
     fines_collected: Mapped[float] = mapped_column(Numeric(15, 2), nullable=False)
 
 
-class Evacuations(BaseDbModel):
-    __tablename__ = 'evacuations_data'
+class EvacuationRoute(BaseDbModel):
+    __tablename__ = 'evacuation_routes'
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    date: Mapped[datetime.date] = mapped_column(Date, nullable=False, index=True)
     year: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
     month: Mapped[int] = mapped_column(Integer, nullable=False)
+    route_path: Mapped[str] = mapped_column(Text)
 
-    tow_trucks_online: Mapped[int] = mapped_column(Integer, nullable=False)
-    dispatches_count: Mapped[int] = mapped_column(Integer, nullable=False)
-    evacuations_count: Mapped[int] = mapped_column(Integer, nullable=False)
-    parking_receipts: Mapped[float] = mapped_column(Numeric(15, 2), nullable=False)
-
+    evacuations: Mapped[List["Evacuations"]] = relationship("Evacuations", back_populates="route")
 
-class EvacuationRoute(BaseDbModel):
-    __tablename__ = 'evacuation_routes'
+class Evacuations(BaseDbModel):
+    __tablename__ = 'evacuations'
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    date: Mapped[datetime.date] = mapped_column(Date, nullable=False, index=True)
     year: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
     month: Mapped[int] = mapped_column(Integer, nullable=False)
 
-    route_description: Mapped[str] = mapped_column(Text, nullable=False)
-    route_path: Mapped[str] = mapped_column(Text)
+    route_id: Mapped[int] = mapped_column(ForeignKey('evacuation_routes.id'), nullable=True)
 
+    evacuators_count: Mapped[int] = mapped_column(Integer, nullable=False)
+    call_count: Mapped[int] = mapped_column(Integer, nullable=False)
+    evacuations_count: Mapped[int] = mapped_column(Integer, nullable=False)
+    collected_sum: Mapped[float] = mapped_column(Numeric(15, 2), nullable=False)
 
-    evacuations = relationship("EvacuationsData", 
-                             primaryjoin="and_(EvacuationsData.year == EvacuationRoute.year, "
-                                        "EvacuationsData.month == EvacuationRoute.month)")
+    route: Mapped[EvacuationRoute] = relationship("EvacuationRoute", back_populates="evacuations")
 
 
 class TrafficLight(BaseDbModel):
@@ -81,4 +84,3 @@ class TrafficLight(BaseDbModel):
     installation_year: Mapped[int] = mapped_column(Integer, nullable=False)
     worked: Mapped[bool] = mapped_column(Boolean, nullable=True)
 
-

backend/my_app_api/models/db_editor.py

@@ -0,0 +1,75 @@
+from __future__ import annotations
+
+import datetime
+from enum import Enum
+from typing import Dict, Any
+
+from sqlalchemy import Integer, String, DateTime, Enum as SQLEnum, ForeignKey, JSON
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from .base import BaseDbModel
+from .db import User
+
+
+class FileType(str, Enum):
+    PDF: str = 'pdf'
+    DOC: str = 'doc'
+    DOCX: str = 'docx'
+
+
+class AdminFileType(str, Enum):
+    PDF: str = 'pdf'
+    DOC: str = 'doc'
+    DOCX: str = 'docx'
+    CSV: str = 'csv'
+    XLSX: str = 'xlsx'
+    XLS: str = 'xls'
+
+
+class Document(BaseDbModel):
+    __tablename__ = 'documents'
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    original_filename: Mapped[str] = mapped_column(String(255), nullable=False)
+    filename: Mapped[str] = mapped_column(String(255), nullable=False)
+    file_size: Mapped[int] = mapped_column(Integer, nullable=False)
+    uploaded_at: Mapped[datetime.datetime] = mapped_column(DateTime, default=datetime.datetime.now)
+    uploaded_by_id: Mapped[int] = mapped_column(ForeignKey('user.id'), nullable=False)
+    path: Mapped[str] = mapped_column(String, nullable=False)
+    description: Mapped[str] = mapped_column(String(500), nullable=True)
+    
+    uploaded_by: Mapped[User] = relationship("User", back_populates="documents")
+
+class EditorDocument(Document):
+    __tablename__ = 'editor_documents'
+    
+    id: Mapped[int] = mapped_column(ForeignKey('base_documents.id'), primary_key=True)
+    file_type: Mapped[FileType] = mapped_column(SQLEnum(FileType, native_enum=False), nullable=False)
+
+
+class AdminDocument(Document):
+    __tablename__ = 'admin_documents'
+    
+    id: Mapped[int] = mapped_column(ForeignKey('base_documents.id'), primary_key=True)
+    file_type: Mapped[AdminFileType] = mapped_column(SQLEnum(AdminFileType, native_enum=False), nullable=False)
+
+
+class Sections(BaseDbModel):
+    __tablename__ = 'sections'
+    
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    name: Mapped[str] = mapped_column(String(100), nullable=False)
+    section_type: Mapped[str] = mapped_column(String(50), nullable=True)
+
+
+class Posts(BaseDbModel):
+    __tablename__ = 'posts'
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    name: Mapped[str] = mapped_column(String(200), nullable=False)
+    section_id: Mapped[int] = mapped_column(ForeignKey('sections.id'), nullable=True)
+    contents: Mapped[Dict[str, Any]] = mapped_column(JSON, default=dict)
+    uploaded_by_id: Mapped[int] = mapped_column(ForeignKey('user.id'), nullable=False)
+    
+    uploaded_by: Mapped["User"] = relationship("User")
+    section: Mapped[Sections] = relationship("Sections", back_populates="posts")

backend/my_app_api/models/db_temp.py

@@ -1,50 +1,5 @@
-import logging
+from . import exc_handlers
+from .base import app
 
-from fastapi import FastAPI, Request
-from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import RedirectResponse
-from fastapi_sqlalchemy import DBSessionMiddleware
-from my_app_api import __version__
-from my_app_api.settings import get_settings
-from starlette.datastructures import URL
 
-from .touch import router as touch_router
-
-settings = get_settings()
-logger = logging.getLogger(__name__)
-app = FastAPI(
-    title="Мое приложение",
-    description="Бэкэнд приложения-примера",
-    version=__version__,
-    # Отключаем нелокальную документацию
-    root_path=settings.ROOT_PATH if __version__ != "dev" else "",
-    docs_url="/swagger",
-    redoc_url=None,
-)
-
-app.add_middleware(
-    DBSessionMiddleware,
-    db_url=str(settings.DB_DSN),
-    engine_args={"pool_pre_ping": True, "isolation_level": "AUTOCOMMIT"},
-)
-
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=settings.CORS_ALLOW_ORIGINS,
-    allow_credentials=settings.CORS_ALLOW_CREDENTIALS,
-    allow_methods=settings.CORS_ALLOW_METHODS,
-    allow_headers=settings.CORS_ALLOW_HEADERS,
-)
-
-
-@app.get("/")
-def redirect(request: Request):
-    url = URL(
-        path="/ui/",
-        query=request.url.components.query,
-        fragment=request.url.components.fragment,
-    )
-    return RedirectResponse(url)
-
-
-app.include_router(touch_router)
+__all__ = ["app", "exc_handlers"]