Upload main.py

main.py

@@ -17,6 +17,7 @@ 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 sqlalchemy import func
+from sqlalchemy.exc import SQLAlchemyError
 
 # --------------------------
 # Auth
@@ -64,6 +65,7 @@ engine = create_engine(
     echo=False,
     connect_args={"check_same_thread": False} if DB_URL.startswith("sqlite") else {}
 )
+IS_SQLITE = DB_URL.startswith("sqlite")
 
 def get_session():
     with Session(engine) as session:
@@ -122,7 +124,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
@@ -159,7 +161,7 @@ class CreateInvoiceIn(BaseModel):
     customer_id: int
     due_date: Optional[date] = None
     notes: Optional[str] = None
-    # 見積→請求コピー用
+    # 見積→請求のコピー用（任意）
     quote_id: Optional[int] = None
 
 class InvoiceItemIn(BaseModel):
@@ -214,7 +216,7 @@ class WizardInvoiceIn(BaseModel):
         return v
 
 # --------------------------
-# Totals
+# Totals（堅牢化）
 # --------------------------
 class MoneyBreakdown(BaseModel):
     subtotal: float
@@ -251,7 +253,7 @@ app.add_middleware(
     allow_methods=["*"], allow_headers=["*"],
 )
 
-# Swagger の Authorize を出す（X-API-Key）
+# Swagger の Authorize（X-API-Key）を出す
 def custom_openapi():
     if app.openapi_schema:
         return app.openapi_schema
@@ -285,8 +287,20 @@ app.mount("/app", StaticFiles(directory="static", html=True), name="app")
 # -------- Customers --------
 @app.post("/customers", dependencies=[Depends(require_api_key)])
 def create_customer(payload: Customer, session: Session = Depends(get_session)):
-    session.add(payload); session.commit(); session.refresh(payload)
-    return payload
+    try:
+        if not (payload.name and str(payload.name).strip()):
+            raise HTTPException(422, "name は必須です")
+        session.add(payload)
+        session.commit()
+        session.refresh(payload)
+        return payload
+    except HTTPException:
+        raise
+    except SQLAlchemyError as e:
+        session.rollback()
+        raise HTTPException(400, f"DBエラー: {e.__class__.__name__}")
+    except Exception as e:
+        raise HTTPException(400, f"不正なリクエスト: {e}")
 
 @app.get("/customers", dependencies=[Depends(require_api_key)])
 def list_customers(
@@ -299,23 +313,43 @@ def list_customers(
     count_stmt = select(func.count(Customer.id))
 
     if q:
-        like = f"%{q}%"
-        cond = (
-            func.lower(Customer.name).like(func.lower(like)) |
-            func.lower(Customer.email).like(func.lower(like)) |
-            func.lower(Customer.phone).like(func.lower(like))
-        )
+        pattern = f"%{q}%"
+        if IS_SQLITE:
+            cond = (
+                Customer.name.like(pattern) |
+                Customer.email.like(pattern) |
+                Customer.phone.like(pattern)
+            )
+        else:
+            cond = (
+                Customer.name.ilike(pattern) |
+                Customer.email.ilike(pattern) |
+                Customer.phone.ilike(pattern)
+            )
         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
+    try:
+        if not (payload.name and str(payload.name).strip()):
+            raise HTTPException(422, "name は必須です")
+        session.add(payload)
+        session.commit()
+        session.refresh(payload)
+        return payload
+    except HTTPException:
+        raise
+    except SQLAlchemyError as e:
+        session.rollback()
+        raise HTTPException(400, f"DBエラー: {e.__class__.__name__}")
+    except Exception as e:
+        raise HTTPException(400, f"不正なリクエスト: {e}")
 
 @app.get("/products", dependencies=[Depends(require_api_key)])
 def list_products(
@@ -369,21 +403,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(
+            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)
@@ -514,10 +548,10 @@ def wizard_create_invoice(payload: WizardInvoiceIn, session: Session = Depends(g
     except Exception as e:
         raise HTTPException(400, f"Wizard failed: {e}")
 
-# ---- ルート（UI を /app に任せつつ、/ は API の案内） ----
-@app.get("/")
-def root():
-    return {"ok": True, "app": "mini-invoice-saas", "docs": "/docs", "ui": "/app/"}
+# ---- ルート（UI） ----
+@app.get("/", response_class=FileResponse)
+def root_ui():
+    return FileResponse("static/app.html")
 
 # -------- ChatGPT router（最後に組み込む） --------
 from openai_integration import router as ai_router