Explorar o código

Entferne nicht mehr benötigte Dateien und bereinige den Code

gc-server3 hai 2 meses
pai
achega
4f366c126a
Modificáronse 8 ficheiros con 21 adicións e 235 borrados
  1. 0 8
      app/auth2.py
  2. 0 3
      app/main2.py
  3. 0 3
      app/main3.py
  4. 0 62
      app/models.py
  5. 21 77
      app/routes.py
  6. 0 47
      app/schemas.py
  7. 0 35
      app/users.py
  8. BIN=BIN
      dev.db

+ 0 - 8
app/auth2.py

@@ -1,8 +0,0 @@
-from fastapi import Request
-
-from .permissions import Principal, current_principal
-
-
-def get_current_user(request: Request) -> Principal:
-    """Compatibility wrapper for older imports; cookie auth is handled centrally."""
-    return current_principal(request)

+ 0 - 3
app/main2.py

@@ -1,3 +0,0 @@
-"""Compatibility entry point. The application now has one authentication stack."""
-
-from .main import app

+ 0 - 3
app/main3.py

@@ -1,3 +0,0 @@
-"""Compatibility entry point. The application now has one authentication stack."""
-
-from .main import app

+ 0 - 62
app/models.py

@@ -1,62 +0,0 @@
-from datetime import datetime, timezone
-
-from sqlalchemy import (
-    Column,
-    Date,
-    DateTime,
-    ForeignKey,
-    Integer,
-    Numeric,
-    String,
-    Text,
-)
-from sqlalchemy.orm import relationship
-
-from .db import Base
-
-
-class Kunde(Base):
-    __tablename__ = "kunden"
-    id = Column(Integer, primary_key=True, index=True)
-    name = Column(String, nullable=False)
-    historie = Column(Text, default="")
-    forderungen = relationship("Forderung", back_populates="kunde")
-
-
-class Forderung(Base):
-    __tablename__ = "forderungen"
-    id = Column(Integer, primary_key=True, index=True)
-    kunde_id = Column(Integer, ForeignKey("kunden.id"))
-    verkaeufer_id = Column(Integer, index=True)
-    fahrzeug = Column(String, nullable=True)
-    fahrgestellnummer = Column(String, nullable=True)
-    rechnungsnummer: Column[str] = Column(String, nullable=False)
-    betrag = Column(Numeric(12, 2), nullable=False)
-    faelligkeit = Column(Date, nullable=True)
-    status = Column(String, default="offen")
-
-    kunde = relationship("Kunde", back_populates="forderungen")
-    zahlungen = relationship("Zahlung", back_populates="forderung")
-    bemerkungen = relationship("Bemerkung", back_populates="forderung")
-
-
-class Zahlung(Base):
-    __tablename__ = "zahlungen"
-    id = Column(Integer, primary_key=True, index=True)
-    forderung_id = Column(Integer, ForeignKey("forderungen.id"))
-    betrag = Column(Numeric(12, 2), nullable=False)
-    datum = Column(Date, nullable=False)
-
-    forderung = relationship("Forderung", back_populates="zahlungen")
-
-
-class Bemerkung(Base):
-    __tablename__ = "bemerkungen"
-    id = Column(Integer, primary_key=True, index=True)
-    forderung_id = Column(Integer, ForeignKey("forderungen.id"))
-    benutzer = Column(String, nullable=False)
-    bemerkung = Column(Text, nullable=True)
-    wiedervorlage_datum = Column(Date, nullable=True)
-    zeitstempel = Column(DateTime, default=datetime.now(timezone.utc))
-
-    forderung = relationship("Forderung", back_populates="bemerkungen")

+ 21 - 77
app/routes.py

@@ -7,9 +7,8 @@ from pathlib import Path
 from typing import Annotated
 from urllib.parse import unquote, urlencode
 
-import pandas as pd
 from docxtpl import DocxTemplate
-from fastapi import APIRouter, Depends, Form, HTTPException, Request, Response, status
+from fastapi import APIRouter, Depends, Form, HTTPException, Request, status
 from fastapi.responses import (
     FileResponse,
     HTMLResponse,
@@ -29,7 +28,12 @@ from .docuware_search import get_invoice_pdf_by_document_no
 from .jinja_templates import templates
 from .ldap import DirectoryUnavailable, ldap_authenticate
 from .oauth_token import create_access_token
-from .permissions import Principal, current_principal, ensure_forderung_access, highest_role, load_entitlements
+from .permissions import (
+    current_principal,
+    ensure_forderung_access,
+    highest_role,
+    load_entitlements,
+)
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -66,11 +70,6 @@ def login_get(request: Request, next: str | None = None):
     return response
 
 
-@router.get("/select", response_class=HTMLResponse)
-def select_get(request: Request):
-    return templates.TemplateResponse(request, "base/select.html", {"request": request})
-
-
 @router.post("/login")
 def login_post(
     request: Request,
@@ -140,6 +139,11 @@ def logout(request: Request):
     return response
 
 
+@router.get("/select", response_class=HTMLResponse)
+def select_get(request: Request):
+    return templates.TemplateResponse(request, "base/select.html", {"request": request})
+
+
 @router.get("/app/forderungen/liste", response_class=HTMLResponse)
 def forderungen_liste(request: Request, db: Session = Depends(get_session), limit: int = 100, page: int = 0):
     principal = current_principal(request)
@@ -345,82 +349,22 @@ def forderungen_dashboard(request: Request, db: Session = Depends(get_session)):
     return templates.TemplateResponse(request, "forderungen/dashboard/dashboard.html", context)
 
 
-@router.get("/export/csv")
-def export_csv(request: Request, db: Session = Depends(get_session)):
-    rows = _export_rows(db, current_principal(request))
-    df = pd.DataFrame(rows)
-    buf = io.StringIO()
-    df.to_csv(buf, index=False)
-    buf.seek(0)
-    return Response(
-        content=buf.getvalue(),
-        media_type="text/csv",
-        headers={"Content-Disposition": "attachment; filename=forderungen.csv"},
-    )
-
-
-@router.get("/export/xlsx")
-def export_xlsx(request: Request, db: Session = Depends(get_session)):
-    rows = _export_rows(db, current_principal(request))
-    df = pd.DataFrame(rows)
-    buf = io.BytesIO()
-    with pd.ExcelWriter(buf, engine="openpyxl") as writer:
-        df.to_excel(writer, index=False, sheet_name="Forderungen")
-    buf.seek(0)
-    return StreamingResponse(
-        buf,
-        media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        headers={"Content-Disposition": "attachment; filename=forderungen.xlsx"},
-    )
-
-
-def _export_rows(db: Session, principal: Principal) -> list[dict]:
-    query = text(
-        """
-        SELECT F.Client_DB,
-               F.Beleg_Nr AS Rechnungsnummer,
-               F.Kunde_Text AS Kunde,
-               F.Beleg_offen AS Betrag_offen,
-               F.Beleg_Faellig_Datum AS Faelligkeit,
-               F.Hauptbetrieb_ID,
-               F.Standort_ID,
-               F.Abteilung
-        FROM dbo.Forderungen_Kopf AS F
-        WHERE EXISTS (
-            SELECT 1
-            FROM dbo.Benutzer_Rechte AS BR
-            INNER JOIN dbo.Rollen AS R ON R.Rolle = BR.Rolle AND R.Aktiv = 1
-            WHERE LOWER(LTRIM(RTRIM(BR.Benutzer_ID))) = :auth_username
-              AND NULLIF(LTRIM(RTRIM(BR.Benutzer_ID)), '') IS NOT NULL
-              AND BR.Hauptbetrieb_ID = F.Hauptbetrieb_ID
-              AND BR.Standort_ID = F.Standort_ID
-              AND (BR.Abteilung IS NULL OR BR.Abteilung = F.Abteilung)
-        )
-        ORDER BY F.Beleg_Faellig_Datum, F.Beleg_Nr
-        """
-    )
-    return [dict(row) for row in db.execute(query, {"auth_username": principal.username}).mappings().all()]
-
-
-@router.get("/detail/{id}/export/docx")
-def export_docx_legacy(id: int):
-    raise HTTPException(status_code=410, detail="Veralteter Export; bitte die Forderungsdetailseite verwenden")
-
-
 # TODO
 @router.get("/app/forderungen/export/{client_db}_{document_no}/")
 def export_docx2(request: Request, client_db: str, document_no: str, db: Session = Depends(get_session)):
     principal = current_principal(request)
     ensure_forderung_access(db, principal, client_db, document_no)
-    q = db.execute(
-        text(
-            """SELECT TOP 1 F.*, K.Kunde_Name, K.Kunde_Adresse, K.Kunde_PLZ, K.Kunde_Ort
+    q = (
+        db.execute(
+            text("""SELECT TOP 1 F.*, K.Kunde_Name, K.Kunde_Adresse, K.Kunde_PLZ, K.Kunde_Ort
                FROM dbo.Forderungen_Kopf AS F
                LEFT JOIN dbo.Kunden AS K ON K.Client_DB = F.Client_DB AND K.Kunde_Nr = F.Kunde_Nr
-               WHERE F.Client_DB = :client_db AND F.Beleg_Nr = :beleg_nr"""
-        ),
-        {"client_db": client_db, "beleg_nr": document_no},
-    ).mappings().first()
+               WHERE F.Client_DB = :client_db AND F.Beleg_Nr = :beleg_nr"""),
+            {"client_db": client_db, "beleg_nr": document_no},
+        )
+        .mappings()
+        .first()
+    )
     if not q or not settings.LOCAL_STORAGE:
         raise HTTPException(status_code=503, detail="Dokumentablage ist nicht konfiguriert")
 

+ 0 - 47
app/schemas.py

@@ -1,47 +0,0 @@
-from datetime import date
-from typing import Optional
-
-from pydantic import BaseModel
-
-
-class KundeOut(BaseModel):
-    id: int
-    name: str
-
-    class Config:
-        from_attributes = True
-
-
-class ZahlungOut(BaseModel):
-    id: int
-    betrag: float
-    datum: date
-
-    class Config:
-        from_attributes = True
-
-
-class BemerkungIn(BaseModel):
-    bemerkung: Optional[str]
-    wiedervorlage_datum: Optional[date]
-
-
-class Token(BaseModel):
-    access_token: str
-    token_type: str
-
-
-class TokenData(BaseModel):
-    username: str | None = None
-
-
-class User(BaseModel):
-    username: str
-    email: str | None = None
-    hashed_password: str
-
-
-class UserInDB(User):
-    username: str
-    email: str | None = None
-    hashed_password: str

+ 0 - 35
app/users.py

@@ -1,35 +0,0 @@
-from sqlalchemy.orm import Session
-from .schemas import UserInDB
-from .db import Base
-from passlib.context import CryptContext
-from sqlalchemy import Column, Integer, String
-
-# Password hashing configuration
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-
-
-class UserModel(Base):
-    __tablename__ = "users"
-    id = Column(Integer, primary_key=True, index=True)
-    username = Column(String, unique=True, index=True)
-    email = Column(String, unique=True, index=True)
-    hashed_password = Column(String)
-
-
-def get_password_hash(password: str) -> str:
-    return pwd_context.hash(password)
-
-
-def verify_password(plain_password: str, hashed_password: str) -> bool:
-    return pwd_context.verify(plain_password, hashed_password)
-
-
-def authenticate_user(db: Session, username: str, password: str) -> UserInDB | None:
-    user = get_by_username(db, username)
-    if not user or not verify_password(password, user.hashed_password):
-        return None
-    return user
-
-
-def get_by_username(db: Session, username: str) -> UserInDB | None:
-    return db.query(UserModel).filter(UserModel.username == username).first()

BIN=BIN
dev.db