feat: v9.1 업그레이드 — CS 기록 메뉴 + 반품 목록 검색 + 구글 연동 안정화

원본(CS 통합 프로그램 v9.1, 2026.09.03)을 서버판에 병합. 서버용 개조는 유지:
SSO(AuthGuard·SessionMiddleware), /corm 서브경로(root_path·APP_BASE_PATH),
X-Service-Token, /health/db, 환경변수 DB 설정, cafe24/naver 키 환경변수.

- CS 기록 메뉴(routers/cs_records.py, cs_records.js/css): 달력별 기록·완료·복사·
  다음 업무일 이월, 상시 메모(폴더·색), 일정, 엑셀 내려받기/업로드.
  표는 itemcode_db 에 자동 생성(CREATE TABLE IF NOT EXISTS). DB 설정은 원본의
  하드코딩 대신 CS_RECORD_DB_* → POSTGRES_*/ITEMCODE_DB 환경변수.
- New CS 누락·파손·불량·오배송 발주 → CS 기록 자동 저장.
- 반품 신청/입고 목록: 최근 3개월 기본, 전체 보기, 원송장번호 전체 검색.
- google_runtime.py: 구글 호출 시간 제한·전용 작업 슬롯, 설정 시트 스냅샷 캐시
  (예전 10분 인메모리 캐시와 /api/config/refresh 대체), 설정 저장 한 번에 원자적으로.
- 밀크런: 탭을 열 때만 구글 시트 조회.
- 자동발주 메뉴는 원본처럼 막지 않고 그대로 둠, 엑셀 내려받기 링크도 /corm 경로.
- requirements: holidays 추가. tests/test_google_resilience.py(서비스 토큰으로 SSO 통과).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-22 16:07:53 +09:00
parent 065e81bf97
commit d2fdec5c43
18 changed files with 5608 additions and 253 deletions
+10 -7
View File
@@ -25,6 +25,7 @@ import requests
from fastapi import APIRouter, HTTPException
from fastapi.responses import StreamingResponse
from pydantic import BaseModel
from google_runtime import GOOGLE_READ_TIMEOUT, GOOGLE_TIMEOUT, create_google_client, create_google_session, google_worker
router = APIRouter(prefix="/api/coupang-milkrun", tags=["Coupang Milkrun"])
@@ -315,7 +316,7 @@ _sheet_tabs_cache = {} # file_id -> (저장시각, 시트 목록 응답)
# 구글이 응답을 안 주면 무한정 매달리지 않도록 (연결 대기, 응답 대기) 초
_HTTP_TIMEOUT = (10, 120)
_HTTP_READ_TIMEOUT = 120
_HTTP_READ_TIMEOUT = GOOGLE_READ_TIMEOUT
# 밀크런 출고리스트 구글 시트 (화면에서 주소를 입력하지 않아도 되도록 기본값으로 둔다)
MILKRUN_SHEET_URL = os.getenv(
@@ -419,7 +420,7 @@ def _drive_get(session, file_id, params):
return session.get(
f"https://www.googleapis.com/drive/v3/files/{file_id}",
params={**params, "supportsAllDrives": "true"},
timeout=60,
timeout=GOOGLE_TIMEOUT,
)
@@ -463,7 +464,7 @@ def _fetch_drive_workbook_authenticated(file_id):
except ImportError:
raise HTTPException(status_code=500, detail="google-auth 라이브러리가 설치되어 있지 않습니다.")
session = AuthorizedSession(_load_credentials([DRIVE_SCOPE]))
session = create_google_session(_load_credentials([DRIVE_SCOPE]))
response = _drive_get(session, file_id, {"alt": "media"})
if response.status_code != 200:
raise HTTPException(status_code=400, detail=_drive_error_detail(response))
@@ -493,7 +494,7 @@ def fetch_drive_file_name(file_id):
try:
from google.auth.transport.requests import AuthorizedSession
session = AuthorizedSession(_load_credentials([DRIVE_SCOPE]))
session = create_google_session(_load_credentials([DRIVE_SCOPE]))
response = _drive_get(session, file_id, {"fields": "name"})
if response.status_code == 200:
return response.json().get("name", "")
@@ -548,7 +549,7 @@ def _read_sheet_tabs(file_id):
raise HTTPException(status_code=500, detail="gspread 라이브러리가 설치되어 있지 않습니다.")
try:
client = gspread.authorize(_load_credentials([SHEETS_SCOPE]))
client = create_google_client(_load_credentials([SHEETS_SCOPE]))
spreadsheet = client.open_by_key(file_id)
return {
"source": "google_sheet",
@@ -672,7 +673,8 @@ def _read_milkrun_sheet(content, sheet_name):
@router.post("/sheet-rows")
async def get_sheet_rows(payload: SheetRowsRequest):
@google_worker
def get_sheet_rows(payload: SheetRowsRequest):
"""선택한 시트의 제품코드/제품명/수량을 읽어 분석용 텍스트로 돌려준다."""
file_id = extract_file_id(payload.url or MILKRUN_SHEET_URL)
if not payload.sheet:
@@ -687,7 +689,8 @@ async def get_sheet_rows(payload: SheetRowsRequest):
@router.post("/sheet-tabs")
async def get_sheet_tabs(payload: SheetTabsRequest):
@google_worker
def get_sheet_tabs(payload: SheetTabsRequest):
"""구글 드라이브 파일의 시트(탭) 이름 목록을 돌려준다."""
file_id = extract_file_id(payload.url or MILKRUN_SHEET_URL)
File diff suppressed because it is too large Load Diff
+37 -20
View File
@@ -80,7 +80,7 @@ async def return_lookup(tracking_no: str):
""", (tracking_no, tracking_no))
row = cur.fetchone()
conn.close()
if row:
return {"success": True, "data": dict(row)}
return {"success": False, "message": "송장번호를 찾을 수 없습니다."}
@@ -114,14 +114,24 @@ async def create_return_request(req: ReturnRequest):
raise HTTPException(status_code=500, detail=str(e))
@router.get("/request")
async def get_return_requests(tracking_no: Optional[str] = None):
async def get_return_requests(tracking_no: Optional[str] = None, all_records: bool = False):
try:
conn = get_return_db_conn()
cur = conn.cursor()
if tracking_no:
cur.execute("SELECT * FROM return_requests WHERE TRIM(tracking_no) = %s ORDER BY created_at DESC LIMIT 1", (tracking_no.strip(),))
else:
cur.execute("SELECT * FROM return_requests ORDER BY id DESC LIMIT 50")
conditions, params = [], []
if tracking_no and tracking_no.strip():
conditions.append("regexp_replace(r.tracking_no, '[-[:space:]]', '', 'g') = %s")
params.append(''.join(tracking_no.replace('-', '').split()))
elif not all_records:
conditions.append("r.request_date::text >= to_char(CURRENT_DATE - INTERVAL '3 months', 'YYYY-MM-DD')")
where = ' WHERE ' + ' AND '.join(conditions) if conditions else ''
cur.execute("""
SELECT r.*, EXISTS (
SELECT 1 FROM return_receivings v
WHERE TRIM(v.tracking_no) = TRIM(r.tracking_no)
) AS is_received
FROM return_requests r
""" + where + " ORDER BY r.request_date DESC, r.id DESC", params)
rows = cur.fetchall()
conn.close()
return {"success": True, "data": [dict(r) for r in rows]}
@@ -133,25 +143,25 @@ async def create_return_receive_bulk(req: BulkReturnReceive):
try:
from datetime import datetime
today = datetime.now().strftime("%Y-%m-%d")
conn_return = get_return_db_conn()
cur_return = conn_return.cursor()
conn_order = get_order_db_conn()
cur_order = conn_order.cursor()
success_count = 0
for tracking_no in req.tracking_numbers:
tracking_no = tracking_no.strip()
if not tracking_no:
continue
mall = ""
receiver_name = ""
phone = ""
address = ""
# 1. Check return_requests
cur_return.execute("SELECT mall, receiver_name, phone, address, request_type, remarks FROM return_requests WHERE TRIM(tracking_no) = %s", (tracking_no,))
req_row = cur_return.fetchone()
@@ -184,7 +194,7 @@ async def create_return_receive_bulk(req: BulkReturnReceive):
receiver_name = ord_row['recipient_name'] or ""
phone = ord_row['recipient_phone'] or ord_row['recipient_mobile'] or ""
address = ord_row['address'] or ""
# Insert into return_receivings
cur_return.execute("""
INSERT INTO return_receivings
@@ -192,11 +202,11 @@ async def create_return_receive_bulk(req: BulkReturnReceive):
VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
""", (today, tracking_no, mall, receiver_name, phone, address, remarks, "환불 대기"))
success_count += 1
conn_return.commit()
conn_return.close()
conn_order.close()
return {"success": True, "count": success_count}
except Exception as e:
print(f"Bulk insert error: {e}")
@@ -208,7 +218,7 @@ async def create_return_receive(req: ReturnReceive):
req.tracking_no = req.tracking_no.strip()
conn = get_return_db_conn()
cur = conn.cursor()
# 중복 송장 검사
if req.id:
cur.execute("""
@@ -222,7 +232,7 @@ async def create_return_receive(req: ReturnReceive):
FROM return_receivings
WHERE TRIM(tracking_no) = %s
""", (req.tracking_no,))
dup = cur.fetchone()
if dup:
conn.close()
@@ -231,7 +241,7 @@ async def create_return_receive(req: ReturnReceive):
"error_type": "duplicate",
"data": dict(dup)
}
if not req.id:
cur.execute("SELECT request_type, remarks FROM return_requests WHERE TRIM(tracking_no) = %s", (req.tracking_no,))
req_row = cur.fetchone()
@@ -271,11 +281,18 @@ async def create_return_receive(req: ReturnReceive):
raise HTTPException(status_code=500, detail=str(e))
@router.get("/receive")
async def get_return_receives():
async def get_return_receives(tracking_no: Optional[str] = None, all_records: bool = False):
try:
conn = get_return_db_conn()
cur = conn.cursor()
cur.execute("SELECT * FROM return_receivings ORDER BY receive_date DESC, mall ASC, id DESC LIMIT 50")
conditions, params = [], []
if tracking_no and tracking_no.strip():
conditions.append("regexp_replace(tracking_no, '[-[:space:]]', '', 'g') = %s")
params.append(''.join(tracking_no.replace('-', '').split()))
elif not all_records:
conditions.append("receive_date::text >= to_char(CURRENT_DATE - INTERVAL '3 months', 'YYYY-MM-DD')")
where = ' WHERE ' + ' AND '.join(conditions) if conditions else ''
cur.execute("SELECT * FROM return_receivings" + where + " ORDER BY receive_date DESC, mall ASC, id DESC", params)
rows = cur.fetchall()
conn.close()
return {"success": True, "data": [dict(r) for r in rows]}