Spaces:

Corin1998
/

Invoice

Sleeping

App Files Files Community

Corin1998 commited on Aug 23, 2025

Commit

6d83cd0

verified ·

1 Parent(s): 31434be

Upload main.py

Browse files

Files changed (1) hide show

main.py +98 -114

main.py CHANGED Viewed

@@ -12,10 +12,11 @@ import pathlib
 from fastapi import FastAPI, Depends, HTTPException, Header, Query
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.openapi.utils import get_openapi
 from fastapi.staticfiles import StaticFiles
-from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
-from pydantic import BaseModel
 from sqlmodel import Field as SQLField, Session, SQLModel, create_engine, select, Relationship
 # --------------------------
 # Auth
@@ -121,7 +122,6 @@ class Invoice(SQLModel, table=True):
     due_date: Optional[date] = None
     notes: Optional[str] = None
-    # 入金関連（任意）
     paid_at: Optional[datetime] = None
     paid_amount: Optional[float] = None
     payment_method: Optional[str] = None
@@ -158,7 +158,7 @@ class CreateInvoiceIn(BaseModel):
     customer_id: int
     due_date: Optional[date] = None
     notes: Optional[str] = None
-    quote_id: Optional[int] = None  # 見積→請求コピー
 class InvoiceItemIn(BaseModel):
     description: str
@@ -177,8 +177,42 @@ class EmailIn(BaseModel):
     body: str
     attach_pdf: bool = True
 # --------------------------
-# Totals（堅牢化）
 # --------------------------
 class MoneyBreakdown(BaseModel):
     subtotal: float
@@ -215,7 +249,7 @@ app.add_middleware(
     allow_methods=["*"], allow_headers=["*"],
 )
-# Swagger の Authorize（X-API-Key）を出す
 def custom_openapi():
     if app.openapi_schema:
         return app.openapi_schema
@@ -244,20 +278,7 @@ def on_startup():
     SQLModel.metadata.create_all(engine)
 # ---- UI（/app） ----
-STATIC_DIR = "static"
-if os.path.isdir(STATIC_DIR):
-    app.mount("/app", StaticFiles(directory=STATIC_DIR, html=True), name="app")
-else:
-    # フォールバック（staticが無い場合でも起動できるようにする）
-    @app.get("/app", response_class=HTMLResponse)
-    def app_inline():
-        return """
-        <!doctype html><meta charset="utf-8">
-        <title>Mini Invoice/Estimate SaaS</title>
-        <h1>Mini Invoice/Estimate SaaS</h1>
-        <p><code>static/app.html</code> が見つかりません。Filesで作成してから再読み込みしてください。</p>
-        <p>APIは <a href="/docs">/docs</a> から操作できます。</p>
-        """
 # -------- Customers --------
 @app.post("/customers", dependencies=[Depends(require_api_key)])
@@ -265,6 +286,7 @@ def create_customer(payload: Customer, session: Session = Depends(get_session)):
     session.add(payload); session.commit(); session.refresh(payload)
     return payload
 @app.get("/customers", dependencies=[Depends(require_api_key)])
 def list_customers(
     q: Optional[str] = Query(default=None, description="free text search (name/email/phone)"),
@@ -275,13 +297,13 @@ def list_customers(
     stmt = select(Customer)
     if q:
         like = f"%{q}%"
-        # SQLite は ILIKE 非対応なので LIKE で十分（大文字小文字は基本無視コラテラル）
         stmt = stmt.where(
-            (Customer.name.like(like)) |
-            (Customer.email.like(like)) |
-            (Customer.phone.like(like))
         )
-    total = session.exec(stmt).count()
     rows = session.exec(stmt.offset(offset).limit(limit)).all()
     return {"data": rows, "pagination": {"total": total, "limit": limit, "offset": offset}}
@@ -291,16 +313,17 @@ def create_product(payload: Product, session: Session = Depends(get_session)):
     session.add(payload); session.commit(); session.refresh(payload)
     return payload
 @app.get("/products", dependencies=[Depends(require_api_key)])
 def list_products(
     limit: int = Query(50, ge=1, le=200),
     offset: int = Query(0, ge=0),
     session: Session = Depends(get_session),
 ):
-    rows = session.exec(select(Product).offset(offset).limit(limit)).all()
-    total = session.exec(select(Product)).count()
     return {"data": rows, "pagination": {"total": total, "limit": limit, "offset": offset}}
 # -------- Quotes --------
 @app.post("/quotes", dependencies=[Depends(require_api_key)])
 def create_quote(payload: CreateQuoteIn, session: Session = Depends(get_session)):
@@ -342,21 +365,21 @@ def create_invoice(payload: CreateInvoiceIn, session: Session = Depends(get_sess
     inv = Invoice(customer_id=payload.customer_id, due_date=payload.due_date, notes=payload.notes)
     session.add(inv); session.commit(); session.refresh(inv)
-    # 見積→請求のコピー
     if payload.quote_id:
         q = session.get(Quote, payload.quote_id)
         if not q:
             raise HTTPException(404, "Quote not found to copy")
         q_items = session.exec(select(QuoteItem).where(QuoteItem.quote_id == payload.quote_id)).all()
         for it in q_items:
-            session.add(InvoiceItem(
                 invoice_id=inv.id,
                 product_id=it.product_id,
                 description=it.description,
                 quantity=it.quantity,
                 unit_price=it.unit_price,
                 tax_rate=it.tax_rate,
-            ))
         session.commit()
     session.refresh(inv)
@@ -438,68 +461,21 @@ def email_invoice(invoice_id: int, payload: EmailIn, session: Session = Depends(
     )
     return {"ok": ok, "detail": detail}
-# ---- ルート：UIへリダイレクト（デモしやすさ優先）----
-@app.get("/", include_in_schema=False)
-def root_redirect():
-    return RedirectResponse("/app")
-# -------- ChatGPT router を最後に組み込む --------
-from openai_integration import router as ai_router
-app.include_router(ai_router, prefix="/ai", tags=["ai"])
-# ===== ここから追記（main.py の import 群より下ならどこでもOK） =====
-from pydantic import Field
-class WizardItemIn(BaseModel):
-    description: str
-    quantity: float = Field(gt=0, default=1)
-    unit_price: float = Field(ge=0)
-    tax_rate: float = Field(ge=0, default=0.0)
-class WizardCustomerIn(BaseModel):
-    # 既存顧客を使うなら id を、無ければ name 等で新規作成
-    id: int | None = None
-    name: str | None = None
-    email: str | None = None
-    phone: str | None = None
-    address: str | None = None
-    city: str | None = None
-    country: str | None = None
-class WizardInvoiceIn(BaseModel):
-    customer: WizardCustomerIn
-    due_date: date | None = None
-    notes: str | None = None
-    items: list[WizardItemIn]
-class WizardInvoiceOut(BaseModel):
-    customer_id: int
-    invoice_id: int
-    totals: MoneyBreakdown
-@app.post("/wizard/invoice", dependencies=[Depends(require_api_key)], response_model=WizardInvoiceOut)
 def wizard_create_invoice(payload: WizardInvoiceIn, session: Session = Depends(get_session)):
-    """
-    顧客IDがあればそれを使用。無ければ name などから顧客を新規作成。
-    その後、請求書を作成し、明細を一括登録して totals を返す。
-    """
-    # 1) 顧客を決定
-    cust_id: int | None = payload.customer.id
-    if cust_id:
-        cust = session.get(Customer, cust_id)
-        if not cust:
-            raise HTTPException(404, "Customer id not found")
-    else:
-        if not payload.customer.name:
-            raise HTTPException(422, "Either customer.id or customer.name is required")
-        # 既存に同名があればそれを使い、無ければ作成（簡易重複回避）
-        existing = session.exec(
-            select(Customer).where(Customer.name == payload.customer.name)
-        ).first()
-        if existing:
-            cust = existing
         else:
-            cust = Customer(
                 name=payload.customer.name.strip(),
                 email=(payload.customer.email or None),
                 phone=(payload.customer.phone or None),
@@ -507,30 +483,38 @@ def wizard_create_invoice(payload: WizardInvoiceIn, session: Session = Depends(g
                 city=(payload.customer.city or None),
                 country=(payload.customer.country or None),
             )
-            session.add(cust)
-            session.commit()
-            session.refresh(cust)
         cust_id = cust.id
-    # 2) 請求書を作成
-    inv = Invoice(customer_id=cust_id, due_date=payload.due_date, notes=payload.notes)
-    session.add(inv)
-    session.commit()
-    session.refresh(inv)
-    # 3) 明細を一括追加
-    for it in payload.items:
-        session.add(InvoiceItem(
-            invoice_id=inv.id,
-            description=it.description,
-            quantity=it.quantity,
-            unit_price=it.unit_price,
-            tax_rate=it.tax_rate,
-        ))
-    session.commit()
-    items = session.exec(select(InvoiceItem).where(InvoiceItem.invoice_id == inv.id)).all()
-    totals = compute_totals(items)
-    return WizardInvoiceOut(customer_id=cust_id, invoice_id=inv.id, totals=totals)
-# ===== 追記ここまで =====

 from fastapi import FastAPI, Depends, HTTPException, Header, Query
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.openapi.utils import get_openapi
+from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
+from pydantic import BaseModel, Field, model_validator
 from sqlmodel import Field as SQLField, Session, SQLModel, create_engine, select, Relationship
+from sqlachemy import func
 # --------------------------
 # Auth
     due_date: Optional[date] = None
     notes: Optional[str] = None
     paid_at: Optional[datetime] = None
     paid_amount: Optional[float] = None
     payment_method: Optional[str] = None
     customer_id: int
     due_date: Optional[date] = None
     notes: Optional[str] = None
+    quote_id: Optional[int] = None
 class InvoiceItemIn(BaseModel):
     description: str
     body: str
     attach_pdf: bool = True
+# ---- ウィザード（フロント一括登録用）----
+class WizardItemIn(BaseModel):
+    description: str
+    quantity: float = Field(gt=0, default=1)
+    unit_price: float = Field(ge=0)
+    tax_rate: float = Field(ge=0, default=0.0)
+class WizardCustomerIn(BaseModel):
+    id: int | None = None
+    name: str | None = None
+    email: str | None = None
+    phone: str | None = None
+    address: str | None = None
+    city: str | None = None
+    country: str | None = None
+class WizardInvoiceIn(BaseModel):
+    customer: WizardCustomerIn
+    due_date: date | None = None
+    notes: str | None = None
+    items: list[WizardItemIn]
+    @model_validator(mode="before")
+    @classmethod
+    def coerce_dates(cls, v: dict):
+        d = v.get("due_date")
+        if isinstance(d, str) and d.strip():
+            s = d.strip().replace("/", "-")
+            try:
+                v["due_date"] = date.fromisoformat(s)
+            except Exception:
+                v["due_date"] = None
+        return v
 # --------------------------
+# Totals
 # --------------------------
 class MoneyBreakdown(BaseModel):
     subtotal: float
     allow_methods=["*"], allow_headers=["*"],
 )
+# Swagger の Authorize を出す（X-API-Key）
 def custom_openapi():
     if app.openapi_schema:
         return app.openapi_schema
     SQLModel.metadata.create_all(engine)
 # ---- UI（/app） ----
+app.mount("/app", StaticFiles(directory="static", html=True), name="app")
 # -------- Customers --------
 @app.post("/customers", dependencies=[Depends(require_api_key)])
     session.add(payload); session.commit(); session.refresh(payload)
     return payload
+# ---- Customers 一覧APIの置き換え ----
 @app.get("/customers", dependencies=[Depends(require_api_key)])
 def list_customers(
     q: Optional[str] = Query(default=None, description="free text search (name/email/phone)"),
     stmt = select(Customer)
     if q:
         like = f"%{q}%"
         stmt = stmt.where(
+            (Customer.name.ilike(like)) |
+            (Customer.email.ilike(like)) |
+            (Customer.phone.ilike(like))
         )
+    # ここがポイント: .count() は使わず count クエリを投げる
+    total = session.exec(select(func.count()).select_from(stmt.subquery())).one()
     rows = session.exec(stmt.offset(offset).limit(limit)).all()
     return {"data": rows, "pagination": {"total": total, "limit": limit, "offset": offset}}
     session.add(payload); session.commit(); session.refresh(payload)
     return payload
+# ---- Products 一覧APIの total も同様に修正 ----
 @app.get("/products", dependencies=[Depends(require_api_key)])
 def list_products(
     limit: int = Query(50, ge=1, le=200),
     offset: int = Query(0, ge=0),
     session: Session = Depends(get_session),
 ):
+    base = select(Product)
+    total = session.exec(select(func.count()).select_from(base.subquery())).one()
+    rows = session.exec(base.offset(offset).limit(limit)).all()
     return {"data": rows, "pagination": {"total": total, "limit": limit, "offset": offset}}
 # -------- Quotes --------
 @app.post("/quotes", dependencies=[Depends(require_api_key)])
 def create_quote(payload: CreateQuoteIn, session: Session = Depends(get_session)):
     inv = Invoice(customer_id=payload.customer_id, due_date=payload.due_date, notes=payload.notes)
     session.add(inv); session.commit(); session.refresh(inv)
     if payload.quote_id:
         q = session.get(Quote, payload.quote_id)
         if not q:
             raise HTTPException(404, "Quote not found to copy")
         q_items = session.exec(select(QuoteItem).where(QuoteItem.quote_id == payload.quote_id)).all()
         for it in q_items:
+            new_item = InvoiceItem(
                 invoice_id=inv.id,
                 product_id=it.product_id,
                 description=it.description,
                 quantity=it.quantity,
                 unit_price=it.unit_price,
                 tax_rate=it.tax_rate,
+            )
+            session.add(new_item)
         session.commit()
     session.refresh(inv)
     )
     return {"ok": ok, "detail": detail}
+# ---- ウィザード：顧客→請求→明細を一括作成 ----
+@app.post("/wizard/invoice", dependencies=[Depends(require_api_key)])
 def wizard_create_invoice(payload: WizardInvoiceIn, session: Session = Depends(get_session)):
+    try:
+        # 顧客確定（既存 or 新規）
+        cust_id: int | None = payload.customer.id
+        if cust_id:
+            cust = session.get(Customer, cust_id)
+            if not cust:
+                raise HTTPException(404, "Customer id not found")
         else:
+            if not payload.customer.name:
+                raise HTTPException(422, "Either customer.id or customer.name is required")
+            existing = session.exec(select(Customer).where(Customer.name == payload.customer.name)).first()
+            cust = existing or Customer(
                 name=payload.customer.name.strip(),
                 email=(payload.customer.email or None),
                 phone=(payload.customer.phone or None),
                 city=(payload.customer.city or None),
                 country=(payload.customer.country or None),
             )
+            if not existing:
+                session.add(cust); session.commit(); session.refresh(cust)
         cust_id = cust.id
+        # 請求書
+        inv = Invoice(customer_id=cust_id, due_date=payload.due_date, notes=payload.notes)
+        session.add(inv); session.commit(); session.refresh(inv)
+        # 明細
+        for it in payload.items:
+            session.add(InvoiceItem(
+                invoice_id=inv.id,
+                description=it.description,
+                quantity=it.quantity,
+                unit_price=it.unit_price,
+                tax_rate=it.tax_rate,
+            ))
+        session.commit()
+        items = session.exec(select(InvoiceItem).where(InvoiceItem.invoice_id == inv.id)).all()
+        totals = compute_totals(items)
+        return {"customer_id": cust_id, "invoice_id": inv.id, "totals": totals}
+    except HTTPException:
+        raise
+    except Exception as e:
+        raise HTTPException(400, f"Wizard failed: {e}")
+# ---- ルート（UI） ----
+@app.get("/", response_class=FileResponse)
+def root_ui():
+    return FileResponse("static/app.html")
+# -------- ChatGPT router（最後に組み込む） --------
+from openai_integration import router as ai_router
+app.include_router(ai_router, prefix="/ai", tags=["ai"])