Upload main.py

main.py

@@ -122,6 +122,7 @@ 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,6 +159,7 @@ class CreateInvoiceIn(BaseModel):
     customer_id: int
     due_date: Optional[date] = None
     notes: Optional[str] = None
+    # 見積→請求コピー用
     quote_id: Optional[int] = None
 
 class InvoiceItemIn(BaseModel):
@@ -286,7 +288,6 @@ def create_customer(payload: Customer, session: Session = Depends(get_session)):
     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)"),
@@ -294,25 +295,30 @@ def list_customers(
     offset: int = Query(0, ge=0),
     session: Session = Depends(get_session),
 ):
-    stmt = select(Customer)
+    # 件数とデータ取得を素直に分ける（環境依存の例外を回避）
+    base = select(Customer)
+    count_stmt = select(func.count(Customer.id))
+
     if q:
         like = f"%{q}%"
-        stmt = stmt.where(
+        cond = (
             (Customer.name.ilike(like)) |
             (Customer.email.ilike(like)) |
             (Customer.phone.ilike(like))
         )
-    # 修正済み：余計なインデントを削除
-    total = session.exec(select(func.count()).select_from(stmt.subquery())).scalar_one()
-    rows = session.exec(stmt.offset(offset).limit(limit)).all()
+        base = base.where(cond)
+        count_stmt = count_stmt.where(cond)
+
+    total = session.exec(count_stmt).scalar() or 0
+    rows = session.exec(base.offset(offset).limit(limit)).all()
     return {"data": rows, "pagination": {"total": total, "limit": limit, "offset": offset}}
+
 # -------- Products --------
 @app.post("/products", dependencies=[Depends(require_api_key)])
 def create_product(payload: Product, session: Session = Depends(get_session)):
     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),
@@ -320,7 +326,7 @@ def list_products(
     session: Session = Depends(get_session),
 ):
     base = select(Product)
-    total = session.exec(select(func.count()).select_from(base.subquery())).scalar_one()
+    total = session.exec(select(func.count(Product.id))).scalar() or 0
     rows = session.exec(base.offset(offset).limit(limit)).all()
     return {"data": rows, "pagination": {"total": total, "limit": limit, "offset": offset}}
 
@@ -365,21 +371,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:
-            new_item = InvoiceItem(
+            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.add(new_item)
+            ))
         session.commit()
 
     session.refresh(inv)
@@ -510,10 +516,10 @@ def wizard_create_invoice(payload: WizardInvoiceIn, session: Session = Depends(g
     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")
+# ---- ルート（UI を /app に任せつつ、/ は API の案内） ----
+@app.get("/")
+def root():
+    return {"ok": True, "app": "mini-invoice-saas", "docs": "/docs", "ui": "/app/"}
 
 # -------- ChatGPT router（最後に組み込む） --------
 from openai_integration import router as ai_router