Spaces:

Corin1998
/

Invoice

Sleeping

App Files Files Community

Corin1998 commited on Aug 23, 2025

Commit

a5eb452

verified ·

1 Parent(s): f3a634d

Upload 6 files

Browse files

Files changed (1) hide show

main.py +28 -16

main.py CHANGED Viewed

@@ -1,4 +1,3 @@
-# main.py
 """
 Mini Invoice/Estimate (Quote) SaaS — single-file FastAPI app
 SQLite + SQLModel + FastAPI
@@ -13,8 +12,8 @@ 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.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
 from sqlmodel import Field as SQLField, Session, SQLModel, create_engine, select, Relationship
@@ -159,8 +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
@@ -246,7 +244,20 @@ def on_startup():
     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)])
@@ -264,16 +275,17 @@ def list_customers(
     stmt = select(Customer)
     if q:
         like = f"%{q}%"
         stmt = stmt.where(
-            (Customer.name.ilike(like)) |
-            (Customer.email.ilike(like)) |
-            (Customer.phone.ilike(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}}
-# -------- Products（必要ならUIから追加） --------
 @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)
@@ -324,28 +336,27 @@ def add_quote_item(quote_id: int, payload: QuoteItemIn, session: Session = Depen
 # -------- Invoices --------
 @app.post("/invoices", dependencies=[Depends(require_api_key)])
 def create_invoice(payload: CreateInvoiceIn, session: Session = Depends(get_session)):
-    # 見積→請求のコピーにも対応（quote_id を受け付ける）
     if not session.get(Customer, payload.customer_id):
         raise HTTPException(400, "Customer not found")
     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)
@@ -427,9 +438,10 @@ def email_invoice(invoice_id: int, payload: EmailIn, session: Session = Depends(
     )
     return {"ok": ok, "detail": detail}
-@app.get("/")
-def root():
-    return {"ok": True, "app": "mini-invoice-saas", "docs": "/docs"}
 # -------- ChatGPT router を最後に組み込む --------
 from openai_integration import router as ai_router

 """
 Mini Invoice/Estimate (Quote) SaaS — single-file FastAPI app
 SQLite + SQLModel + FastAPI
 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
     customer_id: int
     due_date: Optional[date] = None
     notes: Optional[str] = None
+    quote_id: Optional[int] = None  # 見積→請求コピー
 class InvoiceItemIn(BaseModel):
     description: str
     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)])
     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}}
+# -------- 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)
 # -------- Invoices --------
 @app.post("/invoices", dependencies=[Depends(require_api_key)])
 def create_invoice(payload: CreateInvoiceIn, session: Session = Depends(get_session)):
     if not session.get(Customer, payload.customer_id):
         raise HTTPException(400, "Customer not found")
     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)
     )
     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