perf: 쿠팡·배송·경비·말레이시아·휴가 라우터 async def → def
동기 psycopg/파일 I/O 를 async def 안에서 부르면 쿼리·엑셀 파싱 동안 이벤트 루프가 멈춰 앱 전체(다른 모듈 포함) 요청이 줄줄이 대기했다. sync def 로 두면 FastAPI 가 스레드풀에서 돌린다. - await 없는 핸들러 116개는 async 키워드만 제거(AST 로 기계 변환). - 업로드: await up.read() → up.file.read() (쿠팡 매출/발주 업로드, 경비 첨부 청크 읽기). - 말레이시아 폼 핸들러 6개: request.form() 은 async 라 _request_form 의존성(인증 뒤에 실행)으로 미리 받아 넘기고 본문은 def. - Google Sheets writer: httplib2 가 스레드 안전하지 않고 같은 날짜 시트를 동시에 쓰면 섞이므로 RLock 으로 직렬화. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -134,11 +134,23 @@ def _base_ctx(request: Request, user: dict[str, Any], st: Any, *, wh: str) -> di
|
||||
}
|
||||
|
||||
|
||||
async def _request_form(request: Request) -> Any:
|
||||
"""폼 본문을 이벤트 루프에서 미리 읽어 핸들러에 넘겨준다.
|
||||
|
||||
`request.form()` 은 async 라 sync 핸들러 안에서 부를 수 없다. 이 의존성으로
|
||||
폼만 먼저 받고, DB 를 쓰는 핸들러 본문은 `def` 로 두어 스레드풀에서 돌린다
|
||||
(`async def` 안에서 동기 DB 를 부르면 쿼리 동안 앱 전체가 멈춘다).
|
||||
"""
|
||||
return await request.form()
|
||||
|
||||
|
||||
# ════════════════════════════════════════════════════════════
|
||||
# 재고 현황 (메인)
|
||||
# ════════════════════════════════════════════════════════════
|
||||
|
||||
|
||||
@router.get("/", response_class=HTMLResponse)
|
||||
async def index(request: Request) -> HTMLResponse:
|
||||
def index(request: Request) -> HTMLResponse:
|
||||
from app.main import render_template # noqa: WPS433
|
||||
|
||||
guard = _guard(request)
|
||||
@@ -183,7 +195,7 @@ async def index(request: Request) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.get("/rack", response_class=HTMLResponse)
|
||||
async def rack_view(request: Request) -> HTMLResponse:
|
||||
def rack_view(request: Request) -> HTMLResponse:
|
||||
"""창고 랙 보기 — 최근(취소 제외) 재고조사의 랙 입력을 칸별로 한눈에.
|
||||
|
||||
읽기 전용. 각 칸에 어떤 상품이 몇 박스(× 입수량 = 총개수) 있는지 표시.
|
||||
@@ -219,8 +231,8 @@ async def rack_view(request: Request) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.post("/rack/save")
|
||||
async def rack_save(
|
||||
request: Request, user: dict[str, Any] = Depends(_require_user)
|
||||
def rack_save(
|
||||
request: Request, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
|
||||
) -> RedirectResponse:
|
||||
"""랙 보기에서 드래그로 재배치한 칸 구성을 저장(위치만 변경).
|
||||
|
||||
@@ -231,7 +243,6 @@ async def rack_save(
|
||||
st = _store(request)
|
||||
if st is None:
|
||||
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
|
||||
form = await request.form()
|
||||
wh = str(form.get("warehouse_code") or "").strip() or _selected_wh(request, st)
|
||||
latest = st.latest_rack_stocktake(warehouse_code=wh)
|
||||
if not latest:
|
||||
@@ -245,7 +256,7 @@ async def rack_save(
|
||||
|
||||
|
||||
@router.post("/reset")
|
||||
async def reset_data(
|
||||
def reset_data(
|
||||
request: Request, user: dict[str, Any] = Depends(_require_user)
|
||||
) -> RedirectResponse:
|
||||
"""전체 창고 재고 수량 데이터 초기화 — 슈퍼관리자 전용.
|
||||
@@ -263,7 +274,7 @@ async def reset_data(
|
||||
|
||||
|
||||
@router.post("/items/{item_code}/purge")
|
||||
async def purge_orphan_item(
|
||||
def purge_orphan_item(
|
||||
request: Request, item_code: str, user: dict[str, Any] = Depends(_require_user)
|
||||
) -> RedirectResponse:
|
||||
"""미등록(malaysia_items 에 없는) 코드의 이동 이력 삭제 — 슈퍼관리자 전용.
|
||||
@@ -294,7 +305,7 @@ async def purge_orphan_item(
|
||||
# 입고 / 출고 등록 (그리드 일괄)
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/movements", response_class=HTMLResponse)
|
||||
async def movements_page(request: Request) -> HTMLResponse:
|
||||
def movements_page(request: Request) -> HTMLResponse:
|
||||
from app.main import render_template # noqa: WPS433
|
||||
|
||||
guard = _guard(request)
|
||||
@@ -347,7 +358,7 @@ async def movements_page(request: Request) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.post("/movements/apply")
|
||||
async def movements_apply(request: Request, user: dict[str, Any] = Depends(_require_user)) -> RedirectResponse:
|
||||
def movements_apply(request: Request, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)) -> RedirectResponse:
|
||||
"""낱개 + 세트 한 화면 일괄 적용 (버튼 하나).
|
||||
|
||||
form: movement_type(낱개용 IN/OUT/ADJUST), movement_date, warehouse_code,
|
||||
@@ -361,7 +372,6 @@ async def movements_apply(request: Request, user: dict[str, Any] = Depends(_requ
|
||||
st = _store(request)
|
||||
if st is None:
|
||||
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
|
||||
form = await request.form()
|
||||
mtype = str(form.get("movement_type") or "").strip().upper()
|
||||
if mtype not in ("IN", "OUT", "ADJUST"):
|
||||
raise HTTPException(status_code=400, detail="이동 종류 오류")
|
||||
@@ -441,7 +451,7 @@ async def movements_apply(request: Request, user: dict[str, Any] = Depends(_requ
|
||||
|
||||
|
||||
@router.get("/movements/export")
|
||||
async def movements_export(request: Request) -> StreamingResponse:
|
||||
def movements_export(request: Request) -> StreamingResponse:
|
||||
"""해당 일자/종류(IN/OUT)에 입출고된 낱개 수량을 엑셀로 내보낸다.
|
||||
|
||||
컬럼: A=사방넷 코드, B=수량, C=이름.
|
||||
@@ -518,7 +528,7 @@ async def movements_export(request: Request) -> StreamingResponse:
|
||||
|
||||
|
||||
@router.get("/movements/export-daily")
|
||||
async def movements_export_daily(request: Request) -> StreamingResponse:
|
||||
def movements_export_daily(request: Request) -> StreamingResponse:
|
||||
"""기간 전체를 상품(행) × 일자(열) 표로 엑셀 내보내기.
|
||||
|
||||
콤보(세트)는 등록 시 이미 BOM 으로 분해돼 구성 낱개 OUT movement 로 저장되므로
|
||||
@@ -634,7 +644,7 @@ async def movements_export_daily(request: Request) -> StreamingResponse:
|
||||
|
||||
|
||||
@router.get("/movements/export-compare")
|
||||
async def movements_export_compare(request: Request) -> StreamingResponse:
|
||||
def movements_export_compare(request: Request) -> StreamingResponse:
|
||||
"""임의 기준일 대비 자동 비교 엑셀 — 재고조사 확정 여부와 무관하게 movement 이력만으로 계산.
|
||||
|
||||
기준일까지 누적재고(current_stock_as_of) + 기준일 다음날~종료일 일자별 순변동을 더한
|
||||
@@ -773,7 +783,7 @@ async def movements_export_compare(request: Request) -> StreamingResponse:
|
||||
|
||||
|
||||
@router.get("/rack/export")
|
||||
async def rack_export(request: Request) -> StreamingResponse:
|
||||
def rack_export(request: Request) -> StreamingResponse:
|
||||
"""창고 랙 보기 데이터를 엑셀로 내보낸다.
|
||||
|
||||
랙 보기와 동일 기준(latest_rack_stocktake)의 모든 칸 항목을 한 행씩.
|
||||
@@ -873,7 +883,7 @@ async def rack_export(request: Request) -> StreamingResponse:
|
||||
# 일일 재고조사
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/stocktakes", response_class=HTMLResponse)
|
||||
async def stocktakes_page(request: Request) -> HTMLResponse:
|
||||
def stocktakes_page(request: Request) -> HTMLResponse:
|
||||
from app.main import render_template # noqa: WPS433
|
||||
|
||||
guard = _guard(request)
|
||||
@@ -894,7 +904,7 @@ async def stocktakes_page(request: Request) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.post("/stocktakes")
|
||||
async def stocktake_create(
|
||||
def stocktake_create(
|
||||
request: Request,
|
||||
stocktake_date: str = Form(...),
|
||||
warehouse_code: str = Form(...),
|
||||
@@ -915,7 +925,7 @@ async def stocktake_create(
|
||||
|
||||
|
||||
@router.get("/stocktakes/{stocktake_id:int}", response_class=HTMLResponse)
|
||||
async def stocktake_detail(request: Request, stocktake_id: int) -> HTMLResponse:
|
||||
def stocktake_detail(request: Request, stocktake_id: int) -> HTMLResponse:
|
||||
from app.main import render_template # noqa: WPS433
|
||||
from app.store import is_admin # noqa: WPS433
|
||||
|
||||
@@ -968,7 +978,7 @@ async def stocktake_detail(request: Request, stocktake_id: int) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.get("/stocktakes/{stocktake_id:int}/export-compare")
|
||||
async def stocktake_export_compare(request: Request, stocktake_id: int) -> StreamingResponse:
|
||||
def stocktake_export_compare(request: Request, stocktake_id: int) -> StreamingResponse:
|
||||
"""이 재고조사(마감) 이후 오늘까지 자동 비교 엑셀.
|
||||
|
||||
마감재고(재고조사 total_qty) + 마감 다음날부터 오늘까지의 순변동(IN-OUT±ADJUST±STOCKTAKE)을
|
||||
@@ -1102,14 +1112,13 @@ async def stocktake_export_compare(request: Request, stocktake_id: int) -> Strea
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/lines/bulk")
|
||||
async def stocktake_lines_bulk(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
|
||||
def stocktake_lines_bulk(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
|
||||
) -> RedirectResponse:
|
||||
"""그리드 일괄 저장. form: qty_<SKUCODE>... (낱개+세트). 빈칸은 스킵, 0 허용."""
|
||||
st = _store(request)
|
||||
if st is None:
|
||||
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
|
||||
form = await request.form()
|
||||
codes = [i["item_code"] for i in st.list_items(kind="individual")]
|
||||
codes += [i["item_code"] for i in st.list_items(kind="set")]
|
||||
errors: list[str] = []
|
||||
@@ -1161,8 +1170,8 @@ def _parse_rack_form(form: Any) -> list[dict[str, Any]]:
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/lines/upload")
|
||||
async def stocktake_lines_upload(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
|
||||
def stocktake_lines_upload(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
|
||||
) -> RedirectResponse:
|
||||
"""엑셀 업로드로 SKU별 수량 일괄 입력(랙 입력 대신). daily_stocktake_line 을 직접 갱신한다.
|
||||
|
||||
@@ -1182,11 +1191,10 @@ async def stocktake_lines_upload(
|
||||
if head["status"] != "draft":
|
||||
raise HTTPException(status_code=400, detail="작성중인 조사만 입력할 수 있습니다.")
|
||||
|
||||
form = await request.form()
|
||||
upload = form.get("file")
|
||||
if upload is None or not getattr(upload, "filename", ""):
|
||||
raise HTTPException(status_code=400, detail="엑셀 파일을 선택하세요.")
|
||||
data = await upload.read()
|
||||
data = upload.file.read() # sync def(스레드풀) — 동기 읽기
|
||||
if not data:
|
||||
raise HTTPException(status_code=400, detail="빈 파일입니다.")
|
||||
|
||||
@@ -1241,8 +1249,8 @@ async def stocktake_lines_upload(
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/rack/bulk")
|
||||
async def stocktake_rack_bulk(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
|
||||
def stocktake_rack_bulk(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
|
||||
) -> RedirectResponse:
|
||||
"""랙 입력 일괄 저장.
|
||||
|
||||
@@ -1251,7 +1259,6 @@ async def stocktake_rack_bulk(
|
||||
st = _store(request)
|
||||
if st is None:
|
||||
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
|
||||
form = await request.form()
|
||||
entries = _parse_rack_form(form)
|
||||
try:
|
||||
st.replace_rack(stocktake_id=stocktake_id, entries=entries)
|
||||
@@ -1263,7 +1270,7 @@ async def stocktake_rack_bulk(
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/rack/load-previous")
|
||||
async def stocktake_rack_load_previous(
|
||||
def stocktake_rack_load_previous(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
|
||||
) -> RedirectResponse:
|
||||
"""직전 재고조사의 랙 저장값을 현재(작성중) 조사로 불러와 채운다.
|
||||
@@ -1292,8 +1299,8 @@ async def stocktake_rack_load_previous(
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/rack/finalize")
|
||||
async def stocktake_rack_finalize(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
|
||||
def stocktake_rack_finalize(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user), form: Any = Depends(_request_form)
|
||||
) -> RedirectResponse:
|
||||
"""랙 입력 저장 + 즉시 확정(한 번에).
|
||||
|
||||
@@ -1307,7 +1314,6 @@ async def stocktake_rack_finalize(
|
||||
st = _store(request)
|
||||
if st is None:
|
||||
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
|
||||
form = await request.form()
|
||||
entries = _parse_rack_form(form)
|
||||
try:
|
||||
st.replace_rack(stocktake_id=stocktake_id, entries=entries)
|
||||
@@ -1320,7 +1326,7 @@ async def stocktake_rack_finalize(
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/lines/{line_id:int}/delete")
|
||||
async def stocktake_line_delete(
|
||||
def stocktake_line_delete(
|
||||
request: Request, stocktake_id: int, line_id: int,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
) -> RedirectResponse:
|
||||
@@ -1337,7 +1343,7 @@ async def stocktake_line_delete(
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/finalize")
|
||||
async def stocktake_finalize(
|
||||
def stocktake_finalize(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
|
||||
) -> RedirectResponse:
|
||||
from app.store import is_admin # noqa: WPS433
|
||||
@@ -1357,7 +1363,7 @@ async def stocktake_finalize(
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/cancel")
|
||||
async def stocktake_cancel(
|
||||
def stocktake_cancel(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
|
||||
) -> RedirectResponse:
|
||||
st = _store(request)
|
||||
@@ -1371,7 +1377,7 @@ async def stocktake_cancel(
|
||||
|
||||
|
||||
@router.post("/stocktakes/{stocktake_id:int}/delete")
|
||||
async def stocktake_delete(
|
||||
def stocktake_delete(
|
||||
request: Request, stocktake_id: int, user: dict[str, Any] = Depends(_require_user)
|
||||
) -> RedirectResponse:
|
||||
"""재고조사 완전 삭제 — 슈퍼관리자 전용."""
|
||||
@@ -1392,7 +1398,7 @@ async def stocktake_delete(
|
||||
# JSON API
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/api/warehouses")
|
||||
async def api_warehouses(request: Request, _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
|
||||
def api_warehouses(request: Request, _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
|
||||
st = _store(request)
|
||||
if st is None:
|
||||
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
|
||||
@@ -1400,7 +1406,7 @@ async def api_warehouses(request: Request, _: dict[str, Any] = Depends(_require_
|
||||
|
||||
|
||||
@router.get("/api/items")
|
||||
async def api_items(request: Request, kind: str = "", _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
|
||||
def api_items(request: Request, kind: str = "", _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
|
||||
st = _store(request)
|
||||
if st is None:
|
||||
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
|
||||
@@ -1409,13 +1415,13 @@ async def api_items(request: Request, kind: str = "", _: dict[str, Any] = Depend
|
||||
|
||||
|
||||
@router.get("/api/bom")
|
||||
async def api_bom(request: Request, _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
|
||||
def api_bom(request: Request, _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
|
||||
"""itemcode_db(set_components)에서 읽은 MY- 세트 BOM (읽기 전용)."""
|
||||
return JSONResponse({"bom": _bom_map(request)})
|
||||
|
||||
|
||||
@router.get("/api/stock")
|
||||
async def api_stock(request: Request, wh: str = "", _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
|
||||
def api_stock(request: Request, wh: str = "", _: dict[str, Any] = Depends(_require_user)) -> JSONResponse:
|
||||
st = _store(request)
|
||||
if st is None:
|
||||
raise HTTPException(status_code=503, detail="malaysia_stock_db 미설정")
|
||||
@@ -1424,7 +1430,7 @@ async def api_stock(request: Request, wh: str = "", _: dict[str, Any] = Depends(
|
||||
|
||||
|
||||
@router.post("/api/movements")
|
||||
async def api_movement_create(
|
||||
def api_movement_create(
|
||||
request: Request, payload: dict[str, Any] = Body(...), user: dict[str, Any] = Depends(_require_user)
|
||||
) -> JSONResponse:
|
||||
st = _store(request)
|
||||
@@ -1448,7 +1454,7 @@ async def api_movement_create(
|
||||
|
||||
|
||||
@router.post("/api/movements/set-out")
|
||||
async def api_set_out(
|
||||
def api_set_out(
|
||||
request: Request, payload: dict[str, Any] = Body(...), user: dict[str, Any] = Depends(_require_user)
|
||||
) -> JSONResponse:
|
||||
st = _store(request)
|
||||
@@ -1472,7 +1478,7 @@ async def api_set_out(
|
||||
|
||||
|
||||
@router.get("/api/stocktakes/{stocktake_id:int}/result")
|
||||
async def api_stocktake_result(
|
||||
def api_stocktake_result(
|
||||
request: Request, stocktake_id: int, _: dict[str, Any] = Depends(_require_user)
|
||||
) -> JSONResponse:
|
||||
st = _store(request)
|
||||
@@ -1488,5 +1494,5 @@ async def api_stocktake_result(
|
||||
|
||||
|
||||
@router.get("/health")
|
||||
async def health() -> dict[str, str]:
|
||||
def health() -> dict[str, str]:
|
||||
return {"status": "ok", "module": "malaysia"}
|
||||
|
||||
Reference in New Issue
Block a user