From bd0c47e6fc1bdc11d49a249714a2866244637847 Mon Sep 17 00:00:00 2001 From: king Date: Tue, 6 Oct 2026 02:09:10 +0900 Subject: [PATCH] feat(asset): add inventory and HWiNFO reports Requires asset_db initialized with scripts/sql/asset_db_init.sql and ASSET_DB_URL configured before enabling storage. --- .env.example | 4 + .env.local.example | 3 + .gitignore | 3 + AGENTS.md | 6 +- app/main.py | 12 + app/modules/asset/__init__.py | 9 + app/modules/asset/db.py | 183 +++ app/modules/asset/hwinfo.py | 129 ++ app/modules/asset/router.py | 246 ++++ app/modules/asset/store.py | 84 ++ app/modules/asset/templates/asset/index.html | 68 + app/static/asset.css | 1272 ++++++++++++++++++ app/static/asset.js | 990 ++++++++++++++ app/store.py | 1 + docs/ASSET_MODULE.md | 115 ++ docs/DATABASES.md | 8 +- docs/DEPLOYMENT.md | 7 + docs/PROJECT_OVERVIEW.md | 8 +- requirements.txt | 1 + scripts/sql/asset_db_init.sql | 64 + tests/asset_fixtures.py | 23 + tests/js/asset.browser.test.js | 531 ++++++++ tests/js/render_asset.py | 31 + tests/test_asset.py | 349 +++++ tests/test_asset_integration.py | 41 + 25 files changed, 4185 insertions(+), 3 deletions(-) create mode 100644 app/modules/asset/__init__.py create mode 100644 app/modules/asset/db.py create mode 100644 app/modules/asset/hwinfo.py create mode 100644 app/modules/asset/router.py create mode 100644 app/modules/asset/store.py create mode 100644 app/modules/asset/templates/asset/index.html create mode 100644 app/static/asset.css create mode 100644 app/static/asset.js create mode 100644 docs/ASSET_MODULE.md create mode 100644 scripts/sql/asset_db_init.sql create mode 100644 tests/asset_fixtures.py create mode 100644 tests/js/asset.browser.test.js create mode 100644 tests/js/render_asset.py create mode 100644 tests/test_asset.py create mode 100644 tests/test_asset_integration.py diff --git a/.env.example b/.env.example index e1f2334..c410c13 100644 --- a/.env.example +++ b/.env.example @@ -163,3 +163,7 @@ CUSTOMER_ORDER_LIST_URL=/orderlist/ # APP_ENCRYPTION_KEY_V1= # [매출 업데이트] 가 가져오는 기간(오늘 포함 최근 N일, 기본 7, 최대 90) # PERFORMANCE_SYNC_DAYS=7 + +# 자산관리 — 별도 asset_db. 사용자가 서버에서 asset_db_init.sql로 직접 초기화. +# 미설정 시 등록/배정은 비활성, HWiNFO XML 분석 미리보기는 사용 가능. +# ASSET_DB_URL=postgresql://asset_app:replace-me@postgres-db:5432/asset_db diff --git a/.env.local.example b/.env.local.example index 5b68801..aebbfec 100644 --- a/.env.local.example +++ b/.env.local.example @@ -16,3 +16,6 @@ PUBLIC_BASE_URL=http://localhost:8080 CS_ORDER_URL=https://cs.example.com CUSTOMER_ORDER_LIST_URL=https://orders.example.com + +# 자산관리 개발용 DB (사용자가 직접 생성). 운영 DB 접속정보를 사용하지 마세요. +# ASSET_DB_URL=postgresql://asset_app:replace-me@host.docker.internal:5432/asset_db diff --git a/.gitignore b/.gitignore index 6de998a..edbfd35 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ __pycache__/ # dispatch 라벨 PDF 샘플(실제 고객 PII — 커밋 금지) docs/samples/ tests/js/.out/ + +# HWiNFO 실물 보고서: 시리얼/MAC/사용자 정보가 포함되어 소스에 보관하지 않음 +KING-DESKTOP.XML diff --git a/AGENTS.md b/AGENTS.md index b8fa6d8..6d68079 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -40,6 +40,10 @@ Codex는 이 저장소에서 작업을 시작하기 전에 **반드시 아래 상세는 `docs/PROJECT_OVERVIEW.md`. +- 자산관리 (`app/modules/asset/`, `asset_db`) — 사무집기·전산장비 등록/배정/반납/상태·구매/보증·이력. + HWiNFO XML 분석·사양 조회·이전 보고서와 원본 보존. 권한키 `asset`, 환경변수 `ASSET_DB_URL`. + DB 미설정 시 저장 비활성, XML 분석 미리보기 가능. DB 생성은 사용자가 서버 명령으로 직접 진행. 상세 `docs/ASSET_MODULE.md`. + --- ## 개발 원칙 @@ -47,7 +51,7 @@ Codex는 이 저장소에서 작업을 시작하기 전에 **반드시 아래 - 기존 코드를 수정하기 전 관련 파일을 먼저 읽고 구조를 파악한다. - 위험 명령은 **반드시 사용자 확인 후** 실행한다 (아래 "위험 명령" 절 참고). - `.env`, API 키, DB 비밀번호, OAuth Secret, 토큰은 절대 Git에 올리지 않는다. -- 신규 DB가 필요하면 **승인 요청 후** 생성하며, DB명은 반드시 `_db`로 끝낸다 (예: `inventory_db`). +- 신규 DB가 필요하면 **서버에서 실행할 명령을 제공하고 생성은 사용자가 직접 진행한다** (사용자 지시: 2026-10-06). DB명은 반드시 `_db`로 끝낸다 (예: `inventory_db`). 대상 서버·현재 DB·백업 상태와 생성 후 스키마·앱 계정 권한·연결 확인 명령을 함께 제공한다. 기존 DB 삭제·덮어쓰기 등 위험 명령은 아래의 별도 승인 원칙을 그대로 따른다. - 예전 문서/코드의 `orderlist_app`은 현재 기준 `orderlist_db`이다. 발견 시 수정 대상. --- diff --git a/app/main.py b/app/main.py index 27b9e1d..bac8401 100644 --- a/app/main.py +++ b/app/main.py @@ -15,6 +15,8 @@ from pydantic import BaseModel from starlette.middleware.sessions import SessionMiddleware from .modules.cafe24 import build_cafe24_store +from .modules.asset import build_asset_store +from .modules.asset import router as asset_router from .modules.cafe24 import router as cafe24_router from .modules.cupang import build_cupang_store, build_itemcode_reader from .modules.cupang import router as cupang_router @@ -52,6 +54,7 @@ MODULE_LABELS: dict[str, str] = { "project": "프로젝트 관리", "cafe24": "카페24 상품관리", "performance": "실적", + "asset": "자산관리", "expense_approver": "개인경비", "vacation_approver": "휴가", } @@ -140,6 +143,7 @@ _MODULE_TEMPLATE_DIRS = [ BASE_DIR / "modules" / "project" / "templates", BASE_DIR / "modules" / "cafe24" / "templates", BASE_DIR / "modules" / "performance" / "templates", + BASE_DIR / "modules" / "asset" / "templates", ] templates = Jinja2Templates(directory=str(BASE_DIR / "templates")) templates.env.loader = ChoiceLoader( @@ -202,6 +206,7 @@ app.state.cafe24_store = build_cafe24_store(dsn=env("CAFE24_DB_URL") or None) # 실적(쇼핑몰 통합 매출): PERFORMANCE_DB_URL 없으면 store=None(라우터가 "설정 필요" 안내). # 쇼핑몰 API 인증정보는 설정 화면에서 입력 → APP_ENCRYPTION_KEY 로 암호화해 performance_db 에 저장. app.state.performance_store = build_performance_store(dsn=env("PERFORMANCE_DB_URL") or None) +app.state.asset_store = build_asset_store(dsn=env("ASSET_DB_URL") or None) # 모듈 라우터 등록 — 신규 모듈 추가 시 여기 한 줄. app.include_router(expense_router) @@ -212,6 +217,7 @@ app.include_router(dispatch_router) app.include_router(project_router) app.include_router(cafe24_router) app.include_router(performance_router) +app.include_router(asset_router) def public_url_for(request: Request, route_name: str) -> str: @@ -405,6 +411,11 @@ def _menu_items_for(user_rec: dict[str, Any]) -> list[dict[str, Any]]: "category": "관리", }, ] + items.append({ + "key": "asset", "title": "자산관리", "subtitle": "Asset Management", + "description": "사무집기·전산장비의 배정·반납·구매 이력과 HWiNFO 컴퓨터 사양을 관리합니다.", + "url": "/asset/", "health_url": "/asset/health", "status": "ready", "category": "관리", + }) allowed = allowed_modules(user_rec) for item in items: item["allowed"] = item["key"] in allowed @@ -414,6 +425,7 @@ def _menu_items_for(user_rec: dict[str, Any]) -> list[dict[str, Any]]: def _icon_svg(name: str) -> str: """좌측 사이드바용 인라인 아이콘. 외부 의존 없는 작은 SVG.""" paths = { + "asset": '', "home": '', "expense": '', "vacation": '', diff --git a/app/modules/asset/__init__.py b/app/modules/asset/__init__.py new file mode 100644 index 0000000..25df116 --- /dev/null +++ b/app/modules/asset/__init__.py @@ -0,0 +1,9 @@ +"""Company asset management; PostgreSQL only, never creates databases at startup.""" +from .router import router + + +def build_asset_store(*, dsn: str | None): + if not dsn: + return None + from .db import AssetStore + return AssetStore(dsn) diff --git a/app/modules/asset/db.py b/app/modules/asset/db.py new file mode 100644 index 0000000..8060d41 --- /dev/null +++ b/app/modules/asset/db.py @@ -0,0 +1,183 @@ +"""자산·보고서·이력을 함께 저장합니다. DB 생성은 사용자가 서버에서 SQL로 진행합니다.""" +from __future__ import annotations + +import uuid +from datetime import date, datetime +from decimal import Decimal + +from psycopg.rows import dict_row +from psycopg.types.json import Jsonb +from psycopg_pool import ConnectionPool + +from .store import AssetConflict, transition + +FIELDS = ("tag", "name", "category", "manufacturer", "model", "serial", "location", "department", + "purchased_on", "purchase_cost", "vendor", "warranty_until", "notes") +SORTS = {"updated": "a.updated_at DESC", "name": "a.name ASC", "tag": "a.tag ASC", + "cost": "a.purchase_cost DESC NULLS LAST", "warranty": "a.warranty_until ASC NULLS LAST"} + + +def serialize(row): + if row is None: + return None + return {k: (v.isoformat() if isinstance(v, (date, datetime)) else str(v) if isinstance(v, Decimal) else v) + for k, v in row.items()} + + +def filters(q="", category="", status="", location="", assignee="", warranty=False, group=""): + conditions, params = ["TRUE"], [] + if q: + # %와 _도 입력한 글자 그대로 검색합니다. 검색어는 SQL과 분리해서 전달합니다. + value = "%" + q.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_") + "%" + conditions.append("(concat_ws(' ',a.tag,a.name,a.model,a.serial,a.manufacturer,a.location,a.department,a.assignee_email) ILIKE %s)") + params.append(value) + for col, value in (("category", category), ("status", status), ("location", location), ("assignee_email", assignee)): + if value: + conditions.append(f"a.{col} = %s") + params.append(value) + if warranty: + conditions.append("a.warranty_until BETWEEN (now() AT TIME ZONE 'Asia/Seoul')::date AND (now() AT TIME ZONE 'Asia/Seoul')::date + 30 AND a.status <> 'retired'") + if group == "furniture": + conditions.append("a.category IN ('desk','chair','furniture')") + elif group == "computer": + conditions.append("a.category NOT IN ('desk','chair','furniture')") + return " AND ".join(conditions), params + + +class AssetStore: + def __init__(self, dsn): + self._pool = ConnectionPool(dsn, min_size=0, max_size=5, timeout=5, open=False, + kwargs={"row_factory": dict_row, "autocommit": True}) + self._pool.open(wait=False) + + def close(self): + self._pool.close() + + def health(self): + with self._pool.connection(timeout=5) as conn: + conn.execute("SELECT id FROM assets LIMIT 1") + + def list_assets(self, *, page=1, page_size=25, sort="updated", **kwargs): + # 전체 개수와 목록을 같은 시점의 데이터로 읽어 페이지 숫자가 어긋나지 않게 합니다. + where, params = filters(**kwargs) + with self._pool.connection() as conn, conn.transaction(): + conn.execute("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ READ ONLY") + total = conn.execute(f"SELECT count(*) AS n FROM assets a WHERE {where}", params).fetchone()["n"] + rows = conn.execute( + f"SELECT a.*,r.parsed->'summary' AS specs,r.uploaded_at AS report_at FROM assets a " + "LEFT JOIN asset_reports r ON r.id=a.latest_report_id " + f"WHERE {where} ORDER BY {SORTS.get(sort, SORTS['updated'])},a.id LIMIT %s OFFSET %s", + [*params, page_size, (page - 1) * page_size]).fetchall() + return {"items": [serialize(r) for r in rows], "total": total, "page": page, "page_size": page_size} + + def dashboard(self): + with self._pool.connection() as conn, conn.transaction(): + conn.execute("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ READ ONLY") + totals = conn.execute("""SELECT count(*) AS total, + count(*) FILTER(WHERE status='available') AS available, + count(*) FILTER(WHERE status='in_use') AS in_use, + count(*) FILTER(WHERE status='maintenance') AS maintenance, + count(*) FILTER(WHERE status='lost') AS lost, + count(*) FILTER(WHERE status='retired') AS retired, + coalesce(sum(purchase_cost) FILTER(WHERE status<>'retired'),0) AS purchase_total, + count(*) FILTER(WHERE status<>'retired' AND warranty_until BETWEEN + (now() AT TIME ZONE 'Asia/Seoul')::date AND (now() AT TIME ZONE 'Asia/Seoul')::date+30) AS warranty_soon + FROM assets""").fetchone() + categories = conn.execute("SELECT category,count(*) AS count FROM assets GROUP BY category ORDER BY count(*) DESC,category").fetchall() + locations = conn.execute("SELECT DISTINCT location FROM assets WHERE location<>'' ORDER BY location").fetchall() + activity = conn.execute("SELECT e.*,a.tag,a.name FROM asset_events e JOIN assets a ON a.id=e.asset_id ORDER BY e.id DESC LIMIT 12").fetchall() + return {"totals": serialize(totals), "categories": categories, "locations": [r["location"] for r in locations], + "activity": [serialize(r) for r in activity]} + + def detail(self, asset_id): + with self._pool.connection() as conn, conn.transaction(): + conn.execute("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ READ ONLY") + asset = conn.execute("SELECT * FROM assets WHERE id=%s", (asset_id,)).fetchone() + if not asset: + raise KeyError(asset_id) + reports = conn.execute("SELECT id,filename,sha256,uploaded_at,actor,parsed->'summary' AS summary,parsed->>'scan_time' AS scan_time FROM asset_reports WHERE asset_id=%s ORDER BY uploaded_at DESC,id DESC", (asset_id,)).fetchall() + report = conn.execute("SELECT id,filename,uploaded_at,parsed FROM asset_reports WHERE id=%s AND asset_id=%s", (asset["latest_report_id"], asset_id)).fetchone() if asset["latest_report_id"] else None + events = conn.execute("SELECT * FROM asset_events WHERE asset_id=%s ORDER BY id DESC LIMIT 200", (asset_id,)).fetchall() + return {"asset": serialize(asset), "report": serialize(report), "reports": [serialize(r) for r in reports], "events": [serialize(r) for r in events]} + + @staticmethod + def _lock(conn, asset_id, version): + # 같은 자산을 동시에 변경할 때 먼저 저장한 사용자의 값을 보호합니다. + asset = conn.execute("SELECT * FROM assets WHERE id=%s FOR UPDATE", (asset_id,)).fetchone() + if not asset: + raise KeyError(asset_id) + if asset["version"] != version: + raise AssetConflict("다른 사용자가 수정했습니다. 상세 화면을 새로 열고 다시 시도하세요.") + return asset + + @staticmethod + def _event(conn, asset_id, actor, kind, note, changes): + conn.execute("INSERT INTO asset_events(asset_id,actor,kind,note,changes) VALUES(%s,%s,%s,%s,%s)", + (asset_id, actor, kind, note, Jsonb(changes))) + + def create(self, payload, actor, report=None): + data = payload.model_dump() + asset_id = uuid.uuid4().hex + with self._pool.connection() as conn, conn.transaction(): + if not data["tag"]: + data["tag"] = "AST-" + str(conn.execute("SELECT nextval('asset_tag_seq') AS n").fetchone()["n"]).zfill(6) + conn.execute(f"INSERT INTO assets(id,{','.join(FIELDS)}) VALUES({','.join(['%s'] * (len(FIELDS) + 1))})", + [asset_id, *[data[k] for k in FIELDS]]) + self._event(conn, asset_id, actor, "create", "자산 등록", {"after": serialize(data)}) + if report: + if data["category"] != "computer": + raise ValueError("HWiNFO 보고서는 컴퓨터 자산에만 연결할 수 있습니다.") + self._save_report(conn, asset_id, actor, *report) + return asset_id + + def update(self, asset_id, payload, actor): + data = payload.model_dump(exclude={"version"}) + with self._pool.connection() as conn, conn.transaction(): + old = self._lock(conn, asset_id, payload.version) + if old["latest_report_id"] and data["category"] != "computer": + raise ValueError("사양 보고서가 연결된 자산은 컴퓨터 분류를 유지해야 합니다.") + if not data["tag"]: + data["tag"] = old["tag"] + changes = {k: {"before": serialize(old)[k], "after": serialize(data)[k]} for k in FIELDS if old[k] != data[k]} + if changes: + conn.execute(f"UPDATE assets SET {','.join(k+'=%s' for k in FIELDS)},version=version+1,updated_at=now() WHERE id=%s", + [*[data[k] for k in FIELDS], asset_id]) + self._event(conn, asset_id, actor, "update", "자산 정보 수정", changes) + + def action(self, asset_id, payload, actor): + with self._pool.connection() as conn, conn.transaction(): + old = self._lock(conn, asset_id, payload.version) + status, assignee = transition(old, payload) + location = payload.location or old["location"] + conn.execute("UPDATE assets SET status=%s,assignee_email=%s,location=%s,version=version+1,updated_at=now() WHERE id=%s", + (status, assignee, location, asset_id)) + changes = {k: {"before": old[k], "after": value} for k, value in + (("status", status), ("assignee_email", assignee), ("location", location)) if old[k] != value} + self._event(conn, asset_id, actor, payload.action, payload.note, changes) + + def _save_report(self, conn, asset_id, actor, filename, raw, parsed): + # 원본과 분석 결과를 함께 저장하고 최신 보고서만 교체합니다. 이전 보고서는 남습니다. + existing = conn.execute("SELECT id FROM asset_reports WHERE asset_id=%s AND sha256=%s", (asset_id, parsed["sha256"])).fetchone() + if existing: + raise AssetConflict("이 자산에 동일한 보고서가 이미 등록되어 있습니다.") + report_id = uuid.uuid4().hex + conn.execute("INSERT INTO asset_reports(id,asset_id,filename,sha256,raw_xml,parsed,actor) VALUES(%s,%s,%s,%s,%s,%s,%s)", + (report_id, asset_id, filename, parsed["sha256"], raw, Jsonb(parsed), actor)) + conn.execute("UPDATE assets SET latest_report_id=%s,version=version+1,updated_at=now() WHERE id=%s", (report_id, asset_id)) + self._event(conn, asset_id, actor, "report", filename, {"report_id": report_id, "summary": parsed["summary"]}) + return report_id + + def attach_report(self, asset_id, version, actor, filename, raw, parsed): + with self._pool.connection() as conn, conn.transaction(): + asset = self._lock(conn, asset_id, version) + if asset["category"] != "computer": + raise ValueError("HWiNFO 보고서는 컴퓨터 자산에만 연결할 수 있습니다.") + return self._save_report(conn, asset_id, actor, filename, raw, parsed) + + def report(self, asset_id, report_id, *, raw=False): + columns = "filename,raw_xml" if raw else "id,filename,parsed,uploaded_at" + with self._pool.connection() as conn: + row = conn.execute(f"SELECT {columns} FROM asset_reports WHERE asset_id=%s AND id=%s", (asset_id, report_id)).fetchone() + if not row: + raise KeyError(report_id) + return serialize(row) diff --git a/app/modules/asset/hwinfo.py b/app/modules/asset/hwinfo.py new file mode 100644 index 0000000..1c0fb99 --- /dev/null +++ b/app/modules/asset/hwinfo.py @@ -0,0 +1,129 @@ +"""HWiNFO XML을 부품별로 읽습니다. 외부 파일이나 엔티티는 열지 않습니다.""" +from __future__ import annotations + +import hashlib +import re +from datetime import datetime +from xml.etree.ElementTree import ParseError + +from defusedxml.ElementTree import fromstring +from defusedxml.common import DefusedXmlException + +MAX_REPORT_BYTES = 10 * 1024 * 1024 +SECTION_LABELS = { + "SYSTEM": "시스템", "CPU": "프로세서", "MOBO": "메인보드 · BIOS", + "MEMORY": "메모리", "VIDEO": "그래픽", "MONITOR": "모니터", + "DRIVES": "저장장치", "NETWORK": "네트워크", "SOUND": "오디오", + "PORTS": "포트 · USB", "BUS": "버스 · 컨트롤러", +} + + +def _text(node, tag): + return (node.findtext(tag) or "").strip() + + +def _props(node): + return [{"label": _text(p, "Entry"), "value": _text(p, "Description"), + "type": _text(p, "PropertyType")} for p in node.findall("Property")] + + +def _pick(nodes, *, types=(), labels=()): + # 언어와 무관한 PropertyType을 먼저 사용하고, 없을 때 한글/영문 항목명을 찾습니다. + properties = [p for n in nodes for p in n["properties"]] + for kind in types: + for p in properties: + if p["type"] == kind and p["value"]: + return p["value"] + for label in labels: + for p in properties: + if p["label"].casefold() == label.casefold() and p["value"]: + return p["value"] + return "" + + +def parse_hwinfo(raw: bytes) -> dict: + if not raw or len(raw) > MAX_REPORT_BYTES: + raise ValueError("XML 보고서는 비어 있지 않은 10 MB 이하 파일이어야 합니다.") + try: + # HWiNFO의 DTD 선언은 허용하되 파일을 읽지 않습니다. 엔티티는 모두 차단합니다. + root = fromstring(raw, forbid_dtd=False, forbid_entities=True, forbid_external=True) + except (ParseError, DefusedXmlException, ValueError, LookupError) as exc: + raise ValueError("XML을 읽을 수 없습니다. HWiNFO XML 보고서인지 확인하세요.") from exc + if root.tag != "HWINFO" or len(root.findall("COMPUTER")) != 1: + raise ValueError("컴퓨터 한 대의 HWiNFO XML 보고서만 업로드할 수 있습니다.") + computer = root.find("COMPUTER") + sections = [{"key": "SYSTEM", "label": "시스템", "nodes": []}] + count = 0 + + def walk(node, path, result, depth=0): + nonlocal count + count += 1 + if count > 30000 or depth > 64: + raise ValueError("보고서 구조가 너무 크거나 깊습니다.") + name = _text(node, "NodeName") + trail = path + ([name] if name else []) + props = _props(node) + if props: + result.append({"name": name or node.tag, "path": " › ".join(trail), "properties": props}) + for child in node: + if child.tag in {"SubNodes", "SubNode"}: + walk(child, trail, result, depth + 1) + elif child.find("NodeName") is not None: + walk(child, trail, result, depth + 1) + + sections[0]["nodes"] = [{"name": _text(computer, "NodeName") or "컴퓨터", + "path": "시스템", "properties": _props(computer)}] + subnodes = computer.find("SubNodes") + if subnodes is not None: + for node in subnodes: + group = {"key": node.tag, "label": SECTION_LABELS.get(node.tag, _text(node, "NodeName") or node.tag), "nodes": []} + walk(node, [], group["nodes"]) + sections.append(group) + by_key = {s["key"]: s["nodes"] for s in sections} + get = lambda key, **kw: _pick(by_key.get(key, []), **kw) + summary = { + "computer_name": _text(computer, "NodeName") or get("SYSTEM", labels=("컴퓨터 이름", "Computer Name")), + "os": get("SYSTEM", labels=("운영 체제", "Operating System")), + "manufacturer": get("SYSTEM", labels=("컴퓨터 브랜드", "Computer Brand Name")), + "cpu": get("CPU", types=("CPU_NAME",), labels=("프로세서 이름", "Processor Name")), + "cores": get("CPU", labels=("프로세서 코어 수", "CPU 코어 수", "Number of CPU Cores", "Number of Processor Cores")), + "threads": get("CPU", labels=("논리 프로세서 수", "논리 CPU 수", "Number of Logical CPUs", "Number of Logical Processors")), + "motherboard": get("MOBO", types=("SYSTEM_MAINBOARD",)), + "bios": get("MOBO", labels=("BIOS 버전", "BIOS Version")), + "memory": get("MEMORY", labels=("총 메모리 크기", "Total Memory Size")), + "gpu": get("VIDEO", types=("GFXCARD_CHIPSET", "GFXCARD")), + "gpu_memory": get("VIDEO", labels=("그래픽 메모리", "Video Memory", "Video Memory Size")), + "serial": get("MOBO", labels=("제품 일련 번호", "Product Serial Number", "System Serial Number")), + } + if summary["serial"].casefold() in {"system serial number", "to be filled by o.e.m.", "default string", "none", "n/a"}: + summary["serial"] = "" + if not summary["memory"]: + mb = get("MEMORY", types=("SYSTEM_MEMORY",)) + if re.fullmatch(r"\d+(\.\d+)?", mb): + summary["memory"] = f"{float(mb) / 1024:g} GiB" + devices = {} + for key, types, labels in [ + ("DRIVES", ("HDD",), ("드라이브 모델", "Drive Model")), + ("MEMORY", (), ("모듈 부품 번호", "Module Part Number")), + ("MONITOR", ("MONITOR",), ("모니터 이름", "Monitor Name")), + ("NETWORK", ("NETCARD",), ("네트워크 카드", "Network Card")), + ("VIDEO", ("GFXCARD_CHIPSET", "GFXCARD"), ("그래픽 프로세서", "Video Chipset")), + ]: + devices[key] = [] + for node in by_key.get(key, []): + model = _pick([node], types=types, labels=labels) + if model: + devices[key].append({"name": model, "node": node["name"], "properties": node["properties"]}) + summary["drive_count"] = len(devices["DRIVES"]) + summary["monitor_count"] = len(devices["MONITOR"]) + if not summary["computer_name"] or not any(summary[k] for k in ("cpu", "motherboard", "memory", "gpu")): + raise ValueError("컴퓨터 이름과 하드웨어 사양이 포함된 HWiNFO 보고서가 필요합니다.") + scan_time = _text(computer, "ScanTime") + try: + scan_time = datetime.strptime(scan_time, "%d.%m.%Y %H:%M").isoformat(timespec="minutes") + except ValueError: + pass # 날짜 형식이 다르면 원래 보고서에 적힌 시각을 그대로 보존합니다. + warnings = [p["value"] for p in _props(computer) if p["label"] in ("가상 머신 경고", "Virtual Machine Warning") and p["value"]] + return {"summary": summary, "sections": sections, "devices": devices, "scan_time": scan_time, + "warnings": warnings, "sha256": hashlib.sha256(raw).hexdigest(), + "property_count": sum(len(n["properties"]) for s in sections for n in s["nodes"])} diff --git a/app/modules/asset/router.py b/app/modules/asset/router.py new file mode 100644 index 0000000..25d2fe2 --- /dev/null +++ b/app/modules/asset/router.py @@ -0,0 +1,246 @@ +from __future__ import annotations + +# 화면, 권한 검사, 파일 업로드를 담당합니다. 실제 저장은 db.py에서 처리합니다. + +import io +import secrets +from contextlib import contextmanager +from typing import Annotated +from urllib.parse import quote + +from fastapi import APIRouter, Depends, File, Form, HTTPException, Query, Request, UploadFile +from fastapi.responses import RedirectResponse, Response +from openpyxl import Workbook +from pydantic import ValidationError +from psycopg import Error as DBError +from psycopg.errors import UniqueViolation +from psycopg_pool import PoolTimeout +from starlette.concurrency import run_in_threadpool + +from .hwinfo import MAX_REPORT_BYTES, parse_hwinfo +from .store import ActionInput, AssetConflict, AssetInput, AssetUpdate, CATEGORIES, STATUSES + +router = APIRouter(prefix="/asset", tags=["asset"]) + + +def _user(request: Request): + from app.main import get_current_user_record + from app.store import has_module + user = get_current_user_record(request) + if not user: + raise HTTPException(401, "로그인이 필요합니다.") + if not has_module(user, "asset"): + raise HTTPException(403, "자산관리 권한이 없습니다.") + return user + + +def _write(request: Request, user=Depends(_user)): + expected = request.session.get("asset_csrf", "") + token = request.headers.get("x-asset-csrf", "") + if not expected or not secrets.compare_digest(expected, token): + raise HTTPException(403, "화면을 새로 열고 다시 시도하세요.") + return user + + +def _store(request): + store = getattr(request.app.state, "asset_store", None) + if store is None: + raise HTTPException(503, "자산관리 DB 설정이 필요합니다. 관리자에게 문의하세요.") + return store + + +@contextmanager +def _errors(): + try: + yield + except AssetConflict as exc: + raise HTTPException(409, str(exc)) from exc + except KeyError as exc: + raise HTTPException(404, "자산 또는 보고서를 찾을 수 없습니다.") from exc + except ValueError as exc: + raise HTTPException(422, str(exc)) from exc + except UniqueViolation as exc: + raise HTTPException(409, "이미 등록된 자산번호입니다. 다른 번호를 사용하세요.") from exc + except (DBError, PoolTimeout) as exc: + # DB 오류에 접속 비밀번호가 섞일 수 있어 원문 대신 일반 안내만 보여줍니다. + raise HTTPException(503, "자산관리 DB에 연결할 수 없습니다. 설정과 초기화를 확인하세요.") from exc + + +@router.get("/") +def index(request: Request): + from app.main import build_erp_nav, get_current_user_record, render_template + from app.store import has_module, is_admin + user = get_current_user_record(request) + if not user: + return RedirectResponse("/login", 303) + if not has_module(user, "asset"): + return render_template(request, "denied.html", {"reason": "자산관리 권한이 없습니다.", "user": user, + "is_admin": is_admin(user)}, status_code=403) + request.session.setdefault("asset_csrf", secrets.token_urlsafe(32)) + return render_template(request, "asset/index.html", { + "user": user, "is_admin": is_admin(user), "nav_items": build_erp_nav(user, active="asset"), + "page_title": "자산관리", "page_subtitle": "사무집기부터 컴퓨터 사양까지, 회사 자산을 한곳에서", + "categories": CATEGORIES, "statuses": STATUSES, "csrf_token": request.session["asset_csrf"], + "configured": getattr(request.app.state, "asset_store", None) is not None, + }) + + +@router.get("/health") +def health(request: Request, user=Depends(_user)): + with _errors(): + _store(request).health() + return {"ok": True} + + +@router.get("/api/bootstrap") +def bootstrap(request: Request, user=Depends(_user)): + from app.main import user_store + with _errors(): + data = _store(request).dashboard() + data["users"] = [{"email": u["email"], "name": u.get("name") or u["email"]} for u in user_store.list_all()] + return data + + +def _query(q="", category="", status="", location="", assignee="", warranty=False, group=""): + if category and category not in CATEGORIES or status and status not in STATUSES: + raise HTTPException(422, "분류 또는 상태 필터가 올바르지 않습니다.") + if group not in {"", "computer", "furniture"}: + raise HTTPException(422, "자산 구분 필터가 올바르지 않습니다.") + return dict(q=q, category=category, status=status, location=location, assignee=assignee, warranty=warranty, group=group) + + +@router.get("/api/assets") +def assets(request: Request, q: str = Query("", max_length=200), category: str = "", status: str = "", + location: str = Query("", max_length=150), assignee: str = Query("", max_length=254), warranty: bool = False, + page: int = Query(1, ge=1, le=100000), page_size: int = Query(25, ge=1, le=100), + sort: str = "updated", group: str = "", user=Depends(_user)): + with _errors(): + return _store(request).list_assets(page=page, page_size=page_size, sort=sort, + **_query(q, category, status, location, assignee, warranty, group)) + + +@router.get("/api/export") +def export(request: Request, q: str = Query("", max_length=200), category: str = "", status: str = "", + location: str = Query("", max_length=150), assignee: str = Query("", max_length=254), warranty: bool = False, + group: str = "", user=Depends(_user)): + from app.timezone import today_kst + with _errors(): + data = _store(request).list_assets(page=1, page_size=10001, **_query(q, category, status, location, assignee, warranty, group)) + if data["total"] > 10000: + raise HTTPException(422, "한 번에 10,000개까지 내보낼 수 있습니다. 필터를 좁혀주세요.") + book = Workbook() + sheet = book.active + sheet.title = "자산대장" + headers = ["자산번호", "자산명", "분류", "상태", "제조사", "모델", "시리얼", "위치", "부서", "사용자", "구매일", "구매금액(원)", "구매처", "보증종료", "메모", "CPU", "메모리", "GPU", "운영체제"] + sheet.append(headers) + for row in data["items"]: + specs = row.get("specs") or {} + values = [row["tag"], row["name"], CATEGORIES[row["category"]], STATUSES[row["status"]], + *[row[k] for k in ("manufacturer", "model", "serial", "location", "department", "assignee_email", "purchased_on")], + float(row["purchase_cost"]) if row["purchase_cost"] is not None else None, + row["vendor"], row["warranty_until"], row["notes"], *[specs.get(k, "") for k in ("cpu", "memory", "gpu", "os")]] + sheet.append(values) + # =로 시작하는 자산명도 엑셀 수식 대신 일반 글자로 저장합니다. + for cell in sheet[sheet.max_row]: + if isinstance(cell.value, str): + cell.data_type = "s" + sheet.freeze_panes = "C2" + sheet.auto_filter.ref = sheet.dimensions + from openpyxl.styles import Font, PatternFill + from openpyxl.utils import get_column_letter + for cell in sheet[1]: + cell.font = Font(bold=True, color="FFFFFF") + cell.fill = PatternFill("solid", fgColor="171717") + for i in range(1, len(headers) + 1): + sheet.column_dimensions[get_column_letter(i)].width = 22 if i > 2 else 28 + buffer = io.BytesIO() + book.save(buffer) + return Response(buffer.getvalue(), media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + headers={"Content-Disposition": f'attachment; filename="assets-{today_kst().isoformat()}.xlsx"'}) + + +@router.post("/api/assets") +def create(request: Request, payload: AssetInput, user=Depends(_write)): + with _errors(): + asset_id = _store(request).create(payload, user["email"]) + return {"id": asset_id} + + +@router.get("/api/assets/{asset_id}") +def detail(request: Request, asset_id: str, user=Depends(_user)): + with _errors(): + return _store(request).detail(asset_id) + + +@router.put("/api/assets/{asset_id}") +def update(request: Request, asset_id: str, payload: AssetUpdate, user=Depends(_write)): + with _errors(): + _store(request).update(asset_id, payload, user["email"]) + return {"ok": True} + + +@router.post("/api/assets/{asset_id}/actions") +def action(request: Request, asset_id: str, payload: ActionInput, user=Depends(_write)): + from app.main import user_store + if payload.action == "checkout" and not user_store.get(payload.assignee_email.lower()): + raise HTTPException(422, "등록된 회사 사용자를 선택하세요.") + with _errors(): + _store(request).action(asset_id, payload, user["email"]) + return {"ok": True} + + +async def _report_file(file): + filename = (file.filename or "report.xml").replace("\\", "/").rsplit("/", 1)[-1] + if not filename.lower().endswith(".xml") or len(filename) > 200 or any(ord(c) < 32 for c in filename): + raise HTTPException(422, "이름이 200자 이하인 XML 보고서를 선택하세요.") + try: + raw = await file.read(MAX_REPORT_BYTES + 1) + finally: + await file.close() + with _errors(): + parsed = await run_in_threadpool(parse_hwinfo, raw) + return filename, raw, parsed + + +@router.post("/api/reports/preview") +async def preview(file: Annotated[UploadFile, File()], user=Depends(_write)): + filename, raw, parsed = await _report_file(file) + return {"filename": filename, "summary": parsed["summary"], "scan_time": parsed["scan_time"], + "property_count": parsed["property_count"], "warnings": parsed["warnings"]} + + +@router.post("/api/reports/import") +async def import_report(request: Request, file: Annotated[UploadFile, File()], payload: Annotated[str, Form(max_length=20000)], user=Depends(_write)): + with _errors(): + try: + data = AssetInput.model_validate_json(payload) + except ValidationError as exc: + raise HTTPException(422, "자산명·분류·구매일·금액을 확인하세요.") from exc + report = await _report_file(file) + with _errors(): + asset_id = await run_in_threadpool(_store(request).create, data, user["email"], report) + return {"id": asset_id} + + +@router.post("/api/assets/{asset_id}/reports") +async def attach(request: Request, asset_id: str, file: Annotated[UploadFile, File()], + version: Annotated[int, Form(ge=1)], user=Depends(_write)): + filename, raw, parsed = await _report_file(file) + with _errors(): + report_id = await run_in_threadpool(_store(request).attach_report, asset_id, version, user["email"], filename, raw, parsed) + return {"id": report_id} + + +@router.get("/api/assets/{asset_id}/reports/{report_id}") +def report_detail(request: Request, asset_id: str, report_id: str, user=Depends(_user)): + with _errors(): + return _store(request).report(asset_id, report_id) + + +@router.get("/api/assets/{asset_id}/reports/{report_id}/download") +def download(request: Request, asset_id: str, report_id: str, user=Depends(_user)): + with _errors(): + row = _store(request).report(asset_id, report_id, raw=True) + return Response(bytes(row["raw_xml"]), media_type="application/octet-stream", + headers={"Content-Disposition": f"attachment; filename=hwinfo.xml; filename*=UTF-8''{quote(row['filename'], safe='')}", + "X-Content-Type-Options": "nosniff", "Cache-Control": "no-store"}) diff --git a/app/modules/asset/store.py b/app/modules/asset/store.py new file mode 100644 index 0000000..3de1e95 --- /dev/null +++ b/app/modules/asset/store.py @@ -0,0 +1,84 @@ +"""Asset validation and lifecycle rules, shared by API and storage.""" +from datetime import date +from decimal import Decimal + +from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator + +CATEGORIES = {"computer": "컴퓨터", "monitor": "모니터", "mouse": "마우스", "keyboard": "키보드", + "camera": "카메라", "hub": "허브 · 네트워크", "lighting": "조명", "desk": "책상", + "chair": "의자", "furniture": "기타 사무집기", "equipment": "기타 전산장비"} +STATUSES = {"available": "사용 가능", "in_use": "사용 중", "maintenance": "수리 중", "lost": "분실", "retired": "폐기"} + + +class AssetInput(BaseModel): + model_config = ConfigDict(extra="forbid", str_strip_whitespace=True) + tag: str = Field(default="", max_length=64) + name: str = Field(min_length=1, max_length=200) + category: str + manufacturer: str = Field(default="", max_length=150) + model: str = Field(default="", max_length=200) + serial: str = Field(default="", max_length=200) + location: str = Field(default="", max_length=150) + department: str = Field(default="", max_length=100) + purchased_on: date | None = None + purchase_cost: Decimal | None = Field(default=None, ge=0, le=10**12, decimal_places=2) + vendor: str = Field(default="", max_length=200) + warranty_until: date | None = None + notes: str = Field(default="", max_length=10000) + + @field_validator("category") + @classmethod + def valid_category(cls, value): + if value not in CATEGORIES: + raise ValueError("자산 분류가 올바르지 않습니다.") + return value + + @model_validator(mode="after") + def valid_dates(self): + if self.purchased_on and self.warranty_until and self.warranty_until < self.purchased_on: + raise ValueError("보증 종료일은 구매일 이후여야 합니다.") + return self + + +class AssetUpdate(AssetInput): + version: int = Field(ge=1) + + +class ActionInput(BaseModel): + model_config = ConfigDict(extra="forbid", str_strip_whitespace=True) + version: int = Field(ge=1) + action: str + assignee_email: str = Field(default="", max_length=254) + location: str = Field(default="", max_length=150) + note: str = Field(default="", max_length=2000) + + @model_validator(mode="after") + def require_reason(self): + if self.action in {"lost", "retired"} and not self.note: + raise ValueError("분실·폐기 사유를 입력하세요.") + return self + + +class AssetConflict(ValueError): + pass + + +def transition(asset, payload: ActionInput): + state = asset["status"] + if payload.action == "checkout": + if state != "available" or not payload.assignee_email: + raise ValueError("사용 가능한 자산을 선택하고 배정할 사용자를 지정하세요.") + return "in_use", payload.assignee_email.lower() + if payload.action == "checkin": + if state != "in_use": + raise ValueError("사용 중인 자산만 반납할 수 있습니다.") + return "available", "" + if payload.action == "maintenance" and state == "available": + return "maintenance", "" + if payload.action == "available" and state in {"maintenance", "lost", "retired"}: + return "available", "" + if payload.action == "lost" and state in {"available", "in_use", "maintenance"}: + return "lost", asset.get("assignee_email", "") + if payload.action == "retired" and state in {"available", "maintenance", "lost"}: + return "retired", "" + raise ValueError("현재 상태에서 처리할 수 없습니다. 배정된 자산은 먼저 반납하세요.") diff --git a/app/modules/asset/templates/asset/index.html b/app/modules/asset/templates/asset/index.html new file mode 100644 index 0000000..ca42597 --- /dev/null +++ b/app/modules/asset/templates/asset/index.html @@ -0,0 +1,68 @@ +{% extends "erp_base.html" %} +{% set force_sidebar_collapsed = true %} +{% block head_extra %}{% endblock %} +{% block content %} +
+ +
+

COMPANY INVENTORY

회사 자산 대장

어떤 자산이, 어디에, 누구에게 있는지 확인하세요.

+ {% if not configured %}
자산관리 저장소 설정이 필요합니다.

관리자가 자산관리 DB를 연결하면 등록·배정·반납을 사용할 수 있습니다. HWiNFO 보고서는 지금도 분석 결과를 미리 볼 수 있습니다.

{% endif %} + +
+ + + + + +
+
+

전체 자산

자산을 불러오는 중
+ +
자산분류상태사용자 / 위치구매금액보증 종료사양
{% if configured %}자산을 불러오는 중입니다.{% else %}등록된 자산이 여기에 표시됩니다.{% endif %}
+
—
1
+
+

자산 구성

분류별 등록 수

등록된 자산이 없습니다.

보유 자산 구매금액 폐기 제외 · 입력된 금액 기준—

최근 활동

등록 · 배정 · 반납 · 변경

활동 이력이 여기에 표시됩니다.

+
+
+
자산 상세

자산 정보

+
ASSET REGISTER

자산 등록

+ + + + + + + + + +

같은 모델도 자산번호를 각각 발급합니다. 사용자 배정은 등록 후 상세 화면에서 진행합니다.

+
HWiNFO XML IMPORT

컴퓨터 보고서 가져오기

+

HWiNFO에서 저장한 XML 보고서를 선택하세요. 사양을 분석한 뒤 자산으로 등록합니다.

+ + + + +
+

자산 배정

+

자산관리 사용 안내

01. 자산 등록

책상·의자·마우스 등은 개별 자산으로 등록합니다. 자산번호를 비워두면 자동 발급합니다. 컴퓨터는 HWiNFO 보고서를 가져오면 이름과 주요 사양을 확인하고 등록할 수 있습니다.

02. 배정과 반납

사용 가능한 자산을 등록된 회사 사용자에게 배정합니다. 사용 중인 자산은 반납 후 수리·폐기할 수 있습니다. 위치·사유와 처리자가 이력에 남습니다. 분실 처리 시 기존 배정 사용자도 기록됩니다.

03. 컴퓨터 사양

HWiNFO → 보고서 저장 → XML 형식을 선택합니다. 핵심 사양, 부품별 상세와 보고서 전체 항목을 볼 수 있습니다. 재업로드할 때 컴퓨터 이름을 확인하세요. 이전 보고서와 원본 XML은 보존됩니다.

04. 찾기와 내보내기

검색·분류·상태·위치·사용자 필터를 조합합니다. 엑셀 내보내기는 현재 필터에 해당하는 자산 전체를 포함하며 최대 10,000개입니다. 보증 만료 예정은 오늘부터 30일 이내입니다.

보고서에는 시리얼·MAC 주소 등 회사 장비 정보가 포함될 수 있습니다. 자산관리 권한을 가진 사용자만 조회할 수 있습니다.

+ +{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/static/asset.css b/app/static/asset.css new file mode 100644 index 0000000..096f7df --- /dev/null +++ b/app/static/asset.css @@ -0,0 +1,1272 @@ +.erp-page:has(.am-workspace) { + padding: 0; + max-width: none; +} +.am-workspace { + display: grid; + grid-template-columns: 190px minmax(0, 1fr); + min-height: calc(100vh - 80px); + color: #171717; + font-size: 13px; +} +.am-workspace *, +.am-dialog *, +.am-drawer * { + box-sizing: border-box; +} +.am-nav { + padding: 28px 12px; + background: #fafafa; + border-right: 1px solid #e7e7e7; + display: flex; + flex-direction: column; + gap: 5px; +} +.am-nav-brand { + display: flex; + gap: 10px; + align-items: center; + margin: 0 8px 26px; +} +.am-mark { + display: grid; + place-items: center; + background: #171717; + color: #fff; + width: 32px; + height: 36px; + border-radius: 9px; + font-weight: 700; + font-size: 20px; +} +.am-nav-brand strong { + font-size: 14px; +} +.am-nav-brand small { + display: block; + font-size: 8px; + letter-spacing: 1.2px; + color: #858585; + margin-top: 4px; +} +.am-nav-link { + display: flex; + align-items: center; + justify-content: space-between; + gap: 5px; + width: 100%; + padding: 11px 10px; + text-align: left; + background: transparent; + border: 0; + border-radius: 8px; + font: inherit; + color: #646464; + cursor: pointer; +} +.am-nav-link:hover { + background: #eee; +} +.am-nav-link.is-active { + background: #eaeaea; + color: #111; + font-weight: 600; +} +.am-count { + font-size: 11px; + color: #777; +} +.am-nav-label { + font-size: 10px; + color: #909090; + letter-spacing: 0.8px; + padding: 15px 10px 3px; + margin: 0; +} +.am-nav-foot { + margin-top: auto; + padding: 40px 8px 10px; + font-size: 11px; +} +.am-nav-foot strong { + font-weight: 500; +} +.am-nav-foot p { + color: #929292; + line-height: 1.8; +} +.am-text-btn { + border: 0; + background: transparent; + color: #646464; + font: inherit; + font-size: 12px; + cursor: pointer; + padding: 7px 8px; +} +.am-text-btn:hover { + color: #111; + text-decoration: underline; +} +.am-main { + padding: 30px 32px 36px; + min-width: 0; +} +.am-heading { + display: flex; + align-items: center; + justify-content: space-between; + gap: 16px; + margin-bottom: 25px; +} +.am-eyebrow { + font-size: 9px; + letter-spacing: 1.7px; + font-weight: 600; + color: #8a8a8a; + margin: 0 0 9px; +} +.am-heading h2 { + font-size: 25px; + font-weight: 600; + letter-spacing: -1px; + margin: 0 0 8px; +} +.am-heading p:not(.am-eyebrow) { + color: #858585; + font-size: 12px; + margin: 0; +} +.am-heading-actions { + display: flex; + gap: 8px; + flex-wrap: wrap; +} +.am-main .erp-btn, +.am-dialog .erp-btn, +.am-drawer .erp-btn { + font-size: 12px; + min-height: 35px; + padding: 8px 14px; +} +.am-kpis { + display: grid; + grid-template-columns: repeat(5, minmax(0, 1fr)); + gap: 12px; + margin-bottom: 25px; +} +.am-kpi { + text-align: left; + border: 1px solid #e5e5e5; + border-radius: 12px; + padding: 18px 18px 16px; + background: #fff; + color: inherit; + font: inherit; + cursor: pointer; + transition: border-color 0.15s; +} +.am-kpi:hover { + border-color: #888; +} +.am-kpi > span { + font-size: 12px; + color: #646464; +} +.am-kpi > strong { + display: block; + font-size: 30px; + letter-spacing: -1px; + font-weight: 600; + margin: 12px 0 7px; + font-variant-numeric: tabular-nums; +} +.am-kpi > small { + color: #999; + font-size: 10px; +} +.am-dot { + display: inline-block; + width: 6px; + height: 6px; + border-radius: 50%; + margin-right: 7px; + background: #888; + vertical-align: middle; +} +.am-dot-in_use { + background: #171717; +} +.am-dot-available { + background: #378363; +} +.am-dot-maintenance { + background: #b98935; +} +.am-dot-lost { + background: #bb4c43; +} +.am-dot-retired { + background: #aaa; +} +.am-register { + border: 1px solid #e5e5e5; + border-radius: 12px; + background: white; + overflow: hidden; +} +.am-register-head { + display: flex; + justify-content: space-between; + align-items: center; + padding: 19px 20px; + gap: 12px; +} +.am-register-head > div { + display: flex; + gap: 12px; + align-items: center; +} +.am-register-head h3 { + font-weight: 600; + font-size: 14px; + margin: 0; +} +.am-register-head span { + font-size: 11px; + color: #999; +} +.am-filters { + display: flex; + gap: 8px; + flex-wrap: wrap; + padding: 0 20px 18px; +} +.am-filters select, +.am-search { + height: 34px; + border: 1px solid #e5e5e5; + border-radius: 7px; + background: white; + font: inherit; + color: #626262; +} +.am-filters select { + padding: 5px 23px 5px 8px; + max-width: 170px; + font-size: 11px; +} +.am-search { + display: flex; + align-items: center; + gap: 8px; + padding: 0 10px; + flex: 1 1 240px; +} +.am-search > span { + font-size: 22px; + color: #888; +} +.am-search input { + border: 0; + outline: 0; + width: 100%; + min-width: 0; + font: inherit; + font-size: 12px; + background: transparent; +} +.am-table-scroll { + overflow: auto; + max-width: 100%; +} +.am-table { + border-collapse: collapse; + width: 100%; + font-size: 12px; + white-space: nowrap; +} +.am-table th { + background: #fafafa; + text-align: left; + font-weight: 500; + font-size: 10px; + color: #888; + padding: 12px 18px; + border-top: 1px solid #efefef; + border-bottom: 1px solid #efefef; +} +.am-table td { + padding: 16px 18px; + border-bottom: 1px solid #f1f1f1; + color: #646464; +} +.am-table tbody tr:hover:not(:has(.am-empty)) { + background: #fcfcfc; +} +.am-asset-cell { + display: flex; + gap: 12px; + align-items: center; + max-width: 300px; +} +.am-asset-icon { + width: 37px; + height: 37px; + display: grid; + place-items: center; + border: 1px solid #ececec; + background: #fafafa; + border-radius: 9px; + flex: none; + color: #535353; +} +.am-asset-name { + display: block; + border: 0; + background: transparent; + padding: 0; + font: inherit; + font-size: 12px; + font-weight: 600; + color: #222; + cursor: pointer; + text-align: left; + white-space: normal; + overflow-wrap: anywhere; +} +.am-asset-name:hover { + text-decoration: underline; +} +.am-asset-meta { + display: block; + margin-top: 4px; + font-size: 10px; + color: #a0a0a0; + white-space: normal; + overflow-wrap: anywhere; +} +.am-sub { + display: block; + font-size: 10px; + color: #aaa; + margin-top: 4px; +} +.am-badge { + font-size: 10px; + display: inline-flex; + align-items: center; + white-space: nowrap; + border-radius: 99px; + background: #f2f2f2; + color: #666; + padding: 4px 9px; +} +.am-badge-in_use { + background: #ededed; + color: #222; +} +.am-badge-available { + background: #edf5f0; + color: #347153; +} +.am-badge-maintenance { + background: #faf4e7; + color: #9c752a; +} +.am-badge-lost { + background: #fbeeea; + color: #ad5346; +} +.am-spec-link { + font: inherit; + font-size: 11px; + border: 1px solid #e4e4e4; + border-radius: 6px; + background: white; + color: #555; + cursor: pointer; + padding: 5px 9px; +} +.am-empty { + padding: 52px 20px !important; + text-align: center; + white-space: normal; + color: #999 !important; + line-height: 1.9; +} +.am-empty strong { + display: block; + color: #555; + font-size: 14px; + font-weight: 500; + margin-bottom: 6px; +} +.am-empty button { + margin-top: 14px; +} +.am-pagination { + padding: 14px 20px; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 11px; + color: #999; +} +.am-pagination > div { + display: flex; + align-items: center; + gap: 15px; +} +.am-pagination .erp-btn { + font-size: 10px; + min-height: 29px; + padding: 5px 10px; +} +.am-bottom { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 16px; + margin-top: 20px; +} +.am-panel { + border: 1px solid #e5e5e5; + border-radius: 12px; + padding: 20px; + min-width: 0; +} +.am-panel-head { + display: flex; + justify-content: space-between; + align-items: center; + gap: 8px; + margin-bottom: 18px; +} +.am-panel-head h3 { + margin: 0; + font-size: 13px; + font-weight: 600; +} +.am-panel-head > span { + color: #aaa; + font-size: 10px; +} +.am-breakdown { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 15px 24px; + min-height: 100px; +} +.am-category-bar { + border: 0; + background: transparent; + text-align: left; + font: inherit; + cursor: pointer; + padding: 0; + color: #777; +} +.am-category-bar > div { + display: flex; + justify-content: space-between; + font-size: 11px; + margin-bottom: 7px; +} +.am-bar { + height: 4px; + background: #f2f2f2; + border-radius: 99px; + display: block; + overflow: hidden; +} +.am-bar i { + display: block; + height: 100%; + background: #8f8f8f; + border-radius: 99px; +} +.am-value { + display: flex; + justify-content: space-between; + align-items: center; + gap: 10px; + border-top: 1px solid #efefef; + margin-top: 23px; + padding-top: 16px; + font-size: 11px; + color: #888; +} +.am-value small { + display: block; + margin-top: 5px; + font-size: 9px; + color: #aaa; +} +.am-value strong { + font-size: 18px; + font-weight: 500; + color: #333; +} +.am-activity { + max-height: 190px; + overflow: auto; +} +.am-event { + display: flex; + gap: 12px; + align-items: start; + padding: 9px 0; +} +.am-event-dot { + width: 7px; + height: 7px; + background: #aaa; + border-radius: 50%; + flex: none; + margin-top: 5px; +} +.am-event p { + margin: 0; + color: #5f5f5f; + font-size: 11px; + line-height: 1.6; +} +.am-event small { + display: block; + color: #aaa; + font-size: 10px; + margin-top: 3px; +} +.am-event time { + font-size: 9px; + color: #aaa; + margin-left: auto; + white-space: nowrap; +} +.am-muted { + color: #999; + font-size: 12px; + line-height: 1.7; +} +.am-notice, +.am-message { + background: #f8f5ed; + border: 1px solid #e9e0cc; + border-radius: 9px; + padding: 14px 18px; + margin-bottom: 18px; + font-size: 12px; + color: #857342; + line-height: 1.8; +} +.am-notice p { + margin: 4px 0 0; +} +.am-message { + background: #f5f5f5; + border-color: #e5e5e5; + color: #555; +} +.am-message.is-error { + background: #fff2f0; + border-color: #ecd0c9; + color: #a84b3c; +} +.am-dialog, +.am-drawer { + font: inherit; + font-size: 13px; + color: #222; + border: 0; + padding: 0; + background: white; + box-shadow: 0 20px 80px #0002; +} +.am-dialog { + width: min(740px, calc(100vw - 32px)); + max-height: 90dvh; + border-radius: 14px; +} +.am-action-dialog { + width: min(480px, calc(100vw - 32px)); +} +.am-drawer { + position: fixed; + inset: 0 0 0 auto; + margin: 0; + width: min(920px, 95vw); + max-width: 95vw; + height: 100dvh; + max-height: 100dvh; + border-radius: 14px 0 0 14px; + overflow: auto; +} +.am-dialog::backdrop, +.am-drawer::backdrop { + background: #0004; +} +body:has(dialog[open]) { + overflow: hidden; +} +.am-dialog-head { + display: flex; + align-items: center; + justify-content: space-between; + gap: 10px; + padding: 22px 25px; + border-bottom: 1px solid #eee; + background: white; + position: sticky; + top: 0; + z-index: 2; +} +.am-dialog-head h2 { + font-size: 19px; + font-weight: 600; + margin: 4px 0 0; + letter-spacing: -0.4px; + overflow-wrap: anywhere; +} +.am-dialog-head small { + color: #999; + font-size: 10px; + letter-spacing: 0.7px; +} +.am-close { + border: 0; + background: #f5f5f5; + border-radius: 7px; + color: #666; + width: 30px; + height: 30px; + font-size: 23px; + cursor: pointer; + flex: none; +} +.am-form { + padding: 22px 25px; +} +.am-form-grid { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 17px 20px; +} +.am-form label { + display: block; + font-size: 11px; + color: #767676; + line-height: 1.8; + min-width: 0; +} +.am-form label > span:not(.am-upload-icon) { + color: #999; +} +.am-form input:not([type="file"]), +.am-form select, +.am-form textarea { + display: block; + width: 100%; + padding: 9px 11px; + margin-top: 5px; + border: 1px solid #ddd; + border-radius: 8px; + font: inherit; + font-size: 13px; + color: #222; + background: white; + min-height: 36px; +} +.am-form input::placeholder, +.am-form textarea::placeholder { + color: #b0b0b0; + font-size: 11px; +} +.am-form textarea { + resize: vertical; + min-height: 70px; +} +.am-form > label { + margin-bottom: 17px; +} +.am-wide { + grid-column: 1/-1; +} +.am-form-hint { + font-size: 11px; + color: #999; + line-height: 1.8; + margin: 16px 0; +} +.am-form-error { + color: #a84b3c; + background: #fff2ef; + border-radius: 8px; + padding: 10px 12px; + font-size: 12px; + margin: 12px 0; +} +.am-dialog-footer { + display: flex; + align-items: center; + justify-content: flex-end; + gap: 8px; + border-top: 1px solid #eee; + padding-top: 18px; + margin-top: 20px; +} +.am-dialog-footer > .am-muted { + margin-right: auto; + font-size: 10px; +} +.am-drop { + position: relative; + padding: 28px 20px; + border: 1px dashed #bbb; + border-radius: 12px; + text-align: center; + background: #fafafa; + cursor: pointer; + display: flex !important; + flex-direction: column; + align-items: center; + gap: 7px; + overflow: hidden; +} +.am-drop:hover, +.am-drop.is-over { + background: #f1f1f1; + border-color: #555; +} +.am-upload-icon { + display: grid; + place-items: center; + font-size: 23px; + background: #eee; + color: #777; + width: 40px; + height: 40px; + border-radius: 10px; + margin-bottom: 6px; +} +.am-drop strong { + font-size: 13px; + color: #444; +} +.am-drop > span:not(.am-upload-icon) { + font-size: 10px; +} +.am-drop input { + opacity: 0; + position: absolute; + inset: 0; + width: 100%; + height: 100%; + cursor: pointer; +} +.am-drop:focus-within { + outline: 2px solid #333; + outline-offset: 3px; +} +.am-preview { + background: #fafafa; + border: 1px solid #e8e8e8; + border-radius: 12px; + margin: 18px 0; + padding: 18px; +} +.am-preview h3 { + margin: 0 0 13px; + font-size: 15px; + overflow-wrap: anywhere; +} +.am-preview dl { + display: grid; + grid-template-columns: 65px 1fr; + gap: 8px 12px; + font-size: 11px; + line-height: 1.6; + margin: 0; +} +.am-preview dt { + color: #999; +} +.am-preview dd { + margin: 0; + overflow-wrap: anywhere; +} +.am-detail-body { + padding: 24px 25px; +} +.am-detail-actions { + display: flex; + gap: 8px; + align-items: center; + flex-wrap: wrap; + margin-bottom: 20px; +} +.am-detail-actions .am-badge { + margin-right: auto; + font-size: 11px; + padding: 6px 12px; +} +.am-tabs { + display: flex; + gap: 22px; + border-bottom: 1px solid #e5e5e5; + overflow: auto; + padding: 0 25px; +} +.am-tabs button { + white-space: nowrap; + border: 0; + border-bottom: 2px solid transparent; + background: white; + padding: 14px 0; + font: inherit; + font-size: 12px; + cursor: pointer; + color: #999; +} +.am-tabs button.is-active { + color: #171717; + border-color: #171717; + font-weight: 600; +} +.am-section-title { + font-size: 13px; + margin: 0 0 16px; + font-weight: 600; +} +.am-info-grid { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 20px 28px; +} +.am-info-field span { + display: block; + font-size: 10px; + color: #999; + margin-bottom: 5px; +} +.am-info-field strong { + font-size: 12px; + font-weight: 400; + overflow-wrap: anywhere; + white-space: pre-wrap; + line-height: 1.7; +} +.am-info-field.am-wide { + margin-top: 4px; +} +.am-detail-section + .am-detail-section { + border-top: 1px solid #eee; + margin-top: 27px; + padding-top: 25px; +} +.am-spec-cards { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 12px; +} +.am-spec-card { + border: 1px solid #e8e8e8; + border-radius: 10px; + padding: 17px; +} +.am-spec-card span { + font-size: 10px; + color: #999; + display: block; + margin-bottom: 9px; +} +.am-spec-card strong { + font-size: 14px; + font-weight: 500; + line-height: 1.6; + overflow-wrap: anywhere; +} +.am-spec-card small { + display: block; + font-size: 10px; + color: #999; + line-height: 1.8; + margin-top: 4px; +} +.am-spec-tools { + display: flex; + gap: 10px; + align-items: center; + margin: 23px 0 18px; +} +.am-spec-tools .am-search { + min-height: 36px; +} +.am-spec-tools select { + max-width: 180px; + min-height: 35px; + border: 1px solid #ddd; + border-radius: 7px; + background: white; + font: inherit; + font-size: 11px; + padding: 7px; +} +.am-node { + border: 1px solid #e8e8e8; + border-radius: 9px; + margin-bottom: 10px; + overflow: hidden; +} +.am-node summary { + padding: 13px 16px; + cursor: pointer; + font-size: 12px; + color: #555; + overflow-wrap: anywhere; + line-height: 1.6; + background: #fafafa; +} +.am-node-path { + display: block; + font-size: 9px; + color: #aaa; + margin-left: 14px; +} +.am-properties { + display: grid; + grid-template-columns: minmax(130px, 35%) minmax(0, 1fr); + margin: 0; + font-size: 11px; + line-height: 1.7; +} +.am-properties dt, +.am-properties dd { + margin: 0; + padding: 9px 15px; + overflow-wrap: anywhere; + border-bottom: 1px solid #f0f0f0; + white-space: pre-wrap; +} +.am-properties dt { + color: #888; + background: #fdfdfd; +} +.am-properties dd { + color: #444; +} +.am-report-row { + border: 1px solid #e5e5e5; + border-radius: 9px; + padding: 16px; + margin-bottom: 10px; + display: flex; + justify-content: space-between; + gap: 14px; + align-items: center; +} +.am-report-row strong { + display: block; + font-size: 12px; + font-weight: 500; + overflow-wrap: anywhere; +} +.am-report-row p { + color: #999; + font-size: 10px; + line-height: 1.8; + margin: 5px 0 0; +} +.am-report-row > div:last-child { + display: flex; + gap: 8px; + flex: none; +} +.am-history-row { + padding: 16px 0; + border-bottom: 1px solid #eee; +} +.am-history-row h4 { + font-size: 12px; + font-weight: 500; + margin: 0 0 6px; +} +.am-history-row p { + font-size: 11px; + color: #888; + margin: 0 0 7px; + white-space: pre-wrap; + overflow-wrap: anywhere; + line-height: 1.8; +} +.am-history-row small { + font-size: 10px; + color: #aaa; +} +.am-help h3 { + font-size: 13px; + margin: 10px 0; +} +.am-help p { + font-size: 12px; + line-height: 1.9; + color: #777; +} +.am-warning { + font-size: 11px; + line-height: 1.8; + border-radius: 8px; + background: #faf4e9; + color: #91763e; + padding: 12px 15px; + margin: 14px 0; +} +.am-workspace button:focus-visible, +.am-dialog button:focus-visible, +.am-drawer button:focus-visible, +.am-filters select:focus-visible, +.am-form input:focus-visible, +.am-form select:focus-visible, +.am-form textarea:focus-visible, +.am-search:focus-within { + outline: 2px solid #555; + outline-offset: 2px; +} +.am-workspace button:disabled, +.am-dialog button:disabled, +.am-drawer button:disabled { + opacity: 0.45; + cursor: not-allowed; +} +.am-workspace [hidden], +.am-dialog [hidden], +.am-drawer [hidden] { + display: none !important; +} +@media (min-width: 1700px) { + .am-main { + padding: 36px 45px; + } + .am-kpi { + padding: 22px; + } + .am-table td { + padding: 18px 22px; + } +} +@media (max-width: 1200px) { + .am-workspace { + grid-template-columns: 165px minmax(0, 1fr); + } + .am-main { + padding: 24px 20px; + } + .am-heading { + align-items: flex-start; + } + .am-kpis { + gap: 8px; + } + .am-kpi { + padding: 14px 12px; + } + .am-kpi small { + font-size: 9px; + } + .am-bottom { + grid-template-columns: 1fr 1fr; + } +} +@media (max-width: 900px) { + .am-workspace { + display: block; + } + .am-nav { + display: none; + } + .am-main { + padding: 20px 16px; + } + .am-heading h2 { + font-size: 22px; + } + .am-heading { + flex-wrap: wrap; + } + .am-kpis { + grid-template-columns: repeat(3, minmax(0, 1fr)); + } + .am-kpi > strong { + font-size: 25px; + } + .am-bottom { + grid-template-columns: 1fr; + } + .am-register-head { + padding: 16px; + flex-wrap: wrap; + } + .am-filters { + padding: 0 16px 15px; + } + .am-register-head > div { + flex-wrap: wrap; + } + .am-drawer { + width: 100vw; + max-width: 100vw; + border-radius: 0; + } + .am-dialog-head, + .am-detail-body, + .am-form { + padding: 20px; + } + .am-tabs { + padding: 0 20px; + gap: 20px; + } + .am-form-grid { + gap: 14px; + } + .am-info-grid { + gap: 18px; + } + .am-report-row { + flex-wrap: wrap; + } +} +@media (max-width: 480px) { + .am-kpis { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } + .am-kpi:last-child { + grid-column: 1/-1; + } + .am-kpi:last-child > strong { + display: inline-block; + margin: 0 14px; + } + .am-kpi:last-child > small { + display: inline-block; + } + .am-main { + padding: 18px 12px; + } + .am-search { + flex-basis: 100%; + } + .am-filters select { + flex: 1; + min-width: 100px; + max-width: none; + } + .am-spec-cards { + grid-template-columns: 1fr; + } + .am-dialog-head h2 { + font-size: 17px; + } + .am-form-grid { + grid-template-columns: 1fr; + } + .am-dialog { + width: calc(100vw - 20px); + } + .am-properties { + grid-template-columns: minmax(100px, 40%) minmax(0, 1fr); + } + .am-spec-tools { + flex-wrap: wrap; + } + .am-breakdown { + gap: 15px; + } + .am-value strong { + font-size: 15px; + } + .am-info-grid { + grid-template-columns: 1fr 1fr; + } +} +/* 상세 보고서 앞에는 읽기 쉬운 부품 요약을 배치합니다. */ +.am-system-strip { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 20px; + background: #fafafa; + border-radius: 9px; + padding: 17px; + margin: 18px 0; +} +.am-components { + border: 1px solid #e5e5e5; + border-radius: 10px; + margin: 12px 0; + overflow: hidden; +} +.am-components > summary { + padding: 14px 17px; + font-size: 12px; + font-weight: 500; + cursor: pointer; + background: #fafafa; +} +.am-component-grid { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 12px; + padding: 15px; +} +.am-component-card { + min-width: 0; + padding: 14px; + border: 1px solid #eee; + border-radius: 8px; +} +.am-component-card > strong { + display: block; + font-size: 12px; + font-weight: 500; + overflow-wrap: anywhere; +} +.am-component-card > small { + display: block; + color: #aaa; + font-size: 9px; + line-height: 1.7; + margin-top: 6px; + overflow-wrap: anywhere; +} +.am-component-card dl { + display: grid; + grid-template-columns: minmax(90px, 35%) minmax(0, 1fr); + gap: 8px 12px; + margin: 15px 0 0; + font-size: 10px; + line-height: 1.7; +} +.am-component-card dt { + color: #999; +} +.am-component-card dd { + margin: 0; + color: #555; + overflow-wrap: anywhere; +} +.am-full-report-title { + margin-top: 28px; +} +.am-spec-tools { + margin-top: 14px; +} +@media (max-width: 600px) { + .am-component-grid, + .am-system-strip { + grid-template-columns: 1fr; + } +} +@media (prefers-reduced-motion: reduce) { + .am-kpi { + transition: none; + } +} diff --git a/app/static/asset.js b/app/static/asset.js new file mode 100644 index 0000000..bdb0231 --- /dev/null +++ b/app/static/asset.js @@ -0,0 +1,990 @@ +/* 회사 자산대장: 변경 요청에는 세션 확인 토큰과 자산의 수정 버전을 함께 보냅니다. */ +(() => { + "use strict"; + const $ = (id) => document.getElementById(id); + const app = $("asset-app"); + if (!app) return; + const { categories, statuses } = JSON.parse($("am-config").textContent); + const configured = app.dataset.configured === "true"; + const names = { + create: "자산 등록", + update: "정보 수정", + checkout: "사용자 배정", + checkin: "자산 반납", + maintenance: "수리 시작", + available: "사용 가능으로 복구", + lost: "분실 처리", + retired: "폐기 처리", + report: "사양 보고서 등록", + }; + const fieldNames = { + tag: "자산번호", + name: "자산명", + category: "분류", + status: "상태", + manufacturer: "제조사", + model: "모델", + serial: "시리얼", + location: "위치", + department: "부서", + assignee_email: "사용자", + purchased_on: "구매일", + purchase_cost: "구매금액", + vendor: "구매처", + warranty_until: "보증 종료", + notes: "메모", + }; + const state = { + users: [], + detail: null, + page: 1, + group: "", + warranty: false, + tab: "overview", + editing: null, + uploadTarget: null, + preview: null, + file: null, + action: "", + listSeq: 0, + detailSeq: 0, + previewSeq: 0, + }; + const esc = (value) => + String(value ?? "").replace( + /[&<>"']/g, + (c) => + ({ + "&": "&", + "<": "<", + ">": ">", + '"': """, + "'": "'", + })[c], + ); + const money = (value) => + value === null || value === undefined + ? "미입력" + : Number(value).toLocaleString("ko-KR", { maximumFractionDigits: 2 }) + + "원"; + const date = (value) => + value + ? new Date(value).toLocaleString("ko-KR", { + timeZone: "Asia/Seoul", + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + hour12: false, + }) + : "—"; + const userName = (email) => + state.users.find((u) => u.email === email)?.name || email || "미배정"; + const badge = (status) => + `${esc(statuses[status] || status)}`; + const icon = (cat) => + ``; + let messageTimer; + function message(text, error = false) { + const box = $("am-message"); + box.textContent = text; + box.hidden = false; + box.classList.toggle("is-error", error); + clearTimeout(messageTimer); + if (!error) + messageTimer = setTimeout(() => { + box.hidden = true; + }, 6000); + } + function formError(form, error) { + const box = form.querySelector(".am-form-error"); + box.textContent = error?.message || String(error); + box.hidden = false; + } + function clearError(form) { + form.querySelector(".am-form-error").hidden = true; + } + // JSON과 파일 업로드를 같은 방식으로 처리하고 서버의 오류를 화면에 전달합니다. + async function api(path, { method = "GET", body, signal } = {}) { + const headers = { "X-Asset-CSRF": app.dataset.csrf }; + if (body && !(body instanceof FormData)) { + headers["Content-Type"] = "application/json"; + body = JSON.stringify(body); + } + const response = await fetch("/asset/api/" + path, { + method, + body, + headers, + signal, + credentials: "same-origin", + cache: "no-store", + }); + if (!response.ok) { + let detail; + try { + detail = (await response.json()).detail; + } catch (_) {} + const text = Array.isArray(detail) + ? detail + .map( + (e) => + `${fieldNames[e.loc?.at(-1)] || e.loc?.at(-1) || "입력"}: ${e.msg}`, + ) + .join(" / ") + : detail; + const error = new Error( + text || `요청을 처리할 수 없습니다 (${response.status}).`, + ); + error.status = response.status; + throw error; + } + return response.json(); + } + function query() { + const p = new URLSearchParams(); + for (const [key, id] of [ + ["q", "am-query"], + ["category", "am-category"], + ["status", "am-status"], + ["location", "am-location"], + ["assignee", "am-assignee"], + ["sort", "am-sort"], + ]) { + const v = $(id).value; + if (v) p.set(key, v); + } + if (state.group) p.set("group", state.group); + if (state.warranty) p.set("warranty", "true"); + p.set("page", state.page); + return p; + } + function syncURL() { + const p = query(); + if (state.detail && $("am-detail").open) { + p.set("asset", state.detail.asset.id); + p.set("tab", state.tab); + } + history.replaceState(null, "", "/asset/?" + p); + } + function syncNavigation() { + const category = $("am-category").value, + status = $("am-status").value; + document.querySelectorAll(".am-nav-link").forEach((b) => { + const active = b.dataset.state + ? status === b.dataset.state + : b.dataset.view === "warranty" + ? state.warranty + : b.dataset.view === "all" + ? !state.group && !category && !status && !state.warranty + : state.group === b.dataset.view; + b.classList.toggle("is-active", active); + b.setAttribute("aria-current", active ? "page" : "false"); + }); + $("am-list-title").textContent = state.warranty + ? "보증 만료 예정" + : status + ? statuses[status] + " 자산" + : category + ? categories[category] + : state.group === "computer" + ? "컴퓨터 · 전산장비" + : state.group === "furniture" + ? "사무실 · 집기" + : "전체 자산"; + } + let listController; + // 빠르게 검색할 때 늦게 도착한 이전 응답이 최신 검색 결과를 덮어쓰지 않게 합니다. + async function loadList() { + syncNavigation(); + syncURL(); + if (!configured) { + $("am-result-count").textContent = "저장소 설정 대기"; + return; + } + const seq = ++state.listSeq; + listController?.abort(); + listController = new AbortController(); + $("am-rows").setAttribute("aria-busy", "true"); + try { + const result = await api("assets?" + query(), { + signal: listController.signal, + }); + if (seq !== state.listSeq) return; + if (!result.items.length && state.page > 1 && result.total) { + state.page = Math.ceil(result.total / result.page_size); + return loadList(); + } + $("am-result-count").textContent = + `${result.total.toLocaleString("ko-KR")}개 자산`; + $("am-rows").innerHTML = + result.items + .map( + (a) => + `
${icon(a.category)}
${esc(a.tag)}${a.model ? " · " + esc(a.model) : ""}
${esc(categories[a.category])}${badge(a.status)}${esc(userName(a.assignee_email))}${esc(a.location || "위치 미지정")}${money(a.purchase_cost)}${esc(a.warranty_until || "—")}${a.specs ? `` : '—'}`, + ) + .join("") || + `${result.total ? "이 페이지에 자산이 없습니다." : "조건에 맞는 자산이 없습니다."}새 자산을 등록하거나 검색 조건을 변경하세요.
`; + const pages = Math.max(1, Math.ceil(result.total / result.page_size)); + $("am-page-info").textContent = result.total + ? `${(state.page - 1) * result.page_size + 1}–${Math.min(state.page * result.page_size, result.total)} / ${result.total}개` + : "0개"; + $("am-page-number").textContent = `${state.page} / ${pages}`; + $("am-prev").disabled = state.page <= 1; + $("am-next").disabled = state.page >= pages; + } catch (error) { + if (error.name !== "AbortError" && seq === state.listSeq) { + message(error.message, true); + $("am-rows").innerHTML = + '자산을 불러오지 못했습니다.새로고침하여 다시 시도하세요.'; + } + } finally { + if (seq === state.listSeq) $("am-rows").removeAttribute("aria-busy"); + } + } + async function loadDashboard() { + if (!configured) return; + const data = await api("bootstrap"); + state.users = data.users; + for (const key of [ + "total", + "in_use", + "available", + "maintenance", + "warranty_soon", + ]) + $("am-" + key).textContent = data.totals[key].toLocaleString("ko-KR"); + $("am-nav-total").textContent = data.totals.total; + for (const key of Object.keys(statuses)) + $("am-count-" + key).textContent = data.totals[key]; + $("am-count-warranty").textContent = data.totals.warranty_soon; + $("am-value").textContent = money(data.totals.purchase_total); + const currentLocation = $("am-location").value, + currentAssignee = $("am-assignee").value; + $("am-location").innerHTML = + '' + + data.locations + .map((l) => ``) + .join(""); + $("am-location").value = currentLocation; + $("am-locations").innerHTML = data.locations + .map((l) => ``) + .join(""); + const users = state.users + .map( + (u) => + ``, + ) + .join(""); + $("am-assignee").innerHTML = + '' + users; + $("am-assignee").value = currentAssignee; + $("am-action-user").innerHTML = + '' + users; + $("am-breakdown").innerHTML = + data.categories + .map( + (c) => + ``, + ) + .join("") || '

등록된 자산이 없습니다.

'; + $("am-activity").innerHTML = + data.activity + .map( + (e) => + `

· ${esc(names[e.kind] || e.kind)}

${esc(userName(e.actor))}
`, + ) + .join("") || '

활동 이력이 없습니다.

'; + } + async function refresh() { + await loadDashboard(); + await loadList(); + } + function show(id) { + $(id).showModal(); + } + function close(id) { + // 저장 중에는 창을 닫거나 다시 제출해서 요청을 겹치지 않게 합니다. + if ($(id).querySelector('form[data-busy="true"]')) return; + if (id === "am-detail") { + ++state.detailSeq; + state.detail = null; + } + if (id === "am-upload") ++state.previewSeq; + $(id).close(); + if (id === "am-detail") syncURL(); + } + function info(label, value, wide = false) { + return `
${esc(label)}${esc(value || "—")}
`; + } + function summaryCards(s) { + return `
프로세서 / CPU${esc(s.cpu || "정보 없음")}${esc(s.cores || "—")} 코어 · ${esc(s.threads || "—")} 스레드
메모리 / RAM${esc(s.memory || "정보 없음")}설치된 전체 메모리
그래픽 / GPU${esc(s.gpu || "정보 없음")}${esc(s.gpu_memory)}
저장장치 / STORAGE${s.drive_count ?? 0}개 드라이브내장 · 외장 드라이브 포함
`; + } + // 많은 기술 항목 중 용량·속도·시리얼을 먼저 보여주고, 전체 보고서는 아래에 보존합니다. + function componentCards(parsed) { + const groups = { + MEMORY: "메모리 모듈", + DRIVES: "저장장치", + MONITOR: "모니터", + NETWORK: "네트워크", + }; + const labels = { + MEMORY: [ + "모듈 용량", + "Module Size", + "메모리 유형", + "Memory Type", + "메모리 속도", + "Memory Speed", + "모듈 제조업체", + "Module Manufacturer", + ], + DRIVES: [ + "드라이브 용량", + "Drive Capacity", + "디스크 컨트롤러", + "Drive Controller", + "드라이브 일련 번호", + "Drive Serial Number", + ], + MONITOR: [ + "모니터 이름(제조업체)", + "Monitor Name (Manuf)", + "일련 번호", + "Serial Number", + "최대 수평 크기", + "Maximum Horizontal Size", + "최대 수직 크기", + "Maximum Vertical Size", + ], + NETWORK: [ + "MAC 주소", + "MAC Address", + "최대 링크 속도", + "Maximum Link Speed", + "현재 링크 속도", + "Current Link Speed", + ], + }; + const parts = Object.entries(groups) + .map(([key, label]) => { + const devices = parsed.devices[key] || []; + if (!devices.length) return ""; + return `
${label} ${devices.length}개
${devices + .map((d) => { + const props = d.properties.filter((p) => + labels[key].includes(p.label), + ); + return `
${esc(d.name)}${esc(d.node)}
${props.map((p) => `
${esc(p.label)}
${esc(p.value)}
`).join("")}
`; + }) + .join("")}
`; + }) + .join(""); + const s = parsed.summary; + return `
${info("운영체제", s.os)}${info("메인보드 / BIOS", [s.motherboard, s.bios].filter(Boolean).join(" · "))}
${parts}`; + } + async function openDetail(id, tab = "overview") { + const seq = ++state.detailSeq; + state.tab = tab; + state.reportView = null; + if (!$("am-detail").open) show("am-detail"); + $("am-detail-title").textContent = "자산 정보"; + $("am-detail-tag").textContent = "불러오는 중"; + $("am-detail-content").innerHTML = + '

자산 정보를 불러오는 중입니다.

'; + try { + const data = await api("assets/" + encodeURIComponent(id)); + if (seq !== state.detailSeq || !$("am-detail").open) return; + state.detail = data; + renderDetail(); + syncURL(); + } catch (error) { + if (seq === state.detailSeq) + $("am-detail-content").innerHTML = + `

${esc(error.message)}

`; + } + } + function actionButtons(a) { + let buttons = []; + if (a.status === "available") + buttons = ["checkout", "maintenance", "lost", "retired"]; + if (a.status === "in_use") buttons = ["checkin", "lost"]; + if (a.status === "maintenance") buttons = ["available", "lost", "retired"]; + if (a.status === "lost") buttons = ["available", "retired"]; + if (a.status === "retired") buttons = ["available"]; + return buttons + .map( + (action, i) => + ``, + ) + .join(""); + } + function renderDetail() { + const { asset: a, reports, events } = state.detail; + const report = + state.tab === "specs" && state.reportView + ? state.reportView + : state.detail.report; + $("am-detail-title").textContent = a.name; + $("am-detail-tag").textContent = a.tag + " · " + categories[a.category]; + const tabs = { + overview: "기본 정보", + specs: "컴퓨터 사양", + reports: `보고서 ${reports.length}`, + history: "활동 이력", + }; + let body = ""; + if (state.tab === "overview") { + body = `

자산 정보

${info("분류", categories[a.category])}${info("제조사", a.manufacturer)}${info("모델", a.model)}${info("시리얼 번호", a.serial)}${info("배정 사용자", userName(a.assignee_email))}${info("위치", a.location)}${info("부서", a.department)}${info("최근 변경", date(a.updated_at))}

구매 · 보증

${info("구매일", a.purchased_on)}${info("구매금액", money(a.purchase_cost))}${info("구매처", a.vendor)}${info("보증 종료일", a.warranty_until)}${info("메모", a.notes, true)}
`; + if (report) + body += `

컴퓨터 주요 사양

${summaryCards(report.parsed.summary)}
`; + else if (a.category === "computer") + body += + '

컴퓨터 사양 연결

HWiNFO XML 보고서를 올리면 주요 사양과 부품별 상세 정보를 볼 수 있습니다.

'; + } else if (state.tab === "specs") { + if (!report) + body = '

연결된 컴퓨터 보고서가 없습니다.

'; + else + body = `

${esc(report.parsed.summary.computer_name)}

${summaryCards(report.parsed.summary)}

${esc(report.filename)} · 수집 시각 ${esc(report.parsed.scan_time || "미기록")} · ${report.parsed.property_count.toLocaleString()}개 항목

${report.parsed.warnings.map((w) => `

${esc(w)}

`).join("")}
`; + } else if (state.tab === "reports") { + body = + a.category === "computer" + ? '
이전 보고서와 원본 XML이 보존됩니다.
' + : ""; + body += + reports + .map( + (r) => + `
${esc(r.filename)}${r.id === a.latest_report_id ? ' 최신' : ""}

${esc(r.summary.computer_name)} · ${esc(r.summary.cpu)} · ${esc(r.summary.memory)}
업로드 ${esc(date(r.uploaded_at))} · ${esc(userName(r.actor))}
수집 ${esc(r.scan_time || "미기록")}

원본 ↓
`, + ) + .join("") || '

업로드된 보고서가 없습니다.

'; + } else { + body = + events + .map((e) => { + const changes = Object.entries(e.changes) + .filter( + ([k, v]) => + fieldNames[k] && v && typeof v === "object" && "before" in v, + ) + .map( + ([k, v]) => + `${fieldNames[k]}: ${k === "status" ? statuses[v.before] : k === "category" ? categories[v.before] : v.before || "—"} → ${k === "status" ? statuses[v.after] : k === "category" ? categories[v.after] : v.after || "—"}`, + ) + .join("\n"); + return `

${esc(names[e.kind] || e.kind)}

${e.note ? `

${esc(e.note)}

` : ""}${changes ? `

${esc(changes)}

` : ""}${esc(date(e.created_at))} · ${esc(userName(e.actor))}
`; + }) + .join("") + + '

최근 200개 이력을 표시합니다. 전체 이력은 저장소에 보존됩니다.

'; + } + if (state.tab === "specs" && report) + body = body.replace( + '
', + componentCards(report.parsed) + + '

보고서 전체 항목

', + ); + if (state.tab === "specs" && state.reportView) + body = + '

선택한 보고서의 사양입니다. 현재 자산의 최신 보고서는 변경되지 않습니다.

' + + body; + $("am-detail-content").innerHTML = + `
${badge(a.status)}${actionButtons(a)}
${body}
`; + if (state.tab === "specs" && report) { + renderSpecs(); + $("am-spec-query").addEventListener("input", renderSpecs); + $("am-spec-section").addEventListener("change", renderSpecs); + } + } + function renderSpecs() { + const query = $("am-spec-query").value.trim().toLocaleLowerCase(), + section = $("am-spec-section").value; + const sections = ( + state.reportView || state.detail.report + ).parsed.sections.filter((s) => !section || section === s.key); + let count = 0; + $("am-spec-nodes").innerHTML = + sections + .map((s) => + s.nodes + .map((n) => { + const nameMatches = (n.name + " " + n.path) + .toLocaleLowerCase() + .includes(query); + const props = n.properties.filter( + (p) => + !query || + nameMatches || + (p.label + " " + p.value).toLocaleLowerCase().includes(query), + ); + if (!props.length) return ""; + count++; + return `
${esc(n.name)} ${props.length}${esc(s.label)} · ${esc(n.path)}
${props.map((p) => `
${esc(p.label || p.type || "항목")}
${esc(p.value || "—")}
`).join("")}
`; + }) + .join(""), + ) + .join("") || '

검색 결과가 없습니다.

'; + } + function openEditor(edit = false) { + const form = $("am-editor-form"); + form.reset(); + clearError(form); + state.editing = edit ? structuredClone(state.detail.asset) : null; + $("am-editor-title").textContent = edit ? "자산 정보 수정" : "자산 등록"; + if (edit) + for (const input of form.elements) + if (input.name && input.name in state.editing) + input.value = state.editing[input.name] ?? ""; + show("am-editor"); + form.elements.name.focus(); + } + function assetPayload(form) { + const data = Object.fromEntries(new FormData(form)); + for (const key of ["purchased_on", "warranty_until", "purchase_cost"]) + if (!data[key]) data[key] = null; + return data; + } + // 저장에 실패하면 입력을 유지합니다. 저장 이후 조회 실패는 별도의 안내로 표시합니다. + async function afterSave(id, tab = "overview") { + try { + await refresh(); + } catch (error) { + message( + "저장은 완료됐지만 목록을 갱신하지 못했습니다. " + error.message, + true, + ); + } + await openDetail(id, tab); + } + async function saveEditor(event) { + event.preventDefault(); + const form = event.currentTarget, + button = form.querySelector('[type="submit"]'); + if (form.dataset.busy === "true" || !form.reportValidity()) return; + form.dataset.busy = "true"; + button.disabled = true; + clearError(form); + try { + const body = assetPayload(form); + if (state.editing) body.version = state.editing.version; + const result = await api( + state.editing ? "assets/" + state.editing.id : "assets", + { method: state.editing ? "PUT" : "POST", body }, + ); + const id = state.editing?.id || result.id; + form.dataset.busy = "false"; + close("am-editor"); + message("자산 정보를 저장했습니다."); + await afterSave(id); + } catch (error) { + formError(form, error); + } finally { + form.dataset.busy = "false"; + button.disabled = false; + } + } + function openUpload(target = null) { + state.uploadTarget = target ? structuredClone(target) : null; + state.preview = null; + state.file = null; + ++state.previewSeq; + $("am-upload-form").reset(); + clearError($("am-upload-form")); + $("am-report-preview").hidden = true; + $("am-import-fields").hidden = true; + $("am-import-name").required = !target; + $("am-import-save").disabled = true; + $("am-upload-title").textContent = target + ? "컴퓨터 사양 보고서 갱신" + : "컴퓨터 보고서 가져오기"; + $("am-upload-hint").textContent = target + ? `${target.tag} · ${target.name}에 보고서를 연결합니다. 기존 보고서와 자산 정보는 보존됩니다.` + : "HWiNFO에서 저장한 XML 보고서를 선택하세요. 사양을 분석한 뒤 자산으로 등록합니다."; + $("am-import-save").textContent = target ? "보고서 저장" : "자산으로 등록"; + $("am-upload-status").textContent = ""; + show("am-upload"); + } + async function previewFile(file) { + if ($("am-upload-form").dataset.busy === "true") return; + state.file = file; + state.preview = null; + const seq = ++state.previewSeq; + clearError($("am-upload-form")); + $("am-report-preview").hidden = true; + $("am-import-fields").hidden = true; + $("am-import-save").disabled = true; + if (!file) return; + if (!/\.xml$/i.test(file.name) || file.size > 10 * 1024 * 1024) { + formError( + $("am-upload-form"), + new Error("10 MB 이하의 XML 보고서를 선택하세요."), + ); + return; + } + $("am-upload-status").textContent = "보고서 분석 중…"; + try { + const body = new FormData(); + body.append("file", file); + const result = await api("reports/preview", { method: "POST", body }); + if (seq !== state.previewSeq || !$("am-upload").open) return; + state.preview = result; + const s = result.summary; + let warning = ""; + if ( + state.uploadTarget && + state.detail?.report && + state.detail.report.parsed.summary.computer_name !== s.computer_name + ) + warning = `

기존 보고서와 컴퓨터 이름이 다릅니다. ${esc(s.computer_name)}의 보고서를 ${esc(state.uploadTarget.name)}에 연결하는 것이 맞는지 확인하세요.

`; + $("am-report-preview").innerHTML = + `

${esc(s.computer_name)}

CPU
${esc(s.cpu)} · ${esc(s.cores || "—")}코어 / ${esc(s.threads || "—")}스레드
메모리
${esc(s.memory)}
그래픽
${esc(s.gpu)}
메인보드
${esc(s.motherboard)}
저장장치
${s.drive_count}개
운영체제
${esc(s.os)}
${warning}`; + $("am-report-preview").hidden = false; + $("am-import-fields").hidden = !!state.uploadTarget; + if (!state.uploadTarget) $("am-import-name").value = s.computer_name; + $("am-import-save").disabled = !configured; + $("am-upload-status").textContent = configured + ? `${file.name} · ${result.property_count.toLocaleString()}개 사양 항목` + : "분석 완료 · DB 연결 후 저장할 수 있습니다."; + } catch (error) { + if (seq === state.previewSeq) { + formError($("am-upload-form"), error); + $("am-upload-status").textContent = "분석 실패"; + } + } + } + async function saveUpload(event) { + event.preventDefault(); + if ($("am-upload-form").dataset.busy === "true") return; + if (!state.preview || !configured || !state.file) return; + $("am-upload-form").dataset.busy = "true"; + const button = $("am-import-save"), + fileInput = $("am-report-file"); + button.disabled = true; + fileInput.disabled = true; + const target = state.uploadTarget; + clearError($("am-upload-form")); + try { + const body = new FormData(); + body.append("file", state.file); + if (target) body.append("version", target.version); + else + body.append( + "payload", + JSON.stringify({ + name: $("am-import-name").value.trim(), + category: "computer", + location: $("am-import-location").value.trim(), + manufacturer: state.preview.summary.manufacturer || "", + serial: state.preview.summary.serial || "", + }), + ); + const result = await api( + target ? `assets/${target.id}/reports` : "reports/import", + { method: "POST", body }, + ); + $("am-upload-form").dataset.busy = "false"; + close("am-upload"); + message("컴퓨터 보고서를 저장했습니다."); + await afterSave(target?.id || result.id, "specs"); + } catch (error) { + formError($("am-upload-form"), error); + } finally { + $("am-upload-form").dataset.busy = "false"; + button.disabled = false; + fileInput.disabled = false; + } + } + function openAction(action) { + state.action = action; + state.actionAsset = structuredClone(state.detail.asset); + const form = $("am-action-form"); + form.reset(); + clearError(form); + $("am-action-title").textContent = names[action]; + $("am-action-tag").textContent = + state.actionAsset.tag + " · " + state.actionAsset.name; + $("am-action-user-label").hidden = action !== "checkout"; + $("am-action-user").required = action === "checkout"; + $("am-action-location").value = state.actionAsset.location; + $("am-action-note").required = ["lost", "retired"].includes(action); + $("am-action-hint").textContent = { + checkout: + "등록된 회사 사용자를 선택하세요. 배정 후 사용 중 상태가 됩니다.", + checkin: `현재 사용자: ${userName(state.actionAsset.assignee_email)}. 반납 후 사용 가능한 상태가 됩니다.`, + maintenance: "수리 사유와 자산 위치를 기록하세요.", + available: "배정 정보를 해제하고 사용 가능한 상태로 복구합니다.", + lost: "분실 경위를 메모에 입력하세요. 기존 사용자는 기록에 유지됩니다.", + retired: + "폐기 사유를 메모에 입력하세요. 자산 기록과 보고서는 보존됩니다.", + }[action]; + show("am-action"); + } + async function saveAction(event) { + event.preventDefault(); + const form = event.currentTarget, + button = $("am-action-save"); + if (form.dataset.busy === "true") return; + form.dataset.busy = "true"; + button.disabled = true; + clearError(form); + try { + const asset = state.actionAsset; + await api(`assets/${asset.id}/actions`, { + method: "POST", + body: { + version: asset.version, + action: state.action, + assignee_email: $("am-action-user").value, + location: $("am-action-location").value.trim(), + note: $("am-action-note").value.trim(), + }, + }); + form.dataset.busy = "false"; + close("am-action"); + message(names[state.action] + "를 완료했습니다."); + await afterSave(asset.id, state.tab); + } catch (error) { + formError(form, error); + } finally { + form.dataset.busy = "false"; + button.disabled = false; + } + } + async function historicalReport(id) { + const assetId = state.detail.asset.id, + seq = ++state.detailSeq; + try { + const report = await api(`assets/${assetId}/reports/${id}`); + if (seq !== state.detailSeq || !$("am-detail").open) return; + state.reportView = report; + state.tab = "specs"; + renderDetail(); + } catch (error) { + message(error.message, true); + } + } + function resetFilters() { + $("am-filters").reset(); + state.group = ""; + state.warranty = false; + state.page = 1; + } + document.addEventListener("click", (event) => { + const button = event.target.closest("button,a"); + if (!button) return; + if (button.dataset.close) { + close(button.dataset.close); + return; + } + if (button.dataset.open) { + openDetail(button.dataset.open, button.dataset.tab || "overview"); + return; + } + if (button.hasAttribute("data-create")) { + openEditor(); + return; + } + if (button.hasAttribute("data-edit") && state.detail) { + openEditor(true); + return; + } + if (button.hasAttribute("data-attach") && state.detail) { + openUpload(state.detail.asset); + return; + } + if (button.dataset.detailTab && state.detail) { + state.tab = button.dataset.detailTab; + renderDetail(); + syncURL(); + return; + } + if (button.dataset.action && state.detail) { + openAction(button.dataset.action); + return; + } + if (button.dataset.report) { + historicalReport(button.dataset.report); + return; + } + if ( + button.dataset.view || + button.dataset.state || + button.dataset.kpi || + button.dataset.category + ) { + const key = button.dataset.kpi; + resetFilters(); + if ( + button.dataset.view === "computer" || + button.dataset.view === "furniture" + ) + state.group = button.dataset.view; + if (button.dataset.view === "warranty" || key === "warranty") + state.warranty = true; + if (button.dataset.state || (key && statuses[key])) + $("am-status").value = button.dataset.state || key; + if (button.dataset.category) + $("am-category").value = button.dataset.category; + loadList(); + } + }); + $("am-create").addEventListener("click", () => openEditor()); + $("am-import").addEventListener("click", () => openUpload()); + $("am-help-open").addEventListener("click", () => show("am-help")); + $("am-editor-form").addEventListener("submit", saveEditor); + $("am-action-form").addEventListener("submit", saveAction); + $("am-upload-form").addEventListener("submit", saveUpload); + $("am-report-file").addEventListener("change", (event) => + previewFile(event.target.files[0]), + ); + $("am-drop").addEventListener("dragover", (event) => { + event.preventDefault(); + $("am-drop").classList.add("is-over"); + }); + $("am-drop").addEventListener("dragleave", () => + $("am-drop").classList.remove("is-over"), + ); + $("am-drop").addEventListener("drop", (event) => { + event.preventDefault(); + $("am-drop").classList.remove("is-over"); + if (event.dataTransfer.files.length !== 1) { + formError($("am-upload-form"), new Error("보고서를 한 개씩 선택하세요.")); + return; + } + $("am-report-file").files = event.dataTransfer.files; + previewFile(event.dataTransfer.files[0]); + }); + for (const id of [ + "am-detail", + "am-editor", + "am-action", + "am-upload", + "am-help", + ]) + $(id).addEventListener("cancel", (event) => { + event.preventDefault(); + close(id); + }); + $("am-filters").addEventListener("submit", (event) => { + event.preventDefault(); + state.page = 1; + loadList(); + }); + let searchTimer; + $("am-query").addEventListener("input", (event) => { + if (event.isComposing) return; + clearTimeout(searchTimer); + searchTimer = setTimeout(() => { + state.page = 1; + loadList(); + }, 250); + }); + $("am-query").addEventListener("compositionend", () => { + clearTimeout(searchTimer); + state.page = 1; + loadList(); + }); + for (const id of [ + "am-category", + "am-status", + "am-location", + "am-assignee", + "am-sort", + ]) + $(id).addEventListener("change", () => { + state.page = 1; + if (id === "am-category") state.group = ""; + loadList(); + }); + $("am-reset").addEventListener("click", () => { + resetFilters(); + loadList(); + }); + $("am-prev").addEventListener("click", () => { + state.page--; + loadList(); + }); + $("am-next").addEventListener("click", () => { + state.page++; + loadList(); + }); + $("am-refresh").addEventListener("click", () => + refresh().catch((e) => message(e.message, true)), + ); + $("am-export").addEventListener("click", async () => { + const button = $("am-export"); + button.disabled = true; + try { + const params = query(); + params.delete("page"); + params.delete("sort"); + const response = await fetch("/asset/api/export?" + params, { + credentials: "same-origin", + }); + if (!response.ok) { + const data = await response.json(); + throw new Error( + typeof data.detail === "string" + ? data.detail + : "내보내기에 실패했습니다.", + ); + } + const link = document.createElement("a"), + url = URL.createObjectURL(await response.blob()); + link.href = url; + link.download = "자산대장.xlsx"; + link.click(); + setTimeout(() => URL.revokeObjectURL(url), 1000); + } catch (error) { + message(error.message, true); + } finally { + button.disabled = false; + } + }); + async function init() { + const p = new URLSearchParams(location.search), + selectedId = p.get("asset"), + selectedTab = p.get("tab"); + for (const [key, id] of [ + ["q", "am-query"], + ["category", "am-category"], + ["status", "am-status"], + ["sort", "am-sort"], + ]) + if (p.has(key)) $(id).value = p.get(key); + state.page = Math.max( + 1, + Math.min(100000, Math.trunc(Number(p.get("page"))) || 1), + ); + state.group = ["computer", "furniture"].includes(p.get("group")) + ? p.get("group") + : ""; + state.warranty = p.get("warranty") === "true"; + try { + await loadDashboard(); + } catch (error) { + message(error.message, true); + } + if (p.get("location")) $("am-location").value = p.get("location"); + if (p.get("assignee")) $("am-assignee").value = p.get("assignee"); + await loadList(); + if (selectedId && configured) + await openDetail( + selectedId, + ["overview", "specs", "reports", "history"].includes(selectedTab) + ? selectedTab + : "overview", + ); + } + init(); +})(); diff --git a/app/store.py b/app/store.py index d635831..60e04c1 100644 --- a/app/store.py +++ b/app/store.py @@ -33,6 +33,7 @@ MODULE_KEYS: tuple[str, ...] = ( "project", "cafe24", "performance", + "asset", "expense_approver", "vacation_approver", ) diff --git a/docs/ASSET_MODULE.md b/docs/ASSET_MODULE.md new file mode 100644 index 0000000..e95bfe5 --- /dev/null +++ b/docs/ASSET_MODULE.md @@ -0,0 +1,115 @@ +# 자산관리 + +진입 `/asset/`, 권한키 `asset`. 사무집기와 전산장비를 개별 자산번호로 등록한다. +권한이 있는 사용자는 조회·등록·수정·배정·반납·상태 변경·보고서 다운로드가 가능하다. +관리자 페이지의 기존 권한 토글로 접근을 부여한다. + +## 업무 흐름 + +- 현황 카드: 전체·사용 중·사용 가능·수리 중·30일 이내 보증 만료. 분류 구성·최근 활동·보유 구매금액(폐기 제외). +- 자산대장: 검색/분류/상태/위치/사용자 필터, 정렬, 25개씩 페이지 이동. 엑셀은 현재 필터 전체(최대 10,000개). +- 상세: 기본 정보/컴퓨터 사양/보고서/활동 이력. 구매일·금액·구매처·보증·부서·위치·메모. +- 등록: 번호를 비우면 `AST-000001` 형식으로 자동 발급. 대소문자 무관 고유. 같은 모델도 물건마다 하나씩 등록. +- 배정: 사용 가능 → 사용 중. 등록된 회사 사용자만 배정. 반납 시 사용자 배정을 해제한다. +- 수리: 사용 가능 → 수리 중 → 사용 가능. 배정된 자산은 먼저 반납한다. +- 분실: 사용 가능/사용 중/수리 중 → 분실. 기존 사용자를 유지. 발견 후 사용 가능으로 복구하면 배정 해제. +- 폐기: 사용 가능/수리 중/분실 → 폐기. 오처리는 사용 가능으로 복구. 이력·보고서는 보존한다. +- 분실·폐기는 사유 필수. 모든 변경은 처리자·시각·변경 전/후 값을 기록한다. +- 동시 수정은 행 잠금 + version 검사. 409 발생 시 입력을 보존하고 상세를 다시 확인하도록 안내한다. + +## HWiNFO XML + +HWiNFO → 보고서 저장 → XML. 한 파일에 컴퓨터 한 대, 최대 10 MB. +실제 `KING-DESKTOP.XML` 구조를 확인했다. 한국어/영어 항목명 및 언어 독립 PropertyType을 사용한다. +실물 보고서는 시리얼·MAC·사용자 정보가 있어 Git에 포함하지 않는다. + +1. 업로드 시 저장하지 않고 핵심 사양을 미리 분석한다. +2. 이름과 위치를 확인한 뒤 신규 컴퓨터로 등록한다. 제조사와 유효한 시스템 시리얼은 초기값으로 사용한다. +3. 기존 컴퓨터에서 업로드하면 보고서만 새 버전으로 연결한다. 자산명·구매정보·배정·위치를 덮어쓰지 않는다. +4. CPU/RAM/GPU/저장장치 요약과 부품별 펼침 목록, 항목명·값·부품명 검색을 제공한다. +5. 이전 버전 사양 조회와 원본 다운로드. 같은 자산의 동일 SHA-256 보고서는 중복 저장하지 않는다. + 기존 보고서와 컴퓨터 이름이 다르면 확인 안내를 표시한다. + +모든 Property를 계층 경로와 함께 보존한다. SPD 메모리 모듈과 시스템 전체 메모리를 중복 합산하지 않는다. +같은 모델의 서로 다른 디스크/모니터도 개별 노드로 유지한다. 드라이브 수는 외장 장치도 포함한다. +ScanTime은 보고서에 있는 시각 그대로이고 시간대는 추정하지 않는다. 업로드/활동 시각은 KST로 표시한다. +BIOS의 기본 문자열 `System Serial Number`는 실제 시스템 시리얼로 사용하지 않는다. + +`defusedxml`로 엔티티/외부 엔티티를 차단한다. HWiNFO 외부 DTD 선언은 허용하지만 DTD를 읽거나 내려받지 않는다. +크기·계층 제한과 HTML 이스케이프를 적용한다. 원본 XML은 첨부로 내려받는다. +엑셀의 사용자 텍스트는 수식으로 실행하지 않는다. 모든 API는 권한, 변경 API는 세션 CSRF 토큰을 확인한다. + +## 저장소와 설치 + +`app/modules/asset/`의 router/store/db/hwinfo/templates, 공통 메뉴/권한에 등록. +전용 PostgreSQL `asset_db`, `ASSET_DB_URL`. JSON 폴백 없음. 미설정 시 저장 버튼 비활성 + 안내. +XML 분석 미리보기는 DB 없이 가능. 앱 시작 시 DB/테이블을 생성하지 않는다. + +| 테이블 | 용도 | +| --- | --- | +| assets | 자산·상태·사용자·위치·현재 보고서·수정 버전 | +| asset_reports | 원본 XML(BYTEA)·분석 JSONB·SHA-256·처리자/시각. 이전 버전 보존 | +| asset_events | 등록·수정·배정·반납·상태·보고서 이력. 변경 전/후 값 | + +자산/보고서/이력은 한 트랜잭션에서 변경한다. 원본과 분석 결과도 함께 저장하므로 별도 첨부 경로가 없다. +앱 계정 `asset_app`은 자산 SELECT/INSERT/UPDATE, 보고서/이력 SELECT/INSERT, sequence USAGE/SELECT. +소유자는 `postgres`. 최신 보고서의 복합 FK는 다른 자산의 보고서 연결을 막는다. + +**DB 생성은 서버 실행 명령을 제공하고 사용자가 직접 진행한다 (2026-10-06).** +`scripts/sql/asset_db_init.sql`은 재실행 시 기존 데이터·비밀번호를 변경하지 않는다. +운영 `/opt/www/main`, PostgreSQL `postgres-db`, 컨테이너 포트 5432. +현재 상태·DB 목록·기존 백업 위치 확인 후 진행한다. 권장 백업은 매일, +`/var/backups/postgres/asset_db_YYYY-MM-DD.dump`(운영자가 준비; 자동 스케줄은 추가하지 않음). +원본 XML도 pg_dump에 포함되므로 보고서가 늘면 백업 용량도 증가한다. + +```bash +cd /opt/www/main +docker compose ps +docker exec postgres-db psql -U postgres -c '\l' +# 신규 설치 시 사용자가 대상 서버·현재 DB·기존 백업 위치 확인 후 실행: +read -r -s -p 'asset_app password: ' ASSET_APP_PWD; echo +docker exec -i postgres-db psql -v ON_ERROR_STOP=1 -U postgres \ + -v app_password="$ASSET_APP_PWD" < scripts/sql/asset_db_init.sql +unset ASSET_APP_PWD +# .env: ASSET_DB_URL=postgresql://asset_app:@postgres-db:5432/asset_db +docker exec postgres-db psql -U postgres -d asset_db -c '\dt' +docker compose up -d --build web +docker compose ps +docker compose logs --tail=50 web +# 로그인 후 /asset/health와 등록·배정·반납·보고서 확인 +``` + +DB·테이블·`.env`의 `ASSET_DB_URL`을 이미 준비했다면 초기화 SQL은 생략한다. +코드를 반영한 뒤 웹 컨테이너를 재빌드하고 앱 계정의 DB 연결을 확인한다. +아래 확인은 데이터를 추가하거나 수정하지 않는다. 일반 직원은 관리자 페이지에서 `asset` 권한을 부여한다. + +```bash +cd /opt/www/main +docker compose ps +git status --short +git pull --ff-only origin master +docker compose up -d --build web +docker compose ps +docker compose exec -T web python -c 'from app.main import app; store=app.state.asset_store; store is not None or exit("ASSET_DB_URL 설정이 필요합니다."); store.health(); print("asset_db 연결 정상")' +docker compose logs --tail=50 web +``` + +## 참고한 업무 패턴 + +- [Snipe-IT Overview](https://snipe-it.readme.io/docs/overview): 배정·반납·상태 구분. +- [Snipe-IT Managing Assets](https://snipe-it.readme.io/docs/managing-assets): 개별 자산번호. +- [EZOfficeInventory Work Orders](https://www.ezofficeinventory.com/industries/work-order-software): 상세의 정비·처리 이력. + +기존 ERP의 단색 화면·사이드바·상태 배지·다이얼로그에 맞춰 재구성했다. + +## 검증 + +```powershell +python -m unittest discover -s tests -p 'test_asset*.py' +python tests/js/render_asset.py +node tests/js/asset.browser.test.js +``` + +Chrome 검증은 실제 템플릿과 가짜 API를 사용해 운영 DB에 쓰지 않는다. +실물 보고서는 `ASSET_SAMPLE_XML` 경로 또는 프로젝트 루트 `KING-DESKTOP.XML`을 사용한다. +실물 파일이 없으면 그 검증만 건너뛰고 합성 보고서 테스트는 실행한다. diff --git a/docs/DATABASES.md b/docs/DATABASES.md index c29c512..9c5831a 100644 --- a/docs/DATABASES.md +++ b/docs/DATABASES.md @@ -17,10 +17,16 @@ ## 명명 규칙 +자산관리 전용 `asset_db` / 앱 계정 `asset_app` / 소유자 `postgres`. +테이블 `assets`, `asset_reports`, `asset_events`; 원본 XML도 DB에 보존한다. +`ASSET_DB_URL`, 초기화 `scripts/sql/asset_db_init.sql`(사용자가 서버에서 직접 실행). +백업 권장: 매일 `/var/backups/postgres/asset_db_YYYY-MM-DD.dump`. +상세 설치·권한·업무 규칙은 [ASSET_MODULE.md](ASSET_MODULE.md). + - 모든 DB 이름은 **소문자 + 언더스코어**, **`_db`로 끝낸다**. - ✅ `inventory_db`, `cs_db` - ❌ `inventoryApp`, `cs-database` -- 신규 DB가 필요하면 **사용자 승인 후** 생성한다. +- 신규 DB 생성은 **서버 실행 명령을 제공하고 사용자가 직접 진행한다** (사용자 지시: 2026-10-06). 대상·현재 상태·백업 확인과 생성 후 권한·연결 검증 명령을 함께 제공한다. 기존 DB 삭제·덮어쓰기는 별도 승인을 받는다. - 신규 DB 생성 시 함께 정리할 항목: - 용도와 책임 모듈 - 소유자(OWNER) 계정 diff --git a/docs/DEPLOYMENT.md b/docs/DEPLOYMENT.md index 8b80b2b..1231548 100644 --- a/docs/DEPLOYMENT.md +++ b/docs/DEPLOYMENT.md @@ -101,6 +101,13 @@ docker exec postgres-db psql -U postgres -d project_db -c "SELECT column_name FR ## 컨테이너 관리 +자산관리의 `asset_db` 생성은 사용자가 서버 명령으로 직접 진행한다 (2026-10-06). +이미 생성한 DB에 프로그램을 적용할 때는 초기화 SQL을 다시 실행할 필요가 없다. +`ASSET_DB_URL=postgresql://asset_app:@postgres-db:5432/asset_db`를 설정한다. +원본 XML까지 DB 백업에 포함되며 별도 업로드 볼륨은 필요 없다. +DB 미설정 시에도 기존 모듈은 동작하고 자산관리에서 설정 안내/보고서 분석을 제공한다. +상태·백업 확인과 초기화 순서는 [ASSET_MODULE.md](ASSET_MODULE.md#저장소와-설치) 참조. + ```bash docker compose ps # 상태 확인 docker compose restart web # 단일 서비스 재시작 diff --git a/docs/PROJECT_OVERVIEW.md b/docs/PROJECT_OVERVIEW.md index 58e040c..70cea59 100644 --- a/docs/PROJECT_OVERVIEW.md +++ b/docs/PROJECT_OVERVIEW.md @@ -25,11 +25,15 @@ ### 권한 키 (`MODULE_KEYS`) +자산관리: `app/modules/asset/`, `/asset/`, `asset_db` — 사무집기·전산장비 개별 등록, +배정/반납/상태·구매/보증·활동 이력, HWiNFO XML 사양/보고서 보존. 상세 `docs/ASSET_MODULE.md`. + | 키 | 종류 | 설명 | | --- | --- | --- | | `corm` / `order` | 접근 | 외부 모듈 진입 | | `expense` / `vacation` / `cupang` / `malaysia` / `performance` | 접근 | 내부 모듈 진입 (`performance` 설정 화면·API 는 추가로 `admin` 필요) | | `expense_approver` | 결재 | 개인경비 승인/반려/정산 | +| `asset` | 접근 | 자산관리 조회·등록·수정·배정·반납·보고서 | | `vacation_approver` | 결재 | 휴가 승인/반려 (모듈 미개발) | `admin` 역할은 모든 권한 자동 부여. 신규 사용자는 관리자 페이지(`/admin`)에서 이메일만으로 등록 가능. @@ -94,7 +98,9 @@ app/modules// | `malaysia_stock_db` | 말레이시아 창고 재고/세트BOM/재고조사 (`MALAYSIA_STOCK_DB_URL` 필수, JSON 폴백 없음) | | `performance_db` | 실적 — 쇼핑몰 설정/수수료 이력/인증정보(암호문)/매출 사건 (`PERFORMANCE_DB_URL` 필수, JSON 폴백 없음) | -> 신규 DB가 필요하면 **승인 요청 후** 생성하며, 이름은 `_db`로 끝낸다. 상세는 `DATABASES.md`. +> 신규 DB 생성은 서버 실행 명령을 제공하고 사용자가 직접 진행한다 (사용자 지시: 2026-10-06). 대상·상태·백업 확인 명령을 제공하고 이름은 `_db`로 끝낸다. 기존 DB 삭제·덮어쓰기는 별도 승인 대상이다. 상세는 `DATABASES.md`. + +자산관리는 전용 `asset_db`를 사용한다. `ASSET_DB_URL` 미설정 시 저장 비활성, XML 분석 미리보기 가능. --- diff --git a/requirements.txt b/requirements.txt index 0b539fc..bc6ffcf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ itsdangerous>=2.2 python-dotenv>=1.0 psycopg[binary,pool]>=3.2 python-multipart>=0.0.20 +defusedxml>=0.7.1 openpyxl>=3.1 pdfplumber>=0.11 pillow>=10.0 diff --git a/scripts/sql/asset_db_init.sql b/scripts/sql/asset_db_init.sql new file mode 100644 index 0000000..4df3c5f --- /dev/null +++ b/scripts/sql/asset_db_init.sql @@ -0,0 +1,64 @@ +-- 자산관리 초기화. 사용자가 서버에서 직접 실행합니다. 대상·상태·백업 확인 후 실행. +-- 기존 DB·역할의 데이터와 비밀번호는 변경하지 않습니다. +-- psql -v ON_ERROR_STOP=1 -U postgres -v app_password="$APP_PWD" < this-file +\set ON_ERROR_STOP on +SELECT 'CREATE ROLE asset_app LOGIN PASSWORD ' || quote_literal(:'app_password') +WHERE NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname='asset_app') +\gexec +SELECT 'CREATE DATABASE asset_db OWNER postgres ENCODING ''UTF8'' TEMPLATE template0' +WHERE NOT EXISTS (SELECT 1 FROM pg_database WHERE datname='asset_db') +\gexec +GRANT CONNECT ON DATABASE asset_db TO asset_app; +\connect asset_db +BEGIN; +CREATE SEQUENCE IF NOT EXISTS asset_tag_seq; +CREATE TABLE IF NOT EXISTS assets ( + id TEXT PRIMARY KEY, + tag TEXT NOT NULL CHECK(length(tag) BETWEEN 1 AND 64), + name TEXT NOT NULL CHECK(length(name) BETWEEN 1 AND 200), + category TEXT NOT NULL CHECK(category IN ('computer','monitor','mouse','keyboard','camera','hub','lighting','desk','chair','furniture','equipment')), + status TEXT NOT NULL DEFAULT 'available' CHECK(status IN ('available','in_use','maintenance','lost','retired')), + manufacturer TEXT NOT NULL DEFAULT '', model TEXT NOT NULL DEFAULT '', serial TEXT NOT NULL DEFAULT '', + location TEXT NOT NULL DEFAULT '', department TEXT NOT NULL DEFAULT '', + assignee_email TEXT NOT NULL DEFAULT '', + purchased_on DATE, purchase_cost NUMERIC(15,2) CHECK(purchase_cost>=0 AND purchase_cost<=1000000000000), + vendor TEXT NOT NULL DEFAULT '', warranty_until DATE, notes TEXT NOT NULL DEFAULT '', + latest_report_id TEXT, + version INTEGER NOT NULL DEFAULT 1 CHECK(version>=1), + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), updated_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CHECK(status<>'in_use' OR assignee_email<>''), + CHECK(status IN ('in_use','lost') OR assignee_email=''), + CHECK(warranty_until IS NULL OR purchased_on IS NULL OR warranty_until>=purchased_on), + CHECK(latest_report_id IS NULL OR category='computer') +); +CREATE UNIQUE INDEX IF NOT EXISTS assets_tag_unique ON assets(lower(tag)); +CREATE INDEX IF NOT EXISTS assets_status_category ON assets(status,category); +CREATE INDEX IF NOT EXISTS assets_assignee ON assets(assignee_email); +CREATE INDEX IF NOT EXISTS assets_location ON assets(location); +CREATE INDEX IF NOT EXISTS assets_updated ON assets(updated_at DESC,id); +CREATE TABLE IF NOT EXISTS asset_reports ( + id TEXT PRIMARY KEY, asset_id TEXT NOT NULL REFERENCES assets(id), + filename TEXT NOT NULL, sha256 TEXT NOT NULL, + raw_xml BYTEA NOT NULL CHECK(octet_length(raw_xml) BETWEEN 1 AND 10485760), + parsed JSONB NOT NULL, actor TEXT NOT NULL, uploaded_at TIMESTAMPTZ NOT NULL DEFAULT now(), + UNIQUE(asset_id,sha256), UNIQUE(asset_id,id) +); +-- Composite FK prevents linking another computer's report as the current report. +DO $$ BEGIN + IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conname='assets_latest_report_fk' AND conrelid='assets'::regclass) THEN + ALTER TABLE assets ADD CONSTRAINT assets_latest_report_fk + FOREIGN KEY(id,latest_report_id) REFERENCES asset_reports(asset_id,id); + END IF; +END $$; +CREATE INDEX IF NOT EXISTS asset_reports_asset ON asset_reports(asset_id,uploaded_at DESC); +CREATE TABLE IF NOT EXISTS asset_events ( + id BIGSERIAL PRIMARY KEY, asset_id TEXT NOT NULL REFERENCES assets(id), + actor TEXT NOT NULL, kind TEXT NOT NULL, note TEXT NOT NULL DEFAULT '', + changes JSONB NOT NULL DEFAULT '{}', created_at TIMESTAMPTZ NOT NULL DEFAULT now() +); +CREATE INDEX IF NOT EXISTS asset_events_asset ON asset_events(asset_id,id DESC); +GRANT USAGE ON SCHEMA public TO asset_app; +GRANT SELECT,INSERT,UPDATE ON assets TO asset_app; +GRANT SELECT,INSERT ON asset_reports,asset_events TO asset_app; +GRANT USAGE,SELECT ON SEQUENCE asset_tag_seq,asset_events_id_seq TO asset_app; +COMMIT; diff --git a/tests/asset_fixtures.py b/tests/asset_fixtures.py new file mode 100644 index 0000000..8464de4 --- /dev/null +++ b/tests/asset_fixtures.py @@ -0,0 +1,23 @@ +"""Synthetic HWiNFO export; contains no company device identifiers.""" +def prop(label, value, kind=""): + return f"{label}{value}{kind}" + + +def report_xml(english=False): + return (''' +TEST-PC06.10.2026 01:10''' + + prop("Operating System" if english else "운영 체제", "Windows Test") + + 'CPU' + + prop("Number of Processor Cores" if english else "프로세서 코어 수", "8", "CPU_COUNT") + + prop("Number of Logical Processors" if english else "논리 프로세서 수", "16") + + 'Test Processor' + prop("Processor Name", "Test Processor", "CPU_NAME") + + 'Mainboard' + prop("Motherboard", "Test Board", "SYSTEM_MAINBOARD") + + prop("Product Serial Number", "System Serial Number") + 'Memory' + + prop("Total Memory Size [MB]", "32768", "SYSTEM_MEMORY") + + 'DIMM1' + prop("Module Part Number", "TEST-RAM") + prop("Module Size", "16 GiB") + '' + + 'DIMM2' + prop("Module Part Number", "TEST-RAM") + prop("Module Size", "16 GiB") + '' + + 'Drives' + + 'SSD' + prop("Drive Model", "Same Model SSD", "HDD") + prop("Drive Serial Number", "synthetic-1") + '' + + 'SSD' + prop("Drive Model", "Same Model SSD", "HDD") + prop("Drive Serial Number", "synthetic-2") + '' + + '').encode() diff --git a/tests/js/asset.browser.test.js b/tests/js/asset.browser.test.js new file mode 100644 index 0000000..ecd4342 --- /dev/null +++ b/tests/js/asset.browser.test.js @@ -0,0 +1,531 @@ +// Actual Chrome, real ERP template/CSS/JS, synthetic assets and controlled APIs. +const assert = require("node:assert/strict"); +const fs = require("node:fs"); +const http = require("node:http"); +const path = require("node:path"); +const { chromium } = require("playwright"); +const ROOT = path.resolve(__dirname, "../.."), + OUT = path.join(__dirname, ".out"), + STATIC = path.join(ROOT, "app/static"); +const parsed = JSON.parse( + fs.readFileSync(path.join(OUT, "asset_report.json"), "utf8"), +); +let conflict = false, + slow = false, + mutations = [], + counter = 30; +const timestamp = "2026-10-06T01:00:00+09:00"; +const records = Array.from({ length: 30 }, (_, i) => ({ + id: "asset" + i, + tag: "AST-" + String(i + 1).padStart(6, "0"), + name: i === 0 ? "KING-DESKTOP" : `테스트 자산 ${i}`, + category: i % 3 === 0 ? "computer" : i % 3 === 1 ? "chair" : "mouse", + status: "available", + manufacturer: "", + model: i === 0 ? parsed.summary.motherboard : "", + serial: "", + location: "본사 3층", + department: "디자인팀", + assignee_email: "", + purchased_on: "2026-01-01", + purchase_cost: "1250000", + vendor: "", + warranty_until: "2026-10-20", + notes: "", + latest_report_id: i === 0 ? "report1" : null, + version: 1, + created_at: timestamp, + updated_at: timestamp, + specs: i === 0 ? parsed.summary : null, +})); +const users = [ + { email: "reader@test.local", name: "담당자" }, + { email: "staff@test.local", name: "직원" }, +]; +const events = [ + { + id: 1, + asset_id: "asset0", + actor: "reader@test.local", + kind: "create", + note: "자산 등록", + changes: {}, + created_at: timestamp, + }, +]; +const reports = [ + { + id: "report1", + asset_id: "asset0", + filename: "KING-DESKTOP.XML", + uploaded_at: timestamp, + actor: "reader@test.local", + summary: parsed.summary, + scan_time: parsed.scan_time, + }, +]; +function json(res, value, code = 200) { + res.writeHead(code, { "Content-Type": "application/json" }); + res.end(JSON.stringify(value)); +} +function filter(p) { + let rows = records.filter( + (a) => !p.get("category") || a.category === p.get("category"), + ); + for (const key of ["status", "location"]) + rows = rows.filter((a) => !p.get(key) || a[key] === p.get(key)); + if (p.get("assignee")) + rows = rows.filter((a) => a.assignee_email === p.get("assignee")); + if (p.get("group")) + rows = rows.filter( + (a) => + (p.get("group") === "furniture") === + ["chair", "desk", "furniture"].includes(a.category), + ); + if (p.get("q")) + rows = rows.filter((a) => (a.name + a.tag + a.notes).includes(p.get("q"))); + return rows; +} +const server = http.createServer(async (req, res) => { + const url = new URL(req.url, "http://localhost"); + if (url.pathname === "/asset/") { + res.setHeader("Content-Type", "text/html; charset=utf-8"); + res.end( + fs.readFileSync( + path.join( + OUT, + url.searchParams.has("unconfigured") + ? "asset_unconfigured.html" + : "asset_render.html", + ), + ), + ); + return; + } + if (url.pathname.startsWith("/static/")) { + const file = path.resolve( + STATIC, + "." + decodeURIComponent(url.pathname.slice(7)), + ); + if ( + !file.startsWith(STATIC + path.sep) || + !fs.existsSync(file) || + !fs.statSync(file).isFile() + ) { + res.writeHead(404); + res.end(); + return; + } + const types = { + ".css": "text/css", + ".js": "text/javascript", + ".woff2": "font/woff2", + ".png": "image/png", + }; + res.setHeader( + "Content-Type", + types[path.extname(file)] || "application/octet-stream", + ); + fs.createReadStream(file).pipe(res); + return; + } + const route = url.pathname.slice("/asset/api/".length), + parts = route.split("/"); + const chunks = []; + for await (const chunk of req) chunks.push(chunk); + const raw = Buffer.concat(chunks), + body = req.headers["content-type"]?.includes("application/json") + ? JSON.parse(raw.toString()) + : null; + if (req.method !== "GET") { + assert.equal(req.headers["x-asset-csrf"], "browser-test"); + mutations.push({ route, body }); + } + if (route === "bootstrap") { + const totals = { + total: records.length, + available: 0, + in_use: 0, + maintenance: 0, + lost: 0, + retired: 0, + warranty_soon: records.length, + purchase_total: "37500000", + }; + records.forEach((a) => totals[a.status]++); + json(res, { + totals, + users, + locations: ["本社", "본사 3층"], + categories: ["computer", "chair", "mouse"].map((category) => ({ + category, + count: records.filter((a) => a.category === category).length, + })), + activity: events + .slice(-12) + .reverse() + .map((e) => ({ + ...e, + tag: "AST-000001", + name: records.find((a) => a.id === e.asset_id)?.name || "Asset", + })), + }); + return; + } + if (route === "assets" && req.method === "GET") { + const rows = filter(url.searchParams), + page = Number(url.searchParams.get("page") || 1), + result = { + items: rows.slice((page - 1) * 25, page * 25), + total: rows.length, + page, + page_size: 25, + }; + if (slow && url.searchParams.get("q") === "테스트") { + setTimeout(() => json(res, result), 500); + return; + } + json(res, result); + return; + } + if (route === "assets" && req.method === "POST") { + const a = { + ...records[1], + ...body, + id: "asset" + counter++, + tag: body.tag || "AST-TEST", + specs: null, + latest_report_id: null, + }; + records.push(a); + json(res, { id: a.id }); + return; + } + if (route === "reports/preview") { + if (raw.toString().includes("invalid.xml")) { + json(res, { detail: "올바르지 않은 보고서입니다." }, 422); + return; + } + json(res, { + filename: "test.xml", + summary: parsed.summary, + property_count: parsed.property_count, + scan_time: parsed.scan_time, + warnings: [], + }); + return; + } + if (route === "reports/import") { + const match = raw + .toString() + .match(/name="payload"\r\n\r\n([\s\S]*?)\r\n--/); + assert.ok(match, "multipart import must carry the asset payload"); + const data = JSON.parse(match[1]); + const a = { + ...records[0], + ...data, + id: "asset" + counter++, + tag: "AST-IMPORT", + }; + records.push(a); + json(res, { id: a.id }); + return; + } + if (parts[0] === "assets" && parts[1]) { + const a = records.find((a) => a.id === parts[1]); + if (!a) { + json(res, { detail: "없음" }, 404); + return; + } + if (parts.length === 2 && req.method === "GET") { + json(res, { + asset: a, + report: a.latest_report_id ? { ...reports[0], parsed } : null, + reports: a.latest_report_id ? reports : [], + events: events.filter((e) => e.asset_id === a.id), + }); + return; + } + if (parts.length === 2 && req.method === "PUT") { + if (conflict) { + conflict = false; + json( + res, + { detail: "다른 사용자가 수정했습니다. 다시 확인하세요." }, + 409, + ); + return; + } + assert.equal(body.version, a.version); + Object.assign(a, body, { version: a.version + 1 }); + json(res, { ok: true }); + return; + } + if (parts[2] === "actions") { + assert.equal(body.version, a.version); + a.version++; + a.status = { + checkout: "in_use", + checkin: "available", + maintenance: "maintenance", + available: "available", + lost: "lost", + retired: "retired", + }[body.action]; + a.assignee_email = body.action === "checkout" ? body.assignee_email : ""; + events.push({ + id: events.length + 1, + asset_id: a.id, + kind: body.action, + note: body.note, + actor: users[0].email, + changes: {}, + created_at: timestamp, + }); + json(res, { ok: true }); + return; + } + if (parts[2] === "reports" && parts.length === 3) { + a.latest_report_id = "report1"; + a.specs = parsed.summary; + a.version++; + json(res, { id: "report1" }); + return; + } + if (parts[2] === "reports" && parts.length === 4) { + json(res, { ...reports[0], parsed }); + return; + } + } + res.writeHead(404); + res.end(); +}); + +(async () => { + let browser; + try { + await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve)); + browser = await chromium.launch({ + headless: true, + executablePath: + process.env.PJ_TEST_BROWSER || + "C:/Program Files/Google/Chrome/Application/chrome.exe", + }); + const page = await browser.newPage({ + viewport: { width: 1600, height: 1050 }, + }); + const errors = []; + page.on("pageerror", (e) => errors.push(e.message)); + const origin = `http://127.0.0.1:${server.address().port}`; + await page.goto(origin + "/asset/"); + await page.locator("#am-total").filter({ hasText: "30" }).waitFor(); + assert.equal(await page.locator("#am-rows tr").count(), 25); + await page.screenshot({ + path: path.join(OUT, "asset-desktop.png"), + fullPage: true, + }); + await page.locator("#am-next").click(); + await page.waitForFunction( + () => document.querySelector("#am-page-number").textContent === "2 / 2", + ); + assert.equal(await page.locator("#am-rows tr").count(), 5); + await page.locator('[data-view="furniture"]').click(); + await page.waitForFunction( + () => + document.querySelector("#am-result-count").textContent === "10개 자산", + ); + assert.equal(await page.locator("#am-page-number").textContent(), "1 / 1"); + await page.locator("#am-reset").click(); + await page.waitForFunction( + () => + document.querySelector("#am-result-count").textContent === "30개 자산", + ); + slow = true; + await page.locator("#am-query").fill("테스트"); + await page.waitForTimeout(300); + await page.locator("#am-query").fill("KING"); + await page.waitForTimeout(800); + assert.equal( + await page.locator("#am-result-count").textContent(), + "1개 자산", + "late search response must not replace the newest result", + ); + await page.locator('[data-open="asset0"][data-tab="specs"]').click(); + await page.locator("#am-spec-query").waitFor(); + assert.ok( + (await page.locator(".am-spec-card").first().textContent()).includes( + parsed.summary.cpu, + ), + ); + await page.locator("#am-spec-section").selectOption("MEMORY"); + await page.locator("#am-detail").evaluate((el) => { + el.scrollTop = 0; + }); + await page.screenshot({ path: path.join(OUT, "asset-specs.png") }); + await page.locator("#am-spec-query").fill("M378A2K43EB1"); + if (parsed.summary.computer_name === "KING-DESKTOP") + assert.equal(await page.locator(".am-node").count(), 2); + await page.locator('[data-detail-tab="overview"]').click(); + await page.locator("[data-edit]").click(); + await page + .locator('#am-editor-form [name="notes"]') + .fill("저장 전 초안 "); + conflict = true; + await page.locator('#am-editor-form [type="submit"]').click(); + await page + .locator("#am-editor-form .am-form-error") + .filter({ hasText: "다른 사용자" }) + .waitFor(); + assert.ok( + ( + await page.locator('#am-editor-form [name="notes"]').inputValue() + ).includes("초안"), + ); + await page.locator('#am-editor-form [type="submit"]').click(); + await page.waitForFunction( + () => !document.querySelector("#am-editor").open, + ); + await page.locator('[data-action="checkout"]').waitFor(); + assert.equal(await page.evaluate(() => window.assetInjected), undefined); + await page.locator('[data-action="checkout"]').click(); + await page.locator("#am-action-user").selectOption("staff@test.local"); + await page.locator("#am-action-save").click(); + await page.waitForFunction( + () => !document.querySelector("#am-action").open, + ); + await page.locator('[data-action="checkin"]').waitFor(); + assert.equal( + await page.locator('[data-action="retired"]').count(), + 0, + "assigned assets cannot be retired directly", + ); + await page.locator('[data-action="checkin"]').click(); + await page.locator("#am-action-save").click(); + await page.waitForFunction( + () => !document.querySelector("#am-action").open, + ); + await page.locator('[data-action="checkout"]').waitFor(); + await page.locator('[data-detail-tab="reports"]').click(); + await page.locator("[data-report]").click(); + await page.locator("#am-spec-query").waitFor(); + assert.ok( + (await page.locator("#am-detail-content").textContent()).includes( + "선택한 보고서", + ), + ); + await page.locator('[data-close="am-detail"]').click(); + await page.locator("#am-import").click(); + await page.locator("#am-report-file").setInputFiles({ + name: "invalid.xml", + mimeType: "text/xml", + buffer: Buffer.from(""), + }); + await page + .locator("#am-upload-form .am-form-error") + .filter({ hasText: "올바르지" }) + .waitFor(); + assert.equal(await page.locator("#am-import-save").isDisabled(), true); + await page + .locator("#am-report-file") + .setInputFiles(path.join(OUT, "asset_upload.xml")); + await page.locator("#am-report-preview").waitFor({ state: "visible" }); + assert.equal( + await page.locator("#am-import-name").inputValue(), + parsed.summary.computer_name, + ); + await page.screenshot({ path: path.join(OUT, "asset-import.png") }); + await page.locator("#am-import-name").fill("Uploaded workstation"); + await page.locator("#am-import-save").click(); + await page.waitForFunction( + () => !document.querySelector("#am-upload").open, + ); + await page + .locator("#am-detail-title") + .filter({ hasText: "Uploaded workstation" }) + .waitFor(); + await page.locator("#am-spec-query").waitFor(); + await page.locator("[data-attach]").click(); + await page + .locator("#am-report-file") + .setInputFiles(path.join(OUT, "asset_upload.xml")); + await page.locator("#am-report-preview").waitFor({ state: "visible" }); + assert.equal(await page.locator("#am-import-fields").isVisible(), false); + await page.locator("#am-import-save").click(); + await page.waitForFunction( + () => !document.querySelector("#am-upload").open, + ); + await page + .locator("#am-detail-title") + .filter({ hasText: "Uploaded workstation" }) + .waitFor(); + await page.keyboard.press("Escape"); + await page.locator("#am-create").click(); + await page.locator('#am-editor-form [name="name"]').fill("테스트 의자"); + await page + .locator('#am-editor-form [name="category"]') + .selectOption("chair"); + await page.locator('#am-editor-form [type="submit"]').click(); + await page.waitForFunction( + () => !document.querySelector("#am-editor").open, + ); + await page + .locator("#am-detail-title") + .filter({ hasText: "테스트 의자" }) + .waitFor(); + assert.equal(await page.locator('[data-detail-tab="specs"]').count(), 0); + await page.keyboard.press("Escape"); + await page.setViewportSize({ width: 390, height: 844 }); + await page.locator("#am-reset").click(); + await page.waitForTimeout(100); + assert.ok( + await page.evaluate( + () => document.documentElement.scrollWidth <= innerWidth + 1, + ), + "mobile document should not overflow horizontally", + ); + await page.screenshot({ + path: path.join(OUT, "asset-mobile.png"), + fullPage: true, + }); + await page.locator('[data-open="asset0"]').first().click(); + await page + .locator("#am-detail-title") + .filter({ hasText: "KING-DESKTOP" }) + .waitFor(); + assert.ok( + await page.evaluate( + () => + document.querySelector("#am-detail").scrollWidth <= innerWidth + 1, + ), + ); + await page.locator('.am-tabs [data-detail-tab="specs"]').click(); + await page.locator("#am-spec-query").waitFor(); + await page.locator("#am-spec-section").selectOption("MEMORY"); + await page.screenshot({ path: path.join(OUT, "asset-mobile-specs.png") }); + await page.keyboard.press("Escape"); + await page.goto(origin + "/asset/?category=chair&q=테스트"); + await page.waitForFunction( + () => + document.querySelector("#am-result-count").textContent === "11개 자산", + ); + assert.equal(await page.locator("#am-category").inputValue(), "chair"); + await page.goto(origin + "/asset/?unconfigured=1"); + assert.equal(await page.locator("#am-create").isDisabled(), true); + await page.locator("#am-import").click(); + await page + .locator("#am-report-file") + .setInputFiles(path.join(OUT, "asset_upload.xml")); + await page.locator("#am-report-preview").waitFor({ state: "visible" }); + assert.equal(await page.locator("#am-import-save").isDisabled(), true); + assert.deepEqual(errors, []); + console.log( + "ALL PASS: Chrome desktop/mobile, search races, paging, specs, XSS escaping, conflict draft, create, checkout/checkin, report preview, setup mode", + ); + } finally { + await browser?.close(); + await new Promise((resolve) => server.close(resolve)); + } +})().catch((error) => { + console.error(error); + process.exitCode = 1; +}); diff --git a/tests/js/render_asset.py b/tests/js/render_asset.py new file mode 100644 index 0000000..544a8ed --- /dev/null +++ b/tests/js/render_asset.py @@ -0,0 +1,31 @@ +"""Render the real asset workspace for browser validation; no DB or user data.""" +import json +import sys +from pathlib import Path +import jinja2 + +ROOT = Path(__file__).resolve().parents[2] +sys.path.insert(0, str(ROOT)) +sys.path.insert(0, str(ROOT / "tests")) +from app.modules.asset.store import CATEGORIES, STATUSES +from app.modules.asset.hwinfo import parse_hwinfo +from asset_fixtures import report_xml + +env = jinja2.Environment(loader=jinja2.ChoiceLoader([ + jinja2.FileSystemLoader(ROOT / "app/modules/asset/templates"), + jinja2.FileSystemLoader(ROOT / "app/templates"), +]), autoescape=True) +out = ROOT / "tests/js/.out" +out.mkdir(exist_ok=True, parents=True) +for configured in (True, False): + html = env.get_template("asset/index.html").render( + user={"email": "reader@test.local", "name": "Reader"}, nav_items=[], is_admin=False, + page_title="자산관리", page_subtitle="회사 자산을 한곳에서", categories=CATEGORIES, statuses=STATUSES, + csrf_token="browser-test", configured=configured) + (out / ("asset_render.html" if configured else "asset_unconfigured.html")).write_text(html, encoding="utf-8") +sample = ROOT / "KING-DESKTOP.XML" +raw = sample.read_bytes() if sample.exists() else report_xml() +(out / "asset_report.json").write_text(json.dumps(parse_hwinfo(raw), ensure_ascii=False), encoding="utf-8") +# Synthetic file for upload tests, never copy the private source XML into artifacts. +(out / "asset_upload.xml").write_bytes(report_xml()) +print("Asset template and report analysis rendered to tests/js/.out") diff --git a/tests/test_asset.py b/tests/test_asset.py new file mode 100644 index 0000000..f6bfa65 --- /dev/null +++ b/tests/test_asset.py @@ -0,0 +1,349 @@ +import copy +import importlib +import io +import os +import sys +import unittest +from contextlib import contextmanager +from datetime import datetime, timezone +from pathlib import Path +from types import SimpleNamespace +from unittest.mock import patch + +from fastapi import FastAPI, Request +from fastapi.responses import HTMLResponse +from fastapi.testclient import TestClient +from openpyxl import load_workbook +from pydantic import ValidationError +from starlette.middleware.sessions import SessionMiddleware + +from asset_fixtures import prop, report_xml +from app.modules.asset.db import AssetStore, FIELDS, filters +from app.modules.asset.hwinfo import MAX_REPORT_BYTES, parse_hwinfo +from app.modules.asset.store import ActionInput, AssetConflict, AssetInput, AssetUpdate, transition + +api = importlib.import_module("app.modules.asset.router") + + +class ParserTests(unittest.TestCase): + def test_korean_and_english(self): + for english in (False, True): + p = parse_hwinfo(report_xml(english)) + s = p["summary"] + self.assertEqual((s["cpu"], s["memory"], s["cores"], s["threads"]), ("Test Processor", "32 GiB", "8", "16")) + self.assertEqual(s["serial"], "") + self.assertEqual(p["scan_time"], "2026-10-06T01:10") + self.assertEqual(s["drive_count"], 2) + self.assertEqual(len(p["devices"]["MEMORY"]), 2) + self.assertNotEqual(p["devices"]["DRIVES"][0]["properties"], p["devices"]["DRIVES"][1]["properties"]) + + def test_actual_sample(self): + path = Path(os.getenv("ASSET_SAMPLE_XML") or Path(__file__).resolve().parents[1] / "KING-DESKTOP.XML") + if not path.exists(): + self.skipTest("Real report is not present; synthetic tests still run") + p = parse_hwinfo(path.read_bytes()) + s = p["summary"] + self.assertEqual(s["computer_name"], "KING-DESKTOP") + self.assertEqual(s["cpu"], "AMD Ryzen 7 5800X") + self.assertEqual(s["memory"], "32 GiB") + self.assertEqual((s["drive_count"], s["monitor_count"]), (4, 3)) + self.assertEqual(s["gpu"], "NVIDIA GeForce RTX 4060 Ti") + self.assertEqual(len(p["devices"]["MEMORY"]), 2) + self.assertGreater(p["property_count"], 3000) + self.assertEqual(s["serial"], "") + + def test_dtd_is_never_fetched(self): + xml = report_xml().replace(b'HWiNFO32log.dtd', b'file:///does-not-exist.dtd') + self.assertEqual(parse_hwinfo(xml)["summary"]["computer_name"], "TEST-PC") + + def test_entities_rejected_in_utf8_and_utf16(self): + attacks = [']>', ']>'] + for declaration in attacks: + text = declaration + '&x;' + for raw in (text.encode(), ('' + text).encode("utf-16")): + with self.assertRaises(ValueError): + parse_hwinfo(raw) + + def test_bad_input(self): + for raw in (b"", b"", b"", b"", b"X", b"x" * (MAX_REPORT_BYTES + 1)): + with self.assertRaises(ValueError): + parse_hwinfo(raw) + + def test_deep_tree_rejected(self): + raw = b'X' + b'' * 70 + b'' * 70 + b'' + with self.assertRaises(ValueError): + parse_hwinfo(raw) + + def test_properties_preserve_blank_labels_unicode_and_html_as_text(self): + xml = report_xml().replace(b'', (prop("", "<script>bad</script>") + '').encode()) + p = parse_hwinfo(xml) + properties = [p for s in p["sections"] for n in s["nodes"] for p in n["properties"]] + self.assertIn({"label": "", "value": "", "type": ""}, properties) + + +class RuleTests(unittest.TestCase): + def test_invalid_category_cost_dates_extra(self): + for values in ({"category": "unknown"}, {"purchase_cost": -1}, {"purchased_on": "2026-10-06", "warranty_until": "2026-01-01"}, {"status": "in_use"}, {"name": " "}, {"purchase_cost": "nan"}): + with self.assertRaises(ValidationError): + AssetInput.model_validate({"name": "Asset", "category": "desk", **values}) + + def test_required_reason(self): + for action in ("lost", "retired"): + with self.assertRaises(ValidationError): + ActionInput(version=1, action=action) + + def test_lifecycle_and_assignment(self): + a = {"status": "available", "assignee_email": ""} + self.assertEqual(transition(a, ActionInput(version=1, action="checkout", assignee_email="Reader@Test.Local")), ("in_use", "reader@test.local")) + a.update(status="in_use", assignee_email="reader@test.local") + self.assertEqual(transition(a, ActionInput(version=1, action="lost", note="lost")), ("lost", "reader@test.local")) + for action in ("maintenance", "retired", "checkout", "available"): + with self.assertRaises(ValueError): + transition(a, ActionInput(version=1, action=action, note="test", assignee_email="other@test.local")) + self.assertEqual(transition(a, ActionInput(version=1, action="checkin")), ("available", "")) + + def test_search_parameterized_and_group(self): + clause, params = filters(q="100%_\\'", group="furniture", location="HQ", warranty=True) + self.assertNotIn("100%", clause) + self.assertEqual(params[0], "%100\\%\\_\\\\'%") + self.assertIn("IN ('desk','chair','furniture')", clause) + self.assertIn("Asia/Seoul", clause) + + +class Rows: + def __init__(self, row=None): self.row = row + def fetchone(self): return self.row + + +class Connection: + """Transaction model verifies rollback, versions and lock-before-write in actual store methods.""" + def __init__(self): + self.assets, self.reports, self.events, self.calls = {}, {}, [], [] + self.in_tx, self.locked, self.fail_event, self.sequence = False, set(), False, 0 + + @contextmanager + def transaction(self): + before = copy.deepcopy((self.assets, self.reports, self.events)) + self.in_tx = True; self.locked = set() + try: + yield self + except Exception: + self.assets, self.reports, self.events = before + raise + finally: + self.in_tx = False + + def execute(self, sql, params=()): + self.calls.append((sql, params)) + if sql.startswith("SELECT nextval"): + self.sequence += 1; return Rows({"n": self.sequence}) + if sql.startswith("SELECT * FROM assets"): + self.assert_tx() + assert "FOR UPDATE" in sql + self.locked.add(params[0]); return Rows(copy.deepcopy(self.assets.get(params[0]))) + if sql.startswith("INSERT INTO assets"): + self.assert_tx() + row = dict(zip(("id", *FIELDS), params)) + row.update(status="available", assignee_email="", version=1, latest_report_id=None) + self.assets[row["id"]] = row; self.locked.add(row["id"]); return Rows() + if sql.startswith("SELECT id FROM asset_reports"): + return Rows(next((r for r in self.reports.values() if r["asset_id"] == params[0] and r["sha256"] == params[1]), None)) + if sql.startswith("INSERT INTO asset_reports"): + self.assert_tx(); assert params[1] in self.locked + self.reports[params[0]] = dict(zip(("id", "asset_id", "filename", "sha256", "raw_xml", "parsed", "actor"), params)); return Rows() + if sql.startswith("UPDATE assets SET latest_report_id"): + self.assert_tx(); assert params[-1] in self.locked + self.assets[params[-1]]["latest_report_id"] = params[0]; self.assets[params[-1]]["version"] += 1; return Rows() + if sql.startswith("UPDATE assets SET status="): + self.assert_tx(); assert params[-1] in self.locked + self.assets[params[-1]].update(zip(("status", "assignee_email", "location"), params[:3])) + self.assets[params[-1]]["version"] += 1; return Rows() + if sql.startswith("UPDATE assets SET tag="): + self.assert_tx(); assert params[-1] in self.locked + self.assets[params[-1]].update(zip(FIELDS, params[:-1])); self.assets[params[-1]]["version"] += 1; return Rows() + if sql.startswith("INSERT INTO asset_events"): + self.assert_tx(); assert params[0] in self.locked + if self.fail_event: raise RuntimeError("event write failed") + self.events.append(params); return Rows() + raise AssertionError(sql) + + def assert_tx(self): assert self.in_tx + + +class Pool: + def __init__(self, conn): self.conn = conn + @contextmanager + def connection(self): yield self.conn + + +class TransactionTests(unittest.TestCase): + def setUp(self): + self.conn = Connection(); self.store = object.__new__(AssetStore); self.store._pool = Pool(self.conn) + self.payload = AssetInput(name="Computer", category="computer", location="HQ") + self.raw = report_xml(); self.parsed = parse_hwinfo(self.raw) + self.asset_id = self.store.create(self.payload, "actor@test.local") + + def test_create_auto_tag_and_log(self): + self.assertEqual(self.conn.assets[self.asset_id]["tag"], "AST-000001") + self.assertEqual(self.conn.events[0][2], "create") + + def test_stale_version_no_writes(self): + before = copy.deepcopy(self.conn.assets) + with self.assertRaises(AssetConflict): + self.store.action(self.asset_id, ActionInput(version=9, action="checkout", assignee_email="user@test.local"), "actor") + self.assertEqual(before, self.conn.assets) + + def test_checkout_checkin_atomic_and_log(self): + self.store.action(self.asset_id, ActionInput(version=1, action="checkout", assignee_email="user@test.local", location="Desk"), "actor") + a = self.conn.assets[self.asset_id] + self.assertEqual((a["status"], a["version"], a["location"]), ("in_use", 2, "Desk")) + self.store.action(self.asset_id, ActionInput(version=2, action="checkin"), "actor") + self.assertEqual(a["assignee_email"], "") + self.assertEqual(len(self.conn.events), 3) + + def test_event_failure_rolls_back_action(self): + self.conn.fail_event = True + with self.assertRaises(RuntimeError): + self.store.action(self.asset_id, ActionInput(version=1, action="maintenance"), "actor") + self.assertEqual(self.conn.assets[self.asset_id]["status"], "available") + self.assertEqual(self.conn.assets[self.asset_id]["version"], 1) + + def test_report_preserves_manual_data_and_old_versions(self): + first = self.store.attach_report(self.asset_id, 1, "actor", "first.xml", self.raw, self.parsed) + raw = self.raw.replace(b"Test Processor", b"Updated Processor") + second = self.store.attach_report(self.asset_id, 2, "actor", "second.xml", raw, parse_hwinfo(raw)) + a = self.conn.assets[self.asset_id] + self.assertEqual((a["name"], a["location"], a["latest_report_id"], a["version"]), ("Computer", "HQ", second, 3)) + self.assertIn(first, self.conn.reports) + self.assertEqual(len(self.conn.reports), 2) + + def test_duplicate_report_no_version_increment(self): + self.store.attach_report(self.asset_id, 1, "actor", "x.xml", self.raw, self.parsed) + with self.assertRaises(AssetConflict): + self.store.attach_report(self.asset_id, 2, "actor", "x.xml", self.raw, self.parsed) + self.assertEqual(self.conn.assets[self.asset_id]["version"], 2) + + def test_report_and_asset_roll_back_when_log_fails(self): + self.conn.fail_event = True + with self.assertRaises(RuntimeError): + self.store.attach_report(self.asset_id, 1, "actor", "x.xml", self.raw, self.parsed) + self.assertFalse(self.conn.reports) + self.assertIsNone(self.conn.assets[self.asset_id]["latest_report_id"]) + with self.assertRaises(RuntimeError): + self.store.create(self.payload, "actor", ("x.xml", self.raw, self.parsed)) + self.assertEqual(len(self.conn.assets), 1) + + def test_category_cannot_detach_existing_reports(self): + self.store.attach_report(self.asset_id, 1, "actor", "x.xml", self.raw, self.parsed) + with self.assertRaises(ValueError): + self.store.update(self.asset_id, AssetUpdate(name="Desk", category="desk", version=2), "actor") + self.assertEqual(self.conn.assets[self.asset_id]["category"], "computer") + + def test_update_keeps_assignment(self): + self.store.action(self.asset_id, ActionInput(version=1, action="checkout", assignee_email="user@test.local"), "actor") + self.store.update(self.asset_id, AssetUpdate(name="Renamed", category="computer", version=2), "actor") + a = self.conn.assets[self.asset_id] + self.assertEqual((a["name"], a["status"], a["assignee_email"], a["tag"]), ("Renamed", "in_use", "user@test.local", "AST-000001")) + + +class APITests(unittest.TestCase): + def setUp(self): + self.user = {"email": "reader@test.local", "name": "Reader", "role": "user", "modules": {"asset": True}} + self.user_store = SimpleNamespace(get=lambda email: self.user if email == self.user["email"] else None, list_all=lambda: [self.user]) + self.main = SimpleNamespace(get_current_user_record=lambda req: self.user, + user_store=self.user_store, render_template=lambda *a, **kw: HTMLResponse("page", status_code=kw.get("status_code", 200)), build_erp_nav=lambda *a, **kw: []) + self.patch = patch.dict(sys.modules, {"app.main": self.main}); self.patch.start(); self.addCleanup(self.patch.stop) + self.app = FastAPI(); self.app.add_middleware(SessionMiddleware, secret_key="test-only-secret") + self.app.state.asset_store = None; self.app.include_router(api.router) + @self.app.get("/test-session") + def session(request: Request): + request.session["asset_csrf"] = "test-token"; return {"ok": True} + self.client = TestClient(self.app) + self.client.get("/test-session"); self.headers = {"X-Asset-CSRF": "test-token"} + + def test_login_and_permission_required_every_read(self): + paths = ["/asset/health", "/asset/api/bootstrap", "/asset/api/assets", "/asset/api/assets/a", "/asset/api/export", "/asset/api/assets/a/reports/r", "/asset/api/assets/a/reports/r/download"] + self.user = None + for path in paths: self.assertEqual(self.client.get(path).status_code, 401) + self.user = {"role": "user", "email": "x", "modules": {}} + for path in paths: self.assertEqual(self.client.get(path).status_code, 403) + + def test_missing_csrf_and_no_db(self): + payload = {"name": "Desk", "category": "desk"} + self.assertEqual(self.client.post("/asset/api/assets", json=payload).status_code, 403) + self.assertEqual(self.client.post("/asset/api/assets", json=payload, headers=self.headers).status_code, 503) + self.assertEqual(self.client.get("/asset/api/assets").status_code, 503) + + def test_preview_without_database(self): + result = self.client.post("/asset/api/reports/preview", files={"file": ("test.xml", report_xml())}, headers=self.headers) + self.assertEqual(result.status_code, 200, result.text) + self.assertEqual(result.json()["summary"]["memory"], "32 GiB") + + def test_preview_security(self): + for filename, raw in (("x.html", report_xml()), ("x.xml", b"")): + self.assertEqual(self.client.post("/asset/api/reports/preview", files={"file": (filename, raw)}, headers=self.headers).status_code, 422) + self.assertEqual(self.client.post("/asset/api/reports/preview", files={"file": ("test.xml", report_xml())}).status_code, 403) + + def test_import_stores_asset_and_report_together(self): + conn = Connection() + store = object.__new__(AssetStore) + store._pool = Pool(conn) + self.app.state.asset_store = store + result = self.client.post("/asset/api/reports/import", data={"payload": '{"name":"Imported PC","category":"computer","location":"HQ"}'}, + files={"file": ("report.xml", report_xml())}, headers=self.headers) + self.assertEqual(result.status_code, 200, result.text) + asset = conn.assets[result.json()["id"]] + self.assertEqual((asset["name"], asset["location"], asset["version"]), ("Imported PC", "HQ", 2)) + self.assertIn(asset["latest_report_id"], conn.reports) + self.assertEqual(len(conn.events), 2) + + def test_upload_existing_validates_target_and_version(self): + conn = Connection() + store = object.__new__(AssetStore) + store._pool = Pool(conn) + self.app.state.asset_store = store + asset_id = store.create(AssetInput(name="Desk", category="desk"), "actor") + result = self.client.post(f"/asset/api/assets/{asset_id}/reports", data={"version": "1"}, + files={"file": ("report.xml", report_xml())}, headers=self.headers) + self.assertEqual(result.status_code, 422) + asset_id = store.create(AssetInput(name="PC", category="computer"), "actor") + result = self.client.post(f"/asset/api/assets/{asset_id}/reports", data={"version": "99"}, + files={"file": ("report.xml", report_xml())}, headers=self.headers) + self.assertEqual(result.status_code, 409) + self.assertFalse(conn.reports) + + def test_unknown_assignment_rejected(self): + result = self.client.post("/asset/api/assets/a/actions", json={"version": 1, "action": "checkout", "assignee_email": "outsider@test.local"}, headers=self.headers) + self.assertEqual(result.status_code, 422) + + def test_conflict_and_missing_entity(self): + def conflict(*args): raise AssetConflict("conflict") + self.app.state.asset_store = SimpleNamespace(update=conflict) + self.assertEqual(self.client.put("/asset/api/assets/a", json={"name": "Asset", "category": "desk", "version": 1}, headers=self.headers).status_code, 409) + def missing(*args): raise KeyError("no") + self.app.state.asset_store = SimpleNamespace(detail=missing) + self.assertEqual(self.client.get("/asset/api/assets/a").status_code, 404) + + def test_export_literal_formulas_and_filters(self): + record = {**AssetInput(name="=2+2", category="desk", purchase_cost=0).model_dump(mode="json"), "status": "available", "assignee_email": "", "specs": {}} + seen = [] + def listing(**kwargs): seen.append(kwargs); return {"items": [record], "total": 1} + self.app.state.asset_store = SimpleNamespace(list_assets=listing) + response = self.client.get("/asset/api/export?group=furniture&location=HQ") + self.assertEqual(response.status_code, 200) + book = load_workbook(io.BytesIO(response.content)); cell = book.active["B2"] + self.assertEqual((cell.value, cell.data_type), ("=2+2", "s")) + self.assertEqual(book.active["L2"].value, 0) + self.assertEqual((seen[0]["group"], seen[0]["location"]), ("furniture", "HQ")) + + def test_download_bound_to_asset_and_attachment(self): + args = [] + def report(*values, **kwargs): args.append((values, kwargs)); return {"filename": "테스트.xml", "raw_xml": report_xml()} + self.app.state.asset_store = SimpleNamespace(report=report) + response = self.client.get("/asset/api/assets/own/reports/report/download") + self.assertEqual(response.content, report_xml()) + self.assertIn("attachment", response.headers["content-disposition"]) + self.assertEqual(args[0], (("own", "report"), {"raw": True})) + + +if __name__ == "__main__": unittest.main() diff --git a/tests/test_asset_integration.py b/tests/test_asset_integration.py new file mode 100644 index 0000000..8232236 --- /dev/null +++ b/tests/test_asset_integration.py @@ -0,0 +1,41 @@ +"""실제 앱의 메뉴·권한 화면·자산 라우터 연결을 격리된 환경에서 확인합니다.""" +import os +import subprocess +import sys +import tempfile +import unittest +from pathlib import Path + + +class MainIntegrationTests(unittest.TestCase): + def test_registered_module_and_unconfigured_workspace(self): + env = dict(os.environ) + # 운영 DSN과 런타임 데이터는 사용하지 않습니다. + for key in ("ASSET", "CAFE24", "CUPANG", "VACATION", "PROJECT", "DISPATCH", "PERFORMANCE", "MALAYSIA_STOCK", "ITEMCODE", "EXPENSE"): + env[key + "_DB_URL"] = "" + env.update(SESSION_SECRET_KEY="local-asset-test-only", SESSION_COOKIE_SECURE="false") + with tempfile.TemporaryDirectory(prefix="asset-integration-") as directory: + env["DATA_DIR"] = directory + code = ''' +from unittest.mock import patch +from fastapi.testclient import TestClient +import app.main as main +from app.store import MODULE_KEYS +user={"email":"admin@test.local","name":"Admin","role":"admin","is_super_admin":True,"modules":{}} +with patch.object(main,"get_current_user_record",return_value=user),patch.object(main,"get_session_user",return_value=user),patch.object(main.user_store,"get",return_value=user),patch.object(main.user_store,"list_all",return_value=[user]): + client=TestClient(main.app) + for path in ("/","/admin","/asset/"): + result=client.get(path) + assert result.status_code == 200,(path,result.status_code) + assert main.MODULE_LABELS["asset"] in result.text,path + assert client.get("/asset/health").status_code == 503 + assert "asset" in MODULE_KEYS + assert any(x["key"] == "asset" and x["active"] for x in main.build_erp_nav(user,active="asset")) +print("Real app menu/admin/workspace registration OK") +''' + result = subprocess.run([sys.executable, "-c", code], cwd=Path(__file__).resolve().parents[1], env=env, + capture_output=True, text=True, encoding="utf-8", timeout=45) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + + +if __name__ == "__main__": unittest.main()