From 55e0791e1624d08f8bbe3e6ac5f75509ac26aa84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=B3=91=EC=B2=A0?= Date: Mon, 9 Feb 2026 16:14:06 +0900 Subject: [PATCH] =?UTF-8?q?refactor(WEB):=20Server=20Action=20=EA=B3=B5?= =?UTF-8?q?=ED=86=B5=ED=99=94=20=EB=B0=8F=20=EB=B3=B4=EC=95=88=20=EA=B0=95?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - executeServerAction 공통 유틸 도입으로 actions.ts 대폭 간소화 (50+개 파일) - sanitize 유틸 추가 (XSS 방지) - middleware CSP 헤더 추가 및 Open Redirect 방지 - 프록시 라우트 로깅 개발환경 한정으로 변경 - 프로덕션 불필요 console.log 제거 Co-Authored-By: Claude Opus 4.6 --- ...26-02-09] phase1-common-hooks-checklist.md | 268 +++++ ...T-2026-02-09] third-pass-security-audit.md | 952 +++++++++++++++ claudedocs/vercel/vercel-deployment-setup.md | 423 +++++++ package-lock.json | 15 +- package.json | 2 + .../boards/[boardCode]/[postId]/page.tsx | 3 +- src/app/[locale]/layout.tsx | 2 +- src/app/api/auth/login/route.ts | 4 +- src/app/api/proxy/[...path]/route.ts | 32 +- .../accounting/BadDebtCollection/actions.ts | 541 ++------- .../BankTransactionInquiry/actions.ts | 266 +--- .../accounting/BillManagement/actions.ts | 513 ++------ .../CardTransactionInquiry/actions.ts | 529 ++------ .../accounting/DailyReport/actions.ts | 287 +---- .../accounting/DepositManagement/actions.ts | 361 ++---- .../ExpectedExpenseManagement/actions.ts | 609 ++-------- .../accounting/PurchaseManagement/actions.ts | 365 ++---- .../accounting/ReceivablesStatus/actions.ts | 326 ++--- .../accounting/SalesManagement/actions.ts | 377 ++---- .../accounting/VendorLedger/actions.ts | 298 ++--- .../accounting/VendorManagement/actions.ts | 212 +--- .../WithdrawalManagement/actions.ts | 361 ++---- .../approval/ApprovalBox/actions.ts | 324 +---- .../approval/DocumentCreate/actions.ts | 434 ++----- src/components/approval/DraftBox/actions.ts | 324 +---- .../approval/ReferenceBox/actions.ts | 263 +--- src/components/attendance/actions.ts | 246 +--- src/components/board/BoardDetail/index.tsx | 3 +- .../board/BoardManagement/actions.ts | 442 ++----- src/components/board/DynamicBoard/actions.ts | 419 ++----- src/components/board/actions.ts | 334 ++--- src/components/clients/actions.ts | 241 +--- .../NoticePopupModal/NoticePopupModal.tsx | 3 +- .../InquiryManagement/InquiryDetail.tsx | 5 +- .../customer-center/shared/actions.ts | 388 ++---- .../hr/AttendanceManagement/actions.ts | 300 ++--- src/components/hr/CardManagement/actions.ts | 250 ++-- .../hr/DepartmentManagement/actions.ts | 148 +-- .../hr/EmployeeManagement/actions.ts | 495 ++------ src/components/hr/SalaryManagement/actions.ts | 275 ++--- .../hr/VacationManagement/actions.ts | 918 ++++---------- src/components/items/FileUpload.tsx | 22 + .../material/ReceivingManagement/actions.ts | 537 +++------ .../material/StockStatus/actions.ts | 366 ++---- src/components/orders/actions.ts | 673 ++++------- .../outbound/ShipmentManagement/actions.ts | 605 ++-------- src/components/pricing/actions.ts | 579 ++------- src/components/process-management/actions.ts | 759 ++++-------- .../production/ProductionDashboard/actions.ts | 256 ++-- .../production/WorkOrders/actions.ts | 917 ++++---------- .../production/WorkResults/actions.ts | 579 ++------- .../production/WorkerScreen/actions.ts | 761 +++--------- .../quality/InspectionManagement/actions.ts | 612 ++++------ .../PerformanceReportManagement/actions.ts | 395 ++---- src/components/quotes/actions.ts | 1070 +++-------------- src/components/reports/actions.ts | 188 +-- .../settings/AccountInfoManagement/actions.ts | 421 ++----- .../settings/AccountManagement/actions.ts | 402 ++----- .../AttendanceSettingsManagement/actions.ts | 167 +-- .../settings/CompanyInfoManagement/actions.ts | 236 +--- .../settings/LeavePolicyManagement/actions.ts | 130 +- .../settings/NotificationSettings/actions.ts | 122 +- .../PaymentHistoryManagement/actions.ts | 322 ++--- .../settings/PermissionManagement/actions.ts | 500 ++------ .../settings/PopupManagement/PopupDetail.tsx | 3 +- .../settings/PopupManagement/actions.ts | 284 +---- .../PopupManagement/popupDetailConfig.ts | 5 +- .../settings/RankManagement/actions.ts | 267 +--- .../SubscriptionManagement/actions.ts | 255 +--- .../settings/TitleManagement/actions.ts | 267 +--- .../WorkScheduleManagement/actions.ts | 107 +- src/components/ui/file-input.tsx | 22 + src/hooks/useUserRole.ts | 11 +- src/layouts/AuthenticatedLayout.tsx | 12 +- src/lib/actions/bulk-actions.ts | 52 +- src/lib/actions/fcm.ts | 53 +- src/lib/api/execute-server-action.ts | 144 +++ src/lib/api/quote.ts | 2 +- src/lib/permissions/actions.ts | 59 +- src/lib/print-utils.ts | 4 +- src/lib/sanitize.ts | 65 + src/lib/utils.ts | 13 + src/lib/utils/export.ts | 2 +- src/lib/utils/menuRefresh.ts | 20 +- src/middleware.ts | 25 +- 85 files changed, 7211 insertions(+), 17638 deletions(-) create mode 100644 claudedocs/refactoring/[IMPL-2026-02-09] phase1-common-hooks-checklist.md create mode 100644 claudedocs/security/[AUDIT-2026-02-09] third-pass-security-audit.md create mode 100644 claudedocs/vercel/vercel-deployment-setup.md create mode 100644 src/lib/api/execute-server-action.ts create mode 100644 src/lib/sanitize.ts diff --git a/claudedocs/refactoring/[IMPL-2026-02-09] phase1-common-hooks-checklist.md b/claudedocs/refactoring/[IMPL-2026-02-09] phase1-common-hooks-checklist.md new file mode 100644 index 00000000..4f90267d --- /dev/null +++ b/claudedocs/refactoring/[IMPL-2026-02-09] phase1-common-hooks-checklist.md @@ -0,0 +1,268 @@ +# Phase 1 수정: 실제 중복 기반 리팩토링 체크리스트 + +**작성일**: 2026-02-09 +**상태**: Step 1 완료 / Step 2-4 대기 +**관련 문서**: `architecture/[PLAN-2026-02-06] refactoring-roadmap.md` + +--- + +## 계획 수정 사유 + +기존 계획의 `useListData`, `usePagination`, `useClientSideFiltering`, `useSelection` 4개 훅은 +**`UniversalListPage` 템플릿이 이미 내부적으로 처리**하고 있어 불필요. +(리스트 페이지 38개 중 33개+가 이미 UniversalListPage 사용 중) + +실제 코드 분석 결과, 진짜 중복 핫스팟은 다른 곳에 있음. + +--- + +## 실제 중복 핫스팟 (영향도 순) + +| 순위 | 대상 | 파일 수 | 중복 라인 | ROI | +|------|------|---------|-----------|-----| +| 🔴 1 | action.ts CRUD 에러처리 보일러플레이트 | 82개 | ~3,000줄 | 최고 | +| 🟡 2 | 삭제 다이얼로그 상태 반복 | 7개+ | ~150줄 | 높음 (난이도 낮음) | +| 🟡 3 | Stats 로딩 패턴 반복 | 30개+ | ~600줄 | 중간 | +| 🟢 4 | React.memo 미적용 (Phase 5) | 30개+ | 성능 개선 | 중간 | +| 🟢 5 | any 타입 102곳 (Phase 5) | 29개 | 타입 안전성 | 중간 | + +--- + +## Step 1: action.ts 에러처리 래퍼 (ROI 최고) + +> 82개 action.ts에서 함수마다 반복되는 try/catch + 인증 에러 + 응답 검증 패턴 추출 + +### 현재 반복 패턴 (함수마다 ~15줄씩 반복) + +```typescript +// 이 패턴이 82개 파일, 평균 5-8개 함수 = 400-600회 반복 +try { + const { response, error } = await serverFetch(url, options); + if (error?.__authError) { + return { success: false, __authError: true }; + } + if (!response) { + return { success: false, error: error?.message || '서버 오류가 발생했습니다.' }; + } + const result = await response.json(); + if (!response.ok || !result.success) { + return { success: false, error: result.message || '처리에 실패했습니다.' }; + } + return { success: true, data: result.data }; +} catch (error) { + if (isNextRedirectError(error)) throw error; + console.error('[FunctionName] error:', error); + return { success: false, error: '서버 오류가 발생했습니다.' }; +} +``` + +### 생성할 유틸리티 + +- [x] `src/lib/api/execute-server-action.ts` - 에러처리 래퍼 (138줄) + +```typescript +// 사용 전: ~20줄 +export async function getRanks() { + try { + const { response, error } = await serverFetch(url, { method: 'GET' }); + if (error?.__authError) return { success: false, __authError: true }; + if (!response) return { success: false, error: error?.message || '...' }; + const result = await response.json(); + if (!response.ok || !result.success) return { success: false, error: result.message || '...' }; + return { success: true, data: result.data.map(transform) }; + } catch (error) { + if (isNextRedirectError(error)) throw error; + console.error('[getRanks] error:', error); + return { success: false, error: '...' }; + } +} + +// 사용 후: ~5줄 +export const getRanks = createServerAction({ + url: `${API_URL}/api/v1/ranks`, + method: 'GET', + transform: (data) => data.map(transformRank), +}); +``` + +### 파일럿 마이그레이션 (5개) + +| # | 파일 | 함수 수 | 실제 절감 | 상태 | +|---|------|---------|-----------|------| +| 1 | `settings/RankManagement/actions.ts` | 5개 | 276→110줄 (-166) | [x] | +| 2 | `settings/TitleManagement/actions.ts` | 5개 | 276→110줄 (-166) | [x] | +| 3 | `clients/actions.ts` | 4개+1유틸 | 258→76줄 (-182) | [x] | +| 4 | `hr/DepartmentManagement/actions.ts` | 6개 | 327→246줄 (-81) | [x] | +| 5 | `vehicle-management/VehicleList/actions.ts` | - | Mock 데이터 (스킵) | [x] 스킵 | + +### 파일럿 검증 + +- [x] 4개 파일 타입체크 통과 (tsc --noEmit) +- [x] executeServerAction 인터페이스 확정 (transform, body, method, cache) +- [x] 에지 케이스 처리 (FormData 지원 완료, Mock fallback 패턴 확립) +- [ ] 실제 동작 테스트 (사용자 확인 필요) + +### 확대 적용 (77개) → 완료 + +> 도메인별 순차 적용 완료 + +| Wave | 도메인 | 파일 수 | 상태 | +|------|--------|---------|------| +| A | settings (나머지) | 8개 | [x] | +| B | accounting | 13개 | [x] | +| C | hr (나머지) | 5개 | [x] | +| D | construction | 17개 | [x] | +| E | production | 4개 | [x] | +| F | quality + material | 4개 | [x] | +| G | 기타 (board, approval, outbound, pricing 등) | 26개 | [x] | + +### 최종 잔여 serverFetch (의도적 유지 - 2개 파일) + +| 파일 | 함수 | 유지 사유 | +|------|------|-----------| +| `material/ReceivingManagement/actions.ts` | `checkInspectionTemplate` | HTTP 404 구분 필요 | +| `quotes/actions.ts` | 특정 함수 | 특수 응답 처리 필요 | + +### 추가 마이그레이션 (lib/actions) + +| 파일 | 함수 | 상태 | +|------|------|------| +| `lib/actions/fcm.ts` | `sendFcmNotification` | [x] | +| `lib/actions/bulk-actions.ts` | `bulkUpdateAccountCode` | [x] | +| `lib/actions/bulk-actions.ts` | `exportToExcel` | 유지 (Blob 반환, native fetch) | + +--- + +## Step 2: useDeleteDialog 훅 (난이도 최저) + +> 삭제 확인 다이얼로그 상태 + 핸들러 추출 + +### 생성할 훅 + +- [ ] `src/hooks/useDeleteDialog.ts` + +```typescript +// 사용 전: ~25줄 +const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false); +const [deleteTargetId, setDeleteTargetId] = useState(null); +const [isBulkDeleteDialogOpen, setIsBulkDeleteDialogOpen] = useState(false); +const [bulkDeleteIds, setBulkDeleteIds] = useState([]); +const handleDeleteClick = useCallback((id) => { ... }, []); +const handleConfirmDelete = useCallback(async () => { ... }, []); +const handleBulkDelete = useCallback((ids) => { ... }, []); +const handleConfirmBulkDelete = useCallback(async () => { ... }, []); + +// 사용 후: ~3줄 +const { single, bulk } = useDeleteDialog({ + onDelete: deleteVehicle, + onBulkDelete: bulkDeleteVehicles, + onSuccess: () => loadData(), +}); +``` + +### 적용 대상 + +| # | 파일 | 상태 | +|---|------|------| +| 1 | `vehicle-management/VehicleList/index.tsx` | [ ] | +| 2 | `vehicle-management/VehicleLogList/index.tsx` | [ ] | +| 3 | `vehicle-management/ForkliftList/index.tsx` | [ ] | +| 4 | `process-management/ProcessListClient.tsx` | [ ] | +| 5 | `quotes/QuoteManagementClient.tsx` | [ ] | +| 6 | `accounting/BillManagement/BillManagementClient.tsx` | [ ] | +| 7 | `accounting/VendorManagement/VendorManagementClient.tsx` | [ ] | + +--- + +## Step 3: useStatsLoader 훅 (30+ 파일) + +> Stats 별도 로딩 패턴 추출 + +### 생성할 훅 + +- [ ] `src/hooks/useStatsLoader.ts` + +```typescript +// 사용 전: ~15줄 +const [stats, setStats] = useState({ total: 0, active: 0, inactive: 0 }); +useEffect(() => { + const loadStats = async () => { + try { + const result = await getStats(); + if (result.success && result.data) setStats(result.data); + } catch (error) { + if (isNextRedirectError(error)) throw error; + console.error('loadStats error:', error); + } + }; + loadStats(); +}, []); + +// 사용 후: ~1줄 +const { data: stats } = useStatsLoader(getProcessStats, { total: 0, active: 0, inactive: 0 }); +``` + +### 적용 대상 (고빈도 10개 우선) + +| # | 파일 | 상태 | +|---|------|------| +| 1 | `process-management/ProcessListClient.tsx` | [ ] | +| 2 | `production/WorkOrders/WorkOrderList.tsx` | [ ] | +| 3 | `quality/InspectionManagement/InspectionList.tsx` | [ ] | +| 4 | `outbound/ShipmentManagement/ShipmentList.tsx` | [ ] | +| 5 | `business/construction/contract/ContractListClient.tsx` | [ ] | +| 6 | `business/construction/management/ConstructionManagementListClient.tsx` | [ ] | +| 7 | `business/construction/bidding/BiddingListClient.tsx` | [ ] | +| 8 | `business/construction/estimates/EstimateListClient.tsx` | [ ] | +| 9 | `business/construction/order-management/OrderManagementListClient.tsx` | [ ] | +| 10 | `business/construction/progress-billing/ProgressBillingManagementListClient.tsx` | [ ] | + +--- + +## Step 4: Phase 5 항목 (성능/타입) + +### React.memo 적용 (30+ 컴포넌트) + +- [ ] *Row, *Item, *Card 패턴 컴포넌트 전수 조사 +- [ ] WorkItemCard, CommentItem, ProjectCard 등 우선 적용 +- [ ] 리스트 내 반복 렌더링 컴포넌트에 집중 + +### any 타입 제거 (102곳, 29개 파일) + +- [ ] types/ 파일 (4개) +- [ ] action error handler (50+ 파일) → Step 1 createServerAction에서 자동 해결 +- [ ] 컴포넌트 props (20개) + +### @ts-ignore 제거 (25개 파일) + +- [ ] 하나씩 확인하며 제거 (숨겨진 에러 확인) + +--- + +## 진행 규칙 + +1. **Step 1 createServerAction이 최우선** (ROI 최고, 82개 파일 영향) +2. **Step 2-3은 병렬 가능** (독립적) +3. **Step 4는 Step 1 완료 후** (any 제거가 createServerAction과 겹침) +4. **각 Step 사이 안전한 중단점** (다른 작업 끼워넣기 가능) + +--- + +## 예상 효과 (수정) + +| 지표 | 기존 계획 | 수정 계획 | +|------|-----------|-----------| +| 코드 절감 | ~8,500줄 (잘못된 추정) | **~3,750줄** (실증 기반) | +| 영향 파일 수 | 39개 | **82개+ (action) + 37개 (훅)** | +| 패턴 통일 | 데이터 페칭 (이미 완료) | **에러처리 + 상태관리** | +| 추가 효과 | 없음 | **타입 안전성 향상 (any 50곳 자동 해결)** | + +--- + +## 변경 이력 + +| 날짜 | 변경 내용 | +|------|-----------| +| 2026-02-09 | 초기 작성 - 39개 페이지 대상 | +| 2026-02-09 | **전면 수정** - 실제 코드 분석 결과 UniversalListPage가 이미 처리 중. action.ts 에러처리 래퍼 + 삭제 다이얼로그 훅 + Stats 로딩 훅으로 변경 | +| 2026-02-09 | **Step 1 완료** - 전체 action.ts 마이그레이션 완료 (파일럿 4개 + Wave A~G + lib/actions 2개). serverFetch 의도적 유지 2개 파일 외 전부 executeServerAction으로 전환. 타입체크 0 에러. | diff --git a/claudedocs/security/[AUDIT-2026-02-09] third-pass-security-audit.md b/claudedocs/security/[AUDIT-2026-02-09] third-pass-security-audit.md new file mode 100644 index 00000000..2084bcf8 --- /dev/null +++ b/claudedocs/security/[AUDIT-2026-02-09] third-pass-security-audit.md @@ -0,0 +1,952 @@ +# Third-Pass Deep Security Audit Report + +**Project**: SAM ERP Next.js Frontend +**Audit Date**: 2026-02-09 +**Scope**: New vulnerabilities NOT covered in previous two audit rounds +**Methodology**: OWASP Top 10, CWE patterns, IDOR, authorization bypass analysis + +--- + +## Executive Summary + +This third-pass audit identified **12 NEW security findings** (5 CRITICAL, 4 HIGH, 2 MEDIUM, 1 LOW) not addressed in previous rounds. The most critical issues involve: + +1. **Server Actions with NO authentication checks** (CRITICAL) +2. **Missing authorization on sensitive operations** (CRITICAL) +3. **Token refresh race condition** (HIGH) +4. **Dependency vulnerabilities** (HIGH - jsPDF) +5. **Session fixation risk** (MEDIUM) + +**Overall Risk**: HIGH - Immediate remediation required for CRITICAL findings. + +--- + +## CRITICAL Findings + +### 🔴 CRITICAL-01: Server Actions Lack Authentication Validation + +**Category**: Broken Access Control (OWASP A01) +**CWE**: CWE-862 (Missing Authorization) + +**Issue**: +All Server Actions (`'use server'` functions) execute without verifying that the caller is authenticated. While `serverFetch` includes authentication headers, there's no explicit check preventing unauthenticated calls from being executed if the backend doesn't validate properly. + +**Affected Files**: +- `/src/components/accounting/VendorManagement/actions.ts` (lines 158-211) +- `/src/components/settings/PermissionManagement/actions.ts` (lines 12-139) +- `/src/lib/permissions/actions.ts` (lines 36-58) +- **All 93 `actions.ts` files** identified by Grep + +**Vulnerable Pattern**: +```typescript +// ❌ VULNERABLE: No authentication check +export async function deleteClient(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + method: 'DELETE', + errorMessage: '거래처 삭제에 실패했습니다.', + }); +} + +// ❌ Can be called directly from client without verification +export async function deleteRole(id: number): Promise { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/roles/${id}`, + method: 'DELETE', + errorMessage: '역할 삭제에 실패했습니다.', + }); + if (result.success) revalidatePath('/settings/permissions'); + return result; +} +``` + +**Attack Scenario**: +```javascript +// Attacker can call Server Actions directly from browser console +import { deleteRole } from '@/components/settings/PermissionManagement/actions'; + +// If backend validation is weak, this could succeed +await deleteRole(1); // Delete admin role +``` + +**Impact**: +- Unauthenticated users could invoke sensitive operations if backend doesn't validate tokens properly +- Defense-in-depth principle violated (frontend should also verify auth) +- IDOR possible: User A could access/modify User B's data by calling actions with different IDs + +**Recommendation**: +```typescript +// ✅ SECURE: Add auth check in Server Action +import { cookies } from 'next/headers'; + +export async function deleteRole(id: number): Promise { + // 1. Verify authentication + const cookieStore = await cookies(); + const accessToken = cookieStore.get('access_token')?.value; + const refreshToken = cookieStore.get('refresh_token')?.value; + + if (!accessToken && !refreshToken) { + return { + success: false, + error: 'Unauthorized', + __authError: true + }; + } + + // 2. Optionally verify role/permissions + // (if backend doesn't handle this properly) + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/roles/${id}`, + method: 'DELETE', + errorMessage: '역할 삭제에 실패했습니다.', + }); + + if (result.success) revalidatePath('/settings/permissions'); + return result; +} +``` + +**CVSS Score**: 9.1 (Critical) +**Fix Priority**: IMMEDIATE + +--- + +### 🔴 CRITICAL-02: No Role/Permission Validation in Server Actions + +**Category**: Broken Access Control (OWASP A01) +**CWE**: CWE-285 (Improper Authorization) + +**Issue**: +Server Actions don't validate user roles/permissions before executing sensitive operations. The system relies entirely on backend validation. + +**Affected Files**: +- `/src/components/settings/PermissionManagement/actions.ts` (allowAllPermissions, denyAllPermissions) +- `/src/components/settings/AccountManagement/actions.ts` (user account operations) +- `/src/components/accounting/VendorManagement/actions.ts` (vendor deletion) + +**Vulnerable Code**: +```typescript +// ❌ No permission check before allowing ALL permissions +export async function allowAllPermissions(roleId: number): Promise> { + return rolePermissionAction(roleId, 'allow-all', '전체 허용에 실패했습니다.'); +} + +// ❌ Any authenticated user could potentially call this +export async function deleteClient(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + method: 'DELETE', + errorMessage: '거래처 삭제에 실패했습니다.', + }); +} +``` + +**Attack Scenario**: +1. Regular user (non-admin) logs in +2. Discovers Server Action from browser DevTools/source maps +3. Calls `allowAllPermissions(1)` to escalate their own role +4. Calls `deleteClient('123')` to delete competitor vendor data + +**Impact**: +- Privilege escalation if backend validation is weak +- Unauthorized data modification/deletion +- Compliance violations (SOC2, GDPR audit trail) + +**Recommendation**: +```typescript +// ✅ Add role validation +import { getUserRole } from '@/lib/auth/get-user-role'; + +export async function allowAllPermissions(roleId: number): Promise> { + // 1. Check user has admin/permission-manager role + const userRole = await getUserRole(); + if (!userRole || !['admin', 'permission-manager'].includes(userRole)) { + return { + success: false, + error: '권한이 없습니다. 관리자만 실행 가능합니다.', + }; + } + + // 2. Log sensitive action + console.log(`[AUDIT] ${userRole} allowing all permissions for role ${roleId}`); + + return rolePermissionAction(roleId, 'allow-all', '전체 허용에 실패했습니다.'); +} +``` + +**CVSS Score**: 8.8 (High → Critical due to permission escalation) +**Fix Priority**: IMMEDIATE + +--- + +### 🔴 CRITICAL-03: Path Traversal Risk in API Proxy + +**Category**: Injection (OWASP A03) +**CWE**: CWE-22 (Path Traversal) + +**Issue**: +The API proxy (`/api/proxy/[...path]/route.ts`) constructs backend URLs by joining user-supplied path segments without validation. Although Next.js encodes URL segments, there's no explicit validation against path traversal attempts. + +**Affected File**: `/src/app/api/proxy/[...path]/route.ts` (line 101) + +**Vulnerable Code**: +```typescript +// ❌ No validation on path segments +const backendUrl = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/${params.path.join('/')}`; +``` + +**Attack Scenario**: +```javascript +// Attacker attempts path traversal +fetch('/api/proxy/../../../etc/passwd'); +fetch('/api/proxy/users/..%2F..%2Fadmin/secrets'); +``` + +**Current Mitigation**: +- Next.js automatically normalizes and validates route parameters +- Segments like `..` are encoded/rejected by Next.js router +- Backend URL construction is safe *if* Next.js handles this correctly + +**Recommendation** (Defense in Depth): +```typescript +// ✅ Add explicit path validation +async function proxyRequest( + request: NextRequest, + params: { path: string[] }, + method: string +) { + try { + // 1. Validate path segments + const invalidSegments = params.path.filter(segment => + segment.includes('..') || + segment.includes('%2e%2e') || + segment.includes('%252e') || + segment.startsWith('/') + ); + + if (invalidSegments.length > 0) { + console.warn('[SECURITY] Path traversal attempt blocked:', params.path); + return NextResponse.json( + { error: 'Invalid path' }, + { status: 400 } + ); + } + + // 2. Whitelist allowed API prefixes + const allowedPrefixes = [ + 'item-master', + 'clients', + 'approvals', + 'employees', + // ... add all legitimate endpoints + ]; + + if (!allowedPrefixes.some(prefix => params.path[0] === prefix)) { + console.warn('[SECURITY] Unauthorized endpoint access:', params.path[0]); + return NextResponse.json( + { error: 'Endpoint not allowed' }, + { status: 403 } + ); + } + + const backendUrl = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/${params.path.join('/')}`; + // ... rest of proxy logic +``` + +**CVSS Score**: 8.6 (High → Critical if backend has filesystem access) +**Fix Priority**: HIGH + +--- + +### 🔴 CRITICAL-04: Insecure Direct Object Reference (IDOR) in Vendor/Client Operations + +**Category**: Broken Access Control (OWASP A01) +**CWE**: CWE-639 (Authorization Bypass Through User-Controlled Key) + +**Issue**: +All data access operations use user-supplied IDs without verifying ownership or authorization. Example: `getClientById(id)` doesn't check if the current user has permission to view that specific client. + +**Affected Files**: +- `/src/components/accounting/VendorManagement/actions.ts` +- `/src/components/clients/actions.ts` +- Most CRUD Server Actions + +**Vulnerable Code**: +```typescript +// ❌ No ownership/authorization check +export async function getClientById(id: string): Promise { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + transform: (data: ClientApiData) => transformApiToFrontend(data), + errorMessage: '거래처 조회에 실패했습니다.', + }); + return result.data || null; +} +``` + +**Attack Scenario**: +1. User A has access to Client ID 100 +2. User A discovers they can access `/clients/101/edit` +3. User A iterates through IDs to access competitors' client data +4. User A modifies/deletes Client 101 (owned by User B) + +**Impact**: +- Unauthorized data access across tenants/users +- Data modification/deletion of other users' records +- GDPR violation (accessing personal data without authorization) + +**Recommendation**: +```typescript +// ✅ Validate access before fetching +import { validateUserAccess } from '@/lib/auth/access-control'; + +export async function getClientById(id: string): Promise { + // 1. Check if current user can access this client + const canAccess = await validateUserAccess('clients', id); + if (!canAccess) { + console.warn(`[SECURITY] Unauthorized access attempt to client ${id}`); + return null; + } + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + transform: (data: ClientApiData) => transformApiToFrontend(data), + errorMessage: '거래처 조회에 실패했습니다.', + }); + return result.data || null; +} +``` + +**Note**: This assumes the backend performs proper authorization. If backend validation is weak, this is CRITICAL. + +**CVSS Score**: 8.1 (High) +**Fix Priority**: HIGH + +--- + +### 🔴 CRITICAL-05: No File Upload Validation in Server Actions + +**Category**: Unrestricted File Upload (OWASP A04) +**CWE**: CWE-434 (Unrestricted Upload of File with Dangerous Type) + +**Issue**: +The API proxy handles file uploads without validating file size, type, or content. While validation may exist on the backend, there's no frontend defense-in-depth. + +**Affected File**: `/src/app/api/proxy/[...path]/route.ts` (lines 118-136) + +**Vulnerable Code**: +```typescript +// ❌ No file validation +else if (contentType.includes('multipart/form-data')) { + isFormData = true; + const originalFormData = await request.formData(); + const newFormData = new FormData(); + + for (const [key, value] of originalFormData.entries()) { + if (value instanceof File) { + // ❌ No size check, no type validation + newFormData.append(key, value, value.name); + } else { + newFormData.append(key, value); + } + } + body = newFormData; +} +``` + +**Attack Scenarios**: +1. **DoS via Large Files**: Upload 10GB file → exhaust server memory +2. **Malicious Extensions**: Upload `malware.exe.jpg` → backend mishandles +3. **Content-Type Mismatch**: Upload PHP shell as `image/png` + +**Impact**: +- Server memory exhaustion (DoS) +- Potential code execution if backend stores files in webroot +- Storage quota exhaustion + +**Recommendation**: +```typescript +// ✅ Add file validation +const MAX_FILE_SIZE = 50 * 1024 * 1024; // 50MB +const ALLOWED_TYPES = ['image/jpeg', 'image/png', 'application/pdf', 'application/msword']; + +else if (contentType.includes('multipart/form-data')) { + isFormData = true; + const originalFormData = await request.formData(); + const newFormData = new FormData(); + + for (const [key, value] of originalFormData.entries()) { + if (value instanceof File) { + // 1. Size check + if (value.size > MAX_FILE_SIZE) { + return NextResponse.json( + { error: `파일 크기는 ${MAX_FILE_SIZE / 1024 / 1024}MB를 초과할 수 없습니다.` }, + { status: 413 } + ); + } + + // 2. Type validation + if (!ALLOWED_TYPES.includes(value.type)) { + return NextResponse.json( + { error: `허용되지 않는 파일 형식입니다: ${value.type}` }, + { status: 400 } + ); + } + + // 3. Extension check + const ext = value.name.split('.').pop()?.toLowerCase(); + const dangerousExts = ['exe', 'sh', 'bat', 'cmd', 'php', 'jsp', 'asp']; + if (ext && dangerousExts.includes(ext)) { + console.warn('[SECURITY] Dangerous file extension blocked:', value.name); + return NextResponse.json( + { error: '실행 파일은 업로드할 수 없습니다.' }, + { status: 400 } + ); + } + + newFormData.append(key, value, value.name); + } else { + newFormData.append(key, value); + } + } + body = newFormData; +} +``` + +**CVSS Score**: 7.5 (High) +**Fix Priority**: HIGH + +--- + +## HIGH Findings + +### 🟠 HIGH-01: Token Refresh Race Condition + +**Category**: Race Condition (CWE-362) +**CWE**: CWE-362 (Concurrent Execution using Shared Resource with Improper Synchronization) + +**Issue**: +While the system implements a 5-second cache for token refresh (`/src/lib/api/refresh-token.ts`), there's still a narrow race condition window where multiple simultaneous requests could trigger concurrent refresh attempts before the cache is populated. + +**Affected File**: `/src/lib/api/refresh-token.ts` (lines 108-144) + +**Vulnerable Code**: +```typescript +// ⚠️ Race condition window between cache check and promise creation +export async function refreshAccessToken( + refreshToken: string, + caller: string = 'unknown' +): Promise { + const cache = getRefreshCache(); + const now = Date.now(); + + // 1. Cache check (RACE WINDOW HERE) + if (cache.result && cache.result.success && now - cache.timestamp < REFRESH_CACHE_TTL) { + return cache.result; + } + + // 2. Ongoing check (RACE WINDOW HERE) + if (cache.promise && !cache.result && now - cache.timestamp < REFRESH_CACHE_TTL) { + return cache.promise; + } + + // 3. New refresh (MULTIPLE REQUESTS CAN REACH HERE SIMULTANEOUSLY) + cache.timestamp = now; + cache.result = null; + cache.promise = doRefreshToken(refreshToken).then(result => { + cache.result = result; + return result; + }); + + return cache.promise; +} +``` + +**Race Condition Scenario**: +``` +Time Request A Request B Request C +---- ------------------- ------------------- ------------------- +T=0 Check cache (miss) +T=1 Check cache (miss) +T=2 Create promise A +T=3 Create promise B Check cache (miss) +T=4 Create promise C +``` + +Result: 3 concurrent refresh requests to backend → 2 refresh tokens become invalid + +**Impact**: +- Refresh token invalidation (backend may reject reused tokens) +- User logout due to failed refresh +- Race between PROXY and serverFetch processes + +**Recommendation**: +```typescript +// ✅ Use proper mutex/lock +let refreshLock: Promise | null = null; + +export async function refreshAccessToken( + refreshToken: string, + caller: string = 'unknown' +): Promise { + const cache = getRefreshCache(); + const now = Date.now(); + + // 1. Return cached result + if (cache.result && cache.result.success && now - cache.timestamp < REFRESH_CACHE_TTL) { + console.log(`[${caller}] Using cached refresh result`); + return cache.result; + } + + // 2. Wait for active refresh (CRITICAL: check global lock) + if (refreshLock) { + console.log(`[${caller}] Waiting for active refresh operation`); + return refreshLock; + } + + // 3. Acquire lock and refresh + console.log(`[${caller}] Starting new refresh (acquired lock)`); + cache.timestamp = now; + cache.result = null; + + refreshLock = doRefreshToken(refreshToken).then(result => { + cache.result = result; + refreshLock = null; // Release lock + return result; + }).catch(error => { + refreshLock = null; // Release lock on error + throw error; + }); + + cache.promise = refreshLock; + return refreshLock; +} +``` + +**CVSS Score**: 6.5 (Medium → High due to session disruption) +**Fix Priority**: HIGH + +--- + +### 🟠 HIGH-02: Dependency Vulnerability - jsPDF + +**Category**: Vulnerable Components (OWASP A06) +**CWE**: CWE-1035 (Using Components with Known Vulnerabilities) + +**Issue**: +jsPDF library (version ≤4.0.0) has multiple HIGH/MODERATE severity vulnerabilities: + +1. **GHSA-pqxr-3g65-p328**: PDF Injection allowing Arbitrary JavaScript Execution (CVSS 8.1) +2. **GHSA-95fx-jjr5-f39c**: DoS via Unvalidated BMP Dimensions +3. **GHSA-vm32-vv63-w422**: Stored XMP Metadata Injection +4. **GHSA-cjw8-79x6-5cj4**: Shared State Race Condition in addJS Plugin + +**Vulnerable Package**: +```json +// package.json +{ + "dependencies": { + "jspdf": "^2.5.2" // ❌ Vulnerable version + } +} +``` + +**Impact**: +- Arbitrary JavaScript execution via malicious PDF generation +- DoS attacks on PDF generation endpoints +- Metadata spoofing + +**Recommendation**: +```bash +# ✅ Update to latest patched version +npm update jspdf +# or +npm install jspdf@latest + +# Verify fix +npm audit +``` + +**Alternative**: Consider replacing jsPDF with a more secure PDF library like: +- `pdfkit` (Node.js native) +- `pdf-lib` (actively maintained) +- Server-side PDF generation (Puppeteer/Playwright) + +**CVSS Score**: 8.1 (High - from upstream advisory) +**Fix Priority**: HIGH + +--- + +### 🟠 HIGH-03: Next.js DoS Vulnerability + +**Category**: Vulnerable Components (OWASP A06) +**CWE**: CWE-400 (Uncontrolled Resource Consumption) + +**Issue**: +Next.js self-hosted applications vulnerable to DoS via Image Optimizer `remotePatterns` configuration (GHSA-9g9p-9gw9-jx7f). + +**Impact**: +- Server resource exhaustion +- Image optimization endpoint abuse + +**Recommendation**: +```bash +# ✅ Update Next.js to patched version +npm update next@latest + +# Verify current version +npm list next +``` + +**Additional Mitigation**: +```javascript +// next.config.js +module.exports = { + images: { + remotePatterns: [ + { + protocol: 'https', + hostname: 'trusted-domain.com', // ✅ Whitelist specific domains + pathname: '/images/**', + }, + ], + // ✅ Add rate limiting + minimumCacheTTL: 60, + deviceSizes: [640, 750, 828, 1080, 1200], + imageSizes: [16, 32, 48, 64, 96, 128, 256, 384], + }, +}; +``` + +**CVSS Score**: 7.5 (High) +**Fix Priority**: HIGH + +--- + +### 🟠 HIGH-04: Insufficient Logging for Security Events + +**Category**: Security Logging and Monitoring Failures (OWASP A09) +**CWE**: CWE-778 (Insufficient Logging) + +**Issue**: +Critical security events (permission changes, role modifications, account deletions) are not logged with sufficient detail for audit trails. + +**Affected Files**: +- `/src/components/settings/PermissionManagement/actions.ts` +- `/src/components/settings/AccountManagement/actions.ts` +- All sensitive Server Actions + +**Current State**: +```typescript +// ❌ No security logging +export async function allowAllPermissions(roleId: number) { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/roles/${roleId}/permissions/allow-all`, + method: 'POST', + errorMessage: '전체 허용에 실패했습니다.', + }); + if (result.success) revalidatePath(`/settings/permissions/${roleId}`); + return result; +} +``` + +**Impact**: +- Cannot detect unauthorized access attempts +- No audit trail for compliance (SOC2, GDPR) +- Difficult to investigate security incidents + +**Recommendation**: +```typescript +// ✅ Add security logging +import { auditLog } from '@/lib/audit-logger'; + +export async function allowAllPermissions(roleId: number) { + const user = await getCurrentUser(); // Get from session/cookie + + // 1. Log the attempt + await auditLog({ + action: 'PERMISSION_ALLOW_ALL', + resource: `role:${roleId}`, + userId: user?.id, + ipAddress: await getClientIpAddress(), + userAgent: await getUserAgent(), + timestamp: new Date().toISOString(), + }); + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/roles/${roleId}/permissions/allow-all`, + method: 'POST', + errorMessage: '전체 허용에 실패했습니다.', + }); + + // 2. Log the result + await auditLog({ + action: 'PERMISSION_ALLOW_ALL_RESULT', + resource: `role:${roleId}`, + userId: user?.id, + success: result.success, + error: result.error, + timestamp: new Date().toISOString(), + }); + + if (result.success) revalidatePath(`/settings/permissions/${roleId}`); + return result; +} +``` + +**CVSS Score**: 6.5 (Medium → High for compliance risk) +**Fix Priority**: HIGH + +--- + +## MEDIUM Findings + +### 🟡 MEDIUM-01: Session Fixation Risk + +**Category**: Broken Authentication (OWASP A07) +**CWE**: CWE-384 (Session Fixation) + +**Issue**: +The login flow (`/src/app/api/auth/login/route.ts`) sets new tokens without explicitly invalidating old session cookies. If an attacker sets a known session ID before login, it could persist post-authentication. + +**Affected File**: `/src/app/api/auth/login/route.ts` + +**Current Code**: +```typescript +// ⚠️ Sets new tokens but doesn't clear old ones first +const accessTokenCookie = [ + `access_token=${tokens.access_token}`, + 'HttpOnly', + // ... +].join('; '); + +successResponse.headers.append('Set-Cookie', accessTokenCookie); +``` + +**Attack Scenario**: +1. Attacker sets victim's cookie: `access_token=ATTACKER_VALUE` +2. Victim logs in with valid credentials +3. System sets new token but doesn't clear old cookie storage +4. Attacker hijacks session if old cookie lingers + +**Impact**: +- Potential session hijacking +- Attacker gains authenticated access + +**Recommendation**: +```typescript +// ✅ Clear all existing auth cookies before setting new ones +const loginResponse = NextResponse.json(responseData, { status: 200 }); + +// 1. Clear old cookies first +const clearCookies = [ + `access_token=; HttpOnly; ${isProduction ? 'Secure; ' : ''}SameSite=Lax; Path=/; Max-Age=0`, + `refresh_token=; HttpOnly; ${isProduction ? 'Secure; ' : ''}SameSite=Lax; Path=/; Max-Age=0`, + `is_authenticated=; ${isProduction ? 'Secure; ' : ''}SameSite=Lax; Path=/; Max-Age=0`, + `laravel_session=; HttpOnly; ${isProduction ? 'Secure; ' : ''}SameSite=Lax; Path=/; Max-Age=0`, // Legacy +]; + +clearCookies.forEach(cookie => { + loginResponse.headers.append('Set-Cookie', cookie); +}); + +// 2. Set new cookies +loginResponse.headers.append('Set-Cookie', accessTokenCookie); +loginResponse.headers.append('Set-Cookie', refreshTokenCookie); +loginResponse.headers.append('Set-Cookie', isAuthenticatedCookie); +``` + +**CVSS Score**: 5.4 (Medium) +**Fix Priority**: MEDIUM + +--- + +### 🟡 MEDIUM-02: innerHTML Usage in Print Utils (Already Sanitized) + +**Category**: XSS (OWASP A03) +**CWE**: CWE-79 (Cross-site Scripting) + +**Issue**: +`/src/lib/print-utils.ts` uses `.innerHTML` to set content in print window. However, the code already applies sanitization via `sanitizeHTMLForPrint` from Round 1 fixes. + +**Affected File**: `/src/lib/print-utils.ts` (line 167+) + +**Current Code** (assumed from line 150 limit): +```typescript +// ✅ ALREADY SANITIZED in Round 1 +import { sanitizeHTMLForPrint } from '@/lib/sanitize'; + +// Content is sanitized before setting innerHTML +printWindow.document.body.innerHTML = sanitizeHTMLForPrint(contentClone.outerHTML); +``` + +**Status**: ✅ **MITIGATED** (from Round 1) + +**Verification Needed**: Ensure `sanitizeHTMLForPrint` uses DOMPurify with proper config. + +**CVSS Score**: 5.4 (Medium - but mitigated) +**Fix Priority**: LOW (verification only) + +--- + +## LOW Findings + +### 🟢 LOW-01: Missing Rate Limiting on Token Refresh Endpoint + +**Category**: Security Misconfiguration (OWASP A05) +**CWE**: CWE-307 (Improper Restriction of Excessive Authentication Attempts) + +**Issue**: +The token refresh endpoint (`/api/auth/refresh`) has no rate limiting. An attacker could brute-force refresh tokens or cause DoS. + +**Affected File**: `/src/app/api/auth/refresh/route.ts` + +**Current Code**: +```typescript +// ❌ No rate limiting +export async function POST(request: NextRequest) { + const refreshToken = request.cookies.get('refresh_token')?.value; + // ... refresh logic +} +``` + +**Impact**: +- DoS via excessive refresh requests +- Potential brute-force of refresh tokens (if short/predictable) + +**Recommendation**: +```typescript +// ✅ Add rate limiting +import { rateLimit } from '@/lib/rate-limiter'; + +export async function POST(request: NextRequest) { + // 1. Rate limit: 10 requests per 5 minutes per IP + const rateLimitResult = await rateLimit({ + identifier: request.ip || 'unknown', + limit: 10, + window: 5 * 60 * 1000, // 5 minutes + }); + + if (!rateLimitResult.success) { + return NextResponse.json( + { error: 'Too many refresh attempts. Please try again later.' }, + { status: 429 } + ); + } + + const refreshToken = request.cookies.get('refresh_token')?.value; + // ... rest of refresh logic +} +``` + +**Alternative**: Use Vercel Edge Middleware rate limiting or Upstash Redis. + +**CVSS Score**: 4.3 (Low) +**Fix Priority**: LOW + +--- + +## Summary Table + +| ID | Severity | Category | CVSS | Priority | Status | +|----|----------|----------|------|----------|--------| +| CRITICAL-01 | 🔴 CRITICAL | Missing Auth in Server Actions | 9.1 | IMMEDIATE | NEW | +| CRITICAL-02 | 🔴 CRITICAL | Missing Role Validation | 8.8 | IMMEDIATE | NEW | +| CRITICAL-03 | 🔴 CRITICAL | Path Traversal Risk | 8.6 | HIGH | NEW | +| CRITICAL-04 | 🔴 CRITICAL | IDOR Vulnerability | 8.1 | HIGH | NEW | +| CRITICAL-05 | 🔴 CRITICAL | No File Upload Validation | 7.5 | HIGH | NEW | +| HIGH-01 | 🟠 HIGH | Token Refresh Race Condition | 6.5 | HIGH | NEW | +| HIGH-02 | 🟠 HIGH | jsPDF Vulnerabilities | 8.1 | HIGH | NEW | +| HIGH-03 | 🟠 HIGH | Next.js DoS | 7.5 | HIGH | NEW | +| HIGH-04 | 🟠 HIGH | Insufficient Logging | 6.5 | HIGH | NEW | +| MEDIUM-01 | 🟡 MEDIUM | Session Fixation | 5.4 | MEDIUM | NEW | +| MEDIUM-02 | 🟡 MEDIUM | innerHTML (Sanitized) | 5.4 | LOW | VERIFIED | +| LOW-01 | 🟢 LOW | No Rate Limiting | 4.3 | LOW | NEW | + +--- + +## Remediation Priority + +### 🔥 Immediate (Within 1 Week) +1. **CRITICAL-01**: Add authentication checks to all Server Actions +2. **CRITICAL-02**: Implement role/permission validation +3. **HIGH-02**: Update jsPDF to patched version +4. **HIGH-03**: Update Next.js to latest version + +### 📅 Short-Term (Within 1 Month) +5. **CRITICAL-03**: Add path validation to API proxy +6. **CRITICAL-04**: Implement IDOR protection +7. **CRITICAL-05**: Add file upload validation +8. **HIGH-01**: Fix token refresh race condition +9. **HIGH-04**: Implement security audit logging + +### 🔄 Medium-Term (Within 3 Months) +10. **MEDIUM-01**: Enhance session fixation protection +11. **LOW-01**: Add rate limiting to auth endpoints + +--- + +## Testing Recommendations + +### Automated Security Testing +```bash +# 1. Run npm audit +npm audit + +# 2. OWASP ZAP scan +docker run -t zaproxy/zap-stable zap-baseline.py -t https://your-app.com + +# 3. Burp Suite Professional scan +# Configure Burp to test Server Actions directly +``` + +### Manual Security Testing +1. **IDOR Testing**: Iterate through IDs in browser DevTools +2. **Path Traversal**: Test `../` sequences in API proxy +3. **File Upload**: Upload malicious files (exe, php, svg with scripts) +4. **Race Conditions**: Concurrent token refresh with Postman Collection Runner +5. **Permission Bypass**: Call admin Server Actions as regular user + +--- + +## Compliance Impact + +| Standard | Affected Controls | Impact | +|----------|------------------|--------| +| **SOC2** | CC6.1 (Logical Access), CC7.2 (System Monitoring) | HIGH - Missing audit logs, weak authorization | +| **GDPR** | Art. 32 (Security), Art. 33 (Breach Notification) | HIGH - IDOR allows unauthorized personal data access | +| **PCI-DSS** | Req. 6.5.10 (Broken Auth), Req. 10 (Logging) | MEDIUM - If storing payment data | +| **ISO 27001** | A.9.2.3 (Access Rights), A.12.4.1 (Event Logging) | HIGH - Insufficient access control | + +--- + +## False Positives / Non-Issues + +### ✅ Already Fixed (from Previous Rounds) +1. **XSS in dangerouslySetInnerHTML** → DOMPurify applied (Round 1) +2. **CSP Headers** → Implemented in middleware (Round 1) +3. **Open Redirect** → Path validation added (Round 2) +4. **NEXT_PUBLIC_API_KEY exposure** → Moved to server-only API_KEY (Round 2) +5. **console.log in production** → Wrapped with NODE_ENV check (Round 2) +6. **JSON.parse crashes** → safeJsonParse utility applied (Round 2) + +### ✅ Not Vulnerabilities +1. **eval() usage** → Only found in legitimate chart libraries, not user input +2. **localStorage usage** → Only for non-sensitive UI preferences +3. **process.env access** → All server-side, properly scoped +4. **.env files** → Properly gitignored, example file provided + +--- + +## Conclusion + +This third-pass audit revealed **12 new security issues**, with **5 CRITICAL** findings requiring immediate attention. The most urgent issues involve missing authentication and authorization checks in Server Actions, which could allow unauthorized access and privilege escalation. + +**Next Steps**: +1. Address CRITICAL findings within 1 week +2. Update dependencies (jsPDF, Next.js) +3. Implement comprehensive audit logging +4. Schedule fourth-pass audit after remediation + +**Risk Level**: 🔴 **HIGH** - Immediate action required to prevent exploitation. diff --git a/claudedocs/vercel/vercel-deployment-setup.md b/claudedocs/vercel/vercel-deployment-setup.md new file mode 100644 index 00000000..216bda8e --- /dev/null +++ b/claudedocs/vercel/vercel-deployment-setup.md @@ -0,0 +1,423 @@ +# Vercel 배포 프론트엔드 설정 내역 + +> 작성일: 2026-02-09 + +--- + +## 1. Puppeteer 패키지 교체 + +### 변경 내용 + +| 항목 | Before | After | +|------|--------|-------| +| 패키지 | `puppeteer` | `puppeteer-core` + `@sparticuz/chromium` | + +### 왜 교체해야 하는가 + +`puppeteer`는 설치 시 **Chromium 브라우저 전체(~170MB)**를 함께 다운로드한다. 이는 로컬/Docker 환경에서는 문제없지만, Vercel 서버리스 함수는 **패키지 크기 제한(50MB 압축, 250MB 비압축)**이 있어 배포 자체가 불가능하다. + +### 로컬 vs Vercel 차이 + +| 환경 | Chromium 제공 방식 | 설정 | +|------|-------------------|------| +| **로컬 (macOS)** | 사용자 PC에 설치된 Google Chrome 사용 | `PUPPETEER_EXECUTABLE_PATH` 환경변수로 경로 지정 | +| **Vercel (서버리스)** | `@sparticuz/chromium`이 AWS Lambda용 경량 Chromium 제공 | `chromium.executablePath()`로 자동 경로 획득 | + +### 분기 처리 코드 (`src/app/api/pdf/generate/route.ts`) + +```typescript +const isVercel = process.env.VERCEL === '1'; // Vercel이 자동 주입하는 환경변수 + +const browser = await puppeteer.launch({ + args: isVercel ? chromium.args : ['--no-sandbox', ...], + executablePath: isVercel + ? await chromium.executablePath() // Vercel: @sparticuz/chromium 경량 바이너리 + : process.env.PUPPETEER_EXECUTABLE_PATH || '/usr/bin/google-chrome-stable', // 로컬: 시스템 Chrome + headless: true, +}); +``` + +- `process.env.VERCEL === '1'`: Vercel 배포 환경에서 자동으로 설정되는 값 +- `chromium.args`: 서버리스 환경에 최적화된 Chromium 실행 인자 (싱글 프로세스, SwiftShader 등) + +### 로컬 환경변수 설정 (`.env.local`) + +``` +PUPPETEER_EXECUTABLE_PATH=/Applications/Google Chrome.app/Contents/MacOS/Google Chrome +``` + +기존 `puppeteer`는 Chromium을 자체 번들했으므로 경로 지정이 불필요했지만, `puppeteer-core`는 브라우저를 포함하지 않으므로 로컬에서도 Chrome 경로를 명시해야 한다. + +--- + +## 2. next.config.ts 변경 + +### serverExternalPackages + +| Before | After | +|--------|-------| +| `['puppeteer']` | `['puppeteer-core', '@sparticuz/chromium']` | + +Webpack이 이 패키지들을 번들에 포함하지 않고 Node.js 런타임에서 직접 로드하도록 지정. `@sparticuz/chromium`은 바이너리 파일을 포함하고 있어 번들링하면 깨진다. + +### TypeScript / ESLint 빌드 검사 + +| 항목 | Before | After | 이유 | +|------|--------|-------|------| +| `typescript.ignoreBuildErrors` | `true` | `false` | Vercel 배포 시 타입 에러가 런타임 버그로 이어질 수 있으므로 빌드 단계에서 차단 | +| `eslint.ignoreDuringBuilds` | `true` | `true` (유지) | 기존 미사용 import 에러 791개 존재, 점진적 해결 예정 | + +--- + +## 3. vercel.json 생성 + +```json +{ + "regions": ["icn1"], + "functions": { + "src/app/api/pdf/generate/route.ts": { + "memory": 1024, + "maxDuration": 30 + } + } +} +``` + +| 설정 | 값 | 이유 | +|------|-----|------| +| `regions` | `icn1` (서울) | 사용자가 한국에 위치, 백엔드 API도 한국 서버 | +| `memory` | 1024MB | Chromium 브라우저 실행에 최소 512MB 이상 필요, PDF 렌더링 안정성 확보 | +| `maxDuration` | 30초 | 복잡한 문서의 PDF 변환 시 기본 10초로는 부족 | + +--- + +## 4. 환경변수 가이드 + +Vercel Dashboard에 등록해야 할 환경변수 목록은 `claudedocs/vercel/vercel-env-setup-guide.md` 참조. + +핵심 포인트: +- `API_KEY`: Sensitive 체크 필수, `NEXT_PUBLIC_` 접두사 절대 금지 +- `PUPPETEER_EXECUTABLE_PATH`: Vercel에서는 설정 불필요 (`@sparticuz/chromium`이 처리) +- `VERCEL=1`: Vercel이 자동 주입, 별도 설정 불필요 + +--- + +## 5. TypeScript 에러 수정 + +`ignoreBuildErrors: false`로 변경하면서 기존에 숨겨져 있던 TS 에러 16개+ 수정. + +| 에러 유형 | 파일 수 | 원인 | +|-----------|--------|------| +| `WorkOrderItem` 프로퍼티 누락 | 5개 파일 | `orderNodeId`, `orderNodeName` 필드 추가 후 목업 데이터 미갱신 | +| `WorkOrder` 프로퍼티 누락 | 3개 파일 | `shutterCount` 필드 추가 후 합성 객체 미갱신 | +| `unknown` → `ReactNode` | 1개 파일 | `Record` 값을 JSX에 직접 사용 | +| `object` 프로퍼티 접근 | 2개 파일 | `Object.entries()` 후 타입 narrowing 부족 | +| 타입 미export | 1개 파일 | `BomCalculationResult` import만 하고 re-export 안 함 | +| implicit `any` | 1개 파일 | 콜백 파라미터 타입 어노테이션 누락 | + +--- + +## 변경 파일 전체 목록 + +``` +수정: + src/app/api/pdf/generate/route.ts # Puppeteer 교체 + next.config.ts # 빌드 설정 + package.json / package-lock.json # 패키지 교체 + .env.local # Chrome 경로 추가 + .env.example # Chrome 경로 가이드 추가 + +신규: + vercel.json # Vercel 배포 설정 + claudedocs/vercel/vercel-env-setup-guide.md # 환경변수 가이드 + claudedocs/vercel/vercel-deployment-setup.md # 이 문서 + +TS 에러 수정 (13개 파일): + src/app/[locale]/(protected)/quality/qms/components/InspectionModalV2.tsx + src/app/[locale]/(protected)/quality/qms/mockData.ts + src/components/material/ReceivingManagement/actions.ts + src/components/orders/OrderSalesDetailView.tsx + src/components/production/WorkerScreen/index.tsx + src/components/production/WorkerScreen/WorkLogModal.tsx + src/components/production/WorkOrders/documents/InspectionReportModal.tsx + src/components/production/WorkOrders/WorkOrderDetail.tsx + src/components/production/WorkOrders/WorkOrderEdit.tsx + src/components/quotes/LocationDetailPanel.tsx + src/components/quotes/QuoteSummaryPanel.tsx + src/components/quotes/QuotePreviewContent.tsx + src/components/quotes/actions.ts +``` + +--- + +## 6. Vercel 비용 주의사항 + +### 비용 발생 구조 + +Vercel은 **서버리스 함수 호출 횟수 + 실행 시간 + 대역폭**으로 과금된다. 우리 프로젝트에서 비용이 튈 수 있는 요소를 분석한다. + +### 6-1. API Proxy 패턴 (가장 큰 비용 요소) + +현재 구조: `클라이언트 → /api/proxy/* (Vercel 서버리스) → PHP 백엔드` + +| 문제 | 설명 | +|------|------| +| **이중 대역폭** | 모든 API 응답이 Vercel 서버리스를 거쳐 클라이언트로 전달 (대역폭 2배) | +| **함수 호출 폭발** | 모든 API 요청이 서버리스 함수 1회 호출 = 페이지 로드마다 수~수십 회 | +| **실행 시간 누적** | 각 함수가 백엔드 응답을 기다리는 시간만큼 과금 | + +**왜 이 패턴을 쓰는가**: HttpOnly 쿠키에 저장된 `access_token`은 JavaScript로 읽을 수 없어서, 서버(서버리스 함수)에서 쿠키를 읽어 `Authorization` 헤더로 변환해야 한다. + +**예상 영향**: 사용자 수가 늘어날수록 비용이 선형 증가. ERP 특성상 한 페이지에서 3-10개 API를 호출하므로, 동시 접속자 50명이면 분당 수백~수천 회 함수 호출 가능. + +### 6-1-1. 30초 폴링 — 가장 심각한 비용 요소 + +프로젝트에 **30초 간격 폴링이 2개** 존재하며, 이것들이 서버리스 프록시를 통과한다. + +| 폴링 | 파일 | 간격 | 호출 API | +|------|------|------|---------| +| **메뉴 폴링** | `src/hooks/useMenuPolling.ts` | 30초 | `refreshMenus()` → `/api/proxy/*` | +| **알림(Today Issue) 폴링** | `src/layouts/AuthenticatedLayout.tsx` | 30초 | `getUnreadTodayIssues()` → `/api/proxy/*` | + +**폴링만의 서버리스 함수 호출 추정 (동시접속 50명, 8시간 근무 기준)**: + +``` +메뉴 폴링: 50명 × 2회/분 × 60분 × 8시간 = 48,000회/일 +알림 폴링: 50명 × 2회/분 × 60분 × 8시간 = 48,000회/일 +───────────────────────────────────────────────────────── +합계: 96,000회/일 (폴링만으로, 일반 API 호출 제외) +월간: 96,000 × 22일(근무일) = 약 2,112,000회/월 +``` + +Vercel Pro 플랜 기준 서버리스 함수 포함 실행량 100만 회/월이므로, **폴링만으로 2배 초과**. 이 폴링 2개가 Edge Middleware로 전환 시 가장 큰 비용 절감 효과를 볼 수 있다. + +> 참고: 두 폴링 모두 탭 비활성 시 일시정지하는 최적화가 적용되어 있지만, 활성 탭 기준으로는 위 수치가 그대로 적용된다. + +### 6-2. PDF 생성 함수 + +| 항목 | 값 | 비용 영향 | +|------|-----|----------| +| 메모리 | 1024MB | 기본(128MB) 대비 8배 비용 | +| 최대 실행 시간 | 30초 | 긴 실행 = 높은 과금 | +| 빈도 | 낮음 (수동 PDF 변환) | 자동 배치가 아니므로 실제 비용 영향은 적음 | + +PDF는 사용 빈도가 낮아 큰 문제는 아니지만, 메모리 1024MB로 설정했으므로 호출당 비용이 높다. + +### 6-3. Server Actions (bodySizeLimit: 10MB) + +`next.config.ts`에서 `serverActions.bodySizeLimit: '10mb'`로 설정. 이미지 업로드 시 큰 페이로드가 서버리스 함수를 통과하므로 대역폭 비용 발생. 단, 이미지 저장 자체는 PHP 백엔드가 처리하므로 Vercel 스토리지 비용은 없음. + +### 6-4. 비용 안전 요소 + +| 항목 | 상태 | 이유 | +|------|------|------| +| 이미지/파일 저장 | 안전 | PHP 백엔드 서버에 저장, Vercel에 저장 안 함 | +| Vercel Image Optimization | 미사용 | `remotePatterns`에 `placehold.co`만 등록 (개발용) | +| ISR/SSG | 미사용 | 전체 Client Component, 정적 생성 없음 | + +--- + +## 7. API Proxy 비용 절감 방안 + +### 현재 문제 + +``` +클라이언트 → [Vercel 서버리스 함수] → PHP 백엔드 + ↑ 매 API 요청마다 호출 + ↑ Node.js Runtime (비쌈) +``` + +`/api/proxy/[...path]/route.ts`가 **모든 백엔드 API 호출을 중계**하므로 서버리스 함수 호출 횟수가 폭발적으로 증가한다. + +### 방안 1: Edge Middleware Rewrite (프론트엔드 변경만으로 가능) + +``` +클라이언트 → [Edge Middleware] → PHP 백엔드 (직접) + ↑ Edge Runtime (매우 저렴) + ↑ 쿠키 읽기 가능 +``` + +**원리**: 현재 `middleware.ts`는 이미 Edge Runtime에서 쿠키를 읽고 있다. 이를 확장하여 `/api/proxy/*` 요청을 Edge에서 백엔드로 직접 rewrite하면 서버리스 함수 호출을 제거할 수 있다. + +**장점**: +- Edge 함수는 서버리스 대비 **10-100배 저렴** (실행 시간이 아닌 요청 수 기준) +- 프론트엔드만 변경하면 됨 (백엔드 수정 불필요) +- 응답 지연(latency)도 감소 (중간 서버리스 단계 제거) + +**한계**: +- Edge Runtime은 Node.js API 일부를 사용 못함 +- **토큰 자동 갱신(refresh)** 처리가 복잡해짐 — 현재 `authenticatedFetch`가 401 감지 → refresh → retry를 처리하는데, Edge Middleware의 rewrite에서는 이 패턴 구현이 어려움 +- FormData/바이너리 응답 처리에 제약 가능 + +**적용 가능 범위**: 단순 GET/POST API 호출 (토큰 갱신 없이 정상 동작하는 요청) + +### 방안 2: 백엔드 CORS 허용 + 직접 호출 (백엔드 변경 필요) + +``` +클라이언트 → PHP 백엔드 (직접) + ↑ Vercel을 거치지 않음 + ↑ 서버리스 비용 0 +``` + +**원리**: PHP 백엔드가 Vercel 도메인에서의 CORS를 허용하고, 쿠키를 직접 설정(`SameSite=None; Secure`)하면 프록시 자체가 불필요해진다. + +**장점**: +- 서버리스 함수 호출 **완전 제거** +- 가장 큰 비용 절감 효과 +- 응답 속도 최적 (중간 단계 없음) + +**한계**: +- **백엔드 수정 필수**: CORS 헤더, 쿠키 SameSite 정책 변경 +- **HttpOnly 쿠키 도메인 문제**: 프론트(Vercel)와 백엔드(PHP)가 다른 도메인이면 3rd-party 쿠키로 분류되어 브라우저 차단 가능 +- 같은 도메인/서브도메인 구조가 아니면 추가 설정 필요 (`app.example.com` ↔ `api.example.com`) + +### 방안 3: 하이브리드 (권장) + +| 요청 유형 | 처리 방식 | 비용 | +|-----------|----------|------| +| 단순 데이터 조회 (GET) | Edge Middleware rewrite | 매우 저렴 | +| 데이터 변경 (POST/PUT/DELETE) | 기존 서버리스 프록시 유지 | 현행 유지 | +| 파일 업로드 (multipart) | 기존 서버리스 프록시 유지 | 현행 유지 | +| 토큰 갱신 필요 시 | 기존 서버리스 프록시 유지 | 현행 유지 | + +GET 요청이 전체 API 호출의 60-80%를 차지하므로, 이것만 Edge로 옮겨도 비용을 절반 이상 줄일 수 있다. + +### 방안 비교 요약 + +| 방안 | 비용 절감 | 프론트 변경 | 백엔드 변경 | 복잡도 | 권장 | +|------|----------|------------|------------|--------|------| +| **1. Edge Rewrite** | 중 (60-80%) | O | X | 중 | 단기 | +| **2. CORS 직접 호출** | 최대 (95%+) | O | O | 고 | 장기 | +| **3. 하이브리드** | 중상 (60-80%) | O | X | 중 | **현실적 1순위** | + +### 다음 단계 + +1. Vercel 배포 후 실제 함수 호출 횟수/비용 모니터링 +2. 비용이 예상보다 높으면 방안 3(하이브리드) 우선 적용 +3. 장기적으로 백엔드팀과 협의하여 방안 2(CORS) 검토 + +--- + +## 8. 월간 비용 산정 (Vercel Pro, 서울 icn1 리전) + +> 산정일: 2026-02-09 / 출처: [Vercel Pricing](https://vercel.com/pricing), [Fluid Compute Pricing](https://vercel.com/docs/functions/usage-and-pricing) + +### 8-1. Vercel 요금 구조 (Pro 플랜) + +| 항목 | Pro 포함량 | 초과 단가 | +|------|-----------|----------| +| **기본 요금** | $20/개발자 시트/월 | — | +| **사용 크레딧** | $20/월 포함 (사용량 차감) | — | +| **Invocations** (함수 호출) | 크레딧 차감 | $0.60 / 100만 회 | +| **Active CPU** (icn1) | 크레딧 차감 | $0.169 / 시간 | +| **Provisioned Memory** (icn1) | 크레딧 차감 | $0.014 / GB-시간 | +| **Edge Requests** | 1,000만 회/월 | ~$2 / 100만 회 | +| **Bandwidth** | 1TB/월 | 초과 시 GB당 과금 | + +> Fluid Compute 모델: Active CPU는 **코드 실행 중에만** 과금 (I/O 대기 시 과금 안 됨). Provisioned Memory는 **인스턴스 활성 시간** 전체 과금. + +### 8-2. 트래픽 추정 전제 (실제 사업 구조 반영) + +| 전제 | 값 | 비고 | +|------|-----|------| +| 개발자 시트 | **2명** | 프론트엔드 2명 | +| 서비스 회사 수 | **50개 이하** (초기) | 점진적 확장 | +| 회사당 이용자 | **~5명** | ERP 실사용자 | +| 총 등록 사용자 | **~250명** | 50사 × 5명 | +| 동시접속률 | **30~40%** | ERP 특성 (전원 동시 사용 안 함) | +| **동시접속 사용자** | **~75~100명** | 250명 × 30~40% | +| 근무 시간 | 8시간/일 | | +| 월 근무일 | 22일 | | +| 메뉴 폴링 간격 | 30초 | `useMenuPolling.ts` | +| 알림 폴링 간격 | 30초 | `AuthenticatedLayout.tsx` | +| 페이지 이동 시 API 호출 | 평균 5개/페이지 | | +| 페이지 이동 횟수 | 평균 50회/사용자/일 | | +| PDF 생성 | 100건/월 | | + +### 8-3. 월간 함수 호출 횟수 (동시접속 75명 기준) + +``` +① 메뉴 폴링: 75명 × 2회/분 × 480분 × 22일 = 1,584,000회 +② 알림 폴링: 75명 × 2회/분 × 480분 × 22일 = 1,584,000회 +③ 페이지 API: 75명 × 250회/일 × 22일 = 412,500회 +④ PDF 생성: = 100회 +────────────────────────────────────────────────────────────── +합계: 3,580,600회/월 +``` + +### 8-4. 시나리오 A — 현재 구조 (전부 서버리스 프록시) + +모든 API 호출이 `/api/proxy/[...path]` 서버리스 함수를 경유. + +**API 프록시 1회당 비용 추정 (icn1)**: +- Active CPU: ~30ms (쿠키 읽기, 헤더 구성, 응답 파싱) +- Instance alive: ~300ms (백엔드 응답 대기 포함) +- Memory: 128MB (0.128 GB) + +| 항목 | 계산 | 월 비용 | +|------|------|--------| +| **Invocations** | 3,580,000 × $0.60/1M | $2.15 | +| **Active CPU** | 3,580,000 × 0.03s = 107,400s = 29.8hr × $0.169 | $5.04 | +| **Provisioned Memory** | 3,580,000 × 0.128GB × 0.3s / 3600 = 38.2 GB-hr × $0.014 | $0.53 | +| **PDF CPU** | 100 × 5s / 3600 × $0.169 | $0.02 | +| **PDF Memory** | 100 × 1GB × 15s / 3600 × $0.014 | $0.01 | +| **함수 사용량 소계** | | **$7.75** | +| **기본 요금** | 개발자 2명 × $20 | **$40.00** | +| **사용 크레딧** | -$20 (포함) | **-$20.00** | +| **예상 월 합계** | | **~$28** | + +> 함수 사용량 $7.75는 $20 크레딧 이내. 초과 과금 없음. + +### 8-5. 시나리오 B — 하이브리드 (폴링 + GET을 Edge로) + +폴링 2개 + 일반 GET을 Edge Middleware rewrite로 전환. POST/PUT/DELETE/파일업로드만 서버리스 유지. + +``` +Edge로 이동: 폴링 3,168,000 + GET ~300,000 = ~3,468,000 → Edge Requests (10M 포함 이내) +서버리스 유지: POST/PUT/DELETE ~112,500 + PDF 100 = ~112,600 +``` + +| 항목 | 계산 | 월 비용 | +|------|------|--------| +| **Edge Requests** | 3,468,000회 (10M 포함 이내) | $0 | +| **Invocations** | 112,600회 × $0.60/1M | $0.07 | +| **Active CPU** | 112,600 × 0.05s / 3600 × $0.169 | $0.26 | +| **Provisioned Memory** | 112,600 × 0.128GB × 0.4s / 3600 × $0.014 | $0.02 | +| **PDF** | (위와 동일) | $0.03 | +| **함수 사용량 소계** | | **$0.38** | +| **기본 요금** | 개발자 2명 × $20 | **$40.00** | +| **사용 크레딧** | -$20 (포함) | **-$20.00** | +| **예상 월 합계** | | **~$20** | + +### 8-6. 성장 단계별 비용 비교 + +| 단계 | 서비스 회사 | 총 사용자 | 동시접속 | 시나리오 A | 시나리오 B | +|------|-----------|----------|---------|-----------|-----------| +| **초기** | 10사 | 50명 | ~20명 | **~$22** (함수 $2) | **~$20** (함수 $0.1) | +| **안정기** | 50사 | 250명 | ~75명 | **~$28** (함수 $8) | **~$20** (함수 $0.4) | +| **성장기** | 100사 | 500명 | ~150명 | **~$35** (함수 $15) | **~$21** (함수 $0.8) | +| **확장기** | 200사 | 1,000명 | ~300명 | **~$50** (함수 $30) | **~$22** (함수 $1.5) | + +> 모든 단계에서 고정 비용 = 개발자 2시트 $40 − 크레딧 $20 = **$20**. 함수 비용은 이 $20 크레딧에서 차감되며, 초기~안정기에는 크레딧 이내로 해결됨. + +### 8-7. 결론 + +- **초기~안정기 (50사 이하)**: 월 **~$22~28**. 함수 비용 $8 이하로 **크레딧 $20 이내**. 최적화 불필요. +- **성장기 (100사)**: 함수 비용 $15. 아직 크레딧 이내이지만 여유 줄어듦. 하이브리드 전환 검토 시점. +- **확장기 (200사 이상)**: 함수 비용이 크레딧 초과 → 추가 과금 발생. 하이브리드 전환 필수. +- **핵심 비용은 개발자 시트**. 프론트 2명 기준 고정 $20/월. 함수 비용은 초기에 미미. +- 폴링 2개만 Edge로 전환해도 함수 비용 **95% 절감** 가능 (100사 기준 $15 → $0.8). + +--- + +## 배포 전 체크리스트 + +- [x] `puppeteer-core` + `@sparticuz/chromium` 설치 +- [x] PDF 라우트 로컬/Vercel 분기 처리 +- [x] `next.config.ts` 설정 변경 +- [x] `vercel.json` 생성 +- [x] TypeScript 에러 0개 확인 +- [x] 로컬 Chrome 경로 설정 (`.env.local`) +- [ ] 로컬 PDF 변환 테스트 +- [ ] Vercel Dashboard 환경변수 등록 +- [ ] Vercel 배포 및 PDF 변환 테스트 diff --git a/package-lock.json b/package-lock.json index 0588dc06..4296fc29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,11 +38,13 @@ "@tiptap/pm": "^3.13.0", "@tiptap/react": "^3.13.0", "@tiptap/starter-kit": "^3.13.0", + "@types/dompurify": "^3.0.5", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "cmdk": "^1.1.1", "date-fns": "^4.1.0", "dom-to-image-more": "^3.7.2", + "dompurify": "^3.3.1", "html2canvas": "^1.4.1", "immer": "^11.0.1", "jspdf": "^4.0.0", @@ -3872,6 +3874,15 @@ "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==", "license": "MIT" }, + "node_modules/@types/dompurify": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz", + "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==", + "license": "MIT", + "dependencies": { + "@types/trusted-types": "*" + } + }, "node_modules/@types/estree": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", @@ -3967,8 +3978,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "license": "MIT", - "optional": true + "license": "MIT" }, "node_modules/@types/use-sync-external-store": { "version": "0.0.6", @@ -5650,7 +5660,6 @@ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz", "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==", "license": "(MPL-2.0 OR Apache-2.0)", - "optional": true, "optionalDependencies": { "@types/trusted-types": "^2.0.7" } diff --git a/package.json b/package.json index 5cab0515..ee51be87 100644 --- a/package.json +++ b/package.json @@ -44,11 +44,13 @@ "@tiptap/pm": "^3.13.0", "@tiptap/react": "^3.13.0", "@tiptap/starter-kit": "^3.13.0", + "@types/dompurify": "^3.0.5", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "cmdk": "^1.1.1", "date-fns": "^4.1.0", "dom-to-image-more": "^3.7.2", + "dompurify": "^3.3.1", "html2canvas": "^1.4.1", "immer": "^11.0.1", "jspdf": "^4.0.0", diff --git a/src/app/[locale]/(protected)/boards/[boardCode]/[postId]/page.tsx b/src/app/[locale]/(protected)/boards/[boardCode]/[postId]/page.tsx index 1112484a..5706161c 100644 --- a/src/app/[locale]/(protected)/boards/[boardCode]/[postId]/page.tsx +++ b/src/app/[locale]/(protected)/boards/[boardCode]/[postId]/page.tsx @@ -30,6 +30,7 @@ import { import { getBoardByCode } from '@/components/board/BoardManagement/actions'; import { transformApiToComment, type CommentApiData } from '@/components/customer-center/shared/types'; import type { PostApiData } from '@/components/customer-center/shared/types'; +import { sanitizeHTML } from '@/lib/sanitize'; interface BoardPost { id: string; @@ -300,7 +301,7 @@ function DynamicBoardDetailContent({ boardCode, postId }: { boardCode: string; p
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx index 296187f0..7d8430f3 100644 --- a/src/app/[locale]/layout.tsx +++ b/src/app/[locale]/layout.tsx @@ -96,7 +96,7 @@ export default async function RootLayout({ return ( - + {children} diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.ts index c01eb69c..7181e19b 100644 --- a/src/app/api/auth/login/route.ts +++ b/src/app/api/auth/login/route.ts @@ -180,7 +180,9 @@ export async function POST(request: NextRequest) { `Max-Age=${data.expires_in || 7200}`, ].join('; '); - console.log('✅ Login successful - Access & Refresh tokens stored in HttpOnly cookies'); + if (process.env.NODE_ENV === 'development') { + console.log('✅ Login successful - tokens stored in HttpOnly cookies'); + } const response = NextResponse.json(responseData, { status: 200 }); diff --git a/src/app/api/proxy/[...path]/route.ts b/src/app/api/proxy/[...path]/route.ts index 09836503..2382902c 100644 --- a/src/app/api/proxy/[...path]/route.ts +++ b/src/app/api/proxy/[...path]/route.ts @@ -112,10 +112,10 @@ async function proxyRequest( if (['POST', 'PUT', 'DELETE', 'PATCH'].includes(method)) { if (contentType.includes('application/json')) { body = await request.text(); - console.log('🔵 [PROXY] Request:', method, url.toString()); - console.log('🔵 [PROXY] Request Body:', body); + if (process.env.NODE_ENV === 'development') { + console.log('🔵 [PROXY] Request:', method, url.pathname); + } } else if (contentType.includes('multipart/form-data')) { - console.log('📎 [PROXY] Processing multipart/form-data request'); isFormData = true; const originalFormData = await request.formData(); @@ -124,18 +124,20 @@ async function proxyRequest( for (const [key, value] of originalFormData.entries()) { if (value instanceof File) { newFormData.append(key, value, value.name); - console.log(`📎 [PROXY] File field: ${key} = ${value.name} (${value.size} bytes)`); } else { newFormData.append(key, value); - console.log(`📎 [PROXY] Form field: ${key} = ${value}`); } } body = newFormData; - console.log('🔵 [PROXY] Request:', method, url.toString()); + if (process.env.NODE_ENV === 'development') { + console.log('🔵 [PROXY] Request:', method, url.pathname); + } } } else { - console.log('🔵 [PROXY] Request:', method, url.toString()); + if (process.env.NODE_ENV === 'development') { + console.log('🔵 [PROXY] Request:', method, url.pathname); + } } // 4. 헤더 구성 @@ -159,7 +161,9 @@ async function proxyRequest( // 6. 인증 실패 → 쿠키 삭제 + 401 반환 if (authFailed) { - console.warn('🔴 [PROXY] Auth failed, clearing cookies...'); + if (process.env.NODE_ENV === 'development') { + console.warn('🔴 [PROXY] Auth failed, clearing cookies...'); + } const clearResponse = NextResponse.json( { error: 'Authentication failed', needsReauth: true }, { status: 401 } @@ -171,7 +175,9 @@ async function proxyRequest( } // 7. 응답 처리 (바이너리 vs 텍스트/JSON) - console.log('🔵 [PROXY] Response status:', backendResponse.status); + if (process.env.NODE_ENV === 'development') { + console.log('🔵 [PROXY] Response status:', backendResponse.status); + } const responseContentType = backendResponse.headers.get('content-type') || 'application/json'; const isBinaryResponse = @@ -186,7 +192,9 @@ async function proxyRequest( let clientResponse: NextResponse; if (isBinaryResponse) { - console.log('📄 [PROXY] Binary response detected:', responseContentType); + if (process.env.NODE_ENV === 'development') { + console.log('📄 [PROXY] Binary response detected:', responseContentType); + } const binaryData = await backendResponse.arrayBuffer(); clientResponse = new NextResponse(binaryData, { @@ -213,7 +221,9 @@ async function proxyRequest( createTokenCookies(newTokens).forEach(cookie => { clientResponse.headers.append('Set-Cookie', cookie); }); - console.log('🍪 [PROXY] New tokens set in cookies'); + if (process.env.NODE_ENV === 'development') { + console.log('🍪 [PROXY] New tokens set in cookies'); + } } return clientResponse; diff --git a/src/components/accounting/BadDebtCollection/actions.ts b/src/components/accounting/BadDebtCollection/actions.ts index f0220373..bfc00283 100644 --- a/src/components/accounting/BadDebtCollection/actions.ts +++ b/src/components/accounting/BadDebtCollection/actions.ts @@ -14,20 +14,13 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { revalidatePath } from 'next/cache'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { BadDebtRecord, BadDebtItem, CollectionStatus } from './types'; -// ============================================ -// API 응답 타입 정의 -// ============================================ +const API_URL = process.env.NEXT_PUBLIC_API_URL; -interface ApiResponse { - success: boolean; - data: T; - message: string; -} +// ===== API 응답 타입 ===== interface PaginatedResponse { current_page: number; @@ -37,7 +30,6 @@ interface PaginatedResponse { last_page: number; } -// API 개별 악성채권 타입 interface BadDebtItemApiData { id: number; debt_amount: number; @@ -45,13 +37,9 @@ interface BadDebtItemApiData { overdue_days: number; is_active: boolean; occurred_at: string | null; - assigned_user?: { - id: number; - name: string; - } | null; + assigned_user?: { id: number; name: string } | null; } -// API 악성채권 데이터 타입 (거래처 기준) interface BadDebtApiData { id: number; client_id: number; @@ -64,23 +52,15 @@ interface BadDebtApiData { email: string | null; address: string | null; client_type: string | null; - // 집계 데이터 total_debt_amount: number; max_overdue_days: number; bad_debt_count: number; - // 대표 상태 status: 'collecting' | 'legal_action' | 'recovered' | 'bad_debt'; is_active: boolean; - // 담당자 - assigned_user?: { - id: number; - name: string; - } | null; - // 개별 악성채권 목록 + assigned_user?: { id: number; name: string } | null; bad_debts: BadDebtItemApiData[]; } -// 통계 API 응답 타입 interface BadDebtSummaryApiData { total_amount: number; collecting_amount: number; @@ -94,15 +74,8 @@ interface BadDebtSummaryApiData { bad_debt_count: number; } -// ============================================ -// 헬퍼 함수 -// ============================================ +// ===== 헬퍼 함수 ===== -/** - * API 상태 → 프론트엔드 상태 변환 - * API: legal_action, bad_debt (snake_case) - * Frontend: legalAction, badDebt (camelCase) - */ function mapApiStatusToFrontend(apiStatus: string): CollectionStatus { switch (apiStatus) { case 'collecting': return 'collecting'; @@ -113,9 +86,6 @@ function mapApiStatusToFrontend(apiStatus: string): CollectionStatus { } } -/** - * 프론트엔드 상태 → API 상태 변환 - */ function mapFrontendStatusToApi(status: CollectionStatus): string { switch (status) { case 'collecting': return 'collecting'; @@ -126,50 +96,31 @@ function mapFrontendStatusToApi(status: CollectionStatus): string { } } -/** - * API client_type → 프론트엔드 vendorType 변환 - */ function mapClientTypeToVendorType(clientType?: string | null): 'sales' | 'purchase' | 'both' { switch (clientType) { - case 'customer': - case 'sales': - return 'sales'; - case 'supplier': - case 'purchase': - return 'purchase'; - default: - return 'both'; + case 'customer': case 'sales': return 'sales'; + case 'supplier': case 'purchase': return 'purchase'; + default: return 'both'; } } -/** - * API 데이터 → 프론트엔드 타입 변환 (거래처 기준) - */ function transformApiToFrontend(apiData: BadDebtApiData): BadDebtRecord { const manager = apiData.assigned_user; const firstBadDebt = apiData.bad_debts?.[0]; return { - id: String(apiData.id), // Client ID + id: String(apiData.id), vendorId: String(apiData.client_id), vendorCode: apiData.client_code || '', vendorName: apiData.client_name || '거래처 없음', businessNumber: apiData.business_no || '', representativeName: '', vendorType: mapClientTypeToVendorType(apiData.client_type), - businessType: '', - businessCategory: '', - zipCode: '', - address1: apiData.address || '', - address2: '', - phone: apiData.phone || '', - mobile: apiData.mobile || '', - fax: '', - email: apiData.email || '', - contactName: apiData.contact_person || '', - contactPhone: '', - systemManager: '', - // 집계 데이터 + businessType: '', businessCategory: '', zipCode: '', + address1: apiData.address || '', address2: '', + phone: apiData.phone || '', mobile: apiData.mobile || '', + fax: '', email: apiData.email || '', + contactName: apiData.contact_person || '', contactPhone: '', systemManager: '', debtAmount: apiData.total_debt_amount || 0, badDebtCount: apiData.bad_debt_count || 0, status: mapApiStatusToFrontend(apiData.status), @@ -179,36 +130,19 @@ function transformApiToFrontend(apiData: BadDebtApiData): BadDebtRecord { endDate: null, assignedManagerId: manager ? String(manager.id) : null, assignedManager: manager ? { - id: String(manager.id), - departmentName: '', - name: manager.name, - position: '', - phone: '', + id: String(manager.id), departmentName: '', name: manager.name, position: '', phone: '', } : null, settingToggle: apiData.is_active, - // 개별 악성채권 목록 badDebts: (apiData.bad_debts || []).map(bd => ({ - id: String(bd.id), - debtAmount: bd.debt_amount || 0, - status: mapApiStatusToFrontend(bd.status), - overdueDays: bd.overdue_days || 0, - isActive: bd.is_active, - occurredAt: bd.occurred_at, - assignedManager: bd.assigned_user ? { - id: String(bd.assigned_user.id), - name: bd.assigned_user.name, - } : null, + id: String(bd.id), debtAmount: bd.debt_amount || 0, + status: mapApiStatusToFrontend(bd.status), overdueDays: bd.overdue_days || 0, + isActive: bd.is_active, occurredAt: bd.occurred_at, + assignedManager: bd.assigned_user ? { id: String(bd.assigned_user.id), name: bd.assigned_user.name } : null, })), - files: [], - memos: [], - createdAt: '', - updatedAt: '', + files: [], memos: [], createdAt: '', updatedAt: '', }; } -/** - * 프론트엔드 데이터 → API 요청 형식 변환 - */ function transformFrontendToApi(data: Partial): Record { return { client_id: data.vendorId ? parseInt(data.vendorId) : null, @@ -223,382 +157,131 @@ function transformFrontendToApi(data: Partial): Record { - try { - const searchParams = new URLSearchParams(); - - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('size', String(params.size)); - if (params?.status && params.status !== 'all') { - searchParams.set('status', mapFrontendStatusToApi(params.status as CollectionStatus)); - } - if (params?.client_id && params.client_id !== 'all') { - searchParams.set('client_id', params.client_id); - } - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - console.error('[BadDebtActions] GET list error:', error.message); - return []; - } - - if (!response?.ok) { - console.error('[BadDebtActions] GET list error:', response?.status); - return []; - } - - const result: ApiResponse> = await response.json(); - - if (!result.success || !result.data?.data) { - console.warn('[BadDebtActions] No data in response'); - return []; - } - - return result.data.data.map(transformApiToFrontend); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] getBadDebts error:', error); - return []; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('size', String(params.size)); + if (params?.status && params.status !== 'all') { + searchParams.set('status', mapFrontendStatusToApi(params.status as CollectionStatus)); } + if (params?.client_id && params.client_id !== 'all') { + searchParams.set('client_id', params.client_id); + } + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bad-debts?${searchParams.toString()}`, + transform: (data: PaginatedResponse) => data.data.map(transformApiToFrontend), + errorMessage: '악성채권 목록 조회에 실패했습니다.', + }); + return result.data || []; } -/** - * 악성채권 상세 조회 - */ +// ===== 악성채권 상세 조회 ===== export async function getBadDebtById(id: string): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts/${id}`, - { method: 'GET' } - ); - - if (error) { - console.error('[BadDebtActions] GET detail error:', error.message); - return null; - } - - if (!response?.ok) { - console.error('[BadDebtActions] GET detail error:', response?.status); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!result.success || !result.data) { - return null; - } - - return transformApiToFrontend(result.data); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] getBadDebtById error:', error); - return null; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bad-debts/${id}`, + transform: (data: BadDebtApiData) => transformApiToFrontend(data), + errorMessage: '악성채권 조회에 실패했습니다.', + }); + return result.data || null; } -/** - * 악성채권 통계 조회 - */ +// ===== 악성채권 통계 조회 ===== export async function getBadDebtSummary(): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts/summary`, - { method: 'GET' } - ); - - if (error) { - console.error('[BadDebtActions] GET summary error:', error.message); - return null; - } - - if (!response?.ok) { - console.error('[BadDebtActions] GET summary error:', response?.status); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!result.success || !result.data) { - return null; - } - - return result.data; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] getBadDebtSummary error:', error); - return null; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bad-debts/summary`, + errorMessage: '악성채권 통계 조회에 실패했습니다.', + }); + return result.data || null; } -/** - * 악성채권 등록 - */ +// ===== 악성채권 등록 ===== export async function createBadDebt( data: Partial -): Promise<{ success: boolean; data?: BadDebtRecord; error?: string }> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[BadDebtActions] POST request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '악성채권 등록에 실패했습니다.', - }; - } - - revalidatePath('/accounting/bad-debt-collection'); - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] createBadDebt error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bad-debts`, + method: 'POST', + body: transformFrontendToApi(data), + transform: (data: BadDebtApiData) => transformApiToFrontend(data), + errorMessage: '악성채권 등록에 실패했습니다.', + }); + if (result.success) revalidatePath('/accounting/bad-debt-collection'); + return result; } -/** - * 악성채권 수정 - */ +// ===== 악성채권 수정 ===== export async function updateBadDebt( id: string, data: Partial -): Promise<{ success: boolean; data?: BadDebtRecord; error?: string }> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[BadDebtActions] PUT request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '악성채권 수정에 실패했습니다.', - }; - } - - revalidatePath('/accounting/bad-debt-collection'); - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] updateBadDebt error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bad-debts/${id}`, + method: 'PUT', + body: transformFrontendToApi(data), + transform: (data: BadDebtApiData) => transformApiToFrontend(data), + errorMessage: '악성채권 수정에 실패했습니다.', + }); + if (result.success) revalidatePath('/accounting/bad-debt-collection'); + return result; } -/** - * 악성채권 삭제 - */ -export async function deleteBadDebt(id: string): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts/${id}`, - { method: 'DELETE' } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '악성채권 삭제에 실패했습니다.', - }; - } - - revalidatePath('/accounting/bad-debt-collection'); - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] deleteBadDebt error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +// ===== 악성채권 삭제 ===== +export async function deleteBadDebt(id: string): Promise { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bad-debts/${id}`, + method: 'DELETE', + errorMessage: '악성채권 삭제에 실패했습니다.', + }); + if (result.success) revalidatePath('/accounting/bad-debt-collection'); + return result; } -/** - * 악성채권 활성화 토글 - */ -export async function toggleBadDebt(id: string): Promise<{ success: boolean; data?: BadDebtRecord; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts/${id}/toggle`, - { method: 'PATCH' } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '상태 변경에 실패했습니다.', - }; - } - - revalidatePath('/accounting/bad-debt-collection'); - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] toggleBadDebt error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +// ===== 악성채권 활성화 토글 ===== +export async function toggleBadDebt(id: string): Promise> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bad-debts/${id}/toggle`, + method: 'PATCH', + transform: (data: BadDebtApiData) => transformApiToFrontend(data), + errorMessage: '상태 변경에 실패했습니다.', + }); + if (result.success) revalidatePath('/accounting/bad-debt-collection'); + return result; } -/** - * 악성채권 메모 추가 - */ +// ===== 악성채권 메모 추가 ===== export async function addBadDebtMemo( badDebtId: string, content: string -): Promise<{ success: boolean; data?: { id: string; content: string; createdAt: string; createdBy: string }; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts/${badDebtId}/memos`, - { - method: 'POST', - body: JSON.stringify({ content }), - } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '메모 추가에 실패했습니다.', - }; - } - - const memo = result.data; - return { - success: true, - data: { - id: String(memo.id), - content: memo.content, - createdAt: memo.created_at, - createdBy: memo.created_by_user?.name || '사용자', - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] addBadDebtMemo error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bad-debts/${badDebtId}/memos`, + method: 'POST', + body: { content }, + transform: (memo: { id: number; content: string; created_at: string; created_by_user?: { name: string } | null }) => ({ + id: String(memo.id), + content: memo.content, + createdAt: memo.created_at, + createdBy: memo.created_by_user?.name || '사용자', + }), + errorMessage: '메모 추가에 실패했습니다.', + }); } -/** - * 악성채권 메모 삭제 - */ +// ===== 악성채권 메모 삭제 ===== export async function deleteBadDebtMemo( badDebtId: string, memoId: string -): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bad-debts/${badDebtId}/memos/${memoId}`, - { method: 'DELETE' } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '메모 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BadDebtActions] deleteBadDebtMemo error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/bad-debts/${badDebtId}/memos/${memoId}`, + method: 'DELETE', + errorMessage: '메모 삭제에 실패했습니다.', + }); } \ No newline at end of file diff --git a/src/components/accounting/BankTransactionInquiry/actions.ts b/src/components/accounting/BankTransactionInquiry/actions.ts index 14054b47..e583d11a 100644 --- a/src/components/accounting/BankTransactionInquiry/actions.ts +++ b/src/components/accounting/BankTransactionInquiry/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { BankTransaction, TransactionKind } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface BankTransactionApiItem { id: number; @@ -33,22 +34,20 @@ interface BankTransactionApiSummary { withdrawal_unset_count: number; } -interface BankAccountOption { - id: number; - label: string; -} - -interface PaginationMeta { +interface BankTransactionPaginatedResponse { + data: BankTransactionApiItem[]; current_page: number; last_page: number; per_page: number; total: number; } +interface FrontendPagination { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: FrontendPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + // ===== API → Frontend 변환 ===== function transformItem(item: BankTransactionApiItem): BankTransaction { return { - // 입금/출금 테이블이 별도이므로 type을 접두어로 붙여 고유 ID 생성 id: `${item.type}-${item.id}`, bankName: item.bank_name, accountName: item.account_name, @@ -70,217 +69,62 @@ function transformItem(item: BankTransactionApiItem): BankTransaction { // ===== 입출금 통합 목록 조회 ===== export async function getBankTransactionList(params?: { - page?: number; - perPage?: number; - startDate?: string; - endDate?: string; - bankAccountId?: number; - transactionType?: string; - search?: string; - sortBy?: string; - sortDir?: 'asc' | 'desc'; -}): Promise<{ - success: boolean; - data: BankTransaction[]; - pagination: { - currentPage: number; - lastPage: number; - perPage: number; - total: number; - }; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + page?: number; perPage?: number; startDate?: string; endDate?: string; + bankAccountId?: number; transactionType?: string; search?: string; + sortBy?: string; sortDir?: 'asc' | 'desc'; +}): Promise<{ success: boolean; data: BankTransaction[]; pagination: FrontendPagination; error?: string }> { + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('per_page', String(params.perPage)); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + if (params?.bankAccountId) searchParams.set('bank_account_id', String(params.bankAccountId)); + if (params?.transactionType) searchParams.set('transaction_type', params.transactionType); + if (params?.search) searchParams.set('search', params.search); + if (params?.sortBy) searchParams.set('sort_by', params.sortBy); + if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); + const queryString = searchParams.toString(); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('per_page', String(params.perPage)); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.bankAccountId) searchParams.set('bank_account_id', String(params.bankAccountId)); - if (params?.transactionType) searchParams.set('transaction_type', params.transactionType); - if (params?.search) searchParams.set('search', params.search); - if (params?.sortBy) searchParams.set('sort_by', params.sortBy); - if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-transactions${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - }; - } - - if (!response?.ok) { - console.warn('[BankTransactionActions] GET bank-transactions error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '은행 거래 조회에 실패했습니다.', - }; - } - - const paginationData = result.data; - const items = (paginationData?.data || []).map(transformItem); - const meta: PaginationMeta = { - current_page: paginationData?.current_page || 1, - last_page: paginationData?.last_page || 1, - per_page: paginationData?.per_page || 20, - total: paginationData?.total || items.length, - }; - - return { - success: true, - data: items, - pagination: { - currentPage: meta.current_page, - lastPage: meta.last_page, - perPage: meta.per_page, - total: meta.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BankTransactionActions] getBankTransactionList error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bank-transactions${queryString ? `?${queryString}` : ''}`, + transform: (data: BankTransactionPaginatedResponse) => ({ + items: (data?.data || []).map(transformItem), + pagination: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 20, total: data?.total || 0 }, + }), + errorMessage: '은행 거래 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 입출금 요약 통계 ===== export async function getBankTransactionSummary(params?: { - startDate?: string; - endDate?: string; -}): Promise<{ - success: boolean; - data?: { - totalDeposit: number; - totalWithdrawal: number; - depositUnsetCount: number; - withdrawalUnsetCount: number; - }; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + startDate?: string; endDate?: string; +}): Promise> { + const searchParams = new URLSearchParams(); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + const queryString = searchParams.toString(); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-transactions/summary${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[BankTransactionActions] GET summary error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '요약 조회에 실패했습니다.', - }; - } - - const apiSummary: BankTransactionApiSummary = result.data; - - return { - success: true, - data: { - totalDeposit: apiSummary.total_deposit, - totalWithdrawal: apiSummary.total_withdrawal, - depositUnsetCount: apiSummary.deposit_unset_count, - withdrawalUnsetCount: apiSummary.withdrawal_unset_count, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BankTransactionActions] getBankTransactionSummary error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/bank-transactions/summary${queryString ? `?${queryString}` : ''}`, + transform: (data: BankTransactionApiSummary) => ({ + totalDeposit: data.total_deposit, + totalWithdrawal: data.total_withdrawal, + depositUnsetCount: data.deposit_unset_count, + withdrawalUnsetCount: data.withdrawal_unset_count, + }), + errorMessage: '요약 조회에 실패했습니다.', + }); } // ===== 계좌 목록 조회 (필터용) ===== export async function getBankAccountOptions(): Promise<{ - success: boolean; - data: { id: number; label: string }[]; - error?: string; + success: boolean; data: { id: number; label: string }[]; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-transactions/accounts`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - console.warn('[BankTransactionActions] GET accounts error:', response?.status); - return { - success: false, - data: [], - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '계좌 목록 조회에 실패했습니다.', - }; - } - - return { - success: true, - data: result.data as BankAccountOption[], - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BankTransactionActions] getBankAccountOptions error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bank-transactions/accounts`, + transform: (data: { id: number; label: string }[]) => data, + errorMessage: '계좌 목록 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } \ No newline at end of file diff --git a/src/components/accounting/BillManagement/actions.ts b/src/components/accounting/BillManagement/actions.ts index 15cbf39c..52867bea 100644 --- a/src/components/accounting/BillManagement/actions.ts +++ b/src/components/accounting/BillManagement/actions.ts @@ -1,426 +1,157 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { BillRecord, BillApiData, BillStatus } from './types'; import { transformApiToFrontend, transformFrontendToApi } from './types'; const API_URL = process.env.NEXT_PUBLIC_API_URL; +// ===== API 응답 타입 ===== +interface BillPaginatedResponse { + data: BillApiData[]; + current_page: number; + last_page: number; + per_page: number; + total: number; +} + +interface BillSummaryApiData { + total_amount: number; + total_count: number; + by_type: Record; + by_status: Record; + maturity_alert_amount: number; +} + +interface FrontendPagination { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: FrontendPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + // ===== 어음 목록 조회 ===== export async function getBills(params: { - search?: string; - billType?: string; - status?: string; - clientId?: string; - isElectronic?: boolean; - issueStartDate?: string; - issueEndDate?: string; - maturityStartDate?: string; - maturityEndDate?: string; - sortBy?: string; - sortDir?: string; - perPage?: number; - page?: number; -}): Promise<{ - success: boolean; - data: BillRecord[]; - pagination: { - currentPage: number; - lastPage: number; - perPage: number; - total: number; - }; - error?: string; - __authError?: boolean; -}> { - try { - const queryParams = new URLSearchParams(); + search?: string; billType?: string; status?: string; clientId?: string; + isElectronic?: boolean; issueStartDate?: string; issueEndDate?: string; + maturityStartDate?: string; maturityEndDate?: string; + sortBy?: string; sortDir?: string; perPage?: number; page?: number; +}): Promise<{ success: boolean; data: BillRecord[]; pagination: FrontendPagination; error?: string }> { + const queryParams = new URLSearchParams(); + if (params.search) queryParams.append('search', params.search); + if (params.billType && params.billType !== 'all') queryParams.append('bill_type', params.billType); + if (params.status && params.status !== 'all') queryParams.append('status', params.status); + if (params.clientId) queryParams.append('client_id', params.clientId); + if (params.isElectronic !== undefined) queryParams.append('is_electronic', String(params.isElectronic)); + if (params.issueStartDate) queryParams.append('issue_start_date', params.issueStartDate); + if (params.issueEndDate) queryParams.append('issue_end_date', params.issueEndDate); + if (params.maturityStartDate) queryParams.append('maturity_start_date', params.maturityStartDate); + if (params.maturityEndDate) queryParams.append('maturity_end_date', params.maturityEndDate); + if (params.sortBy) queryParams.append('sort_by', params.sortBy); + if (params.sortDir) queryParams.append('sort_dir', params.sortDir); + if (params.perPage) queryParams.append('per_page', String(params.perPage)); + if (params.page) queryParams.append('page', String(params.page)); + const queryString = queryParams.toString(); - if (params.search) queryParams.append('search', params.search); - if (params.billType && params.billType !== 'all') queryParams.append('bill_type', params.billType); - if (params.status && params.status !== 'all') queryParams.append('status', params.status); - if (params.clientId) queryParams.append('client_id', params.clientId); - if (params.isElectronic !== undefined) queryParams.append('is_electronic', String(params.isElectronic)); - if (params.issueStartDate) queryParams.append('issue_start_date', params.issueStartDate); - if (params.issueEndDate) queryParams.append('issue_end_date', params.issueEndDate); - if (params.maturityStartDate) queryParams.append('maturity_start_date', params.maturityStartDate); - if (params.maturityEndDate) queryParams.append('maturity_end_date', params.maturityEndDate); - if (params.sortBy) queryParams.append('sort_by', params.sortBy); - if (params.sortDir) queryParams.append('sort_dir', params.sortDir); - if (params.perPage) queryParams.append('per_page', String(params.perPage)); - if (params.page) queryParams.append('page', String(params.page)); - - const { response, error } = await serverFetch( - `${API_URL}/api/v1/bills?${queryParams.toString()}`, - { method: 'GET' } - ); - - if (error?.__authError) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - __authError: true, - }; - } - - if (!response) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error?.message || 'Failed to fetch bills', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || 'Failed to fetch bills', - }; - } - - const paginatedData = result.data as { - data: BillApiData[]; - current_page: number; - last_page: number; - per_page: number; - total: number; - }; - - return { - success: true, - data: paginatedData.data.map(transformApiToFrontend), - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getBills] Error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: 'Server error', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bills${queryString ? `?${queryString}` : ''}`, + transform: (data: BillPaginatedResponse) => ({ + items: (data?.data || []).map(transformApiToFrontend), + pagination: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 20, total: data?.total || 0 }, + }), + errorMessage: '어음 목록 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 어음 상세 조회 ===== -export async function getBill(id: string): Promise<{ - success: boolean; - data?: BillRecord; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${API_URL}/api/v1/bills/${id}`, - { method: 'GET' } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || 'Failed to fetch bill' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || 'Failed to fetch bill' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data as BillApiData), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getBill] Error:', error); - return { success: false, error: 'Server error' }; - } +export async function getBill(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bills/${id}`, + transform: (data: BillApiData) => transformApiToFrontend(data), + errorMessage: '어음 조회에 실패했습니다.', + }); } // ===== 어음 등록 ===== -export async function createBill( - data: Partial -): Promise<{ success: boolean; data?: BillRecord; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[createBill] Sending data:', JSON.stringify(apiData, null, 2)); - - const { response, error } = await serverFetch( - `${API_URL}/api/v1/bills`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || 'Failed to create bill' }; - } - - const result = await response.json(); - console.log('[createBill] Response:', result); - - if (!response.ok || !result.success) { - if (result.errors) { - const errorMessages = Object.values(result.errors).flat().join(', '); - return { success: false, error: errorMessages || result.message || 'Failed to create bill' }; - } - return { success: false, error: result.message || 'Failed to create bill' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data as BillApiData), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[createBill] Error:', error); - return { success: false, error: 'Server error' }; - } +export async function createBill(data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bills`, + method: 'POST', + body: transformFrontendToApi(data), + transform: (d: BillApiData) => transformApiToFrontend(d), + errorMessage: '어음 등록에 실패했습니다.', + }); } // ===== 어음 수정 ===== -export async function updateBill( - id: string, - data: Partial -): Promise<{ success: boolean; data?: BillRecord; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[updateBill] Sending data:', JSON.stringify(apiData, null, 2)); - - const { response, error } = await serverFetch( - `${API_URL}/api/v1/bills/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || 'Failed to update bill' }; - } - - const result = await response.json(); - console.log('[updateBill] Response:', result); - - if (!response.ok || !result.success) { - if (result.errors) { - const errorMessages = Object.values(result.errors).flat().join(', '); - return { success: false, error: errorMessages || result.message || 'Failed to update bill' }; - } - return { success: false, error: result.message || 'Failed to update bill' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data as BillApiData), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[updateBill] Error:', error); - return { success: false, error: 'Server error' }; - } +export async function updateBill(id: string, data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bills/${id}`, + method: 'PUT', + body: transformFrontendToApi(data), + transform: (d: BillApiData) => transformApiToFrontend(d), + errorMessage: '어음 수정에 실패했습니다.', + }); } // ===== 어음 삭제 ===== -export async function deleteBill(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${API_URL}/api/v1/bills/${id}`, - { method: 'DELETE' } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || 'Failed to delete bill' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || 'Failed to delete bill' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteBill] Error:', error); - return { success: false, error: 'Server error' }; - } +export async function deleteBill(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/bills/${id}`, + method: 'DELETE', + errorMessage: '어음 삭제에 실패했습니다.', + }); } // ===== 어음 상태 변경 ===== -export async function updateBillStatus( - id: string, - status: BillStatus -): Promise<{ success: boolean; data?: BillRecord; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${API_URL}/api/v1/bills/${id}/status`, - { - method: 'PATCH', - body: JSON.stringify({ status }), - } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || 'Failed to update bill status' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || 'Failed to update bill status' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data as BillApiData), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[updateBillStatus] Error:', error); - return { success: false, error: 'Server error' }; - } +export async function updateBillStatus(id: string, status: BillStatus): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bills/${id}/status`, + method: 'PATCH', + body: { status }, + transform: (data: BillApiData) => transformApiToFrontend(data), + errorMessage: '어음 상태 변경에 실패했습니다.', + }); } // ===== 어음 요약 조회 ===== export async function getBillSummary(params: { - billType?: string; - issueStartDate?: string; - issueEndDate?: string; - maturityStartDate?: string; - maturityEndDate?: string; -}): Promise<{ - success: boolean; - data?: { - totalAmount: number; - totalCount: number; - byType: Record; - byStatus: Record; - maturityAlertAmount: number; - }; - error?: string; - __authError?: boolean; -}> { - try { - const queryParams = new URLSearchParams(); + billType?: string; issueStartDate?: string; issueEndDate?: string; + maturityStartDate?: string; maturityEndDate?: string; +}): Promise; + byStatus: Record; + maturityAlertAmount: number; +}>> { + const queryParams = new URLSearchParams(); + if (params.billType && params.billType !== 'all') queryParams.append('bill_type', params.billType); + if (params.issueStartDate) queryParams.append('issue_start_date', params.issueStartDate); + if (params.issueEndDate) queryParams.append('issue_end_date', params.issueEndDate); + if (params.maturityStartDate) queryParams.append('maturity_start_date', params.maturityStartDate); + if (params.maturityEndDate) queryParams.append('maturity_end_date', params.maturityEndDate); + const queryString = queryParams.toString(); - if (params.billType && params.billType !== 'all') queryParams.append('bill_type', params.billType); - if (params.issueStartDate) queryParams.append('issue_start_date', params.issueStartDate); - if (params.issueEndDate) queryParams.append('issue_end_date', params.issueEndDate); - if (params.maturityStartDate) queryParams.append('maturity_start_date', params.maturityStartDate); - if (params.maturityEndDate) queryParams.append('maturity_end_date', params.maturityEndDate); - - const { response, error } = await serverFetch( - `${API_URL}/api/v1/bills/summary?${queryParams.toString()}`, - { method: 'GET' } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || 'Failed to fetch summary' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || 'Failed to fetch summary' }; - } - - return { - success: true, - data: { - totalAmount: result.data.total_amount, - totalCount: result.data.total_count, - byType: result.data.by_type, - byStatus: result.data.by_status, - maturityAlertAmount: result.data.maturity_alert_amount, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getBillSummary] Error:', error); - return { success: false, error: 'Server error' }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/bills/summary${queryString ? `?${queryString}` : ''}`, + transform: (data: BillSummaryApiData) => ({ + totalAmount: data.total_amount, + totalCount: data.total_count, + byType: data.by_type, + byStatus: data.by_status, + maturityAlertAmount: data.maturity_alert_amount, + }), + errorMessage: '어음 요약 조회에 실패했습니다.', + }); } // ===== 거래처 목록 조회 ===== -export async function getClients(): Promise<{ - success: boolean; - data?: { id: number; name: string }[]; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${API_URL}/api/v1/clients?per_page=100`, - { method: 'GET' } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || 'Failed to fetch clients' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || 'Failed to fetch clients' }; - } - - const clients = result.data?.data || result.data || []; - - return { - success: true, - data: clients.map((c: { id: number; name: string }) => ({ - id: c.id, - name: c.name, - })), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getClients] Error:', error); - return { success: false, error: 'Server error' }; - } +export async function getClients(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/clients?per_page=100`, + transform: (data: { data?: { id: number; name: string }[] } | { id: number; name: string }[]) => { + type ClientApi = { id: number; name: string }; + const clients: ClientApi[] = Array.isArray(data) ? data : (data as { data?: ClientApi[] })?.data || []; + return clients.map(c => ({ id: c.id, name: c.name })); + }, + errorMessage: '거래처 조회에 실패했습니다.', + }); } diff --git a/src/components/accounting/CardTransactionInquiry/actions.ts b/src/components/accounting/CardTransactionInquiry/actions.ts index 0cb860e5..44edff6d 100644 --- a/src/components/accounting/CardTransactionInquiry/actions.ts +++ b/src/components/accounting/CardTransactionInquiry/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { CardTransaction } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface CardTransactionApiItem { id: number; @@ -20,10 +21,7 @@ interface CardTransactionApiItem { card_company: string; card_number_last4: string; card_name: string; - assigned_user: { - id: number; - name: string; - } | null; + assigned_user: { id: number; name: string } | null; } | null; usage_type?: string; created_at: string; @@ -37,34 +35,30 @@ interface CardTransactionApiSummary { total_amount: number; } -interface PaginationMeta { +interface CardPaginatedResponse { + data: CardTransactionApiItem[]; current_page: number; last_page: number; per_page: number; total: number; } +interface FrontendPagination { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: FrontendPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + // ===== API → Frontend 변환 ===== function transformItem(item: CardTransactionApiItem): CardTransaction { const card = item.card; - const cardDisplay = card - ? `${card.card_company} ${card.card_number_last4}` - : '-'; - const cardName = card?.card_name || '-'; - const userName = card?.assigned_user?.name || '-'; - - // 사용일시: used_at이 있으면 사용, 없으면 withdrawal_date + 00:00 + const cardDisplay = card ? `${card.card_company} ${card.card_number_last4}` : '-'; const usedAtRaw = item.used_at || item.withdrawal_date; const usedAtDate = new Date(usedAtRaw); - const usedAt = item.used_at - ? usedAtDate.toISOString().slice(0, 16).replace('T', ' ') - : item.withdrawal_date; + const usedAt = item.used_at ? usedAtDate.toISOString().slice(0, 16).replace('T', ' ') : item.withdrawal_date; return { id: String(item.id), card: cardDisplay, - cardName, - user: userName, + cardName: card?.card_name || '-', + user: card?.assigned_user?.name || '-', usedAt, merchantName: item.merchant_name || item.description || '-', amount: typeof item.amount === 'string' ? parseFloat(item.amount) : item.amount, @@ -76,432 +70,129 @@ function transformItem(item: CardTransactionApiItem): CardTransaction { // ===== 카드 거래 목록 조회 ===== export async function getCardTransactionList(params?: { - page?: number; - perPage?: number; - startDate?: string; - endDate?: string; - cardId?: number; - search?: string; - sortBy?: string; - sortDir?: 'asc' | 'desc'; -}): Promise<{ - success: boolean; - data: CardTransaction[]; - pagination: { - currentPage: number; - lastPage: number; - perPage: number; - total: number; - }; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + page?: number; perPage?: number; startDate?: string; endDate?: string; + cardId?: number; search?: string; sortBy?: string; sortDir?: 'asc' | 'desc'; +}): Promise<{ success: boolean; data: CardTransaction[]; pagination: FrontendPagination; error?: string }> { + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('per_page', String(params.perPage)); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + if (params?.cardId) searchParams.set('card_id', String(params.cardId)); + if (params?.search) searchParams.set('search', params.search); + if (params?.sortBy) searchParams.set('sort_by', params.sortBy); + if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); + const queryString = searchParams.toString(); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('per_page', String(params.perPage)); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.cardId) searchParams.set('card_id', String(params.cardId)); - if (params?.search) searchParams.set('search', params.search); - if (params?.sortBy) searchParams.set('sort_by', params.sortBy); - if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/card-transactions${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - }; - } - - if (!response?.ok) { - console.warn('[CardTransactionActions] GET card-transactions error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '카드 거래 조회에 실패했습니다.', - }; - } - - const paginationData = result.data; - const items = (paginationData?.data || []).map(transformItem); - const meta: PaginationMeta = { - current_page: paginationData?.current_page || 1, - last_page: paginationData?.last_page || 1, - per_page: paginationData?.per_page || 20, - total: paginationData?.total || items.length, - }; - - return { - success: true, - data: items, - pagination: { - currentPage: meta.current_page, - lastPage: meta.last_page, - perPage: meta.per_page, - total: meta.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CardTransactionActions] getCardTransactionList error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/card-transactions${queryString ? `?${queryString}` : ''}`, + transform: (data: CardPaginatedResponse) => ({ + items: (data?.data || []).map(transformItem), + pagination: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 20, total: data?.total || 0 }, + }), + errorMessage: '카드 거래 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 카드 거래 요약 통계 ===== export async function getCardTransactionSummary(params?: { - startDate?: string; - endDate?: string; -}): Promise<{ - success: boolean; - data?: { - previousMonthTotal: number; - currentMonthTotal: number; - totalCount: number; - totalAmount: number; - }; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + startDate?: string; endDate?: string; +}): Promise> { + const searchParams = new URLSearchParams(); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + const queryString = searchParams.toString(); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/card-transactions/summary${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[CardTransactionActions] GET summary error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '요약 조회에 실패했습니다.', - }; - } - - const apiSummary: CardTransactionApiSummary = result.data; - - return { - success: true, - data: { - previousMonthTotal: apiSummary.previous_month_total, - currentMonthTotal: apiSummary.current_month_total, - totalCount: apiSummary.total_count, - totalAmount: apiSummary.total_amount, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CardTransactionActions] getCardTransactionSummary error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/card-transactions/summary${queryString ? `?${queryString}` : ''}`, + transform: (data: CardTransactionApiSummary) => ({ + previousMonthTotal: data.previous_month_total, + currentMonthTotal: data.current_month_total, + totalCount: data.total_count, + totalAmount: data.total_amount, + }), + errorMessage: '요약 조회에 실패했습니다.', + }); } // ===== 카드 거래 단건 조회 ===== -export async function getCardTransactionById(id: string): Promise<{ - success: boolean; - data?: CardTransaction; - error?: string; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/card-transactions/${id}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '조회에 실패했습니다.' }; - } - - return { - success: true, - data: transformItem(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CardTransactionActions] getCardTransactionById error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function getCardTransactionById(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/card-transactions/${id}`, + transform: (data: CardTransactionApiItem) => transformItem(data), + errorMessage: '조회에 실패했습니다.', + }); } // ===== 카드 거래 등록 ===== export async function createCardTransaction(data: { - cardId?: number; - usedAt: string; - merchantName: string; - amount: number; - memo?: string; - usageType?: string; -}): Promise<{ - success: boolean; - data?: CardTransaction; - error?: string; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/card-transactions`; - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({ - card_id: data.cardId, - used_at: data.usedAt, - merchant_name: data.merchantName, - amount: data.amount, - description: data.memo, - account_code: data.usageType === 'unset' ? null : data.usageType, - }), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '등록에 실패했습니다.' }; - } - - return { - success: true, - data: transformItem(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CardTransactionActions] createCardTransaction error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + cardId?: number; usedAt: string; merchantName: string; amount: number; memo?: string; usageType?: string; +}): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/card-transactions`, + method: 'POST', + body: { + card_id: data.cardId, used_at: data.usedAt, merchant_name: data.merchantName, + amount: data.amount, description: data.memo, + account_code: data.usageType === 'unset' ? null : data.usageType, + }, + transform: (data: CardTransactionApiItem) => transformItem(data), + errorMessage: '등록에 실패했습니다.', + }); } // ===== 카드 거래 수정 ===== -export async function updateCardTransaction( - id: string, - data: { - usedAt?: string; - merchantName?: string; - amount?: number; - memo?: string; - usageType?: string; - } -): Promise<{ - success: boolean; - data?: CardTransaction; - error?: string; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/card-transactions/${id}`; - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify({ - used_at: data.usedAt, - merchant_name: data.merchantName, - amount: data.amount, - description: data.memo, - account_code: data.usageType === 'unset' ? null : data.usageType, - }), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '수정에 실패했습니다.' }; - } - - return { - success: true, - data: transformItem(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CardTransactionActions] updateCardTransaction error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function updateCardTransaction(id: string, data: { + usedAt?: string; merchantName?: string; amount?: number; memo?: string; usageType?: string; +}): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/card-transactions/${id}`, + method: 'PUT', + body: { + used_at: data.usedAt, merchant_name: data.merchantName, amount: data.amount, + description: data.memo, account_code: data.usageType === 'unset' ? null : data.usageType, + }, + transform: (data: CardTransactionApiItem) => transformItem(data), + errorMessage: '수정에 실패했습니다.', + }); } // ===== 카드 거래 삭제 ===== -export async function deleteCardTransaction(id: string): Promise<{ - success: boolean; - error?: string; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/card-transactions/${id}`; - const { response, error } = await serverFetch(url, { method: 'DELETE' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CardTransactionActions] deleteCardTransaction error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function deleteCardTransaction(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/card-transactions/${id}`, + method: 'DELETE', + errorMessage: '삭제에 실패했습니다.', + }); } // ===== 카드 목록 조회 (등록 폼용) ===== export async function getCardList(): Promise<{ - success: boolean; - data: Array<{ id: number; name: string; cardNumber: string }>; - error?: string; + success: boolean; data: Array<{ id: number; name: string; cardNumber: string }>; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/cards`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const cards = (result.data?.data || result.data || []).map((card: { - id: number; - card_name: string; - card_company: string; - card_number_last4: string; - }) => ({ - id: card.id, - name: card.card_name, - cardNumber: `${card.card_company} ${card.card_number_last4}`, - })); - - return { success: true, data: cards }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CardTransactionActions] getCardList error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/cards`, + transform: (data: { data?: { id: number; card_name: string; card_company: string; card_number_last4: string }[] } | { id: number; card_name: string; card_company: string; card_number_last4: string }[]) => { + type CardApi = { id: number; card_name: string; card_company: string; card_number_last4: string }; + const cards: CardApi[] = Array.isArray(data) ? data : (data as { data?: CardApi[] })?.data || []; + return cards.map(c => ({ id: c.id, name: c.card_name, cardNumber: `${c.card_company} ${c.card_number_last4}` })); + }, + errorMessage: '카드 목록 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 계정과목 일괄 수정 ===== -export async function bulkUpdateAccountCode( - ids: number[], - accountCode: string -): Promise<{ - success: boolean; - updatedCount?: number; - error?: string; +export async function bulkUpdateAccountCode(ids: number[], accountCode: string): Promise<{ + success: boolean; updatedCount?: number; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/card-transactions/bulk-update-account`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify({ ids, account_code: accountCode }), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[CardTransactionActions] PUT bulk-update-account error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '계정과목 수정에 실패했습니다.', - }; - } - - return { - success: true, - updatedCount: result.data?.updated_count || 0, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CardTransactionActions] bulkUpdateAccountCode error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/card-transactions/bulk-update-account`, + method: 'PUT', + body: { ids, account_code: accountCode }, + transform: (data: { updated_count?: number }) => ({ updatedCount: data?.updated_count || 0 }), + errorMessage: '계정과목 수정에 실패했습니다.', + }); + return { success: result.success, updatedCount: result.data?.updatedCount, error: result.error }; } \ No newline at end of file diff --git a/src/components/accounting/DailyReport/actions.ts b/src/components/accounting/DailyReport/actions.ts index 88f8d9d2..ac84f635 100644 --- a/src/components/accounting/DailyReport/actions.ts +++ b/src/components/accounting/DailyReport/actions.ts @@ -3,9 +3,11 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { cookies } from 'next/headers'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { NoteReceivableItem, DailyAccountItem, MatchStatus } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface NoteReceivableItemApi { id: string; @@ -32,239 +34,87 @@ interface DailyReportSummaryApi { note_receivable_total: number; foreign_currency_total: number; cash_asset_total: number; - krw_totals: { - carryover: number; - income: number; - expense: number; - balance: number; - }; - usd_totals: { - carryover: number; - income: number; - expense: number; - balance: number; - }; + krw_totals: { carryover: number; income: number; expense: number; balance: number }; + usd_totals: { carryover: number; income: number; expense: number; balance: number }; } // ===== API → Frontend 변환 ===== function transformNoteReceivable(item: NoteReceivableItemApi): NoteReceivableItem { return { - id: item.id, - content: item.content, - currentBalance: item.current_balance, - issueDate: item.issue_date, - dueDate: item.due_date, + id: item.id, content: item.content, currentBalance: item.current_balance, + issueDate: item.issue_date, dueDate: item.due_date, }; } function transformDailyAccount(item: DailyAccountItemApi): DailyAccountItem { return { - id: item.id, - category: item.category, - matchStatus: item.match_status, - carryover: item.carryover, - income: item.income, - expense: item.expense, - balance: item.balance, - currency: item.currency, + id: item.id, category: item.category, matchStatus: item.match_status, + carryover: item.carryover, income: item.income, expense: item.expense, + balance: item.balance, currency: item.currency, }; } // ===== 어음 및 외상매출채권 현황 조회 ===== export async function getNoteReceivables(params?: { date?: string; -}): Promise<{ - success: boolean; - data: NoteReceivableItem[]; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); +}): Promise<{ success: boolean; data: NoteReceivableItem[]; error?: string }> { + const searchParams = new URLSearchParams(); + if (params?.date) searchParams.set('date', params.date); + const queryString = searchParams.toString(); - if (params?.date) searchParams.set('date', params.date); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/daily-report/note-receivables${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - console.warn('[DailyReportActions] GET note-receivables error:', response?.status); - return { - success: false, - data: [], - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '어음 현황 조회에 실패했습니다.', - }; - } - - const items = (result.data || []).map(transformNoteReceivable); - - return { - success: true, - data: items, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DailyReportActions] getNoteReceivables error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/daily-report/note-receivables${queryString ? `?${queryString}` : ''}`, + transform: (data: NoteReceivableItemApi[]) => (data || []).map(transformNoteReceivable), + errorMessage: '어음 현황 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 일별 계좌 현황 조회 ===== export async function getDailyAccounts(params?: { date?: string; -}): Promise<{ - success: boolean; - data: DailyAccountItem[]; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); +}): Promise<{ success: boolean; data: DailyAccountItem[]; error?: string }> { + const searchParams = new URLSearchParams(); + if (params?.date) searchParams.set('date', params.date); + const queryString = searchParams.toString(); - if (params?.date) searchParams.set('date', params.date); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/daily-report/daily-accounts${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - console.warn('[DailyReportActions] GET daily-accounts error:', response?.status); - return { - success: false, - data: [], - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '계좌 현황 조회에 실패했습니다.', - }; - } - - const items = (result.data || []).map(transformDailyAccount); - - return { - success: true, - data: items, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DailyReportActions] getDailyAccounts error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/daily-report/daily-accounts${queryString ? `?${queryString}` : ''}`, + transform: (data: DailyAccountItemApi[]) => (data || []).map(transformDailyAccount), + errorMessage: '계좌 현황 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 일일 보고서 요약 조회 ===== export async function getDailyReportSummary(params?: { date?: string; -}): Promise<{ - success: boolean; - data?: { - date: string; - dayOfWeek: string; - noteReceivableTotal: number; - foreignCurrencyTotal: number; - cashAssetTotal: number; - krwTotals: { - carryover: number; - income: number; - expense: number; - balance: number; - }; - usdTotals: { - carryover: number; - income: number; - expense: number; - balance: number; - }; - }; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); +}): Promise> { + const searchParams = new URLSearchParams(); + if (params?.date) searchParams.set('date', params.date); + const queryString = searchParams.toString(); - if (params?.date) searchParams.set('date', params.date); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/daily-report/summary${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[DailyReportActions] GET summary error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '요약 조회에 실패했습니다.', - }; - } - - const apiSummary: DailyReportSummaryApi = result.data; - - return { - success: true, - data: { - date: apiSummary.date, - dayOfWeek: apiSummary.day_of_week, - noteReceivableTotal: apiSummary.note_receivable_total, - foreignCurrencyTotal: apiSummary.foreign_currency_total, - cashAssetTotal: apiSummary.cash_asset_total, - krwTotals: apiSummary.krw_totals, - usdTotals: apiSummary.usd_totals, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DailyReportActions] getDailyReportSummary error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/daily-report/summary${queryString ? `?${queryString}` : ''}`, + transform: (data: DailyReportSummaryApi) => ({ + date: data.date, + dayOfWeek: data.day_of_week, + noteReceivableTotal: data.note_receivable_total, + foreignCurrencyTotal: data.foreign_currency_total, + cashAssetTotal: data.cash_asset_total, + krwTotals: data.krw_totals, + usdTotals: data.usd_totals, + }), + errorMessage: '요약 조회에 실패했습니다.', + }); } // ===== 일일 보고서 엑셀 다운로드 ===== @@ -288,38 +138,25 @@ export async function exportDailyReportExcel(params?: { const searchParams = new URLSearchParams(); if (params?.date) searchParams.set('date', params.date); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/daily-report/export${queryString ? `?${queryString}` : ''}`; - const response = await fetch(url, { - method: 'GET', - headers, - }); + const response = await fetch( + `${API_URL}/api/v1/daily-report/export${queryString ? `?${queryString}` : ''}`, + { method: 'GET', headers } + ); if (!response.ok) { - console.warn('[DailyReportActions] GET export error:', response.status); - return { - success: false, - error: `API 오류: ${response.status}`, - }; + return { success: false, error: `API 오류: ${response.status}` }; } const blob = await response.blob(); const contentDisposition = response.headers.get('Content-Disposition'); const filename = contentDisposition?.match(/filename="?(.+)"?/)?.[1] || `일일일보_${params?.date || 'today'}.xlsx`; - return { - success: true, - data: blob, - filename, - }; + return { success: true, data: blob, filename }; } catch (error) { if (isNextRedirectError(error)) throw error; console.error('[DailyReportActions] exportDailyReportExcel error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + return { success: false, error: '서버 오류가 발생했습니다.' }; } } \ No newline at end of file diff --git a/src/components/accounting/DepositManagement/actions.ts b/src/components/accounting/DepositManagement/actions.ts index f302413f..8ac58a09 100644 --- a/src/components/accounting/DepositManagement/actions.ts +++ b/src/components/accounting/DepositManagement/actions.ts @@ -1,56 +1,56 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { DepositRecord, DepositType, DepositStatus } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface DepositApiData { id: number; tenant_id: number; deposit_date: string; - amount: number | string; // API 실제 필드명 - client_id: number | null; // API 실제 필드명 - client_name: string | null; // API 실제 필드명 + amount: number | string; + client_id: number | null; + client_name: string | null; bank_account_id: number | null; - payment_method: string | null; // API 실제 필드명 (결제수단) - account_code: string | null; // API 실제 필드명 (계정과목) - description: string | null; // API 실제 필드명 + payment_method: string | null; + account_code: string | null; + description: string | null; reference_type: string | null; reference_id: number | null; created_at: string; updated_at: string; - // 관계 데이터 client?: { id: number; name: string } | null; bank_account?: { id: number; bank_name: string; account_name: string } | null; } -interface PaginationMeta { +interface DepositPaginatedResponse { + data: DepositApiData[]; current_page: number; last_page: number; per_page: number; total: number; } +interface FrontendPagination { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: FrontendPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + // ===== API → Frontend 변환 ===== function transformApiToFrontend(apiData: DepositApiData): DepositRecord { return { id: String(apiData.id), depositDate: apiData.deposit_date, - depositAmount: typeof apiData.amount === 'string' - ? parseFloat(apiData.amount) - : (apiData.amount ?? 0), + depositAmount: typeof apiData.amount === 'string' ? parseFloat(apiData.amount) : (apiData.amount ?? 0), bankAccountId: apiData.bank_account_id ? String(apiData.bank_account_id) : '', - accountName: apiData.bank_account - ? `${apiData.bank_account.bank_name} ${apiData.bank_account.account_name}` - : '', + accountName: apiData.bank_account ? `${apiData.bank_account.bank_name} ${apiData.bank_account.account_name}` : '', depositorName: apiData.client_name || apiData.client?.name || '', note: apiData.description || '', depositType: (apiData.account_code || 'unset') as DepositType, vendorId: apiData.client_id ? String(apiData.client_id) : '', vendorName: apiData.client?.name || apiData.client_name || '', - status: 'inputWaiting' as DepositStatus, // API에 status 필드 없음 - 기본값 + status: 'inputWaiting' as DepositStatus, createdAt: apiData.created_at, updatedAt: apiData.updated_at, }; @@ -59,318 +59,133 @@ function transformApiToFrontend(apiData: DepositApiData): DepositRecord { // ===== Frontend → API 변환 ===== function transformFrontendToApi(data: Partial): Record { const result: Record = {}; - if (data.depositDate !== undefined) result.deposit_date = data.depositDate; if (data.depositAmount !== undefined) result.amount = data.depositAmount; if (data.depositorName !== undefined) result.client_name = data.depositorName; if (data.note !== undefined) result.description = data.note || null; - // 'unset'은 미설정 상태이므로 API에 null로 전송 if (data.depositType !== undefined) { result.account_code = data.depositType === 'unset' ? null : data.depositType; } if (data.vendorId !== undefined) result.client_id = data.vendorId ? parseInt(data.vendorId, 10) : null; - // 계좌 ID if (data.bankAccountId !== undefined) { result.bank_account_id = data.bankAccountId ? parseInt(data.bankAccountId, 10) : null; } - // payment_method는 API 필수 필드 - 기본값 'transfer'(계좌이체) - // 유효값: cash, transfer, card, check result.payment_method = 'transfer'; - return result; } // ===== 입금 내역 조회 ===== export async function getDeposits(params?: { - page?: number; - perPage?: number; - startDate?: string; - endDate?: string; - depositType?: string; - vendor?: string; - search?: string; -}): Promise<{ - success: boolean; - data: DepositRecord[]; - pagination: { - currentPage: number; - lastPage: number; - perPage: number; - total: number; - }; - error?: string; -}> { + page?: number; perPage?: number; startDate?: string; endDate?: string; + depositType?: string; vendor?: string; search?: string; +}): Promise<{ success: boolean; data: DepositRecord[]; pagination: FrontendPagination; error?: string }> { const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); if (params?.perPage) searchParams.set('per_page', String(params.perPage)); if (params?.startDate) searchParams.set('start_date', params.startDate); if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.depositType && params.depositType !== 'all') { - searchParams.set('deposit_type', params.depositType); - } - if (params?.vendor && params.vendor !== 'all') { - searchParams.set('vendor', params.vendor); - } + if (params?.depositType && params.depositType !== 'all') searchParams.set('deposit_type', params.depositType); + if (params?.vendor && params.vendor !== 'all') searchParams.set('vendor', params.vendor); if (params?.search) searchParams.set('search', params.search); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/deposits${queryString ? `?${queryString}` : ''}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - }; - } - - if (!response?.ok) { - console.warn('[DepositActions] GET deposits error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '입금 내역 조회에 실패했습니다.', - }; - } - - // API 응답 구조 처리: { data: { data: [...], current_page: ... } } 또는 { data: [...], meta: {...} } - const isPaginatedResponse = result.data && typeof result.data === 'object' && 'data' in result.data && Array.isArray(result.data.data); - const rawData = isPaginatedResponse ? result.data.data : (Array.isArray(result.data) ? result.data : []); - const deposits = rawData.map(transformApiToFrontend); - - const meta: PaginationMeta = isPaginatedResponse - ? { - current_page: result.data.current_page || 1, - last_page: result.data.last_page || 1, - per_page: result.data.per_page || 20, - total: result.data.total || deposits.length, - } - : result.meta || { - current_page: 1, - last_page: 1, - per_page: 20, - total: deposits.length, + const result = await executeServerAction({ + url: `${API_URL}/api/v1/deposits${queryString ? `?${queryString}` : ''}`, + transform: (data: DepositPaginatedResponse | DepositApiData[]) => { + const isPaginated = !Array.isArray(data) && data && 'data' in data; + const rawData = isPaginated ? (data as DepositPaginatedResponse).data : (Array.isArray(data) ? data : []); + const items = rawData.map(transformApiToFrontend); + const meta = isPaginated + ? (data as DepositPaginatedResponse) + : { current_page: 1, last_page: 1, per_page: 20, total: items.length }; + return { + items, + pagination: { currentPage: meta.current_page || 1, lastPage: meta.last_page || 1, perPage: meta.per_page || 20, total: meta.total || items.length }, }; - - return { - success: true, - data: deposits, - pagination: { - currentPage: meta.current_page, - lastPage: meta.last_page, - perPage: meta.per_page, - total: meta.total, }, - }; + errorMessage: '입금 내역 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 입금 내역 삭제 ===== -export async function deleteDeposit(id: string): Promise<{ success: boolean; error?: string }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/deposits/${id}`; - const { response, error } = await serverFetch(url, { method: 'DELETE' }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '입금 내역 삭제에 실패했습니다.' }; - } - - return { success: true }; +export async function deleteDeposit(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/deposits/${id}`, + method: 'DELETE', + errorMessage: '입금 내역 삭제에 실패했습니다.', + }); } // ===== 계정과목명 일괄 저장 ===== -export async function updateDepositTypes( - ids: string[], - depositType: string -): Promise<{ success: boolean; error?: string }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/deposits/bulk-update-type`; - const { response, error } = await serverFetch(url, { +export async function updateDepositTypes(ids: string[], depositType: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/deposits/bulk-update-type`, method: 'PUT', - body: JSON.stringify({ - ids: ids.map(id => parseInt(id, 10)), - deposit_type: depositType, - }), + body: { ids: ids.map(id => parseInt(id, 10)), deposit_type: depositType }, + errorMessage: '계정과목명 저장에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '계정과목명 저장에 실패했습니다.' }; - } - - return { success: true }; } // ===== 입금 상세 조회 ===== -export async function getDepositById(id: string): Promise<{ - success: boolean; - data?: DepositRecord; - error?: string; -}> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/deposits/${id}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.error('[DepositActions] GET deposit error:', response?.status); - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { success: false, error: result.message || '입금 내역 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; +export async function getDepositById(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/deposits/${id}`, + transform: (data: DepositApiData) => transformApiToFrontend(data), + errorMessage: '입금 내역 조회에 실패했습니다.', + }); } // ===== 입금 등록 ===== -export async function createDeposit( - data: Partial -): Promise<{ success: boolean; data?: DepositRecord; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[DepositActions] POST deposit request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/deposits`; - const { response, error } = await serverFetch(url, { +export async function createDeposit(data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/deposits`, method: 'POST', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: DepositApiData) => transformApiToFrontend(data), + errorMessage: '입금 등록에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[DepositActions] POST deposit response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '입금 등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } // ===== 입금 수정 ===== -export async function updateDeposit( - id: string, - data: Partial -): Promise<{ success: boolean; data?: DepositRecord; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[DepositActions] PUT deposit request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/deposits/${id}`; - const { response, error } = await serverFetch(url, { +export async function updateDeposit(id: string, data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/deposits/${id}`, method: 'PUT', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: DepositApiData) => transformApiToFrontend(data), + errorMessage: '입금 수정에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[DepositActions] PUT deposit response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '입금 수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } // ===== 거래처 목록 조회 ===== export async function getVendors(): Promise<{ - success: boolean; - data: { id: string; name: string }[]; - error?: string; + success: boolean; data: { id: string; name: string }[]; error?: string; }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients?per_page=100`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const clients = result.data?.data || result.data || []; - - return { - success: true, - data: clients.map((c: { id: number; name: string }) => ({ - id: String(c.id), - name: c.name, - })), - }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/clients?per_page=100`, + transform: (data: { data?: { id: number; name: string }[] } | { id: number; name: string }[]) => { + type ClientApi = { id: number; name: string }; + const clients: ClientApi[] = Array.isArray(data) ? data : (data as { data?: ClientApi[] })?.data || []; + return clients.map(c => ({ id: String(c.id), name: c.name })); + }, + errorMessage: '거래처 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 계좌 목록 조회 ===== export async function getBankAccounts(): Promise<{ - success: boolean; - data: { id: string; name: string }[]; - error?: string; + success: boolean; data: { id: string; name: string }[]; error?: string; }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts?per_page=100`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const accounts = result.data?.data || result.data || []; - - return { - success: true, - data: accounts.map((a: { id: number; account_name: string; bank_name: string }) => ({ - id: String(a.id), - name: `${a.bank_name} ${a.account_name}`, - })), - }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts?per_page=100`, + transform: (data: { data?: { id: number; account_name: string; bank_name: string }[] } | { id: number; account_name: string; bank_name: string }[]) => { + type AccountApi = { id: number; account_name: string; bank_name: string }; + const accounts: AccountApi[] = Array.isArray(data) ? data : (data as { data?: AccountApi[] })?.data || []; + return accounts.map(a => ({ id: String(a.id), name: `${a.bank_name} ${a.account_name}` })); + }, + errorMessage: '계좌 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } diff --git a/src/components/accounting/ExpectedExpenseManagement/actions.ts b/src/components/accounting/ExpectedExpenseManagement/actions.ts index e72cd588..0fe2ff95 100644 --- a/src/components/accounting/ExpectedExpenseManagement/actions.ts +++ b/src/components/accounting/ExpectedExpenseManagement/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { ExpectedExpenseRecord, TransactionType, PaymentStatus, ApprovalStatus } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface ExpectedExpenseApiData { id: number; @@ -22,18 +23,12 @@ interface ExpectedExpenseApiData { description: string | null; created_at: string; updated_at: string; - client?: { - id: number; - name: string; - } | null; - bank_account?: { - id: number; - bank_name: string; - account_name: string; - } | null; + client?: { id: number; name: string } | null; + bank_account?: { id: number; bank_name: string; account_name: string } | null; } -interface PaginationMeta { +interface ExpensePaginatedResponse { + data: ExpectedExpenseApiData[]; current_page: number; last_page: number; per_page: number; @@ -48,6 +43,9 @@ interface SummaryData { by_month: Record; } +interface FrontendPagination { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: FrontendPagination = { currentPage: 1, lastPage: 1, perPage: 50, total: 0 }; + // ===== API → Frontend 변환 ===== function transformApiToFrontend(apiData: ExpectedExpenseApiData): ExpectedExpenseRecord { return { @@ -55,14 +53,10 @@ function transformApiToFrontend(apiData: ExpectedExpenseApiData): ExpectedExpens expectedPaymentDate: apiData.expected_payment_date, settlementDate: apiData.settlement_date || '', transactionType: (apiData.transaction_type || 'other') as TransactionType, - amount: typeof apiData.amount === 'string' - ? parseFloat(apiData.amount) - : apiData.amount, + amount: typeof apiData.amount === 'string' ? parseFloat(apiData.amount) : apiData.amount, vendorId: apiData.client_id ? String(apiData.client_id) : '', vendorName: apiData.client_name || apiData.client?.name || '', - bankAccount: apiData.bank_account - ? `${apiData.bank_account.bank_name} ${apiData.bank_account.account_name}` - : '', + bankAccount: apiData.bank_account ? `${apiData.bank_account.bank_name} ${apiData.bank_account.account_name}` : '', accountSubject: apiData.account_code || '', paymentStatus: (apiData.payment_status || 'pending') as PaymentStatus, approvalStatus: (apiData.approval_status || 'none') as ApprovalStatus, @@ -75,7 +69,6 @@ function transformApiToFrontend(apiData: ExpectedExpenseApiData): ExpectedExpens // ===== Frontend → API 변환 ===== function transformFrontendToApi(data: Partial): Record { const result: Record = {}; - if (data.expectedPaymentDate !== undefined) result.expected_payment_date = data.expectedPaymentDate; if (data.settlementDate !== undefined) result.settlement_date = data.settlementDate || null; if (data.transactionType !== undefined) result.transaction_type = data.transactionType; @@ -86,518 +79,152 @@ function transformFrontendToApi(data: Partial): Record { - try { - const searchParams = new URLSearchParams(); + page?: number; perPage?: number; startDate?: string; endDate?: string; + transactionType?: string; paymentStatus?: string; approvalStatus?: string; + clientId?: string; search?: string; sortBy?: string; sortDir?: 'asc' | 'desc'; +}): Promise<{ success: boolean; data: ExpectedExpenseRecord[]; pagination: FrontendPagination; error?: string }> { + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('per_page', String(params.perPage)); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + if (params?.transactionType && params.transactionType !== 'all') searchParams.set('transaction_type', params.transactionType); + if (params?.paymentStatus && params.paymentStatus !== 'all') searchParams.set('payment_status', params.paymentStatus); + if (params?.approvalStatus && params.approvalStatus !== 'all') searchParams.set('approval_status', params.approvalStatus); + if (params?.clientId) searchParams.set('client_id', params.clientId); + if (params?.search) searchParams.set('search', params.search); + if (params?.sortBy) searchParams.set('sort_by', params.sortBy); + if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); + const queryString = searchParams.toString(); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('per_page', String(params.perPage)); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.transactionType && params.transactionType !== 'all') { - searchParams.set('transaction_type', params.transactionType); - } - if (params?.paymentStatus && params.paymentStatus !== 'all') { - searchParams.set('payment_status', params.paymentStatus); - } - if (params?.approvalStatus && params.approvalStatus !== 'all') { - searchParams.set('approval_status', params.approvalStatus); - } - if (params?.clientId) searchParams.set('client_id', params.clientId); - if (params?.search) searchParams.set('search', params.search); - if (params?.sortBy) searchParams.set('sort_by', params.sortBy); - if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/expected-expenses${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 50, total: 0 }, - error: error.message, - }; - } - - if (!response?.ok) { - console.warn('[ExpectedExpenseActions] GET expected-expenses error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 50, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 50, total: 0 }, - error: result.message || '미지급비용 조회에 실패했습니다.', - }; - } - - const paginationData = result.data; - const expenses = (paginationData?.data || []).map(transformApiToFrontend); - const meta: PaginationMeta = { - current_page: paginationData?.current_page || 1, - last_page: paginationData?.last_page || 1, - per_page: paginationData?.per_page || 50, - total: paginationData?.total || expenses.length, - }; - - return { - success: true, - data: expenses, - pagination: { - currentPage: meta.current_page, - lastPage: meta.last_page, - perPage: meta.per_page, - total: meta.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] getExpectedExpenses error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 50, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/expected-expenses${queryString ? `?${queryString}` : ''}`, + transform: (data: ExpensePaginatedResponse) => ({ + items: (data?.data || []).map(transformApiToFrontend), + pagination: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 50, total: data?.total || 0 }, + }), + errorMessage: '미지급비용 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 미지급비용 상세 조회 ===== -export async function getExpectedExpenseById(id: string): Promise<{ - success: boolean; - data?: ExpectedExpenseRecord; - error?: string; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/expected-expenses/${id}`, - { method: 'GET' } - ); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.error('[ExpectedExpenseActions] GET expected-expense error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { - success: false, - error: result.message || '미지급비용 조회에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] getExpectedExpenseById error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function getExpectedExpenseById(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/expected-expenses/${id}`, + transform: (data: ExpectedExpenseApiData) => transformApiToFrontend(data), + errorMessage: '미지급비용 조회에 실패했습니다.', + }); } // ===== 미지급비용 등록 ===== -export async function createExpectedExpense( - data: Partial -): Promise<{ success: boolean; data?: ExpectedExpenseRecord; error?: string }> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/expected-expenses`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '미지급비용 등록에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] createExpectedExpense error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function createExpectedExpense(data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/expected-expenses`, + method: 'POST', + body: transformFrontendToApi(data), + transform: (data: ExpectedExpenseApiData) => transformApiToFrontend(data), + errorMessage: '미지급비용 등록에 실패했습니다.', + }); } // ===== 미지급비용 수정 ===== -export async function updateExpectedExpense( - id: string, - data: Partial -): Promise<{ success: boolean; data?: ExpectedExpenseRecord; error?: string }> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/expected-expenses/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '미지급비용 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] updateExpectedExpense error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function updateExpectedExpense(id: string, data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/expected-expenses/${id}`, + method: 'PUT', + body: transformFrontendToApi(data), + transform: (data: ExpectedExpenseApiData) => transformApiToFrontend(data), + errorMessage: '미지급비용 수정에 실패했습니다.', + }); } // ===== 미지급비용 삭제 ===== -export async function deleteExpectedExpense(id: string): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/expected-expenses/${id}`, - { method: 'DELETE' } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '미지급비용 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] deleteExpectedExpense error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function deleteExpectedExpense(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/expected-expenses/${id}`, + method: 'DELETE', + errorMessage: '미지급비용 삭제에 실패했습니다.', + }); } // ===== 미지급비용 일괄 삭제 ===== export async function deleteExpectedExpenses(ids: string[]): Promise<{ - success: boolean; - deletedCount?: number; - error?: string; + success: boolean; deletedCount?: number; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/expected-expenses`, - { - method: 'DELETE', - body: JSON.stringify({ - ids: ids.map(id => parseInt(id, 10)), - }), - } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '미지급비용 일괄 삭제에 실패했습니다.', - }; - } - - return { - success: true, - deletedCount: result.data?.deleted_count, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] deleteExpectedExpenses error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/expected-expenses`, + method: 'DELETE', + body: { ids: ids.map(id => parseInt(id, 10)) }, + transform: (data: { deleted_count?: number }) => ({ deletedCount: data?.deleted_count }), + errorMessage: '미지급비용 일괄 삭제에 실패했습니다.', + }); + return { success: result.success, deletedCount: result.data?.deletedCount, error: result.error }; } // ===== 예상 지급일 일괄 변경 ===== -export async function updateExpectedPaymentDate( - ids: string[], - expectedPaymentDate: string -): Promise<{ - success: boolean; - updatedCount?: number; - error?: string; +export async function updateExpectedPaymentDate(ids: string[], expectedPaymentDate: string): Promise<{ + success: boolean; updatedCount?: number; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/expected-expenses/update-payment-date`, - { - method: 'PUT', - body: JSON.stringify({ - ids: ids.map(id => parseInt(id, 10)), - expected_payment_date: expectedPaymentDate, - }), - } - ); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { - success: false, - error: result?.message || '예상 지급일 변경에 실패했습니다.', - }; - } - - return { - success: true, - updatedCount: result.data?.updated_count, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] updateExpectedPaymentDate error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/expected-expenses/update-payment-date`, + method: 'PUT', + body: { ids: ids.map(id => parseInt(id, 10)), expected_payment_date: expectedPaymentDate }, + transform: (data: { updated_count?: number }) => ({ updatedCount: data?.updated_count }), + errorMessage: '예상 지급일 변경에 실패했습니다.', + }); + return { success: result.success, updatedCount: result.data?.updatedCount, error: result.error }; } // ===== 미지급비용 요약 조회 ===== export async function getExpectedExpenseSummary(params?: { - startDate?: string; - endDate?: string; - paymentStatus?: string; -}): Promise<{ - success: boolean; - data?: SummaryData; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + startDate?: string; endDate?: string; paymentStatus?: string; +}): Promise> { + const searchParams = new URLSearchParams(); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + if (params?.paymentStatus && params.paymentStatus !== 'all') searchParams.set('payment_status', params.paymentStatus); + const queryString = searchParams.toString(); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.paymentStatus && params.paymentStatus !== 'all') { - searchParams.set('payment_status', params.paymentStatus); - } - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/expected-expenses/summary${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[ExpectedExpenseActions] GET summary error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '요약 조회에 실패했습니다.', - }; - } - - return { - success: true, - data: result.data, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] getExpectedExpenseSummary error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/expected-expenses/summary${queryString ? `?${queryString}` : ''}`, + errorMessage: '요약 조회에 실패했습니다.', + }); } // ===== 거래처 목록 조회 ===== export async function getClients(): Promise<{ - success: boolean; - data: { id: string; name: string }[]; - error?: string; + success: boolean; data: { id: string; name: string }[]; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients?per_page=100`, - { method: 'GET' } - ); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const clients = result.data?.data || result.data || []; - - return { - success: true, - data: clients.map((c: { id: number; name: string }) => ({ - id: String(c.id), - name: c.name, - })), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] getClients error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/clients?per_page=100`, + transform: (data: { data?: { id: number; name: string }[] } | { id: number; name: string }[]) => { + type ClientApi = { id: number; name: string }; + const clients: ClientApi[] = Array.isArray(data) ? data : (data as { data?: ClientApi[] })?.data || []; + return clients.map(c => ({ id: String(c.id), name: c.name })); + }, + errorMessage: '거래처 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 은행 계좌 목록 조회 ===== export async function getBankAccounts(): Promise<{ - success: boolean; - data: { id: string; bankName: string; accountName: string; accountNumber: string }[]; - error?: string; + success: boolean; data: { id: string; bankName: string; accountName: string; accountNumber: string }[]; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts?per_page=100`, - { method: 'GET' } - ); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const accounts = result.data?.data || result.data || []; - - return { - success: true, - data: accounts.map((a: { id: number; bank_name: string; account_name: string; account_number: string }) => ({ - id: String(a.id), - bankName: a.bank_name, - accountName: a.account_name, - accountNumber: a.account_number, - })), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ExpectedExpenseActions] getBankAccounts error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts?per_page=100`, + transform: (data: { data?: { id: number; bank_name: string; account_name: string; account_number: string }[] } | { id: number; bank_name: string; account_name: string; account_number: string }[]) => { + type AccountApi = { id: number; bank_name: string; account_name: string; account_number: string }; + const accounts: AccountApi[] = Array.isArray(data) ? data : (data as { data?: AccountApi[] })?.data || []; + return accounts.map(a => ({ id: String(a.id), bankName: a.bank_name, accountName: a.account_name, accountNumber: a.account_number })); + }, + errorMessage: '은행 계좌 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } \ No newline at end of file diff --git a/src/components/accounting/PurchaseManagement/actions.ts b/src/components/accounting/PurchaseManagement/actions.ts index 2f5fed08..c68f40b6 100644 --- a/src/components/accounting/PurchaseManagement/actions.ts +++ b/src/components/accounting/PurchaseManagement/actions.ts @@ -14,9 +14,11 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { PurchaseRecord, PurchaseType } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 데이터 타입 ===== interface PurchaseApiData { id: number; @@ -37,11 +39,7 @@ interface PurchaseApiData { document_number: string; title: string; content?: Record; - form?: { - id: number; - name: string; - category: string; - }; + form?: { id: number; name: string; category: string }; }; tax_invoice_received: boolean; created_at?: string; @@ -56,9 +54,8 @@ interface PurchaseApiPaginatedResponse { total: number; } -// ===== API → Frontend 변환 ===== +// ===== 변환 함수 ===== -// 유효한 purchaseType 값 검증 const VALID_PURCHASE_TYPES: PurchaseType[] = [ 'unset', 'raw_material', 'subsidiary_material', 'product', 'outsourcing', 'consumables', 'repair', 'transportation', 'office_supplies', 'rent', @@ -66,54 +63,32 @@ const VALID_PURCHASE_TYPES: PurchaseType[] = [ ]; function transformApiToFrontend(data: PurchaseApiData): PurchaseRecord { - // purchase_type 변환 (API 값이 유효한지 검증) const purchaseType: PurchaseType = data.purchase_type && VALID_PURCHASE_TYPES.includes(data.purchase_type as PurchaseType) - ? (data.purchase_type as PurchaseType) - : 'unset'; + ? (data.purchase_type as PurchaseType) : 'unset'; - // 품의서/지출결의서 연결 정보 변환 let sourceDocument: PurchaseRecord['sourceDocument'] = undefined; if (data.approval) { - // form.category로 문서 유형 결정 (proposal=품의서, expense_report=지출결의서) const docType = data.approval.form?.category === 'expense_report' ? 'expense_report' : 'proposal'; - // content에서 예상금액 추출 (품의서 양식에 따라 다를 수 있음) const expectedCost = (data.approval.content?.expected_cost as number) || (data.approval.content?.total_amount as number) || 0; - - sourceDocument = { - type: docType, - documentNo: data.approval.document_number, - title: data.approval.title, - expectedCost, - }; + sourceDocument = { type: docType, documentNo: data.approval.document_number, title: data.approval.title, expectedCost }; } return { - id: String(data.id), - purchaseNo: data.purchase_number, - purchaseDate: data.purchase_date, - vendorId: String(data.client_id), - vendorName: data.client?.name || '', - supplyAmount: parseFloat(data.supply_amount) || 0, - vat: parseFloat(data.tax_amount) || 0, - totalAmount: parseFloat(data.total_amount) || 0, - purchaseType, - evidenceType: 'tax_invoice', + id: String(data.id), purchaseNo: data.purchase_number, purchaseDate: data.purchase_date, + vendorId: String(data.client_id), vendorName: data.client?.name || '', + supplyAmount: parseFloat(data.supply_amount) || 0, vat: parseFloat(data.tax_amount) || 0, + totalAmount: parseFloat(data.total_amount) || 0, purchaseType, evidenceType: 'tax_invoice', status: data.status === 'confirmed' ? 'completed' : 'pending', approvalId: data.approval_id ? String(data.approval_id) : undefined, - sourceDocument, - items: [], - taxInvoiceReceived: data.tax_invoice_received ?? false, - createdAt: data.created_at || '', - updatedAt: data.updated_at || '', + sourceDocument, items: [], taxInvoiceReceived: data.tax_invoice_received ?? false, + createdAt: data.created_at || '', updatedAt: data.updated_at || '', }; } -// ===== Frontend → API 변환 ===== function transformFrontendToApi(data: Partial): Record { const result: Record = {}; - if (data.purchaseDate !== undefined) result.purchase_date = data.purchaseDate; if (data.vendorId !== undefined) result.client_id = parseInt(data.vendorId, 10); if (data.supplyAmount !== undefined) result.supply_amount = data.supplyAmount; @@ -122,195 +97,76 @@ function transformFrontendToApi(data: Partial): Record { + page?: number; perPage?: number; startDate?: string; endDate?: string; + clientId?: string; status?: string; search?: string; +}): Promise<{ success: boolean; data: PurchaseRecord[]; pagination: PaginationMeta; error?: string }> { const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); if (params?.perPage) searchParams.set('per_page', String(params.perPage)); if (params?.startDate) searchParams.set('start_date', params.startDate); if (params?.endDate) searchParams.set('end_date', params.endDate); if (params?.clientId) searchParams.set('client_id', params.clientId); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); if (params?.search) searchParams.set('search', params.search); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/purchases${queryString ? `?${queryString}` : ''}`; - console.log('[PurchaseActions] GET purchases:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - }; - } - - if (!response?.ok) { - console.warn('[PurchaseActions] GET purchases error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '매입 목록 조회에 실패했습니다.', - }; - } - - const paginatedData: PurchaseApiPaginatedResponse = result.data || { - data: [], - current_page: 1, - last_page: 1, - per_page: 20, - total: 0, - }; - - const purchases = (paginatedData.data || []).map(transformApiToFrontend); - - return { - success: true, - data: purchases, - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/purchases${queryString ? `?${queryString}` : ''}`, + transform: (data: PurchaseApiPaginatedResponse) => ({ + items: (data?.data || []).map(transformApiToFrontend), + pagination: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 20, total: data?.total || 0 }, + }), + errorMessage: '매입 목록 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 매입 상세 조회 ===== -export async function getPurchaseById(id: string): Promise<{ - success: boolean; - data?: PurchaseRecord; - error?: string; -}> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/purchases/${id}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.error('[PurchaseActions] GET purchase error:', response?.status); - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { success: false, error: result.message || '매입 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; +export async function getPurchaseById(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/purchases/${id}`, + transform: (data: PurchaseApiData) => transformApiToFrontend(data), + errorMessage: '매입 조회에 실패했습니다.', + }); } // ===== 매입 등록 ===== -export async function createPurchase( - data: Partial -): Promise<{ success: boolean; data?: PurchaseRecord; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[PurchaseActions] POST purchase request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/purchases`; - const { response, error } = await serverFetch(url, { +export async function createPurchase(data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/purchases`, method: 'POST', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: PurchaseApiData) => transformApiToFrontend(data), + errorMessage: '매입 등록에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[PurchaseActions] POST purchase response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '매입 등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } // ===== 매입 수정 ===== -export async function updatePurchase( - id: string, - data: Partial -): Promise<{ success: boolean; data?: PurchaseRecord; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[PurchaseActions] PUT purchase request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/purchases/${id}`; - const { response, error } = await serverFetch(url, { +export async function updatePurchase(id: string, data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/purchases/${id}`, method: 'PUT', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: PurchaseApiData) => transformApiToFrontend(data), + errorMessage: '매입 수정에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[PurchaseActions] PUT purchase response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '매입 수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } // ===== 세금계산서 수취 상태 토글 ===== export async function togglePurchaseTaxInvoice( - id: string, - value: boolean -): Promise<{ success: boolean; data?: PurchaseRecord; error?: string }> { + id: string, value: boolean +): Promise> { try { return await updatePurchase(id, { taxInvoiceReceived: value }); } catch (error) { - // 인증 만료 등으로 인한 리다이렉트 에러 → 페이지 이동 없이 에러 반환 if (isNextRedirectError(error)) { return { success: false, error: '세션이 만료되었습니다. 다시 로그인해주세요.' }; } @@ -319,45 +175,22 @@ export async function togglePurchaseTaxInvoice( } // ===== 매입 삭제 ===== -export async function deletePurchase(id: string): Promise<{ success: boolean; error?: string }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/purchases/${id}`; - const { response, error } = await serverFetch(url, { method: 'DELETE' }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[PurchaseActions] DELETE purchase response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '매입 삭제에 실패했습니다.' }; - } - - return { success: true }; +export async function deletePurchase(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/purchases/${id}`, + method: 'DELETE', + errorMessage: '매입 삭제에 실패했습니다.', + }); } // ===== 매입 확정 ===== -export async function confirmPurchase(id: string): Promise<{ - success: boolean; - data?: PurchaseRecord; - error?: string; -}> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/purchases/${id}/confirm`; - const { response, error } = await serverFetch(url, { method: 'PUT' }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[PurchaseActions] PUT confirm response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '매입 확정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; +export async function confirmPurchase(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/purchases/${id}/confirm`, + method: 'PUT', + transform: (data: PurchaseApiData) => transformApiToFrontend(data), + errorMessage: '매입 확정에 실패했습니다.', + }); } // ===== 은행 계좌 목록 조회 ===== @@ -366,34 +199,18 @@ export async function getBankAccounts(): Promise<{ data: { id: string; bankName: string; accountName: string; accountNumber: string }[]; error?: string; }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts?per_page=100`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const accounts = result.data?.data || result.data || []; - - return { - success: true, - data: accounts.map((a: { id: number; bank_name: string; account_name: string; account_number: string }) => ({ - id: String(a.id), - bankName: a.bank_name, - accountName: a.account_name, - accountNumber: a.account_number, - })), - }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts?per_page=100`, + transform: (data: { data?: { id: number; bank_name: string; account_name: string; account_number: string }[] } | { id: number; bank_name: string; account_name: string; account_number: string }[]) => { + type BankAccountApi = { id: number; bank_name: string; account_name: string; account_number: string }; + const accounts: BankAccountApi[] = Array.isArray(data) ? data : (data as { data?: BankAccountApi[] })?.data || []; + return accounts.map(a => ({ + id: String(a.id), bankName: a.bank_name, accountName: a.account_name, accountNumber: a.account_number, + })); + }, + errorMessage: '은행 계좌 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 거래처 목록 조회 ===== @@ -402,30 +219,14 @@ export async function getVendors(): Promise<{ data: { id: string; name: string }[]; error?: string; }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients?per_page=100`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const clients = result.data?.data || result.data || []; - - return { - success: true, - data: clients.map((c: { id: number; name: string }) => ({ - id: String(c.id), - name: c.name, - })), - }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/clients?per_page=100`, + transform: (data: { data?: { id: number; name: string }[] } | { id: number; name: string }[]) => { + type ClientApi = { id: number; name: string }; + const clients: ClientApi[] = Array.isArray(data) ? data : (data as { data?: ClientApi[] })?.data || []; + return clients.map(c => ({ id: String(c.id), name: c.name })); + }, + errorMessage: '거래처 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } \ No newline at end of file diff --git a/src/components/accounting/ReceivablesStatus/actions.ts b/src/components/accounting/ReceivablesStatus/actions.ts index 039f485b..0d15c09a 100644 --- a/src/components/accounting/ReceivablesStatus/actions.ts +++ b/src/components/accounting/ReceivablesStatus/actions.ts @@ -1,18 +1,17 @@ 'use server'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { cookies } from 'next/headers'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; import type { VendorReceivables, CategoryType, MonthlyAmount, ReceivablesListResponse, MemoUpdateRequest } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface CategoryAmountApi { category: CategoryType; - amounts: { - values: number[]; - total: number; - }; + amounts: { values: number[]; total: number }; } interface VendorReceivablesApi { @@ -52,282 +51,93 @@ function transformItem(item: VendorReceivablesApi): VendorReceivables { monthLabels: item.month_labels || [], categories: item.categories.map(cat => ({ category: cat.category, - amounts: { - values: cat.amounts.values, - total: cat.amounts.total, - }, + amounts: { values: cat.amounts.values, total: cat.amounts.total }, })), }; } +// ===== year 파라미터 헬퍼 ===== +function applyYearParam(searchParams: URLSearchParams, year?: number) { + if (typeof year === 'number') { + if (year === 0) searchParams.set('recent_year', 'true'); + else searchParams.set('year', String(year)); + } +} + // ===== 채권 현황 목록 조회 ===== export async function getReceivablesList(params?: { - year?: number; - search?: string; - hasReceivable?: boolean; -}): Promise<{ - success: boolean; - data: ReceivablesListResponse; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + year?: number; search?: string; hasReceivable?: boolean; +}): Promise<{ success: boolean; data: ReceivablesListResponse; error?: string }> { + const searchParams = new URLSearchParams(); + applyYearParam(searchParams, params?.year); + if (params?.search) searchParams.set('search', params.search); + if (params?.hasReceivable !== undefined) searchParams.set('has_receivable', params.hasReceivable ? 'true' : 'false'); + const queryString = searchParams.toString(); - // year=0은 "최근 1년" 옵션 - recent_year 파라미터 사용 - // 명시적으로 year가 숫자이고 0인지 확인 (undefined와 구분) - const yearValue = params?.year; - if (typeof yearValue === 'number') { - if (yearValue === 0) { - searchParams.set('recent_year', 'true'); - } else { - searchParams.set('year', String(yearValue)); - } - } - if (params?.search) searchParams.set('search', params.search); - if (params?.hasReceivable !== undefined) { - searchParams.set('has_receivable', params.hasReceivable ? 'true' : 'false'); - } - - const queryString = searchParams.toString(); - console.log('[ReceivablesActions] getReceivablesList - year:', yearValue, 'queryString:', queryString); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivables${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: { monthLabels: [], items: [] }, error: error.message }; - } - - if (!response?.ok) { - console.warn('[ReceivablesActions] GET receivables error:', response?.status); - return { - success: false, - data: { monthLabels: [], items: [] }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: { monthLabels: [], items: [] }, - error: result.message || '채권 현황 조회에 실패했습니다.', - }; - } - - const apiData: ReceivablesListApiResponse = result.data; - const items = (apiData.items || []).map(transformItem); - - return { - success: true, - data: { - monthLabels: apiData.month_labels || [], - items, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivablesActions] getReceivablesList error:', error); - return { - success: false, - data: { monthLabels: [], items: [] }, - error: '서버 오류가 발생했습니다.', - }; - } + const DEFAULT_DATA: ReceivablesListResponse = { monthLabels: [], items: [] }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivables${queryString ? `?${queryString}` : ''}`, + transform: (data: ReceivablesListApiResponse) => ({ + monthLabels: data.month_labels || [], + items: (data.items || []).map(transformItem), + }), + errorMessage: '채권 현황 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || DEFAULT_DATA, error: result.error }; } // ===== 채권 현황 요약 통계 ===== export async function getReceivablesSummary(params?: { year?: number; -}): Promise<{ - success: boolean; - data?: { - totalCarryForward: number; - totalSales: number; - totalDeposits: number; - totalBills: number; - totalReceivables: number; - vendorCount: number; - overdueVendorCount: number; - }; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); +}): Promise> { + const searchParams = new URLSearchParams(); + applyYearParam(searchParams, params?.year); + const queryString = searchParams.toString(); - // year=0은 "최근 1년" 옵션 - recent_year 파라미터 사용 - const yearValue = params?.year; - if (typeof yearValue === 'number') { - if (yearValue === 0) { - searchParams.set('recent_year', 'true'); - } else { - searchParams.set('year', String(yearValue)); - } - } - - const queryString = searchParams.toString(); - console.log('[ReceivablesActions] getReceivablesSummary - year:', yearValue, 'queryString:', queryString); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivables/summary${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[ReceivablesActions] GET summary error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '요약 조회에 실패했습니다.', - }; - } - - const apiSummary: ReceivablesSummaryApi = result.data; - - return { - success: true, - data: { - totalCarryForward: apiSummary.total_carry_forward, - totalSales: apiSummary.total_sales, - totalDeposits: apiSummary.total_deposits, - totalBills: apiSummary.total_bills, - totalReceivables: apiSummary.total_receivables, - vendorCount: apiSummary.vendor_count, - overdueVendorCount: apiSummary.overdue_vendor_count, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivablesActions] getReceivablesSummary error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/receivables/summary${queryString ? `?${queryString}` : ''}`, + transform: (data: ReceivablesSummaryApi) => ({ + totalCarryForward: data.total_carry_forward, + totalSales: data.total_sales, + totalDeposits: data.total_deposits, + totalBills: data.total_bills, + totalReceivables: data.total_receivables, + vendorCount: data.vendor_count, + overdueVendorCount: data.overdue_vendor_count, + }), + errorMessage: '요약 조회에 실패했습니다.', + }); } // ===== 연체 상태 일괄 업데이트 ===== export async function updateOverdueStatus( updates: Array<{ id: string; isOverdue: boolean }> -): Promise<{ - success: boolean; - updatedCount?: number; - error?: string; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivables/overdue-status`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify({ - updates: updates.map(item => ({ - id: parseInt(item.id, 10), - is_overdue: item.isOverdue, - })), - }), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[ReceivablesActions] PUT overdue-status error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '연체 상태 업데이트에 실패했습니다.', - }; - } - - return { - success: true, - updatedCount: result.data?.updated_count || updates.length, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivablesActions] updateOverdueStatus error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise<{ success: boolean; updatedCount?: number; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivables/overdue-status`, + method: 'PUT', + body: { updates: updates.map(item => ({ id: parseInt(item.id, 10), is_overdue: item.isOverdue })) }, + transform: (data: { updated_count?: number }) => ({ updatedCount: data?.updated_count || updates.length }), + errorMessage: '연체 상태 업데이트에 실패했습니다.', + }); + return { success: result.success, updatedCount: result.data?.updatedCount, error: result.error }; } // ===== 메모 일괄 업데이트 ===== export async function updateMemos( memos: MemoUpdateRequest[] -): Promise<{ - success: boolean; - updatedCount?: number; - error?: string; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivables/memos`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify({ - memos: memos.map(item => ({ - id: parseInt(item.id, 10), - memo: item.memo, - })), - }), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[ReceivablesActions] PUT memos error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '메모 업데이트에 실패했습니다.', - }; - } - - return { - success: true, - updatedCount: result.data?.updated_count || memos.length, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivablesActions] updateMemos error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise<{ success: boolean; updatedCount?: number; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivables/memos`, + method: 'PUT', + body: { memos: memos.map(item => ({ id: parseInt(item.id, 10), memo: item.memo })) }, + transform: (data: { updated_count?: number }) => ({ updatedCount: data?.updated_count || memos.length }), + errorMessage: '메모 업데이트에 실패했습니다.', + }); + return { success: result.success, updatedCount: result.data?.updatedCount, error: result.error }; } // ===== 엑셀 다운로드 ===== diff --git a/src/components/accounting/SalesManagement/actions.ts b/src/components/accounting/SalesManagement/actions.ts index a2d6fea8..ff31c387 100644 --- a/src/components/accounting/SalesManagement/actions.ts +++ b/src/components/accounting/SalesManagement/actions.ts @@ -15,206 +15,81 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; -import type { - SalesRecord, - SaleApiData, - SaleApiPaginatedResponse, -} from './types'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; +import type { SalesRecord, SaleApiData, SaleApiPaginatedResponse } from './types'; import { transformApiToFrontend, transformFrontendToApi } from './types'; -// ===== 페이지네이션 타입 ===== -interface PaginationMeta { - currentPage: number; - lastPage: number; - perPage: number; - total: number; -} +const API_URL = process.env.NEXT_PUBLIC_API_URL; + +interface PaginationMeta { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: PaginationMeta = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; // ===== 매출 목록 조회 ===== export async function getSales(params?: { - page?: number; - perPage?: number; - startDate?: string; - endDate?: string; - clientId?: string; - status?: string; - search?: string; -}): Promise<{ - success: boolean; - data: SalesRecord[]; - pagination: PaginationMeta; - error?: string; -}> { + page?: number; perPage?: number; startDate?: string; endDate?: string; + clientId?: string; status?: string; search?: string; +}): Promise<{ success: boolean; data: SalesRecord[]; pagination: PaginationMeta; error?: string }> { const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); if (params?.perPage) searchParams.set('per_page', String(params.perPage)); if (params?.startDate) searchParams.set('start_date', params.startDate); if (params?.endDate) searchParams.set('end_date', params.endDate); if (params?.clientId) searchParams.set('client_id', params.clientId); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); if (params?.search) searchParams.set('search', params.search); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/sales${queryString ? `?${queryString}` : ''}`; - console.log('[SalesActions] GET sales:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - }; - } - - if (!response?.ok) { - console.warn('[SalesActions] GET sales error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '매출 목록 조회에 실패했습니다.', - }; - } - - // API 응답 구조: { success, data: { data: [], current_page, last_page, per_page, total } } - const paginatedData: SaleApiPaginatedResponse = result.data || { - data: [], - current_page: 1, - last_page: 1, - per_page: 20, - total: 0, - }; - - const sales = (paginatedData.data || []).map(transformApiToFrontend); - - return { - success: true, - data: sales, - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/sales${queryString ? `?${queryString}` : ''}`, + transform: (data: SaleApiPaginatedResponse) => ({ + items: (data?.data || []).map(transformApiToFrontend), + pagination: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 20, total: data?.total || 0 }, + }), + errorMessage: '매출 목록 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 매출 상세 조회 ===== -export async function getSaleById(id: string): Promise<{ - success: boolean; - data?: SalesRecord; - error?: string; -}> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/sales/${id}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.error('[SalesActions] GET sale error:', response?.status); - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { success: false, error: result.message || '매출 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; +export async function getSaleById(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/sales/${id}`, + transform: (data: SaleApiData) => transformApiToFrontend(data), + errorMessage: '매출 조회에 실패했습니다.', + }); } // ===== 매출 등록 ===== -export async function createSale( - data: Partial -): Promise<{ success: boolean; data?: SalesRecord; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[SalesActions] POST sale request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/sales`; - const { response, error } = await serverFetch(url, { +export async function createSale(data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/sales`, method: 'POST', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: SaleApiData) => transformApiToFrontend(data), + errorMessage: '매출 등록에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[SalesActions] POST sale response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '매출 등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } // ===== 매출 수정 ===== -export async function updateSale( - id: string, - data: Partial -): Promise<{ success: boolean; data?: SalesRecord; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[SalesActions] PUT sale request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/sales/${id}`; - const { response, error } = await serverFetch(url, { +export async function updateSale(id: string, data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/sales/${id}`, method: 'PUT', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: SaleApiData) => transformApiToFrontend(data), + errorMessage: '매출 수정에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[SalesActions] PUT sale response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '매출 수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } // ===== 세금계산서/거래명세서 발행 상태 토글 ===== export async function toggleSaleIssuance( - id: string, - field: 'taxInvoiceIssued' | 'transactionStatementIssued', - value: boolean -): Promise<{ success: boolean; data?: SalesRecord; error?: string }> { + id: string, field: 'taxInvoiceIssued' | 'transactionStatementIssued', value: boolean +): Promise> { const updateData: Partial = - field === 'taxInvoiceIssued' - ? { taxInvoiceIssued: value } - : { transactionStatementIssued: value }; - + field === 'taxInvoiceIssued' ? { taxInvoiceIssued: value } : { transactionStatementIssued: value }; try { return await updateSale(id, updateData); } catch (error) { - // 인증 만료 등으로 인한 리다이렉트 에러 → 페이지 이동 없이 에러 반환 if (isNextRedirectError(error)) { return { success: false, error: '세션이 만료되었습니다. 다시 로그인해주세요.' }; } @@ -223,152 +98,58 @@ export async function toggleSaleIssuance( } // ===== 매출 삭제 ===== -export async function deleteSale(id: string): Promise<{ success: boolean; error?: string }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/sales/${id}`; - const { response, error } = await serverFetch(url, { method: 'DELETE' }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[SalesActions] DELETE sale response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '매출 삭제에 실패했습니다.' }; - } - - return { success: true }; +export async function deleteSale(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/sales/${id}`, + method: 'DELETE', + errorMessage: '매출 삭제에 실패했습니다.', + }); } // ===== 매출 확정 ===== -export async function confirmSale(id: string): Promise<{ - success: boolean; - data?: SalesRecord; - error?: string; -}> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/sales/${id}/confirm`; - const { response, error } = await serverFetch(url, { method: 'PUT' }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[SalesActions] PUT confirm response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '매출 확정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; +export async function confirmSale(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/sales/${id}/confirm`, + method: 'PUT', + transform: (data: SaleApiData) => transformApiToFrontend(data), + errorMessage: '매출 확정에 실패했습니다.', + }); } // ===== 매출 요약 통계 ===== -export async function getSalesSummary(params?: { - startDate?: string; - endDate?: string; -}): Promise<{ - success: boolean; - data?: { - totalAmount: number; - totalCount: number; - confirmedAmount: number; - confirmedCount: number; - draftAmount: number; - draftCount: number; - }; - error?: string; -}> { - const searchParams = new URLSearchParams(); +interface SalesSummaryApi { total_amount: string; total_count: number; confirmed_amount: string; confirmed_count: number; draft_amount: string; draft_count: number } +export async function getSalesSummary(params?: { + startDate?: string; endDate?: string; +}): Promise> { + const searchParams = new URLSearchParams(); if (params?.startDate) searchParams.set('start_date', params.startDate); if (params?.endDate) searchParams.set('end_date', params.endDate); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/sales/summary${queryString ? `?${queryString}` : ''}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[SalesActions] GET summary error:', response?.status); - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '매출 요약 조회에 실패했습니다.' }; - } - - // API 응답 → 프론트엔드 형식 변환 - const summary = result.data || {}; - - return { - success: true, - data: { - totalAmount: parseFloat(summary.total_amount) || 0, - totalCount: summary.total_count || 0, - confirmedAmount: parseFloat(summary.confirmed_amount) || 0, - confirmedCount: summary.confirmed_count || 0, - draftAmount: parseFloat(summary.draft_amount) || 0, - draftCount: summary.draft_count || 0, - }, - }; + return executeServerAction({ + url: `${API_URL}/api/v1/sales/summary${queryString ? `?${queryString}` : ''}`, + transform: (data: SalesSummaryApi) => ({ + totalAmount: parseFloat(data.total_amount) || 0, totalCount: data.total_count || 0, + confirmedAmount: parseFloat(data.confirmed_amount) || 0, confirmedCount: data.confirmed_count || 0, + draftAmount: parseFloat(data.draft_amount) || 0, draftCount: data.draft_count || 0, + }), + errorMessage: '매출 요약 조회에 실패했습니다.', + }); } // ===== 계정과목 일괄 수정 ===== export async function bulkUpdateSalesAccountCode( - ids: number[], - accountCode: string -): Promise<{ - success: boolean; - updatedCount?: number; - error?: string; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/sales/bulk-update-account`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify({ ids, account_code: accountCode }), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[SalesActions] PUT bulk-update-account error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '계정과목 수정에 실패했습니다.', - }; - } - - return { - success: true, - updatedCount: result.data?.updated_count || 0, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[SalesActions] bulkUpdateSalesAccountCode error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + ids: number[], accountCode: string +): Promise<{ success: boolean; updatedCount?: number; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/sales/bulk-update-account`, + method: 'PUT', + body: { ids, account_code: accountCode }, + transform: (data: { updated_count?: number }) => ({ updatedCount: data?.updated_count || 0 }), + errorMessage: '계정과목 수정에 실패했습니다.', + }); + return { success: result.success, updatedCount: result.data?.updatedCount, error: result.error }; } \ No newline at end of file diff --git a/src/components/accounting/VendorLedger/actions.ts b/src/components/accounting/VendorLedger/actions.ts index f6661865..3fa316db 100644 --- a/src/components/accounting/VendorLedger/actions.ts +++ b/src/components/accounting/VendorLedger/actions.ts @@ -1,11 +1,13 @@ 'use server'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { cookies } from 'next/headers'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; import type { VendorLedgerItem, VendorLedgerDetail, VendorLedgerSummary, TransactionEntry } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface VendorLedgerApiItem { id: number; @@ -54,10 +56,7 @@ interface VendorLedgerApiTransaction { interface VendorLedgerApiDetail { client: VendorLedgerApiClient; - period: { - start_date: string | null; - end_date: string | null; - }; + period: { start_date: string | null; end_date: string | null }; carryover_balance: number; total_sales: number; total_collection: number; @@ -65,28 +64,23 @@ interface VendorLedgerApiDetail { transactions: VendorLedgerApiTransaction[]; } -interface PaginationMeta { +interface VendorLedgerPaginatedResponse { + data: VendorLedgerApiItem[]; current_page: number; last_page: number; per_page: number; total: number; } +interface FrontendPagination { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: FrontendPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + // ===== API → Frontend 변환 ===== function transformListItem(item: VendorLedgerApiItem): VendorLedgerItem { - const carryoverSales = typeof item.carryover_sales === 'string' - ? parseFloat(item.carryover_sales) - : item.carryover_sales; - const carryoverDeposits = typeof item.carryover_deposits === 'string' - ? parseFloat(item.carryover_deposits) - : item.carryover_deposits; - const periodSales = typeof item.period_sales === 'string' - ? parseFloat(item.period_sales) - : item.period_sales; - const periodCollection = typeof item.period_collection === 'string' - ? parseFloat(item.period_collection) - : item.period_collection; - + const carryoverSales = typeof item.carryover_sales === 'string' ? parseFloat(item.carryover_sales) : item.carryover_sales; + const carryoverDeposits = typeof item.carryover_deposits === 'string' ? parseFloat(item.carryover_deposits) : item.carryover_deposits; + const periodSales = typeof item.period_sales === 'string' ? parseFloat(item.period_sales) : item.period_sales; + const periodCollection = typeof item.period_collection === 'string' ? parseFloat(item.period_collection) : item.period_collection; const carryoverBalance = carryoverSales - carryoverDeposits; const balance = carryoverBalance + periodSales - periodCollection; @@ -102,9 +96,8 @@ function transformListItem(item: VendorLedgerApiItem): VendorLedgerItem { } function transformTransaction(tx: VendorLedgerApiTransaction): TransactionEntry { - // API의 type을 프론트엔드 TransactionType으로 매핑 let type: TransactionEntry['type'] = 'sales'; - if (tx.type === 'collection') type = 'sales'; // collection도 일반 거래로 표시 + if (tx.type === 'collection') type = 'sales'; if (tx.type === 'note') type = 'note'; if (tx.type === 'sales') type = 'sales'; @@ -142,225 +135,74 @@ function transformDetail(data: VendorLedgerApiDetail): VendorLedgerDetail { // ===== 거래처원장 목록 조회 ===== export async function getVendorLedgerList(params?: { - page?: number; - perPage?: number; - startDate?: string; - endDate?: string; - search?: string; - sortBy?: string; - sortDir?: 'asc' | 'desc'; -}): Promise<{ - success: boolean; - data: VendorLedgerItem[]; - pagination: { - currentPage: number; - lastPage: number; - perPage: number; - total: number; - }; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + page?: number; perPage?: number; startDate?: string; endDate?: string; + search?: string; sortBy?: string; sortDir?: 'asc' | 'desc'; +}): Promise<{ success: boolean; data: VendorLedgerItem[]; pagination: FrontendPagination; error?: string }> { + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('per_page', String(params.perPage)); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + if (params?.search) searchParams.set('search', params.search); + if (params?.sortBy) searchParams.set('sort_by', params.sortBy); + if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); + const queryString = searchParams.toString(); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('per_page', String(params.perPage)); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.search) searchParams.set('search', params.search); - if (params?.sortBy) searchParams.set('sort_by', params.sortBy); - if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/vendor-ledger${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - }; - } - - if (!response?.ok) { - console.warn('[VendorLedgerActions] GET vendor-ledger error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '거래처원장 조회에 실패했습니다.', - }; - } - - const paginationData = result.data; - const items = (paginationData?.data || []).map(transformListItem); - const meta: PaginationMeta = { - current_page: paginationData?.current_page || 1, - last_page: paginationData?.last_page || 1, - per_page: paginationData?.per_page || 20, - total: paginationData?.total || items.length, - }; - - return { - success: true, - data: items, - pagination: { - currentPage: meta.current_page, - lastPage: meta.last_page, - perPage: meta.per_page, - total: meta.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[VendorLedgerActions] getVendorLedgerList error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/vendor-ledger${queryString ? `?${queryString}` : ''}`, + transform: (data: VendorLedgerPaginatedResponse) => ({ + items: (data?.data || []).map(transformListItem), + pagination: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 20, total: data?.total || 0 }, + }), + errorMessage: '거래처원장 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 거래처원장 요약 통계 조회 ===== export async function getVendorLedgerSummary(params?: { - startDate?: string; - endDate?: string; -}): Promise<{ - success: boolean; - data?: VendorLedgerSummary; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + startDate?: string; endDate?: string; +}): Promise> { + const searchParams = new URLSearchParams(); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + const queryString = searchParams.toString(); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/vendor-ledger/summary${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.warn('[VendorLedgerActions] GET summary error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '요약 조회에 실패했습니다.', - }; - } - - const apiSummary: VendorLedgerApiSummary = result.data; - - return { - success: true, - data: { - carryoverBalance: apiSummary.carryover_balance, - totalSales: apiSummary.total_sales, - totalCollection: apiSummary.total_collection, - balance: apiSummary.balance, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[VendorLedgerActions] getVendorLedgerSummary error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/vendor-ledger/summary${queryString ? `?${queryString}` : ''}`, + transform: (data: VendorLedgerApiSummary) => ({ + carryoverBalance: data.carryover_balance, + totalSales: data.total_sales, + totalCollection: data.total_collection, + balance: data.balance, + }), + errorMessage: '요약 조회에 실패했습니다.', + }); } // ===== 거래처원장 상세 조회 ===== export async function getVendorLedgerDetail(clientId: string, params?: { - startDate?: string; - endDate?: string; -}): Promise<{ - success: boolean; - data?: VendorLedgerDetail; - summary?: VendorLedgerSummary; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + startDate?: string; endDate?: string; +}): Promise<{ success: boolean; data?: VendorLedgerDetail; summary?: VendorLedgerSummary; error?: string }> { + const searchParams = new URLSearchParams(); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + const queryString = searchParams.toString(); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/vendor-ledger/${clientId}${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.error('[VendorLedgerActions] GET detail error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { - success: false, - error: result.message || '거래처원장 상세 조회에 실패했습니다.', - }; - } - - const apiDetail: VendorLedgerApiDetail = result.data; - - return { - success: true, - data: transformDetail(apiDetail), + const result = await executeServerAction({ + url: `${API_URL}/api/v1/vendor-ledger/${clientId}${queryString ? `?${queryString}` : ''}`, + transform: (data: VendorLedgerApiDetail) => ({ + detail: transformDetail(data), summary: { - carryoverBalance: apiDetail.carryover_balance, - totalSales: apiDetail.total_sales, - totalCollection: apiDetail.total_collection, - balance: apiDetail.balance, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[VendorLedgerActions] getVendorLedgerDetail error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + carryoverBalance: data.carryover_balance, + totalSales: data.total_sales, + totalCollection: data.total_collection, + balance: data.balance, + } as VendorLedgerSummary, + }), + errorMessage: '거래처원장 상세 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.detail, summary: result.data?.summary, error: result.error }; } // ===== 거래처원장 목록 엑셀 다운로드 ===== diff --git a/src/components/accounting/VendorManagement/actions.ts b/src/components/accounting/VendorManagement/actions.ts index 04a2da26..3fac4452 100644 --- a/src/components/accounting/VendorManagement/actions.ts +++ b/src/components/accounting/VendorManagement/actions.ts @@ -13,28 +13,26 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { Vendor, ClientApiData, - ApiResponse, PaginatedResponse, VendorCategory, BadDebtStatus, } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + /** * API 데이터 → 프론트엔드 타입 변환 */ function transformApiToFrontend(apiData: ClientApiData): Vendor { - // client_type → category 변환 (API는 영문 SALES/PURCHASE/BOTH 반환) let category: VendorCategory = 'both'; if (apiData.client_type === 'PURCHASE') category = 'purchase'; else if (apiData.client_type === 'SALES') category = 'sales'; else if (apiData.client_type === 'BOTH') category = 'both'; - // bad_debt_total (bad_debts 테이블 기반) → badDebtStatus 변환 const badDebtTotal = apiData.bad_debt_total ?? 0; const hasBadDebt = apiData.has_bad_debt ?? badDebtTotal > 0; let badDebtStatus: BadDebtStatus = 'none'; @@ -44,7 +42,6 @@ function transformApiToFrontend(apiData: ClientApiData): Vendor { badDebtStatus = 'normal'; } - // purchase_payment_day 문자열 → 숫자 변환 const purchasePaymentDay = apiData.purchase_payment_day ? parseInt(apiData.purchase_payment_day.replace(/[^0-9]/g, '')) || 25 : 25; @@ -61,8 +58,6 @@ function transformApiToFrontend(apiData: ClientApiData): Vendor { category, businessType: apiData.business_type || '', businessCategory: apiData.business_item || '', - - // 연락처 정보 zipCode: '', address1: apiData.address || '', address2: '', @@ -70,39 +65,27 @@ function transformApiToFrontend(apiData: ClientApiData): Vendor { mobile: apiData.mobile || '', fax: apiData.fax || '', email: apiData.email || '', - - // 담당자 정보 managerName: apiData.manager_name || '', managerPhone: apiData.manager_tel || '', systemManager: apiData.system_manager || '', - - // 회사 정보 logoUrl: '', purchasePaymentDay, salesPaymentDay, - - // 신용/거래 정보 (API에 없는 필드는 기본값) creditRating: 'A', transactionGrade: 'C', taxInvoiceEmail: apiData.email || '', bankName: '', accountNumber: apiData.account_id || '', accountHolder: apiData.name || '', - - // 미수금/악성채권 정보 (API에서 계산된 값 사용) outstandingAmount: apiData.outstanding_amount || 0, overdueAmount: 0, overdueDays: 0, unpaidAmount: 0, - badDebtAmount: badDebtTotal, // bad_debts 테이블 기반 악성채권 합계 + badDebtAmount: badDebtTotal, badDebtStatus, - overdueToggle: apiData.is_overdue ?? false, // API의 is_overdue 값 사용 + overdueToggle: apiData.is_overdue ?? false, badDebtToggle: hasBadDebt, - - // 메모 memos: apiData.memo ? [{ id: '1', content: apiData.memo, createdAt: apiData.created_at }] : [], - - // 시스템 필드 createdAt: apiData.created_at, updatedAt: apiData.updated_at, }; @@ -112,7 +95,6 @@ function transformApiToFrontend(apiData: ClientApiData): Vendor { * 프론트엔드 데이터 → API 요청 형식 변환 */ function transformFrontendToApi(data: Partial): Record { - // category → client_type 변환 (API는 영문 SALES/PURCHASE/BOTH 기대) let clientType: string | null = null; if (data.category === 'purchase') clientType = 'PURCHASE'; else if (data.category === 'sales') clientType = 'SALES'; @@ -137,15 +119,13 @@ function transformFrontendToApi(data: Partial): Record business_type: data.businessType || null, business_item: data.businessCategory || null, bad_debt: data.badDebtToggle || false, - is_overdue: data.overdueToggle ?? false, // 연체 토글 상태 전송 + is_overdue: data.overdueToggle ?? false, memo: data.memos?.[0]?.content || null, is_active: true, }; } -/** - * 거래처 목록 조회 - */ +// ===== 거래처 목록 조회 ===== export async function getClients(params?: { page?: number; size?: number; @@ -153,157 +133,79 @@ export async function getClients(params?: { only_active?: boolean; }): Promise<{ success: boolean; data: Vendor[]; total: number; error?: string }> { const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); if (params?.size) searchParams.set('size', String(params.size)); if (params?.q) searchParams.set('q', params.q); if (params?.only_active !== undefined) searchParams.set('only_active', String(params.only_active)); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients?${searchParams.toString()}`; - console.log('[VendorActions] GET clients:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], total: 0, error: error.message }; - } - - if (!response?.ok) { - console.error('[VendorActions] GET clients error:', response?.status); - return { success: false, data: [], total: 0, error: `HTTP ${response?.status}` }; - } - - const result: ApiResponse> = await response.json(); - console.log('[VendorActions] GET clients response:', result.success, result.data?.total); - - if (!result.success || !result.data) { - return { success: false, data: [], total: 0, error: result.message }; - } - - const vendors = result.data.data.map(transformApiToFrontend); - - return { success: true, data: vendors, total: result.data.total }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/clients?${searchParams.toString()}`, + transform: (data: PaginatedResponse) => ({ + items: data.data.map(transformApiToFrontend), + total: data.total, + }), + errorMessage: '거래처 목록 조회에 실패했습니다.', + }); + return { + success: result.success, + data: result.data?.items || [], + total: result.data?.total || 0, + error: result.error, + }; } -/** - * 거래처 상세 조회 - */ +// ===== 거래처 상세 조회 ===== export async function getClientById(id: string): Promise { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients/${id}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response?.ok) { - console.error('[VendorActions] GET client error:', error?.message || response?.status); - return null; - } - - const result: ApiResponse = await response.json(); - console.log('[VendorActions] GET client response:', result.success); - - if (!result.success || !result.data) { - return null; - } - - return transformApiToFrontend(result.data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + transform: (data: ClientApiData) => transformApiToFrontend(data), + errorMessage: '거래처 조회에 실패했습니다.', + }); + return result.data || null; } -/** - * 거래처 등록 - */ +// ===== 거래처 등록 ===== export async function createClient( data: Partial -): Promise<{ success: boolean; data?: Vendor; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[VendorActions] POST client request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients`; - const { response, error } = await serverFetch(url, { +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/clients`, method: 'POST', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: ClientApiData) => transformApiToFrontend(data), + errorMessage: '거래처 등록에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[VendorActions] POST client response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '거래처 등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } -/** - * 거래처 수정 - */ +// ===== 거래처 수정 ===== export async function updateClient( id: string, data: Partial -): Promise<{ success: boolean; data?: Vendor; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[VendorActions] PUT client request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients/${id}`; - const { response, error } = await serverFetch(url, { +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, method: 'PUT', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: ClientApiData) => transformApiToFrontend(data), + errorMessage: '거래처 수정에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[VendorActions] PUT client response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '거래처 수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } -/** - * 거래처 삭제 - */ -export async function deleteClient(id: string): Promise<{ success: boolean; error?: string }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients/${id}`; - const { response, error } = await serverFetch(url, { method: 'DELETE' }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[VendorActions] DELETE client response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '거래처 삭제에 실패했습니다.' }; - } - - return { success: true }; +// ===== 거래처 삭제 ===== +export async function deleteClient(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + method: 'DELETE', + errorMessage: '거래처 삭제에 실패했습니다.', + }); } -/** - * 거래처 활성/비활성 토글 - */ -export async function toggleClientActive(id: string): Promise<{ success: boolean; data?: Vendor; error?: string }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients/${id}/toggle`; - const { response, error } = await serverFetch(url, { method: 'PATCH' }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[VendorActions] PATCH toggle response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '상태 변경에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; +// ===== 거래처 활성/비활성 토글 ===== +export async function toggleClientActive(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}/toggle`, + method: 'PATCH', + transform: (data: ClientApiData) => transformApiToFrontend(data), + errorMessage: '상태 변경에 실패했습니다.', + }); } diff --git a/src/components/accounting/WithdrawalManagement/actions.ts b/src/components/accounting/WithdrawalManagement/actions.ts index aad53208..52b9d211 100644 --- a/src/components/accounting/WithdrawalManagement/actions.ts +++ b/src/components/accounting/WithdrawalManagement/actions.ts @@ -1,54 +1,54 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { WithdrawalRecord, WithdrawalType } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface WithdrawalApiData { id: number; tenant_id: number; withdrawal_date: string; used_at: string | null; - amount: number | string; // API 실제 필드명 - client_id: number | null; // API 실제 필드명 - client_name: string | null; // API 실제 필드명 - merchant_name: string | null; // API 실제 필드명 (가맹점명) + amount: number | string; + client_id: number | null; + client_name: string | null; + merchant_name: string | null; bank_account_id: number | null; card_id: number | null; - payment_method: string | null; // API 실제 필드명 (결제수단) - account_code: string | null; // API 실제 필드명 (계정과목) - description: string | null; // API 실제 필드명 + payment_method: string | null; + account_code: string | null; + description: string | null; reference_type: string | null; reference_id: number | null; created_at: string; updated_at: string; - // 관계 데이터 client?: { id: number; name: string } | null; bank_account?: { id: number; bank_name: string; account_name: string } | null; card?: { id: number; card_name: string } | null; } -interface PaginationMeta { +interface WithdrawalPaginatedResponse { + data: WithdrawalApiData[]; current_page: number; last_page: number; per_page: number; total: number; } +interface FrontendPagination { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: FrontendPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + // ===== API → Frontend 변환 ===== function transformApiToFrontend(apiData: WithdrawalApiData): WithdrawalRecord { return { id: String(apiData.id), withdrawalDate: apiData.withdrawal_date, - withdrawalAmount: typeof apiData.amount === 'string' - ? parseFloat(apiData.amount) - : (apiData.amount ?? 0), + withdrawalAmount: typeof apiData.amount === 'string' ? parseFloat(apiData.amount) : (apiData.amount ?? 0), bankAccountId: apiData.bank_account_id ? String(apiData.bank_account_id) : '', - accountName: apiData.bank_account - ? `${apiData.bank_account.bank_name} ${apiData.bank_account.account_name}` - : '', + accountName: apiData.bank_account ? `${apiData.bank_account.bank_name} ${apiData.bank_account.account_name}` : '', recipientName: apiData.merchant_name || apiData.client_name || apiData.client?.name || '', note: apiData.description || '', withdrawalType: (apiData.account_code || 'unset') as WithdrawalType, @@ -62,318 +62,133 @@ function transformApiToFrontend(apiData: WithdrawalApiData): WithdrawalRecord { // ===== Frontend → API 변환 ===== function transformFrontendToApi(data: Partial): Record { const result: Record = {}; - if (data.withdrawalDate !== undefined) result.withdrawal_date = data.withdrawalDate; if (data.withdrawalAmount !== undefined) result.amount = data.withdrawalAmount; if (data.recipientName !== undefined) result.client_name = data.recipientName; if (data.note !== undefined) result.description = data.note || null; - // 'unset'은 미설정 상태이므로 API에 null로 전송 if (data.withdrawalType !== undefined) { result.account_code = data.withdrawalType === 'unset' ? null : data.withdrawalType; } if (data.vendorId !== undefined) result.client_id = data.vendorId ? parseInt(data.vendorId, 10) : null; - // 계좌 ID if (data.bankAccountId !== undefined) { result.bank_account_id = data.bankAccountId ? parseInt(data.bankAccountId, 10) : null; } - // payment_method는 API 필수 필드 - 기본값 'transfer'(계좌이체) - // 유효값: cash, transfer, card, check result.payment_method = 'transfer'; - return result; } // ===== 출금 내역 조회 ===== export async function getWithdrawals(params?: { - page?: number; - perPage?: number; - startDate?: string; - endDate?: string; - withdrawalType?: string; - vendor?: string; - search?: string; -}): Promise<{ - success: boolean; - data: WithdrawalRecord[]; - pagination: { - currentPage: number; - lastPage: number; - perPage: number; - total: number; - }; - error?: string; -}> { + page?: number; perPage?: number; startDate?: string; endDate?: string; + withdrawalType?: string; vendor?: string; search?: string; +}): Promise<{ success: boolean; data: WithdrawalRecord[]; pagination: FrontendPagination; error?: string }> { const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); if (params?.perPage) searchParams.set('per_page', String(params.perPage)); if (params?.startDate) searchParams.set('start_date', params.startDate); if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.withdrawalType && params.withdrawalType !== 'all') { - searchParams.set('withdrawal_type', params.withdrawalType); - } - if (params?.vendor && params.vendor !== 'all') { - searchParams.set('vendor', params.vendor); - } + if (params?.withdrawalType && params.withdrawalType !== 'all') searchParams.set('withdrawal_type', params.withdrawalType); + if (params?.vendor && params.vendor !== 'all') searchParams.set('vendor', params.vendor); if (params?.search) searchParams.set('search', params.search); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/withdrawals${queryString ? `?${queryString}` : ''}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - }; - } - - if (!response?.ok) { - console.warn('[WithdrawalActions] GET withdrawals error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '출금 내역 조회에 실패했습니다.', - }; - } - - // API 응답 구조 처리: { data: { data: [...], current_page: ... } } 또는 { data: [...], meta: {...} } - const isPaginatedResponse = result.data && typeof result.data === 'object' && 'data' in result.data && Array.isArray(result.data.data); - const rawData = isPaginatedResponse ? result.data.data : (Array.isArray(result.data) ? result.data : []); - const withdrawals = rawData.map(transformApiToFrontend); - - const meta: PaginationMeta = isPaginatedResponse - ? { - current_page: result.data.current_page || 1, - last_page: result.data.last_page || 1, - per_page: result.data.per_page || 20, - total: result.data.total || withdrawals.length, - } - : result.meta || { - current_page: 1, - last_page: 1, - per_page: 20, - total: withdrawals.length, + const result = await executeServerAction({ + url: `${API_URL}/api/v1/withdrawals${queryString ? `?${queryString}` : ''}`, + transform: (data: WithdrawalPaginatedResponse | WithdrawalApiData[]) => { + const isPaginated = !Array.isArray(data) && data && 'data' in data; + const rawData = isPaginated ? (data as WithdrawalPaginatedResponse).data : (Array.isArray(data) ? data : []); + const items = rawData.map(transformApiToFrontend); + const meta = isPaginated + ? (data as WithdrawalPaginatedResponse) + : { current_page: 1, last_page: 1, per_page: 20, total: items.length }; + return { + items, + pagination: { currentPage: meta.current_page || 1, lastPage: meta.last_page || 1, perPage: meta.per_page || 20, total: meta.total || items.length }, }; - - return { - success: true, - data: withdrawals, - pagination: { - currentPage: meta.current_page, - lastPage: meta.last_page, - perPage: meta.per_page, - total: meta.total, }, - }; + errorMessage: '출금 내역 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error }; } // ===== 출금 내역 삭제 ===== -export async function deleteWithdrawal(id: string): Promise<{ success: boolean; error?: string }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/withdrawals/${id}`; - const { response, error } = await serverFetch(url, { method: 'DELETE' }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '출금 내역 삭제에 실패했습니다.' }; - } - - return { success: true }; +export async function deleteWithdrawal(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/withdrawals/${id}`, + method: 'DELETE', + errorMessage: '출금 내역 삭제에 실패했습니다.', + }); } // ===== 계정과목명 일괄 저장 ===== -export async function updateWithdrawalTypes( - ids: string[], - withdrawalType: string -): Promise<{ success: boolean; error?: string }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/withdrawals/bulk-update-type`; - const { response, error } = await serverFetch(url, { +export async function updateWithdrawalTypes(ids: string[], withdrawalType: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/withdrawals/bulk-update-type`, method: 'PUT', - body: JSON.stringify({ - ids: ids.map(id => parseInt(id, 10)), - withdrawal_type: withdrawalType, - }), + body: { ids: ids.map(id => parseInt(id, 10)), withdrawal_type: withdrawalType }, + errorMessage: '계정과목명 저장에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '계정과목명 저장에 실패했습니다.' }; - } - - return { success: true }; } // ===== 출금 상세 조회 ===== -export async function getWithdrawalById(id: string): Promise<{ - success: boolean; - data?: WithdrawalRecord; - error?: string; -}> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/withdrawals/${id}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response?.ok) { - console.error('[WithdrawalActions] GET withdrawal error:', response?.status); - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { success: false, error: result.message || '출금 내역 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; +export async function getWithdrawalById(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/withdrawals/${id}`, + transform: (data: WithdrawalApiData) => transformApiToFrontend(data), + errorMessage: '출금 내역 조회에 실패했습니다.', + }); } // ===== 출금 등록 ===== -export async function createWithdrawal( - data: Partial -): Promise<{ success: boolean; data?: WithdrawalRecord; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[WithdrawalActions] POST withdrawal request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/withdrawals`; - const { response, error } = await serverFetch(url, { +export async function createWithdrawal(data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/withdrawals`, method: 'POST', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: WithdrawalApiData) => transformApiToFrontend(data), + errorMessage: '출금 등록에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[WithdrawalActions] POST withdrawal response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '출금 등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } // ===== 출금 수정 ===== -export async function updateWithdrawal( - id: string, - data: Partial -): Promise<{ success: boolean; data?: WithdrawalRecord; error?: string }> { - const apiData = transformFrontendToApi(data); - console.log('[WithdrawalActions] PUT withdrawal request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/withdrawals/${id}`; - const { response, error } = await serverFetch(url, { +export async function updateWithdrawal(id: string, data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/withdrawals/${id}`, method: 'PUT', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (data: WithdrawalApiData) => transformApiToFrontend(data), + errorMessage: '출금 수정에 실패했습니다.', }); - - if (error) { - return { success: false, error: error.message }; - } - - const result = await response?.json(); - console.log('[WithdrawalActions] PUT withdrawal response:', result); - - if (!response?.ok || !result.success) { - return { success: false, error: result?.message || '출금 수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; } // ===== 거래처 목록 조회 ===== export async function getVendors(): Promise<{ - success: boolean; - data: { id: string; name: string }[]; - error?: string; + success: boolean; data: { id: string; name: string }[]; error?: string; }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients?per_page=100`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const clients = result.data?.data || result.data || []; - - return { - success: true, - data: clients.map((c: { id: number; name: string }) => ({ - id: String(c.id), - name: c.name, - })), - }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/clients?per_page=100`, + transform: (data: { data?: { id: number; name: string }[] } | { id: number; name: string }[]) => { + type ClientApi = { id: number; name: string }; + const clients: ClientApi[] = Array.isArray(data) ? data : (data as { data?: ClientApi[] })?.data || []; + return clients.map(c => ({ id: String(c.id), name: c.name })); + }, + errorMessage: '거래처 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 계좌 목록 조회 ===== export async function getBankAccounts(): Promise<{ - success: boolean; - data: { id: string; name: string }[]; - error?: string; + success: boolean; data: { id: string; name: string }[]; error?: string; }> { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts?per_page=100`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, data: [], error: error.message }; - } - - if (!response?.ok) { - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message }; - } - - const accounts = result.data?.data || result.data || []; - - return { - success: true, - data: accounts.map((a: { id: number; account_name: string; bank_name: string }) => ({ - id: String(a.id), - name: `${a.bank_name} ${a.account_name}`, - })), - }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts?per_page=100`, + transform: (data: { data?: { id: number; account_name: string; bank_name: string }[] } | { id: number; account_name: string; bank_name: string }[]) => { + type AccountApi = { id: number; account_name: string; bank_name: string }; + const accounts: AccountApi[] = Array.isArray(data) ? data : (data as { data?: AccountApi[] })?.data || []; + return accounts.map(a => ({ id: String(a.id), name: `${a.bank_name} ${a.account_name}` })); + }, + errorMessage: '계좌 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data || [], error: result.error }; } diff --git a/src/components/approval/ApprovalBox/actions.ts b/src/components/approval/ApprovalBox/actions.ts index b85a09ca..a1d6fc08 100644 --- a/src/components/approval/ApprovalBox/actions.ts +++ b/src/components/approval/ApprovalBox/actions.ts @@ -11,20 +11,13 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { ApprovalRecord, ApprovalType, ApprovalStatus } from './types'; // ============================================ // API 응답 타입 정의 // ============================================ -interface ApiResponse { - success: boolean; - data: T; - message: string; -} - interface PaginatedResponse { current_page: number; data: T[]; @@ -40,24 +33,13 @@ interface InboxSummary { rejected: number; } -// API 응답의 결재 문서 타입 interface InboxApiData { id: number; document_number: string; title: string; status: string; - form?: { - id: number; - name: string; - code: string; - category: string; - }; - drafter?: { - id: number; - name: string; - position?: string; - department?: { name: string }; - }; + form?: { id: number; name: string; code: string; category: string }; + drafter?: { id: number; name: string; position?: string; department?: { name: string } }; steps?: InboxStepApiData[]; created_at: string; updated_at: string; @@ -68,12 +50,7 @@ interface InboxStepApiData { step_order: number; step_type: string; approver_id: number; - approver?: { - id: number; - name: string; - position?: string; - department?: { name: string }; - }; + approver?: { id: number; name: string; position?: string; department?: { name: string } }; status: string; processed_at?: string; comment?: string; @@ -83,63 +60,35 @@ interface InboxStepApiData { // 헬퍼 함수 // ============================================ -/** - * API 상태 → 프론트엔드 상태 변환 - */ function mapApiStatus(apiStatus: string): ApprovalStatus { const statusMap: Record = { - 'pending': 'pending', - 'approved': 'approved', - 'rejected': 'rejected', + 'pending': 'pending', 'approved': 'approved', 'rejected': 'rejected', }; return statusMap[apiStatus] || 'pending'; } -/** - * 프론트엔드 탭 상태 → 백엔드 API 상태 변환 - * 백엔드 inbox API가 기대하는 값: - * - requested: 결재 요청 (현재 내 차례) = 미결재 - * - completed: 내가 처리 완료 = 결재완료 - * - rejected: 내가 반려한 문서 = 결재반려 - */ function mapTabToApiStatus(tabStatus: string): string | undefined { const statusMap: Record = { - 'pending': 'requested', // 미결재 → 결재 요청 - 'approved': 'completed', // 결재완료 → 처리 완료 - 'rejected': 'rejected', // 반려 (동일) + 'pending': 'requested', 'approved': 'completed', 'rejected': 'rejected', }; return statusMap[tabStatus]; } -/** - * 양식 카테고리 → 결재 유형 변환 - */ function mapApprovalType(formCategory?: string): ApprovalType { const typeMap: Record = { - 'expense_report': 'expense_report', - 'proposal': 'proposal', - 'expense_estimate': 'expense_estimate', + 'expense_report': 'expense_report', 'proposal': 'proposal', 'expense_estimate': 'expense_estimate', }; return typeMap[formCategory || ''] || 'proposal'; } -/** - * 문서 상태 텍스트 변환 - */ function mapDocumentStatus(status: string): string { const statusMap: Record = { - 'pending': '진행중', - 'approved': '완료', - 'rejected': '반려', + 'pending': '진행중', 'approved': '완료', 'rejected': '반려', }; return statusMap[status] || '진행중'; } -/** - * API 데이터 → 프론트엔드 데이터 변환 - */ function transformApiToFrontend(data: InboxApiData): ApprovalRecord { - // 현재 사용자의 결재 단계 정보 추출 ('approval' 또는 'agreement' 타입) const currentStep = data.steps?.find(s => s.step_type === 'approval' || s.step_type === 'agreement'); const approver = currentStep?.approver; const stepStatus = currentStep?.status || 'pending'; @@ -163,242 +112,91 @@ function transformApiToFrontend(data: InboxApiData): ApprovalRecord { }; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ============================================ // API 함수 // ============================================ -/** - * 결재함 목록 조회 - */ export async function getInbox(params?: { - page?: number; - per_page?: number; - search?: string; - status?: string; - approval_type?: string; - sort_by?: string; - sort_dir?: 'asc' | 'desc'; + page?: number; per_page?: number; search?: string; status?: string; + approval_type?: string; sort_by?: string; sort_dir?: 'asc' | 'desc'; }): Promise<{ data: ApprovalRecord[]; total: number; lastPage: number; __authError?: boolean }> { - try { - const searchParams = new URLSearchParams(); - - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.per_page) searchParams.set('per_page', String(params.per_page)); - if (params?.search) searchParams.set('search', params.search); - if (params?.status && params.status !== 'all') { - // 프론트엔드 탭 상태를 백엔드 API 상태로 변환 - const apiStatus = mapTabToApiStatus(params.status); - if (apiStatus) { - searchParams.set('status', apiStatus); - } - } - if (params?.approval_type && params.approval_type !== 'all') { - searchParams.set('approval_type', params.approval_type); - } - if (params?.sort_by) searchParams.set('sort_by', params.sort_by); - if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/inbox?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error?.__authError) { - return { data: [], total: 0, lastPage: 1, __authError: true }; - } - - if (!response) { - console.error('[ApprovalBoxActions] GET inbox error:', error?.message); - return { data: [], total: 0, lastPage: 1 }; - } - - const result: ApiResponse> = await response.json(); - - if (!response.ok || !result.success || !result.data?.data) { - console.warn('[ApprovalBoxActions] No data in response'); - return { data: [], total: 0, lastPage: 1 }; - } - - return { - data: result.data.data.map(transformApiToFrontend), - total: result.data.total, - lastPage: result.data.last_page, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ApprovalBoxActions] getInbox error:', error); - return { data: [], total: 0, lastPage: 1 }; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.per_page) searchParams.set('per_page', String(params.per_page)); + if (params?.search) searchParams.set('search', params.search); + if (params?.status && params.status !== 'all') { + const apiStatus = mapTabToApiStatus(params.status); + if (apiStatus) searchParams.set('status', apiStatus); } + if (params?.approval_type && params.approval_type !== 'all') searchParams.set('approval_type', params.approval_type); + if (params?.sort_by) searchParams.set('sort_by', params.sort_by); + if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); + + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/approvals/inbox?${searchParams.toString()}`, + errorMessage: '결재함 목록 조회에 실패했습니다.', + }); + + if (result.__authError) return { data: [], total: 0, lastPage: 1, __authError: true }; + if (!result.success || !result.data?.data) return { data: [], total: 0, lastPage: 1 }; + + return { + data: result.data.data.map(transformApiToFrontend), + total: result.data.total, + lastPage: result.data.last_page, + }; } -/** - * 결재함 통계 조회 - */ export async function getInboxSummary(): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/inbox/summary`, - { method: 'GET' } - ); - - if (error?.__authError || !response) { - console.error('[ApprovalBoxActions] GET inbox/summary error:', error?.message); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return null; - } - - return result.data; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ApprovalBoxActions] getInboxSummary error:', error); - return null; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/approvals/inbox/summary`, + errorMessage: '결재함 통계 조회에 실패했습니다.', + }); + return result.success ? result.data || null : null; } -/** - * 승인 처리 - */ -export async function approveDocument(id: string, comment?: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}/approve`, - { - method: 'POST', - body: JSON.stringify({ comment: comment || '' }), - } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '승인 처리에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '승인 처리에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ApprovalBoxActions] approveDocument error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function approveDocument(id: string, comment?: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}/approve`, + method: 'POST', + body: { comment: comment || '' }, + errorMessage: '승인 처리에 실패했습니다.', + }); } -/** - * 반려 처리 - */ -export async function rejectDocument(id: string, comment: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - if (!comment?.trim()) { - return { - success: false, - error: '반려 사유를 입력해주세요.', - }; - } - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}/reject`, - { - method: 'POST', - body: JSON.stringify({ comment }), - } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '반려 처리에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '반려 처리에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ApprovalBoxActions] rejectDocument error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function rejectDocument(id: string, comment: string): Promise { + if (!comment?.trim()) return { success: false, error: '반려 사유를 입력해주세요.' }; + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}/reject`, + method: 'POST', + body: { comment }, + errorMessage: '반려 처리에 실패했습니다.', + }); } -/** - * 일괄 승인 처리 - */ export async function approveDocumentsBulk(ids: string[], comment?: string): Promise<{ success: boolean; failedIds?: string[]; error?: string }> { const failedIds: string[] = []; - for (const id of ids) { const result = await approveDocument(id, comment); - if (!result.success) { - failedIds.push(id); - } + if (!result.success) failedIds.push(id); } - if (failedIds.length > 0) { - return { - success: false, - failedIds, - error: `${failedIds.length}건의 승인 처리에 실패했습니다.`, - }; + return { success: false, failedIds, error: `${failedIds.length}건의 승인 처리에 실패했습니다.` }; } - return { success: true }; } -/** - * 일괄 반려 처리 - */ export async function rejectDocumentsBulk(ids: string[], comment: string): Promise<{ success: boolean; failedIds?: string[]; error?: string }> { - if (!comment?.trim()) { - return { - success: false, - error: '반려 사유를 입력해주세요.', - }; - } - + if (!comment?.trim()) return { success: false, error: '반려 사유를 입력해주세요.' }; const failedIds: string[] = []; - for (const id of ids) { const result = await rejectDocument(id, comment); - if (!result.success) { - failedIds.push(id); - } + if (!result.success) failedIds.push(id); } - if (failedIds.length > 0) { - return { - success: false, - failedIds, - error: `${failedIds.length}건의 반려 처리에 실패했습니다.`, - }; + return { success: false, failedIds, error: `${failedIds.length}건의 반려 처리에 실패했습니다.` }; } - return { success: true }; } \ No newline at end of file diff --git a/src/components/approval/DocumentCreate/actions.ts b/src/components/approval/DocumentCreate/actions.ts index f05bdc24..a2c61c33 100644 --- a/src/components/approval/DocumentCreate/actions.ts +++ b/src/components/approval/DocumentCreate/actions.ts @@ -13,7 +13,7 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { cookies } from 'next/headers'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { ExpenseEstimateItem, ApprovalPerson, @@ -125,6 +125,8 @@ function transformEmployee(employee: EmployeeApiData): ApprovalPerson { // API 함수 // ============================================ +const API_URL = process.env.NEXT_PUBLIC_API_URL; + /** * 파일 업로드 * @param files 업로드할 파일 배열 @@ -200,88 +202,36 @@ export async function getExpenseEstimateItems(yearMonth?: string): Promise<{ accountBalance: number; finalDifference: number; } | null> { - try { - const searchParams = new URLSearchParams(); + const searchParams = new URLSearchParams(); + if (yearMonth) searchParams.set('year_month', yearMonth); - if (yearMonth) { - searchParams.set('year_month', yearMonth); - } - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/reports/expense-estimate?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error || !response) { - console.error('[DocumentCreateActions] GET expense-estimate error:', error?.message); - return null; - } - - if (!response.ok) { - console.error('[DocumentCreateActions] GET expense-estimate error:', response.status); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!result.success || !result.data) { - console.warn('[DocumentCreateActions] No data in response'); - return null; - } - - return { - items: result.data.items.map(transformExpenseEstimateItem), - totalExpense: result.data.total_expense, - accountBalance: result.data.account_balance, - finalDifference: result.data.final_difference, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DocumentCreateActions] getExpenseEstimateItems error:', error); - return null; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/reports/expense-estimate?${searchParams.toString()}`, + errorMessage: '비용견적서 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return null; + return { + items: result.data.items.map(transformExpenseEstimateItem), + totalExpense: result.data.total_expense, + accountBalance: result.data.account_balance, + finalDifference: result.data.final_difference, + }; } /** * 직원 목록 조회 (결재선/참조 선택용) */ export async function getEmployees(search?: string): Promise { - try { - const searchParams = new URLSearchParams(); - searchParams.set('per_page', '100'); - if (search) { - searchParams.set('search', search); - } + const searchParams = new URLSearchParams(); + searchParams.set('per_page', '100'); + if (search) searchParams.set('search', search); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/employees?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error || !response) { - console.error('[DocumentCreateActions] GET employees error:', error?.message); - return []; - } - - if (!response.ok) { - console.error('[DocumentCreateActions] GET employees error:', response.status); - return []; - } - - const result: ApiResponse<{ data: EmployeeApiData[] }> = await response.json(); - - if (!result.success || !result.data?.data) { - return []; - } - - return result.data.data.map(transformEmployee); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DocumentCreateActions] getEmployees error:', error); - return []; - } + const result = await executeServerAction<{ data: EmployeeApiData[] }>({ + url: `${API_URL}/api/v1/employees?${searchParams.toString()}`, + errorMessage: '직원 목록 조회에 실패했습니다.', + }); + if (!result.success || !result.data?.data) return []; + return result.data.data.map(transformEmployee); } /** @@ -292,80 +242,47 @@ export async function createApproval(formData: DocumentFormData): Promise<{ data?: { id: number; documentNo: string }; error?: string; }> { - try { - // 새 첨부파일 업로드 - const newFiles = formData.proposalData?.attachments - || formData.expenseReportData?.attachments - || []; - let uploadedFiles: UploadedFile[] = []; + // 새 첨부파일 업로드 + const newFiles = formData.proposalData?.attachments + || formData.expenseReportData?.attachments + || []; + let uploadedFiles: UploadedFile[] = []; - if (newFiles.length > 0) { - const uploadResult = await uploadFiles(newFiles); - if (!uploadResult.success) { - return { success: false, error: uploadResult.error }; - } - uploadedFiles = uploadResult.data || []; + if (newFiles.length > 0) { + const uploadResult = await uploadFiles(newFiles); + if (!uploadResult.success) { + return { success: false, error: uploadResult.error }; } - - // 프론트엔드 데이터 → API 요청 데이터 변환 - const requestBody = { - form_code: formData.basicInfo.documentType, - title: getDocumentTitle(formData), - status: 'draft', // 임시저장 - steps: [ - ...formData.approvalLine.map((person, index) => ({ - step_type: 'approval', - step_order: index + 1, - approver_id: parseInt(person.id), - })), - ...formData.references.map((person, index) => ({ - step_type: 'reference', - step_order: formData.approvalLine.length + index + 1, - approver_id: parseInt(person.id), - })), - ], - content: getDocumentContent(formData, uploadedFiles), - }; - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals`, - { - method: 'POST', - body: JSON.stringify(requestBody), - } - ); - - if (error || !response) { - return { - success: false, - error: error?.message || '문서 저장에 실패했습니다.', - }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '문서 저장에 실패했습니다.', - }; - } - - return { - success: true, - data: { - id: result.data.id, - documentNo: result.data.document_number, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DocumentCreateActions] createApproval error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + uploadedFiles = uploadResult.data || []; } + + const requestBody = { + form_code: formData.basicInfo.documentType, + title: getDocumentTitle(formData), + status: 'draft', + steps: [ + ...formData.approvalLine.map((person, index) => ({ + step_type: 'approval', + step_order: index + 1, + approver_id: parseInt(person.id), + })), + ...formData.references.map((person, index) => ({ + step_type: 'reference', + step_order: formData.approvalLine.length + index + 1, + approver_id: parseInt(person.id), + })), + ], + content: getDocumentContent(formData, uploadedFiles), + }; + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/approvals`, + method: 'POST', + body: requestBody, + errorMessage: '문서 저장에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, error: result.error }; + return { success: true, data: { id: result.data.id, documentNo: result.data.document_number } }; } /** @@ -375,40 +292,13 @@ export async function submitApproval(id: number): Promise<{ success: boolean; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}/submit`, - { - method: 'POST', - body: JSON.stringify({}), - } - ); - - if (error || !response) { - return { - success: false, - error: error?.message || '문서 상신에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '문서 상신에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DocumentCreateActions] submitApproval error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}/submit`, + method: 'POST', + body: {}, + errorMessage: '문서 상신에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } /** @@ -457,41 +347,13 @@ export async function getApprovalById(id: number): Promise<{ data?: DocumentFormData; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}`, - { - method: 'GET', - } - ); - - if (error || !response) { - return { success: false, error: error?.message || '문서 조회에 실패했습니다.' }; - } - - if (!response.ok) { - if (response.status === 404) { - return { success: false, error: '문서를 찾을 수 없습니다.' }; - } - return { success: false, error: '문서 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { success: false, error: result.message || '문서 조회에 실패했습니다.' }; - } - - // API 응답을 프론트엔드 형식으로 변환 - const apiData = result.data; - const formDataResult = transformApiToFormData(apiData); - - return { success: true, data: formDataResult }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DocumentCreateActions] getApprovalById error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const result = await executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}`, + errorMessage: '문서 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, error: result.error }; + return { success: true, data: transformApiToFormData(result.data) }; } /** @@ -502,75 +364,46 @@ export async function updateApproval(id: number, formData: DocumentFormData): Pr data?: { id: number; documentNo: string }; error?: string; }> { - try { - // 새 첨부파일 업로드 - const newFiles = formData.proposalData?.attachments - || formData.expenseReportData?.attachments - || []; - let uploadedFiles: UploadedFile[] = []; + // 새 첨부파일 업로드 + const newFiles = formData.proposalData?.attachments + || formData.expenseReportData?.attachments + || []; + let uploadedFiles: UploadedFile[] = []; - if (newFiles.length > 0) { - const uploadResult = await uploadFiles(newFiles); - if (!uploadResult.success) { - return { success: false, error: uploadResult.error }; - } - uploadedFiles = uploadResult.data || []; + if (newFiles.length > 0) { + const uploadResult = await uploadFiles(newFiles); + if (!uploadResult.success) { + return { success: false, error: uploadResult.error }; } - - const requestBody = { - form_code: formData.basicInfo.documentType, - title: getDocumentTitle(formData), - steps: [ - ...formData.approvalLine.map((person, index) => ({ - step_type: 'approval', - step_order: index + 1, - approver_id: parseInt(person.id), - })), - ...formData.references.map((person, index) => ({ - step_type: 'reference', - step_order: formData.approvalLine.length + index + 1, - approver_id: parseInt(person.id), - })), - ], - content: getDocumentContent(formData, uploadedFiles), - }; - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}`, - { - method: 'PATCH', - body: JSON.stringify(requestBody), - } - ); - - if (error || !response) { - return { - success: false, - error: error?.message || '문서 수정에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '문서 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: { - id: result.data.id, - documentNo: result.data.document_number, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DocumentCreateActions] updateApproval error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + uploadedFiles = uploadResult.data || []; } + + const requestBody = { + form_code: formData.basicInfo.documentType, + title: getDocumentTitle(formData), + steps: [ + ...formData.approvalLine.map((person, index) => ({ + step_type: 'approval', + step_order: index + 1, + approver_id: parseInt(person.id), + })), + ...formData.references.map((person, index) => ({ + step_type: 'reference', + step_order: formData.approvalLine.length + index + 1, + approver_id: parseInt(person.id), + })), + ], + content: getDocumentContent(formData, uploadedFiles), + }; + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}`, + method: 'PATCH', + body: requestBody, + errorMessage: '문서 수정에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, error: result.error }; + return { success: true, data: { id: result.data.id, documentNo: result.data.document_number } }; } /** @@ -615,39 +448,12 @@ export async function deleteApproval(id: number): Promise<{ success: boolean; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}`, - { - method: 'DELETE', - } - ); - - if (error || !response) { - return { - success: false, - error: error?.message || '문서 삭제에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '문서 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DocumentCreateActions] deleteApproval error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}`, + method: 'DELETE', + errorMessage: '문서 삭제에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } // ============================================ diff --git a/src/components/approval/DraftBox/actions.ts b/src/components/approval/DraftBox/actions.ts index 1e7c495d..dfae273e 100644 --- a/src/components/approval/DraftBox/actions.ts +++ b/src/components/approval/DraftBox/actions.ts @@ -13,20 +13,13 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { DraftRecord, DocumentStatus, Approver } from './types'; // ============================================ // API 응답 타입 정의 // ============================================ -interface ApiResponse { - success: boolean; - data: T; - message: string; -} - interface PaginatedResponse { current_page: number; data: T[]; @@ -166,295 +159,108 @@ function transformApiToFrontend(data: ApprovalApiData): DraftRecord { }; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ============================================ // API 함수 // ============================================ -/** - * 기안함 목록 조회 - */ export async function getDrafts(params?: { - page?: number; - per_page?: number; - search?: string; - status?: string; - sort_by?: string; - sort_dir?: 'asc' | 'desc'; + page?: number; per_page?: number; search?: string; status?: string; + sort_by?: string; sort_dir?: 'asc' | 'desc'; }): Promise<{ data: DraftRecord[]; total: number; lastPage: number; __authError?: boolean }> { - try { - const searchParams = new URLSearchParams(); - - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.per_page) searchParams.set('per_page', String(params.per_page)); - if (params?.search) searchParams.set('search', params.search); - if (params?.status && params.status !== 'all') { - // 프론트엔드 상태 → API 상태 - const statusMap: Record = { - 'draft': 'draft', - 'pending': 'pending', - 'inProgress': 'in_progress', - 'approved': 'approved', - 'rejected': 'rejected', - }; - searchParams.set('status', statusMap[params.status] || params.status); - } - if (params?.sort_by) searchParams.set('sort_by', params.sort_by); - if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/drafts?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error?.__authError) { - return { data: [], total: 0, lastPage: 1, __authError: true }; - } - - if (!response) { - console.error('[DraftBoxActions] GET drafts error:', error?.message); - return { data: [], total: 0, lastPage: 1 }; - } - - const result: ApiResponse> = await response.json(); - - if (!response.ok || !result.success || !result.data?.data) { - console.warn('[DraftBoxActions] No data in response'); - return { data: [], total: 0, lastPage: 1 }; - } - - return { - data: result.data.data.map(transformApiToFrontend), - total: result.data.total, - lastPage: result.data.last_page, + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.per_page) searchParams.set('per_page', String(params.per_page)); + if (params?.search) searchParams.set('search', params.search); + if (params?.status && params.status !== 'all') { + const statusMap: Record = { + 'draft': 'draft', 'pending': 'pending', 'inProgress': 'in_progress', + 'approved': 'approved', 'rejected': 'rejected', }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DraftBoxActions] getDrafts error:', error); - return { data: [], total: 0, lastPage: 1 }; + searchParams.set('status', statusMap[params.status] || params.status); } + if (params?.sort_by) searchParams.set('sort_by', params.sort_by); + if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); + + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/approvals/drafts?${searchParams.toString()}`, + errorMessage: '기안함 목록 조회에 실패했습니다.', + }); + + if (result.__authError) return { data: [], total: 0, lastPage: 1, __authError: true }; + if (!result.success || !result.data?.data) return { data: [], total: 0, lastPage: 1 }; + + return { + data: result.data.data.map(transformApiToFrontend), + total: result.data.total, + lastPage: result.data.last_page, + }; } -/** - * 기안함 현황 카드 (통계) - */ export async function getDraftsSummary(): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/drafts/summary`, - { method: 'GET' } - ); - - if (error?.__authError || !response) { - console.error('[DraftBoxActions] GET summary error:', error?.message); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return null; - } - - return result.data; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DraftBoxActions] getDraftsSummary error:', error); - return null; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/approvals/drafts/summary`, + errorMessage: '기안함 현황 조회에 실패했습니다.', + }); + return result.success ? result.data || null : null; } -/** - * 결재 문서 상세 조회 - */ export async function getDraftById(id: string): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}`, - { method: 'GET' } - ); - - if (error?.__authError || !response) { - console.error('[DraftBoxActions] GET draft error:', error?.message); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return null; - } - - return transformApiToFrontend(result.data); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DraftBoxActions] getDraftById error:', error); - return null; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}`, + transform: (data: ApprovalApiData) => transformApiToFrontend(data), + errorMessage: '결재 문서 조회에 실패했습니다.', + }); + return result.success ? result.data || null : null; } -/** - * 결재 문서 삭제 (임시저장 상태만) - */ -export async function deleteDraft(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}`, - { method: 'DELETE' } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '결재 문서 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '결재 문서 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DraftBoxActions] deleteDraft error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function deleteDraft(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}`, + method: 'DELETE', + errorMessage: '결재 문서 삭제에 실패했습니다.', + }); } -/** - * 결재 문서 일괄 삭제 - */ export async function deleteDrafts(ids: string[]): Promise<{ success: boolean; failedIds?: string[]; error?: string }> { const failedIds: string[] = []; - for (const id of ids) { const result = await deleteDraft(id); - if (!result.success) { - failedIds.push(id); - } + if (!result.success) failedIds.push(id); } - if (failedIds.length > 0) { - return { - success: false, - failedIds, - error: `${failedIds.length}건의 삭제에 실패했습니다.`, - }; + return { success: false, failedIds, error: `${failedIds.length}건의 삭제에 실패했습니다.` }; } - return { success: true }; } -/** - * 결재 상신 - */ -export async function submitDraft(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}/submit`, - { - method: 'POST', - body: JSON.stringify({}), - } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '결재 상신에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '결재 상신에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DraftBoxActions] submitDraft error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function submitDraft(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}/submit`, + method: 'POST', + body: {}, + errorMessage: '결재 상신에 실패했습니다.', + }); } -/** - * 결재 문서 일괄 상신 - */ export async function submitDrafts(ids: string[]): Promise<{ success: boolean; failedIds?: string[]; error?: string }> { const failedIds: string[] = []; - for (const id of ids) { const result = await submitDraft(id); - if (!result.success) { - failedIds.push(id); - } + if (!result.success) failedIds.push(id); } - if (failedIds.length > 0) { - return { - success: false, - failedIds, - error: `${failedIds.length}건의 상신에 실패했습니다.`, - }; + return { success: false, failedIds, error: `${failedIds.length}건의 상신에 실패했습니다.` }; } - return { success: true }; } -/** - * 결재 회수 (기안자만) - */ -export async function cancelDraft(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}/cancel`, - { - method: 'POST', - body: JSON.stringify({}), - } - ); - - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '결재 회수에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '결재 회수에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DraftBoxActions] cancelDraft error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function cancelDraft(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}/cancel`, + method: 'POST', + body: {}, + errorMessage: '결재 회수에 실패했습니다.', + }); } diff --git a/src/components/approval/ReferenceBox/actions.ts b/src/components/approval/ReferenceBox/actions.ts index d18f32c5..4ccaa7bf 100644 --- a/src/components/approval/ReferenceBox/actions.ts +++ b/src/components/approval/ReferenceBox/actions.ts @@ -10,20 +10,14 @@ 'use server'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; import type { ReferenceRecord, ApprovalType, DocumentStatus } from './types'; // ============================================ // API 응답 타입 정의 // ============================================ -interface ApiResponse { - success: boolean; - data: T; - message: string; -} - interface PaginatedResponse { current_page: number; data: T[]; @@ -32,24 +26,13 @@ interface PaginatedResponse { last_page: number; } -// API 응답의 참조 문서 타입 interface ReferenceApiData { id: number; document_number: string; title: string; status: string; - form?: { - id: number; - name: string; - code: string; - category: string; - }; - drafter?: { - id: number; - name: string; - position?: string; - department?: { name: string }; - }; + form?: { id: number; name: string; code: string; category: string }; + drafter?: { id: number; name: string; position?: string; department?: { name: string } }; steps?: ReferenceStepApiData[]; created_at: string; updated_at: string; @@ -60,12 +43,7 @@ interface ReferenceStepApiData { step_order: number; step_type: string; approver_id: number; - approver?: { - id: number; - name: string; - position?: string; - department?: { name: string }; - }; + approver?: { id: number; name: string; position?: string; department?: { name: string } }; is_read: boolean; read_at?: string; } @@ -74,37 +52,22 @@ interface ReferenceStepApiData { // 헬퍼 함수 // ============================================ -/** - * API 상태 → 프론트엔드 상태 변환 - */ function mapApiStatus(apiStatus: string): DocumentStatus { const statusMap: Record = { - 'draft': 'pending', - 'pending': 'pending', - 'in_progress': 'pending', - 'approved': 'approved', - 'rejected': 'rejected', + 'draft': 'pending', 'pending': 'pending', 'in_progress': 'pending', + 'approved': 'approved', 'rejected': 'rejected', }; return statusMap[apiStatus] || 'pending'; } -/** - * 양식 카테고리 → 결재 유형 변환 - */ function mapApprovalType(formCategory?: string): ApprovalType { const typeMap: Record = { - 'expense_report': 'expense_report', - 'proposal': 'proposal', - 'expense_estimate': 'expense_estimate', + 'expense_report': 'expense_report', 'proposal': 'proposal', 'expense_estimate': 'expense_estimate', }; return typeMap[formCategory || ''] || 'proposal'; } -/** - * API 데이터 → 프론트엔드 데이터 변환 - */ function transformApiToFrontend(data: ReferenceApiData): ReferenceRecord { - // 참조 단계에서 열람 상태 추출 const referenceStep = data.steps?.find(s => s.step_type === 'reference'); const isRead = referenceStep?.is_read ?? false; const readAt = referenceStep?.read_at; @@ -126,219 +89,91 @@ function transformApiToFrontend(data: ReferenceApiData): ReferenceRecord { }; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ============================================ // API 함수 // ============================================ -/** - * 참조함 목록 조회 - */ export async function getReferences(params?: { - page?: number; - per_page?: number; - search?: string; - is_read?: boolean; - approval_type?: string; - sort_by?: string; - sort_dir?: 'asc' | 'desc'; + page?: number; per_page?: number; search?: string; is_read?: boolean; + approval_type?: string; sort_by?: string; sort_dir?: 'asc' | 'desc'; }): Promise<{ data: ReferenceRecord[]; total: number; lastPage: number }> { - try { - const searchParams = new URLSearchParams(); + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.per_page) searchParams.set('per_page', String(params.per_page)); + if (params?.search) searchParams.set('search', params.search); + if (params?.is_read !== undefined) searchParams.set('is_read', params.is_read ? '1' : '0'); + if (params?.approval_type && params.approval_type !== 'all') searchParams.set('approval_type', params.approval_type); + if (params?.sort_by) searchParams.set('sort_by', params.sort_by); + if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.per_page) searchParams.set('per_page', String(params.per_page)); - if (params?.search) searchParams.set('search', params.search); - if (params?.is_read !== undefined) { - searchParams.set('is_read', params.is_read ? '1' : '0'); - } - if (params?.approval_type && params.approval_type !== 'all') { - searchParams.set('approval_type', params.approval_type); - } - if (params?.sort_by) searchParams.set('sort_by', params.sort_by); - if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/approvals/reference?${searchParams.toString()}`, + errorMessage: '참조 목록 조회에 실패했습니다.', + }); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/reference?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - // serverFetch handles 401 with redirect, so we just check for other errors - if (error || !response) { - console.error('[ReferenceBoxActions] GET reference error:', error?.message); - return { data: [], total: 0, lastPage: 1 }; - } - - if (!response.ok) { - console.error('[ReferenceBoxActions] GET reference error:', response.status); - return { data: [], total: 0, lastPage: 1 }; - } - - const result: ApiResponse> = await response.json(); - - if (!result.success || !result.data?.data) { - console.warn('[ReferenceBoxActions] No data in response'); - return { data: [], total: 0, lastPage: 1 }; - } - - return { - data: result.data.data.map(transformApiToFrontend), - total: result.data.total, - lastPage: result.data.last_page, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReferenceBoxActions] getReferences error:', error); + if (!result.success || !result.data?.data) { return { data: [], total: 0, lastPage: 1 }; } + + return { + data: result.data.data.map(transformApiToFrontend), + total: result.data.total, + lastPage: result.data.last_page, + }; } -/** - * 참조함 통계 (목록 데이터 기반) - */ export async function getReferenceSummary(): Promise<{ all: number; read: number; unread: number } | null> { try { - // 전체 데이터를 조회해서 통계 계산 const allResult = await getReferences({ per_page: 1 }); const readResult = await getReferences({ per_page: 1, is_read: true }); const unreadResult = await getReferences({ per_page: 1, is_read: false }); - - return { - all: allResult.total, - read: readResult.total, - unread: unreadResult.total, - }; + return { all: allResult.total, read: readResult.total, unread: unreadResult.total }; } catch (error) { if (isNextRedirectError(error)) throw error; - console.error('[ReferenceBoxActions] getReferenceSummary error:', error); return null; } } -/** - * 열람 처리 - */ -export async function markAsRead(id: string): Promise<{ success: boolean; error?: string }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}/read`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({}), - }); - - // serverFetch handles 401 with redirect - if (error || !response) { - return { - success: false, - error: error?.message || '열람 처리에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '열람 처리에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReferenceBoxActions] markAsRead error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function markAsRead(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}/read`, + method: 'POST', + body: {}, + errorMessage: '열람 처리에 실패했습니다.', + }); } -/** - * 미열람 처리 - */ -export async function markAsUnread(id: string): Promise<{ success: boolean; error?: string }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${id}/unread`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({}), - }); - - // serverFetch handles 401 with redirect - if (error || !response) { - return { - success: false, - error: error?.message || '미열람 처리에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '미열람 처리에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReferenceBoxActions] markAsUnread error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function markAsUnread(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${id}/unread`, + method: 'POST', + body: {}, + errorMessage: '미열람 처리에 실패했습니다.', + }); } -/** - * 일괄 열람 처리 - */ export async function markAsReadBulk(ids: string[]): Promise<{ success: boolean; failedIds?: string[]; error?: string }> { const failedIds: string[] = []; - for (const id of ids) { const result = await markAsRead(id); - if (!result.success) { - failedIds.push(id); - } + if (!result.success) failedIds.push(id); } - if (failedIds.length > 0) { - return { - success: false, - failedIds, - error: `${failedIds.length}건의 열람 처리에 실패했습니다.`, - }; + return { success: false, failedIds, error: `${failedIds.length}건의 열람 처리에 실패했습니다.` }; } - return { success: true }; } -/** - * 일괄 미열람 처리 - */ export async function markAsUnreadBulk(ids: string[]): Promise<{ success: boolean; failedIds?: string[]; error?: string }> { const failedIds: string[] = []; - for (const id of ids) { const result = await markAsUnread(id); - if (!result.success) { - failedIds.push(id); - } + if (!result.success) failedIds.push(id); } - if (failedIds.length > 0) { - return { - success: false, - failedIds, - error: `${failedIds.length}건의 미열람 처리에 실패했습니다.`, - }; + return { success: false, failedIds, error: `${failedIds.length}건의 미열람 처리에 실패했습니다.` }; } - return { success: true }; } \ No newline at end of file diff --git a/src/components/attendance/actions.ts b/src/components/attendance/actions.ts index 8fb6f470..fdd81beb 100644 --- a/src/components/attendance/actions.ts +++ b/src/components/attendance/actions.ts @@ -1,53 +1,30 @@ -/** - * 근태관리 서버 액션 - * - * API Endpoints: - * - POST /api/v1/attendances/check-in - 출근 체크인 - * - POST /api/v1/attendances/check-out - 퇴근 체크아웃 - * - GET /api/v1/attendances - 근태 목록 조회 - */ - 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch, getServerApiHeaders } from '@/lib/api/fetch-wrapper'; - import { getTodayString } from '@/utils/date'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; +import { getTodayString } from '@/utils/date'; -// ============================================ -// 타입 정의 -// ============================================ +const API_URL = process.env.NEXT_PUBLIC_API_URL; -/** - * GPS 데이터 타입 - */ +// ===== 타입 정의 ===== export interface GpsData { latitude: number; longitude: number; accuracy?: number; } -/** - * 출근 체크인 요청 데이터 - */ export interface CheckInRequest { userId?: number; - checkIn?: string; // HH:mm:ss format + checkIn?: string; gpsData?: GpsData; } -/** - * 퇴근 체크아웃 요청 데이터 - */ export interface CheckOutRequest { userId?: number; - checkOut?: string; // HH:mm:ss format + checkOut?: string; gpsData?: GpsData; } -/** - * 근태 기록 응답 타입 - */ export interface AttendanceRecord { id: number; userId: number; @@ -60,27 +37,15 @@ export interface AttendanceRecord { updatedAt: string; } -interface ApiResponse { - success: boolean; - data: T; - message: string; -} - -interface PaginatedResponse { +interface AttendancePaginatedResponse { current_page: number; - data: T[]; + data: Record[]; total: number; per_page: number; last_page: number; } -// ============================================ -// 헬퍼 함수 -// ============================================ - -/** - * API 응답에서 프론트엔드 형식으로 변환 - */ +// ===== 변환 ===== function transformApiToFrontend(apiData: Record): AttendanceRecord { return { id: apiData.id as number, @@ -95,170 +60,41 @@ function transformApiToFrontend(apiData: Record): AttendanceRec }; } -// ============================================ -// API 함수 -// ============================================ - -/** - * 출근 체크인 - * POST /v1/attendances/check-in - */ -export async function checkIn( - data: CheckInRequest -): Promise<{ success: boolean; data?: AttendanceRecord; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/attendances/check-in`, { - method: 'POST', - body: JSON.stringify({ - user_id: data.userId, - check_in: data.checkIn, - gps_data: data.gpsData - ? { - latitude: data.gpsData.latitude, - longitude: data.gpsData.longitude, - accuracy: data.gpsData.accuracy, - } - : undefined, - }), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '출근 기록에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '출근 기록에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[checkIn] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '출근 기록에 실패했습니다.', - }; - } +function transformGpsBody(gpsData?: GpsData) { + return gpsData ? { latitude: gpsData.latitude, longitude: gpsData.longitude, accuracy: gpsData.accuracy } : undefined; } -/** - * 퇴근 체크아웃 - * POST /v1/attendances/check-out - */ -export async function checkOut( - data: CheckOutRequest -): Promise<{ success: boolean; data?: AttendanceRecord; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/attendances/check-out`, { - method: 'POST', - body: JSON.stringify({ - user_id: data.userId, - check_out: data.checkOut, - gps_data: data.gpsData - ? { - latitude: data.gpsData.latitude, - longitude: data.gpsData.longitude, - accuracy: data.gpsData.accuracy, - } - : undefined, - }), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '퇴근 기록에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '퇴근 기록에 실패했습니다.', - }; - } catch (err) { - if (isNextRedirectError(err)) throw err; - console.error('[checkOut] Error:', err); - return { - success: false, - error: err instanceof Error ? err.message : '퇴근 기록에 실패했습니다.', - }; - } +// ===== 출근 체크인 ===== +export async function checkIn(data: CheckInRequest): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/attendances/check-in`, + method: 'POST', + body: { user_id: data.userId, check_in: data.checkIn, gps_data: transformGpsBody(data.gpsData) }, + transform: (d: Record) => transformApiToFrontend(d), + errorMessage: '출근 기록에 실패했습니다.', + }); } -/** - * 오늘 근태 상태 조회 - * GET /v1/attendances?date=YYYY-MM-DD - */ -export async function getTodayAttendance(): Promise<{ - success: boolean; - data?: AttendanceRecord; - error?: string; - __authError?: boolean; -}> { - try { - const today = getTodayString(); +// ===== 퇴근 체크아웃 ===== +export async function checkOut(data: CheckOutRequest): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/attendances/check-out`, + method: 'POST', + body: { user_id: data.userId, check_out: data.checkOut, gps_data: transformGpsBody(data.gpsData) }, + transform: (d: Record) => transformApiToFrontend(d), + errorMessage: '퇴근 기록에 실패했습니다.', + }); +} - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/attendances?date=${today}&per_page=1`, - { - method: 'GET', - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '근태 조회에 실패했습니다.' }; - } - - const result: ApiResponse>> = await response.json(); - - if (result.success && result.data) { - const items = result.data.data || []; - if (items.length > 0) { - return { - success: true, - data: transformApiToFrontend(items[0]), - }; - } - // 오늘 기록이 없으면 undefined 반환 - return { success: true, data: undefined }; - } - - return { - success: false, - error: result.message || '근태 조회에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getTodayAttendance] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '근태 조회에 실패했습니다.', - }; - } +// ===== 오늘 근태 상태 조회 ===== +export async function getTodayAttendance(): Promise> { + const today = getTodayString(); + return executeServerAction({ + url: `${API_URL}/api/v1/attendances?date=${today}&per_page=1`, + transform: (data: AttendancePaginatedResponse) => { + const items = data.data || []; + return items.length > 0 ? transformApiToFrontend(items[0]) : undefined; + }, + errorMessage: '근태 조회에 실패했습니다.', + }); } \ No newline at end of file diff --git a/src/components/board/BoardDetail/index.tsx b/src/components/board/BoardDetail/index.tsx index f60d1a0d..1abe225c 100644 --- a/src/components/board/BoardDetail/index.tsx +++ b/src/components/board/BoardDetail/index.tsx @@ -35,6 +35,7 @@ import { deletePost } from '../actions'; import type { Post, Comment } from '../types'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { useMenuStore } from '@/store/menuStore'; +import { sanitizeHTML } from '@/lib/sanitize'; interface BoardDetailProps { post: Post; @@ -159,7 +160,7 @@ export function BoardDetail({ post, comments: initialComments, currentUserId }: {/* 내용 (HTML 렌더링) */}
{/* 첨부파일 */} diff --git a/src/components/board/BoardManagement/actions.ts b/src/components/board/BoardManagement/actions.ts index a6e0e63f..774e5ff7 100644 --- a/src/components/board/BoardManagement/actions.ts +++ b/src/components/board/BoardManagement/actions.ts @@ -1,38 +1,16 @@ -/** - * 게시판 관리 서버 액션 - * - * API Endpoints: - * - GET /api/v1/boards - 접근 가능한 게시판 목록 - * - GET /api/v1/boards/tenant - 테넌트 게시판만 - * - GET /api/v1/boards/{code} - 게시판 상세 (코드 기반) - * - POST /api/v1/boards - 테넌트 게시판 생성 - * - PUT /api/v1/boards/{id} - 테넌트 게시판 수정 - * - DELETE /api/v1/boards/{id} - 테넌트 게시판 삭제 - */ - 'use server'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; import type { Board, BoardApiData, BoardFormData } from './types'; -// API 응답 타입 -interface ApiResponse { - success: boolean; - data: T; - message: string; -} +const API_URL = process.env.NEXT_PUBLIC_API_URL; -/** - * API 데이터 → 프론트엔드 타입 변환 - */ +// ===== 변환 ===== function transformApiToFrontend(apiData: BoardApiData): Board { const extraSettings = apiData.extra_settings || {}; - - // permissions 추출 (read 권한 기준으로 사용) const permissions = extraSettings.permissions?.read || []; - return { id: String(apiData.id), boardCode: apiData.board_code, @@ -52,389 +30,117 @@ function transformApiToFrontend(apiData: BoardApiData): Board { }; } -/** - * 프론트엔드 데이터 → API 요청 형식 변환 - */ function transformFrontendToApi(data: BoardFormData & { boardCode?: string; description?: string }, isUpdate = false): Record { - // extra_settings 구성 const extraSettings: Record = { target: data.target, target_name: data.target === 'department' ? data.targetName : null, }; - - // 권한 대상인 경우 permissions 추가 if (data.target === 'permission' && data.permissions && data.permissions.length > 0) { - extraSettings.permissions = { - read: data.permissions, - write: data.permissions, - manage: data.permissions, - }; + extraSettings.permissions = { read: data.permissions, write: data.permissions, manage: data.permissions }; } - const result: Record = { - name: data.boardName, - description: data.description || null, - is_active: data.status === 'active', - extra_settings: extraSettings, + name: data.boardName, description: data.description || null, + is_active: data.status === 'active', extra_settings: extraSettings, }; - - // 생성 시에만 board_code 전송 (수정 시에는 코드 변경 불가) - if (!isUpdate && data.boardCode) { - result.board_code = data.boardCode; - } - + if (!isUpdate && data.boardCode) result.board_code = data.boardCode; return result; } -/** - * 게시판 목록 조회 (테넌트 게시판만 - 시스템 게시판 제외) - */ +// ===== 게시판 목록 조회 ===== export async function getBoards(filters?: { - board_type?: string; - search?: string; -}): Promise<{ success: boolean; data?: Board[]; error?: string; __authError?: boolean }> { - try { - const params = new URLSearchParams(); - if (filters?.board_type) params.append('board_type', filters.board_type); - if (filters?.search) params.append('search', filters.search); - - const queryString = params.toString(); - // 테넌트 게시판만 조회 (시스템 게시판은 mng에서 관리) - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/tenant${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시판 목록 조회에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시판 목록 조회에 실패했습니다.' }; - } - - // data가 없거나 배열이 아닌 경우 빈 배열 반환 - if (!result.data || !Array.isArray(result.data)) { - return { success: true, data: [] }; - } - - const boards = result.data.map(transformApiToFrontend); - return { success: true, data: boards }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] getBoards error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + board_type?: string; search?: string; +}): Promise> { + const params = new URLSearchParams(); + if (filters?.board_type) params.append('board_type', filters.board_type); + if (filters?.search) params.append('search', filters.search); + const queryString = params.toString(); + return executeServerAction({ + url: `${API_URL}/api/v1/boards/tenant${queryString ? `?${queryString}` : ''}`, + transform: (data: BoardApiData[]) => (Array.isArray(data) ? data : []).map(transformApiToFrontend), + errorMessage: '게시판 목록 조회에 실패했습니다.', + }); } -/** - * 테넌트 게시판만 조회 - */ +// ===== 테넌트 게시판만 조회 ===== export async function getTenantBoards(filters?: { - board_type?: string; - search?: string; -}): Promise<{ success: boolean; data?: Board[]; error?: string; __authError?: boolean }> { - try { - const params = new URLSearchParams(); - if (filters?.board_type) params.append('board_type', filters.board_type); - if (filters?.search) params.append('search', filters.search); - - const queryString = params.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/tenant${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '테넌트 게시판 목록 조회에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '테넌트 게시판 목록 조회에 실패했습니다.' }; - } - - const boards = result.data.map(transformApiToFrontend); - return { success: true, data: boards }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] getTenantBoards error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + board_type?: string; search?: string; +}): Promise> { + const params = new URLSearchParams(); + if (filters?.board_type) params.append('board_type', filters.board_type); + if (filters?.search) params.append('search', filters.search); + const queryString = params.toString(); + return executeServerAction({ + url: `${API_URL}/api/v1/boards/tenant${queryString ? `?${queryString}` : ''}`, + transform: (data: BoardApiData[]) => data.map(transformApiToFrontend), + errorMessage: '테넌트 게시판 목록 조회에 실패했습니다.', + }); } -/** - * 게시판 상세 조회 (코드 기반) - */ -export async function getBoardByCode(code: string): Promise<{ success: boolean; data?: Board; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${code}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시판 조회에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '게시판을 찾을 수 없습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] getBoardByCode error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +// ===== 게시판 상세 조회 (코드 기반) ===== +export async function getBoardByCode(code: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${code}`, + transform: (data: BoardApiData) => transformApiToFrontend(data), + errorMessage: '게시판을 찾을 수 없습니다.', + }); } -/** - * 게시판 상세 조회 (ID 기반) - */ -export async function getBoardById(id: string): Promise<{ success: boolean; data?: Board; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${id}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시판 조회에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '게시판을 찾을 수 없습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] getBoardById error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +// ===== 게시판 상세 조회 (ID 기반) ===== +export async function getBoardById(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${id}`, + transform: (data: BoardApiData) => transformApiToFrontend(data), + errorMessage: '게시판을 찾을 수 없습니다.', + }); } -/** - * 게시판 생성 - */ +// ===== 게시판 생성 ===== export async function createBoard( data: BoardFormData & { boardCode: string; description?: string } -): Promise<{ success: boolean; data?: Board; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(apiData), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시판 생성에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '게시판 생성에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] createBoard error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards`, + method: 'POST', + body: transformFrontendToApi(data), + transform: (d: BoardApiData) => transformApiToFrontend(d), + errorMessage: '게시판 생성에 실패했습니다.', + }); } -/** - * 게시판 수정 - */ +// ===== 게시판 수정 ===== export async function updateBoard( id: string, data: BoardFormData & { boardCode?: string; description?: string } -): Promise<{ success: boolean; data?: Board; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data, true); // isUpdate=true - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${id}`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시판 수정에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '게시판 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] updateBoard error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${id}`, + method: 'PUT', + body: transformFrontendToApi(data, true), + transform: (d: BoardApiData) => transformApiToFrontend(d), + errorMessage: '게시판 수정에 실패했습니다.', + }); } -/** - * 게시판 삭제 - */ -export async function deleteBoard(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${id}`; - - const { response, error } = await serverFetch(url, { - method: 'DELETE', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시판 삭제에 실패했습니다.' }; - } - - let result: { success: boolean; message?: string }; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '게시판 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] deleteBoard error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +// ===== 게시판 삭제 ===== +export async function deleteBoard(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${id}`, + method: 'DELETE', + errorMessage: '게시판 삭제에 실패했습니다.', + }); } -/** - * 게시판 일괄 삭제 - */ -export async function deleteBoardsBulk(ids: string[]): Promise<{ success: boolean; error?: string; __authError?: boolean }> { +// ===== 게시판 일괄 삭제 ===== +export async function deleteBoardsBulk(ids: string[]): Promise { try { const results = await Promise.all(ids.map(id => deleteBoard(id))); const failed = results.filter(r => !r.success); const hasAuthError = results.some(r => r.__authError); - - if (hasAuthError) { - return { success: false, error: '인증이 만료되었습니다.', __authError: true }; - } - - if (failed.length > 0) { - return { - success: false, - error: `${failed.length}개의 게시판 삭제에 실패했습니다.`, - }; - } - + if (hasAuthError) return { success: false, error: '인증이 만료되었습니다.', __authError: true }; + if (failed.length > 0) return { success: false, error: `${failed.length}개의 게시판 삭제에 실패했습니다.` }; return { success: true }; } catch (error) { if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] deleteBoardsBulk error:', error); return { success: false, error: '서버 오류가 발생했습니다.' }; } } \ No newline at end of file diff --git a/src/components/board/DynamicBoard/actions.ts b/src/components/board/DynamicBoard/actions.ts index c6999f48..98d36b65 100644 --- a/src/components/board/DynamicBoard/actions.ts +++ b/src/components/board/DynamicBoard/actions.ts @@ -1,382 +1,117 @@ -/** - * 동적 게시판 Server Actions - * 일반 게시판 게시글 API 호출 (/api/v1/boards/{code}/posts) - */ - 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { PostApiData, PostPaginationResponse, - ApiResponse, PostFilters, CommentApiData, CommentsApiResponse, } from '@/components/customer-center/shared/types'; -/** - * 게시글 목록 조회 - */ +const API_URL = process.env.NEXT_PUBLIC_API_URL; + +// ===== 게시글 API ===== + export async function getDynamicBoardPosts( - boardCode: string, - filters?: PostFilters -): Promise<{ success: boolean; data?: PostPaginationResponse; error?: string; __authError?: boolean }> { - try { - const params = new URLSearchParams(); - if (filters?.search) params.append('search', filters.search); - if (filters?.is_notice !== undefined) params.append('is_notice', String(filters.is_notice)); - if (filters?.status) params.append('status', filters.status); - if (filters?.per_page) params.append('per_page', String(filters.per_page)); - if (filters?.page) params.append('page', String(filters.page)); - - const queryString = params.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 목록 조회에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[DynamicBoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 목록 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] getDynamicBoardPosts error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + boardCode: string, filters?: PostFilters +): Promise> { + const params = new URLSearchParams(); + if (filters?.search) params.append('search', filters.search); + if (filters?.is_notice !== undefined) params.append('is_notice', String(filters.is_notice)); + if (filters?.status) params.append('status', filters.status); + if (filters?.per_page) params.append('per_page', String(filters.per_page)); + if (filters?.page) params.append('page', String(filters.page)); + const queryString = params.toString(); + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts${queryString ? `?${queryString}` : ''}`, + errorMessage: '게시글 목록 조회에 실패했습니다.', + }); } -/** - * 게시글 상세 조회 - */ export async function getDynamicBoardPost( - boardCode: string, - postId: number | string -): Promise<{ success: boolean; data?: PostApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '게시글을 찾을 수 없습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] getDynamicBoardPost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + boardCode: string, postId: number | string +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}`, + errorMessage: '게시글을 찾을 수 없습니다.', + }); } -/** - * 게시글 등록 - */ export async function createDynamicBoardPost( boardCode: string, - data: { - title: string; - content: string; - is_secret?: boolean; - is_notice?: boolean; - custom_fields?: Record; - } -): Promise<{ success: boolean; data?: PostApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(data), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 등록에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 등록에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] createDynamicBoardPost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + data: { title: string; content: string; is_secret?: boolean; is_notice?: boolean; custom_fields?: Record } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts`, + method: 'POST', + body: data, + errorMessage: '게시글 등록에 실패했습니다.', + }); } -/** - * 게시글 수정 - */ export async function updateDynamicBoardPost( - boardCode: string, - postId: number | string, - data: { - title?: string; - content?: string; - is_secret?: boolean; - is_notice?: boolean; - custom_fields?: Record; - } -): Promise<{ success: boolean; data?: PostApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify(data), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 수정에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] updateDynamicBoardPost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + boardCode: string, postId: number | string, + data: { title?: string; content?: string; is_secret?: boolean; is_notice?: boolean; custom_fields?: Record } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}`, + method: 'PUT', + body: data, + errorMessage: '게시글 수정에 실패했습니다.', + }); } -/** - * 게시글 삭제 - */ export async function deleteDynamicBoardPost( - boardCode: string, - postId: number | string -): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'DELETE', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] deleteDynamicBoardPost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + boardCode: string, postId: number | string +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}`, + method: 'DELETE', + errorMessage: '게시글 삭제에 실패했습니다.', + }); } // ===== 댓글 API ===== -/** - * 댓글 목록 조회 - */ export async function getDynamicBoardComments( - boardCode: string, - postId: number | string -): Promise<{ success: boolean; data?: CommentsApiResponse; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}/comments`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '댓글 목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '댓글 목록 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] getDynamicBoardComments error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + boardCode: string, postId: number | string +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}/comments`, + errorMessage: '댓글 목록 조회에 실패했습니다.', + }); } -/** - * 댓글 작성 - */ export async function createDynamicBoardComment( - boardCode: string, - postId: number | string, - content: string -): Promise<{ success: boolean; data?: CommentApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}/comments`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({ content }), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '댓글 등록에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '댓글 등록에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] createDynamicBoardComment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + boardCode: string, postId: number | string, content: string +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}/comments`, + method: 'POST', + body: { content }, + errorMessage: '댓글 등록에 실패했습니다.', + }); } -/** - * 댓글 수정 - */ export async function updateDynamicBoardComment( - boardCode: string, - postId: number | string, - commentId: number | string, - content: string -): Promise<{ success: boolean; data?: CommentApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}/comments/${commentId}`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify({ content }), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '댓글 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '댓글 수정에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] updateDynamicBoardComment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + boardCode: string, postId: number | string, commentId: number | string, content: string +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}/comments/${commentId}`, + method: 'PUT', + body: { content }, + errorMessage: '댓글 수정에 실패했습니다.', + }); } -/** - * 댓글 삭제 - */ export async function deleteDynamicBoardComment( - boardCode: string, - postId: number | string, - commentId: number | string -): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}/comments/${commentId}`; - - const { response, error } = await serverFetch(url, { - method: 'DELETE', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '댓글 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '댓글 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[DynamicBoardActions] deleteDynamicBoardComment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + boardCode: string, postId: number | string, commentId: number | string +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}/comments/${commentId}`, + method: 'DELETE', + errorMessage: '댓글 삭제에 실패했습니다.', + }); } \ No newline at end of file diff --git a/src/components/board/actions.ts b/src/components/board/actions.ts index d670c9a4..97ed111b 100644 --- a/src/components/board/actions.ts +++ b/src/components/board/actions.ts @@ -1,31 +1,17 @@ -/** - * 게시판 게시글 Server Actions - * - * API Endpoints: - * - GET /api/v1/boards/{code}/posts - 게시글 목록 - * - GET /api/v1/boards/{code}/posts/{id} - 게시글 상세 - * - GET /api/v1/my-posts - 나의 게시글 - * - POST /api/v1/boards/{code}/posts - 게시글 작성 - * - PUT /api/v1/boards/{code}/posts/{id} - 게시글 수정 - * - DELETE /api/v1/boards/{code}/posts/{id} - 게시글 삭제 - */ - 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { PostApiData, PostPaginationResponse, - ApiResponse, PostFilters, Post, } from './types'; -/** - * API 데이터 → 프론트엔드 타입 변환 - */ +const API_URL = process.env.NEXT_PUBLIC_API_URL; + +// ===== 변환 ===== function transformApiToPost(apiData: PostApiData, boardName?: string): Post { return { id: String(apiData.id), @@ -40,7 +26,7 @@ function transformApiToPost(apiData: PostApiData, boardName?: string): Post { authorPosition: apiData.author?.position, isPinned: apiData.is_notice, isSecret: apiData.is_secret, - allowComments: true, // API에서 board 설정 참조 필요 + allowComments: true, viewCount: apiData.views, attachments: (apiData.files || []).map(file => ({ id: String(file.id), @@ -55,269 +41,93 @@ function transformApiToPost(apiData: PostApiData, boardName?: string): Post { }; } -/** - * 게시글 목록 조회 - */ +function buildPostFilterParams(filters?: PostFilters): string { + const params = new URLSearchParams(); + if (filters?.search) params.append('search', filters.search); + if (filters?.is_notice !== undefined) params.append('is_notice', String(filters.is_notice)); + if (filters?.status) params.append('status', filters.status); + if (filters?.per_page) params.append('per_page', String(filters.per_page)); + if (filters?.page) params.append('page', String(filters.page)); + if (filters?.board_code) params.append('board_code', filters.board_code); + return params.toString(); +} + +// ===== 게시글 목록 조회 ===== export async function getPosts( boardCode: string, filters?: PostFilters ): Promise<{ success: boolean; data?: PostPaginationResponse; posts?: Post[]; error?: string; __authError?: boolean }> { - try { - const params = new URLSearchParams(); - if (filters?.search) params.append('search', filters.search); - if (filters?.is_notice !== undefined) params.append('is_notice', String(filters.is_notice)); - if (filters?.status) params.append('status', filters.status); - if (filters?.per_page) params.append('per_page', String(filters.per_page)); - if (filters?.page) params.append('page', String(filters.page)); - - const queryString = params.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 목록 조회에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 목록 조회에 실패했습니다.' }; - } - - // 프론트엔드 타입으로 변환 - const posts = result.data.data.map(post => transformApiToPost(post)); - - return { success: true, data: result.data, posts }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] getPosts error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const queryString = buildPostFilterParams(filters); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts${queryString ? `?${queryString}` : ''}`, + transform: (data: PostPaginationResponse) => ({ + raw: data, + posts: data.data.map(post => transformApiToPost(post)), + }), + errorMessage: '게시글 목록 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.raw, posts: result.data?.posts, error: result.error, __authError: result.__authError }; } -/** - * 나의 게시글 목록 조회 - */ +// ===== 나의 게시글 목록 조회 ===== export async function getMyPosts( filters?: PostFilters ): Promise<{ success: boolean; data?: PostPaginationResponse; posts?: Post[]; error?: string; __authError?: boolean }> { - try { - const params = new URLSearchParams(); - if (filters?.search) params.append('search', filters.search); - if (filters?.board_code) params.append('board_code', filters.board_code); - if (filters?.status) params.append('status', filters.status); - if (filters?.per_page) params.append('per_page', String(filters.per_page)); - if (filters?.page) params.append('page', String(filters.page)); - - const queryString = params.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/my-posts${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '나의 게시글 조회에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[BoardActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '나의 게시글 조회에 실패했습니다.' }; - } - - // 프론트엔드 타입으로 변환 - const posts = result.data.data.map(post => transformApiToPost(post)); - - return { success: true, data: result.data, posts }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] getMyPosts error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const queryString = buildPostFilterParams(filters); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/my-posts${queryString ? `?${queryString}` : ''}`, + transform: (data: PostPaginationResponse) => ({ + raw: data, + posts: data.data.map(post => transformApiToPost(post)), + }), + errorMessage: '나의 게시글 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.raw, posts: result.data?.posts, error: result.error, __authError: result.__authError }; } -/** - * 게시글 상세 조회 - */ -export async function getPost( - boardCode: string, - postId: number | string -): Promise<{ success: boolean; data?: Post; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '게시글을 찾을 수 없습니다.' }; - } - - return { success: true, data: transformApiToPost(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] getPost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +// ===== 게시글 상세 조회 ===== +export async function getPost(boardCode: string, postId: number | string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}`, + transform: (data: PostApiData) => transformApiToPost(data), + errorMessage: '게시글을 찾을 수 없습니다.', + }); } -/** - * 게시글 등록 - */ +// ===== 게시글 등록 ===== export async function createPost( boardCode: string, - data: { - title: string; - content: string; - is_notice?: boolean; - is_secret?: boolean; - custom_fields?: Record; - } -): Promise<{ success: boolean; data?: Post; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(data), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 등록에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToPost(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] createPost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + data: { title: string; content: string; is_notice?: boolean; is_secret?: boolean; custom_fields?: Record } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts`, + method: 'POST', + body: data, + transform: (d: PostApiData) => transformApiToPost(d), + errorMessage: '게시글 등록에 실패했습니다.', + }); } -/** - * 게시글 수정 - */ +// ===== 게시글 수정 ===== export async function updatePost( boardCode: string, postId: number | string, - data: { - title?: string; - content?: string; - is_notice?: boolean; - is_secret?: boolean; - custom_fields?: Record; - } -): Promise<{ success: boolean; data?: Post; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify(data), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToPost(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] updatePost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + data: { title?: string; content?: string; is_notice?: boolean; is_secret?: boolean; custom_fields?: Record } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}`, + method: 'PUT', + body: data, + transform: (d: PostApiData) => transformApiToPost(d), + errorMessage: '게시글 수정에 실패했습니다.', + }); } -/** - * 게시글 삭제 - */ -export async function deletePost( - boardCode: string, - postId: number | string -): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'DELETE', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[BoardActions] deletePost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +// ===== 게시글 삭제 ===== +export async function deletePost(boardCode: string, postId: number | string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/boards/${boardCode}/posts/${postId}`, + method: 'DELETE', + errorMessage: '게시글 삭제에 실패했습니다.', + }); } diff --git a/src/components/clients/actions.ts b/src/components/clients/actions.ts index 6ab9c172..9e511b75 100644 --- a/src/components/clients/actions.ts +++ b/src/components/clients/actions.ts @@ -8,12 +8,9 @@ * - POST /api/v1/clients - 등록 * - PUT /api/v1/clients/{id} - 수정 * - DELETE /api/v1/clients/{id} - 삭제 - * - * 🚨 401 에러 시 __authError: true 반환 → 클라이언트에서 로그인 페이지로 리다이렉트 */ -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { Client, ClientFormData, ClientApiResponse } from '@/hooks/useClientList'; import { transformClientFromApi, @@ -21,229 +18,51 @@ import { transformClientToApiUpdate, } from '@/hooks/useClientList'; -// ===== 응답 타입 ===== -interface ActionResponse { - success: boolean; - data?: T; - error?: string; - __authError?: boolean; -} - -interface ApiResponse { - success: boolean; - data: T; - message?: string; -} +const API_URL = process.env.NEXT_PUBLIC_API_URL; // ===== 거래처 단건 조회 ===== -export async function getClientById(id: string): Promise> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients/${id}`; - console.log('[ClientActions] GET client URL:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - // 🚨 401 인증 에러 - if (error?.__authError) { - console.error('[ClientActions] Auth error:', error); - return { success: false, __authError: true }; - } - - if (!response) { - console.error('[ClientActions] No response, error:', error); - return { - success: false, - error: error?.message || '서버 응답이 없습니다.', - }; - } - - // 응답 텍스트 먼저 읽기 - const responseText = await response.text(); - console.log('[ClientActions] Response status:', response.status); - console.log('[ClientActions] Response text:', responseText); - - if (!response.ok) { - console.error('[ClientActions] GET client error:', response.status); - return { - success: false, - error: `API 오류: ${response.status}`, - }; - } - - // JSON 파싱 - let result: ApiResponse; - try { - result = JSON.parse(responseText); - } catch { - console.error('[ClientActions] JSON parse error'); - return { - success: false, - error: 'JSON 파싱 오류', - }; - } - - if (!result.success || !result.data) { - console.error('[ClientActions] API returned error:', result); - return { - success: false, - error: result.message || '거래처를 찾을 수 없습니다.', - }; - } - - return { - success: true, - data: transformClientFromApi(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ClientActions] getClientById error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '거래처 조회 중 오류가 발생했습니다.', - }; - } +export async function getClientById(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + transform: (data: ClientApiResponse) => transformClientFromApi(data), + errorMessage: '거래처 조회 중 오류가 발생했습니다.', + }); } // ===== 거래처 생성 ===== export async function createClient( formData: Partial -): Promise> { - try { - const apiData = transformClientToApiCreate(formData as ClientFormData); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients`; - - console.log('[ClientActions] POST client request:', apiData); - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(apiData), - }); - - // 🚨 401 인증 에러 - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - const result: ApiResponse = await response.json(); - console.log('[ClientActions] POST client response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '거래처 생성에 실패했습니다.', - }; - } - - return { - success: true, - data: transformClientFromApi(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ClientActions] createClient error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '거래처 생성 중 오류가 발생했습니다.', - }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/clients`, + method: 'POST', + body: transformClientToApiCreate(formData as ClientFormData), + transform: (data: ClientApiResponse) => transformClientFromApi(data), + errorMessage: '거래처 생성에 실패했습니다.', + }); } // ===== 거래처 수정 ===== export async function updateClient( id: string, formData: Partial -): Promise> { - try { - const apiData = transformClientToApiUpdate(formData as ClientFormData); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients/${id}`; - - console.log('[ClientActions] PUT client request:', apiData); - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - // 🚨 401 인증 에러 - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - const result: ApiResponse = await response.json(); - console.log('[ClientActions] PUT client response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '거래처 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformClientFromApi(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ClientActions] updateClient error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '거래처 수정 중 오류가 발생했습니다.', - }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + method: 'PUT', + body: transformClientToApiUpdate(formData as ClientFormData), + transform: (data: ClientApiResponse) => transformClientFromApi(data), + errorMessage: '거래처 수정에 실패했습니다.', + }); } // ===== 거래처 삭제 ===== -export async function deleteClient(id: string): Promise { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/clients/${id}`; - const { response, error } = await serverFetch(url, { method: 'DELETE' }); - - // 🚨 401 인증 에러 - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[ClientActions] DELETE client response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '거래처 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ClientActions] deleteClient error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '거래처 삭제 중 오류가 발생했습니다.', - }; - } +export async function deleteClient(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/clients/${id}`, + method: 'DELETE', + errorMessage: '거래처 삭제에 실패했습니다.', + }); } // ===== 거래처 코드 생성 (8자리 영문+숫자) ===== diff --git a/src/components/common/NoticePopupModal/NoticePopupModal.tsx b/src/components/common/NoticePopupModal/NoticePopupModal.tsx index e88503bf..33b47c2f 100644 --- a/src/components/common/NoticePopupModal/NoticePopupModal.tsx +++ b/src/components/common/NoticePopupModal/NoticePopupModal.tsx @@ -5,6 +5,7 @@ import * as DialogPrimitive from '@radix-ui/react-dialog'; import { Checkbox } from '@/components/ui/checkbox'; import { Button } from '@/components/ui/button'; import { cn } from '@/components/ui/utils'; +import { sanitizeHTML } from '@/lib/sanitize'; /* eslint-disable @next/next/no-img-element */ // ============================================ @@ -131,7 +132,7 @@ export function NoticePopupModal({ popup, open, onOpenChange }: NoticePopupModal

내용

diff --git a/src/components/customer-center/InquiryManagement/InquiryDetail.tsx b/src/components/customer-center/InquiryManagement/InquiryDetail.tsx index d3b5acf9..4ff7e78d 100644 --- a/src/components/customer-center/InquiryManagement/InquiryDetail.tsx +++ b/src/components/customer-center/InquiryManagement/InquiryDetail.tsx @@ -25,6 +25,7 @@ import { import { IntegratedDetailTemplate } from '@/components/templates/IntegratedDetailTemplate'; import { inquiryConfig } from './inquiryConfig'; import type { Inquiry, Reply, Comment, Attachment } from './types'; +import { sanitizeHTML } from '@/lib/sanitize'; interface InquiryDetailProps { inquiry: Inquiry; @@ -183,7 +184,7 @@ export function InquiryDetail({ {/* 내용 (HTML 렌더링) */}
{/* 첨부파일 */} @@ -211,7 +212,7 @@ export function InquiryDetail({ {/* 내용 (HTML 렌더링) */}
{/* 첨부파일 */} diff --git a/src/components/customer-center/shared/actions.ts b/src/components/customer-center/shared/actions.ts index 8bd95207..e5c08ecc 100644 --- a/src/components/customer-center/shared/actions.ts +++ b/src/components/customer-center/shared/actions.ts @@ -6,376 +6,134 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { PostApiData, PostPaginationResponse, - ApiResponse, SystemBoardCode, PostFilters, CommentApiData, CommentsApiResponse, } from './types'; -/** - * 게시글 목록 조회 - */ +const API_URL = process.env.NEXT_PUBLIC_API_URL; + +function buildPostFilterParams(filters?: PostFilters): string { + const params = new URLSearchParams(); + if (filters?.search) params.append('search', filters.search); + if (filters?.is_notice !== undefined) params.append('is_notice', String(filters.is_notice)); + if (filters?.status) params.append('status', filters.status); + if (filters?.per_page) params.append('per_page', String(filters.per_page)); + if (filters?.page) params.append('page', String(filters.page)); + return params.toString(); +} + +// ===== 게시글 API ===== + export async function getPosts( boardCode: SystemBoardCode, filters?: PostFilters -): Promise<{ success: boolean; data?: PostPaginationResponse; error?: string; __authError?: boolean }> { - try { - const params = new URLSearchParams(); - if (filters?.search) params.append('search', filters.search); - if (filters?.is_notice !== undefined) params.append('is_notice', String(filters.is_notice)); - if (filters?.status) params.append('status', filters.status); - if (filters?.per_page) params.append('per_page', String(filters.per_page)); - if (filters?.page) params.append('page', String(filters.page)); - - const queryString = params.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 목록 조회에 실패했습니다.' }; - } - - let result: ApiResponse; - try { - result = await response.json(); - } catch { - console.error('[CustomerCenterActions] JSON parse error'); - return { success: false, error: '서버 응답 형식 오류입니다.' }; - } - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 목록 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] getPosts error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + const queryString = buildPostFilterParams(filters); + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts${queryString ? `?${queryString}` : ''}`, + errorMessage: '게시글 목록 조회에 실패했습니다.', + }); } -/** - * 게시글 상세 조회 - */ export async function getPost( boardCode: SystemBoardCode, postId: number | string -): Promise<{ success: boolean; data?: PostApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '게시글을 찾을 수 없습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] getPost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}`, + errorMessage: '게시글을 찾을 수 없습니다.', + }); } -/** - * 게시글 등록 (1:1 문의용) - */ export async function createPost( boardCode: SystemBoardCode, - data: { - title: string; - content: string; - is_secret?: boolean; - custom_fields?: Record; - } -): Promise<{ success: boolean; data?: PostApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(data), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 등록에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 등록에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] createPost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + data: { title: string; content: string; is_secret?: boolean; custom_fields?: Record } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts`, + method: 'POST', + body: data, + errorMessage: '게시글 등록에 실패했습니다.', + }); } -/** - * 게시글 수정 - */ export async function updatePost( boardCode: SystemBoardCode, postId: number | string, - data: { - title?: string; - content?: string; - is_secret?: boolean; - custom_fields?: Record; - } -): Promise<{ success: boolean; data?: PostApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify(data), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 수정에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] updatePost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + data: { title?: string; content?: string; is_secret?: boolean; custom_fields?: Record } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}`, + method: 'PUT', + body: data, + errorMessage: '게시글 수정에 실패했습니다.', + }); } -/** - * 게시글 삭제 - */ export async function deletePost( boardCode: SystemBoardCode, postId: number | string -): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}`; - - const { response, error } = await serverFetch(url, { - method: 'DELETE', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '게시글 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '게시글 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] deletePost error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}`, + method: 'DELETE', + errorMessage: '게시글 삭제에 실패했습니다.', + }); } // ===== 댓글 API ===== -/** - * 댓글 목록 조회 - */ export async function getComments( boardCode: SystemBoardCode, postId: number | string -): Promise<{ success: boolean; data?: CommentsApiResponse; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}/comments`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '댓글 목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '댓글 목록 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] getComments error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}/comments`, + errorMessage: '댓글 목록 조회에 실패했습니다.', + }); } -/** - * 댓글 작성 - */ export async function createComment( boardCode: SystemBoardCode, postId: number | string, content: string -): Promise<{ success: boolean; data?: CommentApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}/comments`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({ content }), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '댓글 등록에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '댓글 등록에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] createComment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}/comments`, + method: 'POST', + body: { content }, + errorMessage: '댓글 등록에 실패했습니다.', + }); } -/** - * 댓글 수정 - */ export async function updateComment( boardCode: SystemBoardCode, postId: number | string, commentId: number | string, content: string -): Promise<{ success: boolean; data?: CommentApiData; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}/comments/${commentId}`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify({ content }), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '댓글 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '댓글 수정에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] updateComment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}/comments/${commentId}`, + method: 'PUT', + body: { content }, + errorMessage: '댓글 수정에 실패했습니다.', + }); } -/** - * 댓글 삭제 - */ export async function deleteComment( boardCode: SystemBoardCode, postId: number | string, commentId: number | string -): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}/comments/${commentId}`; - - const { response, error } = await serverFetch(url, { - method: 'DELETE', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '댓글 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '댓글 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[CustomerCenterActions] deleteComment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/system-boards/${boardCode}/posts/${postId}/comments/${commentId}`, + method: 'DELETE', + errorMessage: '댓글 삭제에 실패했습니다.', + }); } \ No newline at end of file diff --git a/src/components/hr/AttendanceManagement/actions.ts b/src/components/hr/AttendanceManagement/actions.ts index 9e525e10..27323329 100644 --- a/src/components/hr/AttendanceManagement/actions.ts +++ b/src/components/hr/AttendanceManagement/actions.ts @@ -15,9 +15,9 @@ 'use server'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { cookies } from 'next/headers'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; import type { AttendanceRecord, AttendanceApiData, @@ -30,12 +30,6 @@ import type { // API 응답 타입 정의 // ============================================ -interface ApiResponse { - success: boolean; - data: T; - message: string; -} - interface PaginatedResponse { current_page: number; data: T[]; @@ -176,34 +170,16 @@ interface EmployeeApiData { position_key?: string; } -/** - * 사원 목록 조회 (근태 등록용) - */ export async function getEmployeesForAttendance(): Promise { - const searchParams = new URLSearchParams(); - searchParams.set('per_page', '100'); // API 최대 500, 드롭다운용 100 충분 - searchParams.set('status', 'active'); // 재직자만 + const result = await executeServerAction>({ + url: `${API_URL}/v1/employees?per_page=100&status=active`, + errorMessage: '사원 목록 조회에 실패했습니다.', + }); - const url = `${API_URL}/v1/employees?${searchParams.toString()}`; + if (!result.success || !result.data?.data) return []; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - console.error('[AttendanceActions] GET employees error:', error?.message); - return []; - } - - const result: ApiResponse> = await response.json(); - - if (!result.success || !result.data?.data) { - console.warn('[AttendanceActions] No employees data'); - return []; - } - - // API는 TenantUserProfile을 반환하지만, Attendance.user_id는 User.id를 참조 - // 따라서 user.id를 사용해야 함 return result.data.data.map((emp) => ({ - id: String(emp.user?.id || emp.user_id), // User.id 사용 + id: String(emp.user?.id || emp.user_id), name: emp.user?.name || emp.name, department: emp.department?.name || emp.tenant_user_profile?.department?.name || '', position: emp.position_key || emp.tenant_user_profile?.position?.name || '', @@ -215,51 +191,29 @@ export async function getEmployeesForAttendance(): Promise { // 근태 API 함수 // ============================================ -/** - * 근태 목록 조회 - */ export async function getAttendances(params?: { - page?: number; - per_page?: number; - user_id?: string; - date?: string; - date_from?: string; - date_to?: string; - status?: string; - department_id?: string; - sort_by?: string; - sort_dir?: 'asc' | 'desc'; + page?: number; per_page?: number; user_id?: string; date?: string; + date_from?: string; date_to?: string; status?: string; + department_id?: string; sort_by?: string; sort_dir?: 'asc' | 'desc'; }): Promise<{ data: AttendanceRecord[]; total: number; lastPage: number }> { const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); if (params?.per_page) searchParams.set('per_page', String(params.per_page)); if (params?.user_id) searchParams.set('user_id', params.user_id); if (params?.date) searchParams.set('date', params.date); if (params?.date_from) searchParams.set('date_from', params.date_from); if (params?.date_to) searchParams.set('date_to', params.date_to); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); if (params?.department_id) searchParams.set('department_id', params.department_id); if (params?.sort_by) searchParams.set('sort_by', params.sort_by); if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); - const url = `${API_URL}/v1/attendances?${searchParams.toString()}`; + const result = await executeServerAction>({ + url: `${API_URL}/v1/attendances?${searchParams.toString()}`, + errorMessage: '근태 목록 조회에 실패했습니다.', + }); - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - console.error('[AttendanceActions] GET list error:', error?.message); - return { data: [], total: 0, lastPage: 1 }; - } - - const result: ApiResponse> = await response.json(); - - if (!result.success || !result.data?.data) { - console.warn('[AttendanceActions] No data in response'); - return { data: [], total: 0, lastPage: 1 }; - } + if (!result.success || !result.data?.data) return { data: [], total: 0, lastPage: 1 }; return { data: result.data.data.map(transformApiToFrontend), @@ -268,172 +222,86 @@ export async function getAttendances(params?: { }; } -/** - * 근태 상세 조회 - */ export async function getAttendanceById(id: string): Promise { - const { response, error } = await serverFetch(`${API_URL}/v1/attendances/${id}`, { method: 'GET' }); - - if (error || !response) { - console.error('[AttendanceActions] GET attendance error:', error?.message); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!result.success || !result.data) { - return null; - } - - return transformApiToFrontend(result.data); + const result = await executeServerAction({ + url: `${API_URL}/v1/attendances/${id}`, + transform: (data: AttendanceApiData) => transformApiToFrontend(data), + errorMessage: '근태 조회에 실패했습니다.', + }); + return result.success ? result.data || null : null; } -/** - * 근태 등록 - */ export async function createAttendance( data: AttendanceFormData ): Promise<{ success: boolean; data?: AttendanceRecord; error?: string }> { const apiData = transformFrontendToApi(data); - console.log('[AttendanceActions] POST attendance request:', apiData); - - const { response, error } = await serverFetch(`${API_URL}/v1/attendances`, { + const result = await executeServerAction({ + url: `${API_URL}/v1/attendances`, method: 'POST', - body: JSON.stringify(apiData), + body: apiData, + transform: (d: AttendanceApiData) => transformApiToFrontend(d), + errorMessage: '근태 등록에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '근태 등록에 실패했습니다.' }; - } - - const result = await response.json(); - console.log('[AttendanceActions] POST attendance response:', result); - - if (!result.success) { - return { - success: false, - error: result.message || '근태 등록에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; + return { success: result.success, data: result.data, error: result.error }; } -/** - * 근태 수정 - */ export async function updateAttendance( id: string, data: AttendanceFormData ): Promise<{ success: boolean; data?: AttendanceRecord; error?: string }> { const apiData = transformFrontendToApi(data); - console.log('[AttendanceActions] PATCH attendance request:', apiData); - - const { response, error } = await serverFetch(`${API_URL}/v1/attendances/${id}`, { + const result = await executeServerAction({ + url: `${API_URL}/v1/attendances/${id}`, method: 'PATCH', - body: JSON.stringify(apiData), + body: apiData, + transform: (d: AttendanceApiData) => transformApiToFrontend(d), + errorMessage: '근태 수정에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '근태 수정에 실패했습니다.' }; - } - - const result = await response.json(); - console.log('[AttendanceActions] PATCH attendance response:', result); - - if (!result.success) { - return { - success: false, - error: result.message || '근태 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; + return { success: result.success, data: result.data, error: result.error }; } -/** - * 근태 삭제 - */ export async function deleteAttendance(id: string): Promise<{ success: boolean; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/attendances/${id}`, { method: 'DELETE' }); - - if (error || !response) { - return { success: false, error: error?.message || '근태 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - console.log('[AttendanceActions] DELETE attendance response:', result); - - if (!result.success) { - return { - success: false, - error: result.message || '근태 삭제에 실패했습니다.', - }; - } - - return { success: true }; -} - -/** - * 근태 일괄 삭제 - */ -export async function deleteAttendances(ids: string[]): Promise<{ success: boolean; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/attendances/bulk-delete`, { - method: 'POST', - body: JSON.stringify({ ids: ids.map(id => parseInt(id, 10)) }), + const result = await executeServerAction({ + url: `${API_URL}/v1/attendances/${id}`, + method: 'DELETE', + errorMessage: '근태 삭제에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '근태 일괄 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - console.log('[AttendanceActions] BULK DELETE attendance response:', result); - - if (!result.success) { - return { - success: false, - error: result.message || '근태 일괄 삭제에 실패했습니다.', - }; - } - - return { success: true }; + return { success: result.success, error: result.error }; +} + +export async function deleteAttendances(ids: string[]): Promise<{ success: boolean; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/v1/attendances/bulk-delete`, + method: 'POST', + body: { ids: ids.map(id => parseInt(id, 10)) }, + errorMessage: '근태 일괄 삭제에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } -/** - * 월간 통계 조회 - */ export async function getMonthlyStats(params: { - year: number; - month: number; - user_id?: string; + year: number; month: number; user_id?: string; }): Promise { const searchParams = new URLSearchParams(); - searchParams.set('year', String(params.year)); searchParams.set('month', String(params.month)); if (params.user_id) searchParams.set('user_id', params.user_id); - const url = `${API_URL}/v1/attendances/monthly-stats?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - console.error('[AttendanceActions] GET monthly-stats error:', error?.message); - return null; + interface MonthlyStatsApiData { + year: number; month: number; total_days: number; + by_status: { + onTime: number; late: number; absent: number; vacation: number; + businessTrip: number; fieldWork: number; overtime: number; remote: number; + }; + total_work_minutes: number; total_overtime_minutes: number; } - const result = await response.json(); + const result = await executeServerAction({ + url: `${API_URL}/v1/attendances/monthly-stats?${searchParams.toString()}`, + errorMessage: '월간 통계 조회에 실패했습니다.', + }); - if (!result.success || !result.data) { - return null; - } + if (!result.success || !result.data) return null; return { year: result.data.year, @@ -446,23 +314,14 @@ export async function getMonthlyStats(params: { } // ============================================ -// 엑셀 내보내기 +// 엑셀 내보내기 (native fetch - keep as-is) // ============================================ -/** - * 근태 엑셀 내보내기 - */ export async function exportAttendanceExcel(params?: { - date_from?: string; - date_to?: string; - user_id?: string; - status?: string; - department_id?: string; + date_from?: string; date_to?: string; user_id?: string; + status?: string; department_id?: string; }): Promise<{ - success: boolean; - data?: Blob; - filename?: string; - error?: string; + success: boolean; data?: Blob; filename?: string; error?: string; }> { try { const cookieStore = await cookies(); @@ -478,25 +337,16 @@ export async function exportAttendanceExcel(params?: { if (params?.date_from) searchParams.set('date_from', params.date_from); if (params?.date_to) searchParams.set('date_to', params.date_to); if (params?.user_id) searchParams.set('user_id', params.user_id); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); if (params?.department_id) searchParams.set('department_id', params.department_id); const queryString = searchParams.toString(); const url = `${API_URL}/v1/attendances/export${queryString ? `?${queryString}` : ''}`; - const response = await fetch(url, { - method: 'GET', - headers, - }); + const response = await fetch(url, { method: 'GET', headers }); if (!response.ok) { - console.warn('[AttendanceActions] GET export error:', response.status); - return { - success: false, - error: `API 오류: ${response.status}`, - }; + return { success: false, error: `API 오류: ${response.status}` }; } const blob = await response.blob(); @@ -504,17 +354,9 @@ export async function exportAttendanceExcel(params?: { const filenameMatch = contentDisposition?.match(/filename="?(.+)"?/); const filename = filenameMatch?.[1] || `근태현황_${params?.date_from || 'all'}.xlsx`; - return { - success: true, - data: blob, - filename, - }; + return { success: true, data: blob, filename }; } catch (error) { if (isNextRedirectError(error)) throw error; - console.error('[AttendanceActions] exportAttendanceExcel error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + return { success: false, error: '서버 오류가 발생했습니다.' }; } } diff --git a/src/components/hr/CardManagement/actions.ts b/src/components/hr/CardManagement/actions.ts index e970ce6a..2584425a 100644 --- a/src/components/hr/CardManagement/actions.ts +++ b/src/components/hr/CardManagement/actions.ts @@ -1,8 +1,8 @@ 'use server'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; import type { Card, CardFormData, CardStatus } from './types'; // API 응답 타입 @@ -13,10 +13,7 @@ interface TenantProfile { department_id: number | null; position_key: string | null; job_title_key: string | null; - department?: { - id: number; - name: string; - } | null; + department?: { id: number; name: string } | null; } interface CardApiData { @@ -38,22 +35,12 @@ interface CardApiData { updated_at: string; } -interface CardListResponse { - success: boolean; - message: string; - data: { - data: CardApiData[]; - current_page: number; - last_page: number; - per_page: number; - total: number; - }; -} - -interface CardResponse { - success: boolean; - message: string; - data: CardApiData; +interface CardPaginationData { + data: CardApiData[]; + current_page: number; + last_page: number; + per_page: number; + total: number; } // API URL (without double /api) @@ -71,7 +58,6 @@ function mapFrontendStatusToApi(frontendStatus: CardStatus): 'active' | 'inactiv // API → Frontend 변환 function transformApiToFrontend(apiData: CardApiData): Card { - // TenantProfile에서 부서/직책 정보 추출 const profile = apiData.assigned_user?.tenant_profiles?.[0]; const department = profile?.department; @@ -80,8 +66,8 @@ function transformApiToFrontend(apiData: CardApiData): Card { cardCompany: apiData.card_company as Card['cardCompany'], cardNumber: `****-****-****-${apiData.card_number_last4}`, cardName: apiData.card_name, - expiryDate: apiData.expiry_date ? apiData.expiry_date.replace('/', '') : '', // MM/YY → MMYY - pinPrefix: '**', // 보안상 표시 안함 + expiryDate: apiData.expiry_date ? apiData.expiry_date.replace('/', '') : '', + pinPrefix: '**', status: mapApiStatusToFrontend(apiData.status), user: apiData.assigned_user ? { id: String(apiData.assigned_user.id), @@ -90,7 +76,7 @@ function transformApiToFrontend(apiData: CardApiData): Card { employeeId: String(apiData.assigned_user.id), employeeName: apiData.assigned_user.name, positionId: profile?.position_key || '', - positionName: profile?.position_key || '', // position_key를 그대로 사용 (별도 조회 필요시 추가) + positionName: profile?.position_key || '', } : undefined, createdAt: apiData.created_at, updatedAt: apiData.updated_at, @@ -102,24 +88,21 @@ function transformFrontendToApi(data: CardFormData): Record { const apiData: Record = { card_company: data.cardCompany, expiry_date: data.expiryDate.length === 4 - ? `${data.expiryDate.slice(0, 2)}/${data.expiryDate.slice(2)}` // MMYY → MM/YY + ? `${data.expiryDate.slice(0, 2)}/${data.expiryDate.slice(2)}` : data.expiryDate, card_name: data.cardName, status: mapFrontendStatusToApi(data.status), }; - // 카드번호가 마스킹되지 않은 경우에만 전송 (수정 시 기존 값 유지) const cardNumberDigits = data.cardNumber.replace(/-/g, ''); if (cardNumberDigits && !cardNumberDigits.includes('*')) { apiData.card_number = cardNumberDigits; } - // 비밀번호가 있으면 추가 if (data.pinPrefix && data.pinPrefix !== '**') { apiData.card_password = data.pinPrefix; } - // 사용자 ID가 있으면 추가 if (data.userId) { apiData.assigned_user_id = parseInt(data.userId, 10); } @@ -127,33 +110,24 @@ function transformFrontendToApi(data: CardFormData): Record { return apiData; } -/** - * 카드 목록 조회 - */ +// ===== 카드 목록 조회 ===== export async function getCards(params?: { - search?: string; - status?: string; - page?: number; - per_page?: number; + search?: string; status?: string; page?: number; per_page?: number; }): Promise<{ success: boolean; data?: Card[]; pagination?: { total: number; currentPage: number; lastPage: number }; error?: string }> { const searchParams = new URLSearchParams(); - if (params?.search) searchParams.set('search', params.search); if (params?.status && params.status !== 'all') searchParams.set('status', mapFrontendStatusToApi(params.status as CardStatus)); if (params?.page) searchParams.set('page', String(params.page)); if (params?.per_page) searchParams.set('per_page', String(params.per_page)); + const queryString = searchParams.toString(); - const url = `${API_URL}/v1/cards${searchParams.toString() ? `?${searchParams.toString()}` : ''}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); + const result = await executeServerAction({ + url: `${API_URL}/v1/cards${queryString ? `?${queryString}` : ''}`, + errorMessage: '카드 목록을 불러오는데 실패했습니다.', + }); - if (error || !response) { - return { success: false, error: error?.message || '카드 목록을 불러오는데 실패했습니다.' }; - } - - const result: CardListResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '카드 목록을 불러오는데 실패했습니다.' }; + if (!result.success || !result.data) { + return { success: false, error: result.error }; } return { @@ -167,168 +141,94 @@ export async function getCards(params?: { }; } -/** - * 카드 상세 조회 - */ -export async function getCard(id: string): Promise<{ success: boolean; data?: Card; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/cards/${id}`, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '카드 정보를 불러오는데 실패했습니다.' }; - } - - const result: CardResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '카드 정보를 불러오는데 실패했습니다.' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; +// ===== 카드 상세 조회 ===== +export async function getCard(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/v1/cards/${id}`, + transform: (data: CardApiData) => transformApiToFrontend(data), + errorMessage: '카드 정보를 불러오는데 실패했습니다.', + }); } -/** - * 카드 등록 - */ -export async function createCard(data: CardFormData): Promise<{ success: boolean; data?: Card; error?: string }> { - const apiData = transformFrontendToApi(data); - const { response, error } = await serverFetch(`${API_URL}/v1/cards`, { +// ===== 카드 등록 ===== +export async function createCard(data: CardFormData): Promise> { + return executeServerAction({ + url: `${API_URL}/v1/cards`, method: 'POST', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (d: CardApiData) => transformApiToFrontend(d), + errorMessage: '카드 등록에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '카드 등록에 실패했습니다.' }; - } - - const result: CardResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '카드 등록에 실패했습니다.' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; } -/** - * 카드 수정 - */ -export async function updateCard(id: string, data: CardFormData): Promise<{ success: boolean; data?: Card; error?: string }> { - const apiData = transformFrontendToApi(data); - const { response, error } = await serverFetch(`${API_URL}/v1/cards/${id}`, { +// ===== 카드 수정 ===== +export async function updateCard(id: string, data: CardFormData): Promise> { + return executeServerAction({ + url: `${API_URL}/v1/cards/${id}`, method: 'PUT', - body: JSON.stringify(apiData), + body: transformFrontendToApi(data), + transform: (d: CardApiData) => transformApiToFrontend(d), + errorMessage: '카드 수정에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '카드 수정에 실패했습니다.' }; - } - - const result: CardResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '카드 수정에 실패했습니다.' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; } -/** - * 카드 삭제 - */ -export async function deleteCard(id: string): Promise<{ success: boolean; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/cards/${id}`, { method: 'DELETE' }); - - if (error || !response) { - return { success: false, error: error?.message || '카드 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '카드 삭제에 실패했습니다.' }; - } - - return { success: true }; +// ===== 카드 삭제 ===== +export async function deleteCard(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/v1/cards/${id}`, + method: 'DELETE', + errorMessage: '카드 삭제에 실패했습니다.', + }); } -/** - * 카드 일괄 삭제 - */ +// ===== 카드 일괄 삭제 ===== export async function deleteCards(ids: string[]): Promise<{ success: boolean; error?: string }> { try { const results = await Promise.all(ids.map(id => deleteCard(id))); const failed = results.filter(r => !r.success); - if (failed.length > 0) { return { success: false, error: `${failed.length}개의 카드 삭제에 실패했습니다.` }; } - return { success: true }; } catch (error) { if (isNextRedirectError(error)) throw error; - console.error('[deleteCards] Error:', error); return { success: false, error: '서버 오류가 발생했습니다.' }; } } -/** - * 카드 상태 토글 - */ -export async function toggleCardStatus(id: string): Promise<{ success: boolean; data?: Card; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/cards/${id}/toggle`, { method: 'PATCH' }); - - if (error || !response) { - return { success: false, error: error?.message || '상태 변경에 실패했습니다.' }; - } - - const result: CardResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '상태 변경에 실패했습니다.' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; +// ===== 카드 상태 토글 ===== +export async function toggleCardStatus(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/v1/cards/${id}/toggle`, + method: 'PATCH', + transform: (data: CardApiData) => transformApiToFrontend(data), + errorMessage: '상태 변경에 실패했습니다.', + }); } -/** - * 활성 직원 목록 조회 (카드 할당용) - * 주의: Card.assigned_user_id는 User.id를 참조하므로 user.id를 반환해야 함 - */ +// ===== 활성 직원 목록 조회 (카드 할당용) ===== export async function getActiveEmployees(): Promise<{ success: boolean; data?: Array<{ id: string; label: string }>; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/employees?status=active&per_page=50`, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '직원 목록을 불러오는데 실패했습니다.' }; + interface EmployeePaginationData { + data: Array<{ + id: number; + user_id: number; + user?: { id: number; name: string }; + department?: { name: string }; + position_key?: string; + }>; } - const result = await response.json(); + const result = await executeServerAction({ + url: `${API_URL}/v1/employees?status=active&per_page=50`, + errorMessage: '직원 목록을 불러오는데 실패했습니다.', + }); - if (!result.success) { - return { success: false, error: result.message || '직원 목록을 불러오는데 실패했습니다.' }; + if (!result.success || !result.data) { + return { success: false, error: result.error }; } - // API는 TenantUserProfile을 반환하지만, Card.assigned_user_id는 User.id를 참조 - // 따라서 user.id를 사용해야 함 - const employees = result.data.data.map((emp: { - id: number; - user_id: number; - user?: { id: number; name: string }; - department?: { name: string }; - position_key?: string; - }) => ({ - id: String(emp.user?.id || emp.user_id), // User.id 사용 + const employees = result.data.data.map(emp => ({ + id: String(emp.user?.id || emp.user_id), label: `${emp.department?.name || ''} / ${emp.user?.name || ''} / ${emp.position_key || ''}`.replace(/^ \/ | \/ $/g, '').replace(/ \/ $/g, ''), })); diff --git a/src/components/hr/DepartmentManagement/actions.ts b/src/components/hr/DepartmentManagement/actions.ts index 5e48ec7c..a863ebd1 100644 --- a/src/components/hr/DepartmentManagement/actions.ts +++ b/src/components/hr/DepartmentManagement/actions.ts @@ -14,7 +14,7 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; // ============================================ // 타입 정의 @@ -83,17 +83,10 @@ export interface UpdateDepartmentRequest { parentId?: number | null; // null이면 최상위로 이동 } -interface ApiResponse { - success: boolean; - data: T; - message: string; -} - // ============================================ // 헬퍼 함수 // ============================================ -// API URL const API_URL = `${process.env.NEXT_PUBLIC_API_URL}/api`; /** @@ -130,36 +123,18 @@ function transformApiToFrontend(apiData: ApiDepartment, depth: number = 0): Depa */ export async function getDepartmentTree(params?: { withUsers?: boolean; -}): Promise<{ success: boolean; data?: DepartmentRecord[]; error?: string }> { +}): Promise> { const queryParams = new URLSearchParams(); - if (params?.withUsers) { queryParams.append('with_users', '1'); } - const queryString = queryParams.toString(); - const url = `${API_URL}/v1/departments/tree${queryString ? `?${queryString}` : ''}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '부서 트리 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (result.success && result.data) { - const transformed = result.data.map((dept) => transformApiToFrontend(dept, 0)); - return { - success: true, - data: transformed, - }; - } - - return { - success: false, - error: result.message || '부서 트리 조회에 실패했습니다.', - }; + return executeServerAction({ + url: `${API_URL}/v1/departments/tree${queryString ? `?${queryString}` : ''}`, + transform: (data: ApiDepartment[]) => data.map((dept) => transformApiToFrontend(dept, 0)), + errorMessage: '부서 트리 조회에 실패했습니다.', + }); } /** @@ -168,26 +143,12 @@ export async function getDepartmentTree(params?: { */ export async function getDepartmentById( id: number -): Promise<{ success: boolean; data?: DepartmentRecord; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/departments/${id}`, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '부서 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '부서 조회에 실패했습니다.', - }; +): Promise> { + return executeServerAction({ + url: `${API_URL}/v1/departments/${id}`, + transform: (data: ApiDepartment) => transformApiToFrontend(data), + errorMessage: '부서 조회에 실패했습니다.', + }); } /** @@ -196,36 +157,21 @@ export async function getDepartmentById( */ export async function createDepartment( data: CreateDepartmentRequest -): Promise<{ success: boolean; data?: DepartmentRecord; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/departments`, { +): Promise> { + return executeServerAction({ + url: `${API_URL}/v1/departments`, method: 'POST', - body: JSON.stringify({ + body: { parent_id: data.parentId, code: data.code, name: data.name, description: data.description, is_active: data.isActive !== undefined ? (data.isActive ? 1 : 0) : undefined, sort_order: data.sortOrder, - }), + }, + transform: (data: ApiDepartment) => transformApiToFrontend(data), + errorMessage: '부서 생성에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '부서 생성에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '부서 생성에 실패했습니다.', - }; } /** @@ -235,36 +181,21 @@ export async function createDepartment( export async function updateDepartment( id: number, data: UpdateDepartmentRequest -): Promise<{ success: boolean; data?: DepartmentRecord; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/departments/${id}`, { +): Promise> { + return executeServerAction({ + url: `${API_URL}/v1/departments/${id}`, method: 'PATCH', - body: JSON.stringify({ - parent_id: data.parentId === null ? 0 : data.parentId, // null이면 0(최상위)으로 전환 + body: { + parent_id: data.parentId === null ? 0 : data.parentId, code: data.code, name: data.name, description: data.description, is_active: data.isActive !== undefined ? (data.isActive ? 1 : 0) : undefined, sort_order: data.sortOrder, - }), + }, + transform: (data: ApiDepartment) => transformApiToFrontend(data), + errorMessage: '부서 수정에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '부서 수정에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '부서 수정에 실패했습니다.', - }; } /** @@ -273,23 +204,12 @@ export async function updateDepartment( */ export async function deleteDepartment( id: number -): Promise<{ success: boolean; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/departments/${id}`, { method: 'DELETE' }); - - if (error || !response) { - return { success: false, error: error?.message || '부서 삭제에 실패했습니다.' }; - } - - const result: ApiResponse<{ id: number; deleted_at: string }> = await response.json(); - - if (result.success) { - return { success: true }; - } - - return { - success: false, - error: result.message || '부서 삭제에 실패했습니다.', - }; +): Promise { + return executeServerAction({ + url: `${API_URL}/v1/departments/${id}`, + method: 'DELETE', + errorMessage: '부서 삭제에 실패했습니다.', + }); } /** diff --git a/src/components/hr/EmployeeManagement/actions.ts b/src/components/hr/EmployeeManagement/actions.ts index 300d2ee9..f64d0297 100644 --- a/src/components/hr/EmployeeManagement/actions.ts +++ b/src/components/hr/EmployeeManagement/actions.ts @@ -16,9 +16,9 @@ 'use server'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { cookies } from 'next/headers'; -import { serverFetch, getServerApiHeaders } from '@/lib/api/fetch-wrapper'; import type { Employee, EmployeeFormData, EmployeeStats } from './types'; import { transformApiToFrontend, transformFrontendToApi, type EmployeeApiData } from './utils'; @@ -40,332 +40,138 @@ interface PaginatedResponse { last_page: number; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ============================================ // API 함수 // ============================================ -/** - * 직원 목록 조회 - */ export async function getEmployees(params?: { - page?: number; - per_page?: number; - q?: string; - status?: string; - department_id?: string; - has_account?: boolean; - sort_by?: string; - sort_dir?: 'asc' | 'desc'; + page?: number; per_page?: number; q?: string; status?: string; + department_id?: string; has_account?: boolean; + sort_by?: string; sort_dir?: 'asc' | 'desc'; }): Promise<{ data: Employee[]; total: number; lastPage: number; __authError?: boolean }> { - try { - const searchParams = new URLSearchParams(); + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.per_page) searchParams.set('per_page', String(params.per_page)); + if (params?.q) searchParams.set('q', params.q); + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); + if (params?.department_id) searchParams.set('department_id', params.department_id); + if (params?.has_account !== undefined) searchParams.set('has_account', String(params.has_account)); + if (params?.sort_by) searchParams.set('sort_by', params.sort_by); + if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.per_page) searchParams.set('per_page', String(params.per_page)); - if (params?.q) searchParams.set('q', params.q); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } - if (params?.department_id) searchParams.set('department_id', params.department_id); - if (params?.has_account !== undefined) { - searchParams.set('has_account', String(params.has_account)); - } - if (params?.sort_by) searchParams.set('sort_by', params.sort_by); - if (params?.sort_dir) searchParams.set('sort_dir', params.sort_dir); + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/employees?${searchParams.toString()}`, + errorMessage: '직원 목록 조회에 실패했습니다.', + }); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/employees?${searchParams.toString()}`; + if (result.__authError) return { data: [], total: 0, lastPage: 1, __authError: true }; + if (!result.success || !result.data?.data) return { data: [], total: 0, lastPage: 1 }; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - // 🚨 401 인증 에러 → 클라이언트에서 로그인 페이지로 리다이렉트 - if (error?.__authError) { - return { data: [], total: 0, lastPage: 1, __authError: true }; - } - - if (!response || !response.ok) { - console.error('[EmployeeActions] GET list error:', response?.status); - return { data: [], total: 0, lastPage: 1 }; - } - - const result: ApiResponse> = await response.json(); - - if (!result.success || !result.data?.data) { - console.warn('[EmployeeActions] No data in response'); - return { data: [], total: 0, lastPage: 1 }; - } - - return { - data: result.data.data.map(transformApiToFrontend), - total: result.data.total, - lastPage: result.data.last_page, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] getEmployees error:', error); - return { data: [], total: 0, lastPage: 1 }; - } + return { + data: result.data.data.map(transformApiToFrontend), + total: result.data.total, + lastPage: result.data.last_page, + }; } -/** - * 직원 상세 조회 - */ export async function getEmployeeById(id: string): Promise { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/employees/${id}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/employees/${id}`, + transform: (data: EmployeeApiData) => transformApiToFrontend(data), + errorMessage: '직원 조회에 실패했습니다.', + }); - // 🚨 401 인증 에러 - if (error?.__authError) { - return { __authError: true }; - } - - if (!response || !response.ok) { - console.error('[EmployeeActions] GET employee error:', response?.status); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!result.success || !result.data) { - return null; - } - - return transformApiToFrontend(result.data); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] getEmployeeById error:', error); - return null; - } + if (result.__authError) return { __authError: true }; + return result.success ? result.data || null : null; } -/** - * 직원 등록 - */ export async function createEmployee( data: EmployeeFormData ): Promise<{ - success: boolean; - data?: Employee; - error?: string; - errors?: Record; - status?: number; - __authError?: boolean; + success: boolean; data?: Employee; error?: string; + errors?: Record; status?: number; __authError?: boolean; }> { - try { - const apiData = transformFrontendToApi(data); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/employees`; + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/employees`, + method: 'POST', + body: apiData, + transform: (d: EmployeeApiData) => transformApiToFrontend(d), + errorMessage: '직원 등록에 실패했습니다.', + }); - console.log('[EmployeeActions] POST employee request:', apiData); - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(apiData), - }); - - // 🚨 401 인증 에러 - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '서버 오류가 발생했습니다.' }; - } - - const result = await response.json(); - console.log('[EmployeeActions] POST employee response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '직원 등록에 실패했습니다.', - errors: result.error?.details, // validation errors: error.details 구조 - status: result.error?.code || response.status, - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] createEmployee error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } -/** - * 직원 수정 - */ export async function updateEmployee( id: string, data: EmployeeFormData ): Promise<{ success: boolean; data?: Employee; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/employees/${id}`; + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/employees/${id}`, + method: 'PATCH', + body: apiData, + transform: (d: EmployeeApiData) => transformApiToFrontend(d), + errorMessage: '직원 수정에 실패했습니다.', + }); - console.log('[EmployeeActions] PATCH employee request:', apiData); - - const { response, error } = await serverFetch(url, { - method: 'PATCH', - body: JSON.stringify(apiData), - }); - - // 🚨 401 인증 에러 - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '서버 오류가 발생했습니다.' }; - } - - const result = await response.json(); - console.log('[EmployeeActions] PATCH employee response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '직원 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] updateEmployee error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } -/** - * 직원 삭제 (퇴직 처리) - */ export async function deleteEmployee(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/employees/${id}`; - const { response, error } = await serverFetch(url, { method: 'DELETE' }); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/employees/${id}`, + method: 'DELETE', + errorMessage: '직원 삭제에 실패했습니다.', + }); - // 🚨 401 인증 에러 - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '서버 오류가 발생했습니다.' }; - } - - const result = await response.json(); - console.log('[EmployeeActions] DELETE employee response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '직원 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] deleteEmployee error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } -/** - * 직원 일괄 삭제 - */ export async function deleteEmployees(ids: string[]): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/employees/bulk-delete`; - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({ ids: ids.map(id => parseInt(id, 10)) }), - }); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/employees/bulk-delete`, + method: 'POST', + body: { ids: ids.map(id => parseInt(id, 10)) }, + errorMessage: '직원 일괄 삭제에 실패했습니다.', + }); - // 🚨 401 인증 에러 - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '서버 오류가 발생했습니다.' }; - } - - const result = await response.json(); - console.log('[EmployeeActions] BULK DELETE employee response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '직원 일괄 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] deleteEmployees error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; +} + +interface EmployeeStatsApiData { + active_count: number; + leave_count: number; + resigned_count: number; + average_tenure: number; } -/** - * 직원 통계 조회 - */ export async function getEmployeeStats(): Promise { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/employees/stats`; - const { response, error } = await serverFetch(url, { method: 'GET' }); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/employees/stats`, + errorMessage: '직원 통계 조회에 실패했습니다.', + }); - // 🚨 401 인증 에러 - if (error?.__authError) { - return { __authError: true }; - } + if (result.__authError) return { __authError: true }; + if (!result.success || !result.data) return null; - if (!response || !response.ok) { - console.error('[EmployeeActions] GET stats error:', response?.status); - return null; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return null; - } - - return { - activeCount: result.data.active_count ?? 0, - leaveCount: result.data.leave_count ?? 0, - resignedCount: result.data.resigned_count ?? 0, - averageTenure: result.data.average_tenure ?? 0, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] getEmployeeStats error:', error); - return null; - } + return { + activeCount: result.data.active_count ?? 0, + leaveCount: result.data.leave_count ?? 0, + resignedCount: result.data.resigned_count ?? 0, + averageTenure: result.data.average_tenure ?? 0, + }; } // ============================================ -// 직급/직책 조회 (positions) +// 직급/직책 조회 (native fetch - keep as-is) // ============================================ export interface PositionItem { @@ -377,47 +183,19 @@ export interface PositionItem { is_active: boolean; } -/** - * 직급/직책 목록 조회 - * @param type 'rank' (직급) | 'title' (직책) | undefined (전체) - */ export async function getPositions(type?: 'rank' | 'title'): Promise { - try { - const headers = await getServerApiHeaders(); - const searchParams = new URLSearchParams(); - if (type) { - searchParams.set('type', type); - } + const searchParams = new URLSearchParams(); + if (type) searchParams.set('type', type); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions?${searchParams.toString()}`; - - const response = await fetch(url, { - method: 'GET', - headers, - cache: 'no-store', - }); - - if (!response.ok) { - console.error('[EmployeeActions] GET positions error:', response.status); - return []; - } - - const result: ApiResponse = await response.json(); - - if (!result.success || !result.data) { - return []; - } - - return result.data; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] getPositions error:', error); - return []; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/positions?${searchParams.toString()}`, + errorMessage: '직급/직책 조회에 실패했습니다.', + }); + return result.data || []; } // ============================================ -// 부서 조회 (departments) +// 부서 조회 (native fetch - keep as-is) // ============================================ export interface DepartmentItem { @@ -428,45 +206,17 @@ export interface DepartmentItem { is_active: boolean; } -/** - * 부서 목록 조회 - */ export async function getDepartments(): Promise { - try { - const headers = await getServerApiHeaders(); - - const response = await fetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/departments`, - { - method: 'GET', - headers, - cache: 'no-store', - } - ); - - if (!response.ok) { - console.error('[EmployeeActions] GET departments error:', response.status); - return []; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return []; - } - - // 페이지네이션 응답 또는 배열 직접 반환 모두 처리 - const departments = Array.isArray(result.data) ? result.data : result.data.data || []; - return departments; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] getDepartments error:', error); - return []; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/departments`, + errorMessage: '부서 조회에 실패했습니다.', + }); + if (!result.data) return []; + return Array.isArray(result.data) ? result.data : result.data.data || []; } // ============================================ -// 파일 업로드 +// 파일 업로드 (native fetch - keep as-is) // ============================================ export async function uploadProfileImage(inputFormData: FormData): Promise<{ @@ -479,16 +229,12 @@ export async function uploadProfileImage(inputFormData: FormData): Promise<{ const cookieStore = await cookies(); const token = cookieStore.get('access_token')?.value; - // 토큰 없으면 인증 에러 - if (!token) { - return { success: false, __authError: true }; - } + if (!token) return { success: false, __authError: true }; - // 디렉토리 정보 추가 inputFormData.append('directory', 'employees/profiles'); const response = await fetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/files/upload`, + `${API_URL}/api/v1/files/upload`, { method: 'POST', headers: { @@ -499,29 +245,15 @@ export async function uploadProfileImage(inputFormData: FormData): Promise<{ } ); - // 🚨 401 인증 에러 - if (response.status === 401) { - return { success: false, __authError: true }; - } - - if (!response.ok) { - return { success: false, error: `파일 업로드 실패: ${response.status}` }; - } + if (response.status === 401) return { success: false, __authError: true }; + if (!response.ok) return { success: false, error: `파일 업로드 실패: ${response.status}` }; const result = await response.json(); + if (!result.success) return { success: false, error: result.message || '파일 업로드에 실패했습니다.' }; - if (!result.success) { - return { success: false, error: result.message || '파일 업로드에 실패했습니다.' }; - } - - // 업로드된 파일 경로 추출 (API 응답: file_path 필드) const uploadedPath = result.data?.file_path || result.data?.path || result.data?.url; + if (!uploadedPath) return { success: false, error: '업로드된 파일 경로를 가져올 수 없습니다.' }; - if (!uploadedPath) { - return { success: false, error: '업로드된 파일 경로를 가져올 수 없습니다.' }; - } - - // /storage/tenants/ 경로로 변환 (tenant disk 파일 접근 경로) const storagePath = uploadedPath.startsWith('/storage/') ? uploadedPath : `/storage/tenants/${uploadedPath}`; @@ -529,13 +261,12 @@ export async function uploadProfileImage(inputFormData: FormData): Promise<{ return { success: true, data: { - url: `${process.env.NEXT_PUBLIC_API_URL}${storagePath}`, + url: `${API_URL}${storagePath}`, path: uploadedPath, }, }; } catch (error) { if (isNextRedirectError(error)) throw error; - console.error('[EmployeeActions] uploadProfileImage error:', error); return { success: false, error: '서버 오류가 발생했습니다.' }; } -} \ No newline at end of file +} diff --git a/src/components/hr/SalaryManagement/actions.ts b/src/components/hr/SalaryManagement/actions.ts index 5d20b607..6a5247c5 100644 --- a/src/components/hr/SalaryManagement/actions.ts +++ b/src/components/hr/SalaryManagement/actions.ts @@ -1,9 +1,9 @@ 'use server'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { cookies } from 'next/headers'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; import type { SalaryRecord, SalaryDetail, PaymentStatus } from './types'; // API 응답 타입 @@ -46,46 +46,24 @@ interface SalaryApiData { updated_at: string; } -interface SalaryListResponse { - success: boolean; - message: string; - data: { - data: SalaryApiData[]; - current_page: number; - last_page: number; - per_page: number; - total: number; - }; +interface SalaryPaginationData { + data: SalaryApiData[]; + current_page: number; + last_page: number; + per_page: number; + total: number; } -interface SalaryResponse { - success: boolean; - message: string; - data: SalaryApiData; -} - -interface StatisticsResponse { - success: boolean; - message: string; - data: { - total_net_payment: number; - total_base_salary: number; - total_allowance: number; - total_overtime: number; - total_bonus: number; - total_deduction: number; - count: number; - scheduled_count: number; - completed_count: number; - }; -} - -interface BulkUpdateResponse { - success: boolean; - message: string; - data: { - updated_count: number; - }; +interface StatisticsApiData { + total_net_payment: number; + total_base_salary: number; + total_allowance: number; + total_overtime: number; + total_bonus: number; + total_deduction: number; + count: number; + scheduled_count: number; + completed_count: number; } // API URL @@ -99,8 +77,8 @@ function transformApiToFrontend(apiData: SalaryApiData): SalaryRecord { employeeId: apiData.employee?.user_id || `EMP${String(apiData.employee_id).padStart(3, '0')}`, employeeName: apiData.employee?.name || '-', department: profile?.department?.name || '-', - position: profile?.job_title_label || '-', // 직책 (팀장, 팀원) - rank: profile?.rank || '-', // 직급 (부장, 과장, 대리) + position: profile?.job_title_label || '-', + rank: profile?.rank || '-', baseSalary: parseFloat(apiData.base_salary), allowance: parseFloat(apiData.total_allowance), overtime: parseFloat(apiData.total_overtime), @@ -126,8 +104,8 @@ function transformApiToDetail(apiData: SalaryApiData): SalaryDetail { employeeId: apiData.employee?.user_id || `EMP${String(apiData.employee_id).padStart(3, '0')}`, employeeName: apiData.employee?.name || '-', department: profile?.department?.name || '-', - position: profile?.job_title_label || '-', // 직책 (팀장, 팀원) - rank: profile?.rank || '-', // 직급 (부장, 과장, 대리) + position: profile?.job_title_label || '-', + rank: profile?.rank || '-', baseSalary: parseFloat(apiData.base_salary), allowances: { positionAllowance: allowanceDetails.position_allowance || 0, @@ -155,19 +133,11 @@ function transformApiToDetail(apiData: SalaryApiData): SalaryDetail { }; } -/** - * 급여 목록 조회 - */ +// ===== 급여 목록 조회 ===== export async function getSalaries(params?: { - search?: string; - year?: number; - month?: number; - status?: string; - employee_id?: number; - start_date?: string; - end_date?: string; - page?: number; - per_page?: number; + search?: string; year?: number; month?: number; status?: string; + employee_id?: number; start_date?: string; end_date?: string; + page?: number; per_page?: number; }): Promise<{ success: boolean; data?: SalaryRecord[]; @@ -175,7 +145,6 @@ export async function getSalaries(params?: { error?: string }> { const searchParams = new URLSearchParams(); - if (params?.search) searchParams.set('search', params.search); if (params?.year) searchParams.set('year', String(params.year)); if (params?.month) searchParams.set('month', String(params.month)); @@ -185,19 +154,14 @@ export async function getSalaries(params?: { if (params?.end_date) searchParams.set('end_date', params.end_date); if (params?.page) searchParams.set('page', String(params.page)); if (params?.per_page) searchParams.set('per_page', String(params.per_page)); + const queryString = searchParams.toString(); - const url = `${API_URL}/v1/salaries${searchParams.toString() ? `?${searchParams.toString()}` : ''}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); + const result = await executeServerAction({ + url: `${API_URL}/v1/salaries${queryString ? `?${queryString}` : ''}`, + errorMessage: '급여 목록을 불러오는데 실패했습니다.', + }); - if (error || !response) { - return { success: false, error: error?.message || '급여 목록을 불러오는데 실패했습니다.' }; - } - - const result: SalaryListResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '급여 목록을 불러오는데 실패했습니다.' }; - } + if (!result.success || !result.data) return { success: false, error: result.error }; return { success: true, @@ -210,94 +174,49 @@ export async function getSalaries(params?: { }; } -/** - * 급여 상세 조회 - */ +// ===== 급여 상세 조회 ===== export async function getSalary(id: string): Promise<{ - success: boolean; - data?: SalaryDetail; - error?: string + success: boolean; data?: SalaryDetail; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/salaries/${id}`, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '급여 정보를 불러오는데 실패했습니다.' }; - } - - const result: SalaryResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '급여 정보를 불러오는데 실패했습니다.' }; - } - - return { - success: true, - data: transformApiToDetail(result.data), - }; + const result = await executeServerAction({ + url: `${API_URL}/v1/salaries/${id}`, + transform: (data: SalaryApiData) => transformApiToDetail(data), + errorMessage: '급여 정보를 불러오는데 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 급여 상태 변경 - */ +// ===== 급여 상태 변경 ===== export async function updateSalaryStatus( id: string, status: PaymentStatus ): Promise<{ success: boolean; data?: SalaryRecord; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/salaries/${id}/status`, { + const result = await executeServerAction({ + url: `${API_URL}/v1/salaries/${id}/status`, method: 'PATCH', - body: JSON.stringify({ status }), + body: { status }, + transform: (data: SalaryApiData) => transformApiToFrontend(data), + errorMessage: '상태 변경에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '상태 변경에 실패했습니다.' }; - } - - const result: SalaryResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '상태 변경에 실패했습니다.' }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; + return { success: result.success, data: result.data, error: result.error }; } -/** - * 급여 일괄 상태 변경 - */ +// ===== 급여 일괄 상태 변경 ===== export async function bulkUpdateSalaryStatus( ids: string[], status: PaymentStatus ): Promise<{ success: boolean; updatedCount?: number; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/salaries/bulk-update-status`, { + const result = await executeServerAction<{ updated_count: number }>({ + url: `${API_URL}/v1/salaries/bulk-update-status`, method: 'POST', - body: JSON.stringify({ - ids: ids.map(id => parseInt(id, 10)), - status - }), + body: { ids: ids.map(id => parseInt(id, 10)), status }, + errorMessage: '일괄 상태 변경에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '일괄 상태 변경에 실패했습니다.' }; - } - - const result: BulkUpdateResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '일괄 상태 변경에 실패했습니다.' }; - } - - return { - success: true, - updatedCount: result.data.updated_count, - }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { success: true, updatedCount: result.data.updated_count }; } -/** - * 급여 수정 (수당/공제 항목 포함) - */ +// ===== 급여 수정 ===== export async function updateSalary( id: string, data: { @@ -308,69 +227,41 @@ export async function updateSalary( payment_date?: string; } ): Promise<{ success: boolean; data?: SalaryDetail; error?: string }> { - const { response, error } = await serverFetch(`${API_URL}/v1/salaries/${id}`, { + const result = await executeServerAction({ + url: `${API_URL}/v1/salaries/${id}`, method: 'PUT', - body: JSON.stringify(data), + body: data, + transform: (d: SalaryApiData) => transformApiToDetail(d), + errorMessage: '급여 수정에 실패했습니다.', }); - - if (error || !response) { - return { success: false, error: error?.message || '급여 수정에 실패했습니다.' }; - } - - const result: SalaryResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '급여 수정에 실패했습니다.' }; - } - - return { - success: true, - data: transformApiToDetail(result.data), - }; + return { success: result.success, data: result.data, error: result.error }; } -/** - * 급여 통계 조회 - */ +// ===== 급여 통계 조회 ===== export async function getSalaryStatistics(params?: { - year?: number; - month?: number; - start_date?: string; - end_date?: string; + year?: number; month?: number; start_date?: string; end_date?: string; }): Promise<{ success: boolean; data?: { - totalNetPayment: number; - totalBaseSalary: number; - totalAllowance: number; - totalOvertime: number; - totalBonus: number; - totalDeduction: number; - count: number; - scheduledCount: number; - completedCount: number; + totalNetPayment: number; totalBaseSalary: number; totalAllowance: number; + totalOvertime: number; totalBonus: number; totalDeduction: number; + count: number; scheduledCount: number; completedCount: number; }; error?: string }> { const searchParams = new URLSearchParams(); - if (params?.year) searchParams.set('year', String(params.year)); if (params?.month) searchParams.set('month', String(params.month)); if (params?.start_date) searchParams.set('start_date', params.start_date); if (params?.end_date) searchParams.set('end_date', params.end_date); + const queryString = searchParams.toString(); - const url = `${API_URL}/v1/salaries/statistics${searchParams.toString() ? `?${searchParams.toString()}` : ''}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); + const result = await executeServerAction({ + url: `${API_URL}/v1/salaries/statistics${queryString ? `?${queryString}` : ''}`, + errorMessage: '통계 정보를 불러오는데 실패했습니다.', + }); - if (error || !response) { - return { success: false, error: error?.message || '통계 정보를 불러오는데 실패했습니다.' }; - } - - const result: StatisticsResponse = await response.json(); - - if (!result.success) { - return { success: false, error: result.message || '통계 정보를 불러오는데 실패했습니다.' }; - } + if (!result.success || !result.data) return { success: false, error: result.error }; return { success: true, @@ -388,9 +279,7 @@ export async function getSalaryStatistics(params?: { }; } -/** - * 급여 엑셀 내보내기 - */ +// ===== 급여 엑셀 내보내기 (native fetch - keep as-is) ===== export async function exportSalaryExcel(params?: { year?: number; month?: number; @@ -433,11 +322,7 @@ export async function exportSalaryExcel(params?: { }); if (!response.ok) { - console.warn('[SalaryActions] GET export error:', response.status); - return { - success: false, - error: `API 오류: ${response.status}`, - }; + return { success: false, error: `API 오류: ${response.status}` }; } const blob = await response.blob(); @@ -445,17 +330,9 @@ export async function exportSalaryExcel(params?: { const filenameMatch = contentDisposition?.match(/filename="?(.+)"?/); const filename = filenameMatch?.[1] || `급여명세_${params?.year || 'all'}_${params?.month || 'all'}.xlsx`; - return { - success: true, - data: blob, - filename, - }; + return { success: true, data: blob, filename }; } catch (error) { if (isNextRedirectError(error)) throw error; - console.error('[SalaryActions] exportSalaryExcel error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + return { success: false, error: '서버 오류가 발생했습니다.' }; } -} \ No newline at end of file +} diff --git a/src/components/hr/VacationManagement/actions.ts b/src/components/hr/VacationManagement/actions.ts index 00d9f45e..e6ed7cba 100644 --- a/src/components/hr/VacationManagement/actions.ts +++ b/src/components/hr/VacationManagement/actions.ts @@ -22,8 +22,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; // ============================================ // 타입 정의 @@ -239,569 +238,200 @@ function transformBalanceToFrontend(apiData: Record): LeaveBala // API 함수 // ============================================ -/** - * 휴가 목록 조회 - * GET /v1/leaves - */ +/** 휴가 목록 조회 */ export async function getLeaves(params?: GetLeavesParams): Promise<{ success: boolean; data?: { items: LeaveRecord[]; total: number; currentPage: number; lastPage: number }; error?: string; }> { - try { - const searchParams = new URLSearchParams(); - - if (params) { - if (params.userId) searchParams.append('user_id', params.userId.toString()); - if (params.status) searchParams.append('status', params.status); - if (params.leaveType) searchParams.append('leave_type', params.leaveType); - if (params.dateFrom) searchParams.append('date_from', params.dateFrom); - if (params.dateTo) searchParams.append('date_to', params.dateTo); - if (params.year) searchParams.append('year', params.year.toString()); - if (params.departmentId) searchParams.append('department_id', params.departmentId.toString()); - if (params.sortBy) searchParams.append('sort_by', params.sortBy); - if (params.sortDir) searchParams.append('sort_dir', params.sortDir); - if (params.perPage) searchParams.append('per_page', params.perPage.toString()); - if (params.page) searchParams.append('page', params.page.toString()); - } - - const queryString = searchParams.toString(); - const url = `${API_URL}/v1/leaves${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse>> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: { - items: result.data.data.map(transformApiToFrontend), - total: result.data.total, - currentPage: result.data.current_page, - lastPage: result.data.last_page, - }, - }; - } - - return { - success: false, - error: result.message || '휴가 목록 조회에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getLeaves] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 목록 조회에 실패했습니다.', - }; + const searchParams = new URLSearchParams(); + if (params) { + if (params.userId) searchParams.append('user_id', params.userId.toString()); + if (params.status) searchParams.append('status', params.status); + if (params.leaveType) searchParams.append('leave_type', params.leaveType); + if (params.dateFrom) searchParams.append('date_from', params.dateFrom); + if (params.dateTo) searchParams.append('date_to', params.dateTo); + if (params.year) searchParams.append('year', params.year.toString()); + if (params.departmentId) searchParams.append('department_id', params.departmentId.toString()); + if (params.sortBy) searchParams.append('sort_by', params.sortBy); + if (params.sortDir) searchParams.append('sort_dir', params.sortDir); + if (params.perPage) searchParams.append('per_page', params.perPage.toString()); + if (params.page) searchParams.append('page', params.page.toString()); } + const queryString = searchParams.toString(); + const result = await executeServerAction>>({ + url: `${API_URL}/v1/leaves${queryString ? `?${queryString}` : ''}`, + errorMessage: '휴가 목록 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + items: result.data.data.map(transformApiToFrontend), + total: result.data.total, currentPage: result.data.current_page, lastPage: result.data.last_page, + }, + }; } -/** - * 휴가 상세 조회 - * GET /v1/leaves/{id} - */ -export async function getLeaveById(id: number): Promise<{ - success: boolean; - data?: LeaveRecord; - error?: string; -}> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves/${id}`, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 조회에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '휴가 조회에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getLeaveById] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 조회에 실패했습니다.', - }; - } +/** 휴가 상세 조회 */ +export async function getLeaveById(id: number): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves/${id}`, + transform: (data: Record) => transformApiToFrontend(data), + errorMessage: '휴가 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 휴가 신청 - * POST /v1/leaves - */ -export async function createLeave( - data: CreateLeaveRequest -): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves`, { - method: 'POST', - body: JSON.stringify({ - user_id: data.userId, - leave_type: data.leaveType, - start_date: data.startDate, - end_date: data.endDate, - days: data.days, - reason: data.reason, - }), - }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 신청에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '휴가 신청에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[createLeave] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 신청에 실패했습니다.', - }; - } +/** 휴가 신청 */ +export async function createLeave(data: CreateLeaveRequest): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves`, + method: 'POST', + body: { user_id: data.userId, leave_type: data.leaveType, start_date: data.startDate, end_date: data.endDate, days: data.days, reason: data.reason }, + transform: (d: Record) => transformApiToFrontend(d), + errorMessage: '휴가 신청에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 휴가 승인 - * POST /v1/leaves/{id}/approve - */ -export async function approveLeave( - id: number, - comment?: string -): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves/${id}/approve`, { - method: 'POST', - body: JSON.stringify({ comment }), - }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 승인에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '휴가 승인에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[approveLeave] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 승인에 실패했습니다.', - }; - } +/** 휴가 승인 */ +export async function approveLeave(id: number, comment?: string): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves/${id}/approve`, + method: 'POST', + body: { comment }, + transform: (d: Record) => transformApiToFrontend(d), + errorMessage: '휴가 승인에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 휴가 반려 - * POST /v1/leaves/{id}/reject - */ -export async function rejectLeave( - id: number, - reason: string -): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves/${id}/reject`, { - method: 'POST', - body: JSON.stringify({ reason }), - }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 반려에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '휴가 반려에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[rejectLeave] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 반려에 실패했습니다.', - }; - } +/** 휴가 반려 */ +export async function rejectLeave(id: number, reason: string): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves/${id}/reject`, + method: 'POST', + body: { reason }, + transform: (d: Record) => transformApiToFrontend(d), + errorMessage: '휴가 반려에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 휴가 취소 - * POST /v1/leaves/{id}/cancel - */ -export async function cancelLeave( - id: number, - reason?: string -): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves/${id}/cancel`, { - method: 'POST', - body: JSON.stringify({ reason }), - }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 취소에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '휴가 취소에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[cancelLeave] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 취소에 실패했습니다.', - }; - } +/** 휴가 취소 */ +export async function cancelLeave(id: number, reason?: string): Promise<{ success: boolean; data?: LeaveRecord; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves/${id}/cancel`, + method: 'POST', + body: { reason }, + transform: (d: Record) => transformApiToFrontend(d), + errorMessage: '휴가 취소에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 내 잔여 휴가 조회 - * GET /v1/leaves/balance - */ -export async function getMyLeaveBalance(year?: number): Promise<{ - success: boolean; - data?: LeaveBalance; - error?: string; -}> { - try { - const url = year - ? `${API_URL}/v1/leaves/balance?year=${year}` - : `${API_URL}/v1/leaves/balance`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '잔여 휴가 조회에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformBalanceToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '잔여 휴가 조회에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getMyLeaveBalance] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '잔여 휴가 조회에 실패했습니다.', - }; - } +/** 내 잔여 휴가 조회 */ +export async function getMyLeaveBalance(year?: number): Promise<{ success: boolean; data?: LeaveBalance; error?: string }> { + const url = year ? `${API_URL}/v1/leaves/balance?year=${year}` : `${API_URL}/v1/leaves/balance`; + const result = await executeServerAction({ + url, + transform: (data: Record) => transformBalanceToFrontend(data), + errorMessage: '잔여 휴가 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 특정 사용자 잔여 휴가 조회 - * GET /v1/leaves/balance/{userId} - */ -export async function getUserLeaveBalance( - userId: number, - year?: number -): Promise<{ - success: boolean; - data?: LeaveBalance; - error?: string; -}> { - try { - const url = year - ? `${API_URL}/v1/leaves/balance/${userId}?year=${year}` - : `${API_URL}/v1/leaves/balance/${userId}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '잔여 휴가 조회에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformBalanceToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '잔여 휴가 조회에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getUserLeaveBalance] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '잔여 휴가 조회에 실패했습니다.', - }; - } +/** 특정 사용자 잔여 휴가 조회 */ +export async function getUserLeaveBalance(userId: number, year?: number): Promise<{ success: boolean; data?: LeaveBalance; error?: string }> { + const url = year ? `${API_URL}/v1/leaves/balance/${userId}?year=${year}` : `${API_URL}/v1/leaves/balance/${userId}`; + const result = await executeServerAction({ + url, + transform: (data: Record) => transformBalanceToFrontend(data), + errorMessage: '잔여 휴가 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 잔여 휴가 설정 (부여) - * PUT /v1/leaves/balance - */ -export async function setLeaveBalance( - data: SetLeaveBalanceRequest -): Promise<{ success: boolean; data?: LeaveBalance; error?: string }> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves/balance`, { - method: 'PUT', - body: JSON.stringify({ - user_id: data.userId, - year: data.year, - total_days: data.totalDays, - }), - }); - - if (error || !response) { - return { success: false, error: error?.message || '잔여 휴가 설정에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformBalanceToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '잔여 휴가 설정에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[setLeaveBalance] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '잔여 휴가 설정에 실패했습니다.', - }; - } +/** 잔여 휴가 설정 (부여) */ +export async function setLeaveBalance(data: SetLeaveBalanceRequest): Promise<{ success: boolean; data?: LeaveBalance; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves/balance`, + method: 'PUT', + body: { user_id: data.userId, year: data.year, total_days: data.totalDays }, + transform: (d: Record) => transformBalanceToFrontend(d), + errorMessage: '잔여 휴가 설정에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 휴가 삭제 - * DELETE /v1/leaves/{id} - */ +/** 휴가 삭제 */ export async function deleteLeave(id: number): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves/${id}`, { - method: 'DELETE', - }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 삭제에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (result.success) { - return { success: true }; - } - - return { - success: false, - error: result.message || '휴가 삭제에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteLeave] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 삭제에 실패했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves/${id}`, + method: 'DELETE', + errorMessage: '휴가 삭제에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } -/** - * 여러 휴가 일괄 승인 - */ +/** 여러 휴가 일괄 승인 */ export async function approveLeavesMany(ids: number[]): Promise<{ - success: boolean; - results?: { id: number; success: boolean; error?: string }[]; - error?: string; + success: boolean; results?: { id: number; success: boolean; error?: string }[]; error?: string; }> { - try { - const results = await Promise.all( - ids.map(async (id) => { - const result = await approveLeave(id); - return { id, success: result.success, error: result.error }; - }) - ); - - const allSuccess = results.every((r) => r.success); - return { - success: allSuccess, - results, - error: allSuccess ? undefined : '일부 휴가 승인에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[approveLeavesMany] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 일괄 승인에 실패했습니다.', - }; - } + const results = await Promise.all( + ids.map(async (id) => { + const r = await approveLeave(id); + return { id, success: r.success, error: r.error }; + }) + ); + const allSuccess = results.every((r) => r.success); + return { success: allSuccess, results, error: allSuccess ? undefined : '일부 휴가 승인에 실패했습니다.' }; } -/** - * 여러 휴가 일괄 반려 - */ -export async function rejectLeavesMany( - ids: number[], - reason: string -): Promise<{ - success: boolean; - results?: { id: number; success: boolean; error?: string }[]; - error?: string; +/** 여러 휴가 일괄 반려 */ +export async function rejectLeavesMany(ids: number[], reason: string): Promise<{ + success: boolean; results?: { id: number; success: boolean; error?: string }[]; error?: string; }> { - try { - const results = await Promise.all( - ids.map(async (id) => { - const result = await rejectLeave(id, reason); - return { id, success: result.success, error: result.error }; - }) - ); - - const allSuccess = results.every((r) => r.success); - return { - success: allSuccess, - results, - error: allSuccess ? undefined : '일부 휴가 반려에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[rejectLeavesMany] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 일괄 반려에 실패했습니다.', - }; - } + const results = await Promise.all( + ids.map(async (id) => { + const r = await rejectLeave(id, reason); + return { id, success: r.success, error: r.error }; + }) + ); + const allSuccess = results.every((r) => r.success); + return { success: allSuccess, results, error: allSuccess ? undefined : '일부 휴가 반려에 실패했습니다.' }; } -/** - * 전체 직원 휴가 사용현황 조회 - * GET /v1/leaves/balances - */ +/** 전체 직원 휴가 사용현황 조회 */ export async function getLeaveBalances(params?: GetLeaveBalancesParams): Promise<{ success: boolean; data?: { items: LeaveBalanceRecord[]; total: number; currentPage: number; lastPage: number }; error?: string; }> { - try { - const searchParams = new URLSearchParams(); - - if (params) { - if (params.year) searchParams.append('year', params.year.toString()); - if (params.departmentId) searchParams.append('department_id', params.departmentId.toString()); - if (params.search) searchParams.append('search', params.search); - if (params.sortBy) searchParams.append('sort_by', params.sortBy); - if (params.sortDir) searchParams.append('sort_dir', params.sortDir); - if (params.perPage) searchParams.append('per_page', params.perPage.toString()); - if (params.page) searchParams.append('page', params.page.toString()); - } - - const queryString = searchParams.toString(); - const url = `${API_URL}/v1/leaves/balances${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 사용현황 조회에 실패했습니다.' }; - } - - const result: ApiResponse>> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: { - items: result.data.data.map(transformBalanceRecordToFrontend), - total: result.data.total, - currentPage: result.data.current_page, - lastPage: result.data.last_page, - }, - }; - } - - return { - success: false, - error: result.message || '휴가 사용현황 조회에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getLeaveBalances] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 사용현황 조회에 실패했습니다.', - }; + const searchParams = new URLSearchParams(); + if (params) { + if (params.year) searchParams.append('year', params.year.toString()); + if (params.departmentId) searchParams.append('department_id', params.departmentId.toString()); + if (params.search) searchParams.append('search', params.search); + if (params.sortBy) searchParams.append('sort_by', params.sortBy); + if (params.sortDir) searchParams.append('sort_dir', params.sortDir); + if (params.perPage) searchParams.append('per_page', params.perPage.toString()); + if (params.page) searchParams.append('page', params.page.toString()); } + const queryString = searchParams.toString(); + const result = await executeServerAction>>({ + url: `${API_URL}/v1/leaves/balances${queryString ? `?${queryString}` : ''}`, + errorMessage: '휴가 사용현황 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + items: result.data.data.map(transformBalanceRecordToFrontend), + total: result.data.total, currentPage: result.data.current_page, lastPage: result.data.last_page, + }, + }; } /** @@ -888,147 +518,61 @@ export interface CreateLeaveGrantRequest { reason?: string; } -/** - * 휴가 부여 이력 조회 - * GET /v1/leaves/grants - */ +/** 휴가 부여 이력 조회 */ export async function getLeaveGrants(params?: GetLeaveGrantsParams): Promise<{ success: boolean; data?: { items: LeaveGrantRecord[]; total: number; currentPage: number; lastPage: number }; error?: string; }> { - try { - const searchParams = new URLSearchParams(); - - if (params) { - if (params.userId) searchParams.append('user_id', params.userId.toString()); - if (params.grantType) searchParams.append('grant_type', params.grantType); - if (params.dateFrom) searchParams.append('date_from', params.dateFrom); - if (params.dateTo) searchParams.append('date_to', params.dateTo); - if (params.year) searchParams.append('year', params.year.toString()); - if (params.departmentId) searchParams.append('department_id', params.departmentId.toString()); - if (params.search) searchParams.append('search', params.search); - if (params.sortBy) searchParams.append('sort_by', params.sortBy); - if (params.sortDir) searchParams.append('sort_dir', params.sortDir); - if (params.perPage) searchParams.append('per_page', params.perPage.toString()); - if (params.page) searchParams.append('page', params.page.toString()); - } - - const queryString = searchParams.toString(); - const url = `${API_URL}/v1/leaves/grants${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 부여 이력 조회에 실패했습니다.' }; - } - - const result: ApiResponse>> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: { - items: result.data.data.map(transformGrantRecordToFrontend), - total: result.data.total, - currentPage: result.data.current_page, - lastPage: result.data.last_page, - }, - }; - } - - return { - success: false, - error: result.message || '휴가 부여 이력 조회에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getLeaveGrants] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 부여 이력 조회에 실패했습니다.', - }; + const searchParams = new URLSearchParams(); + if (params) { + if (params.userId) searchParams.append('user_id', params.userId.toString()); + if (params.grantType) searchParams.append('grant_type', params.grantType); + if (params.dateFrom) searchParams.append('date_from', params.dateFrom); + if (params.dateTo) searchParams.append('date_to', params.dateTo); + if (params.year) searchParams.append('year', params.year.toString()); + if (params.departmentId) searchParams.append('department_id', params.departmentId.toString()); + if (params.search) searchParams.append('search', params.search); + if (params.sortBy) searchParams.append('sort_by', params.sortBy); + if (params.sortDir) searchParams.append('sort_dir', params.sortDir); + if (params.perPage) searchParams.append('per_page', params.perPage.toString()); + if (params.page) searchParams.append('page', params.page.toString()); } + const queryString = searchParams.toString(); + const result = await executeServerAction>>({ + url: `${API_URL}/v1/leaves/grants${queryString ? `?${queryString}` : ''}`, + errorMessage: '휴가 부여 이력 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + items: result.data.data.map(transformGrantRecordToFrontend), + total: result.data.total, currentPage: result.data.current_page, lastPage: result.data.last_page, + }, + }; } -/** - * 휴가 부여 - * POST /v1/leaves/grants - */ -export async function createLeaveGrant( - data: CreateLeaveGrantRequest -): Promise<{ success: boolean; data?: LeaveGrantRecord; error?: string }> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves/grants`, { - method: 'POST', - body: JSON.stringify({ - user_id: data.userId, - grant_type: data.grantType, - grant_date: data.grantDate, - grant_days: data.grantDays, - reason: data.reason, - }), - }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 부여에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (result.success && result.data) { - return { - success: true, - data: transformGrantRecordToFrontend(result.data), - }; - } - - return { - success: false, - error: result.message || '휴가 부여에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[createLeaveGrant] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 부여에 실패했습니다.', - }; - } +/** 휴가 부여 */ +export async function createLeaveGrant(data: CreateLeaveGrantRequest): Promise<{ success: boolean; data?: LeaveGrantRecord; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves/grants`, + method: 'POST', + body: { user_id: data.userId, grant_type: data.grantType, grant_date: data.grantDate, grant_days: data.grantDays, reason: data.reason }, + transform: (d: Record) => transformGrantRecordToFrontend(d), + errorMessage: '휴가 부여에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } -/** - * 휴가 부여 삭제 - * DELETE /v1/leaves/grants/{id} - */ +/** 휴가 부여 삭제 */ export async function deleteLeaveGrant(id: number): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch(`${API_URL}/v1/leaves/grants/${id}`, { - method: 'DELETE', - }); - - if (error || !response) { - return { success: false, error: error?.message || '휴가 부여 삭제에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (result.success) { - return { success: true }; - } - - return { - success: false, - error: result.message || '휴가 부여 삭제에 실패했습니다.', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteLeaveGrant] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '휴가 부여 삭제에 실패했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/v1/leaves/grants/${id}`, + method: 'DELETE', + errorMessage: '휴가 부여 삭제에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } /** @@ -1074,53 +618,25 @@ export interface EmployeeOption { position: string; } -/** - * 활성 직원 목록 조회 (휴가 신청/부여용) - * GET /v1/employees - */ -export async function getActiveEmployees(): Promise<{ - success: boolean; - data?: EmployeeOption[]; - error?: string; -}> { - try { - const url = `${API_URL}/v1/employees?status=active&per_page=100`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || '직원 목록 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (result.success && result.data?.data) { - const employees: EmployeeOption[] = result.data.data.map((item: Record) => { - const user = item.user as Record | undefined; - const department = item.department as Record | undefined; - - return { - id: String(item.id), - userId: (item.user_id as number) ?? (user?.id as number) ?? item.id, - name: (user?.name as string) ?? (item.name as string) ?? '', - department: (department?.name as string) ?? '-', - position: (item.position_label as string) ?? (item.position_key as string) ?? '-', - }; - }); - - return { success: true, data: employees }; - } +/** 활성 직원 목록 조회 (휴가 신청/부여용) */ +export async function getActiveEmployees(): Promise<{ success: boolean; data?: EmployeeOption[]; error?: string }> { + interface EmployeePaginatedResponse { data: Record[]; total: number } + const result = await executeServerAction({ + url: `${API_URL}/v1/employees?status=active&per_page=100`, + errorMessage: '직원 목록 조회에 실패했습니다.', + }); + if (!result.success || !result.data?.data) return { success: false, error: result.error }; + const employees: EmployeeOption[] = result.data.data.map((item) => { + const user = item.user as Record | undefined; + const department = item.department as Record | undefined; return { - success: false, - error: result.message || '직원 목록 조회에 실패했습니다.', + id: String(item.id), + userId: (item.user_id as number) ?? (user?.id as number) ?? (item.id as number), + name: (user?.name as string) ?? (item.name as string) ?? '', + department: (department?.name as string) ?? '-', + position: (item.position_label as string) ?? (item.position_key as string) ?? '-', }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getActiveEmployees] Error:', error); - return { - success: false, - error: error instanceof Error ? error.message : '직원 목록 조회에 실패했습니다.', - }; - } + }); + return { success: true, data: employees }; } \ No newline at end of file diff --git a/src/components/items/FileUpload.tsx b/src/components/items/FileUpload.tsx index b7e75dde..dea94e3d 100644 --- a/src/components/items/FileUpload.tsx +++ b/src/components/items/FileUpload.tsx @@ -48,6 +48,28 @@ export default function FileUpload({ return; } + // 위험한 확장자 차단 + const dangerousExtensions = ['.exe', '.bat', '.cmd', '.sh', '.js', '.jsx', '.ts', '.tsx', '.mjs', '.jar', '.app', '.scr', '.vbs', '.ps1', '.htm', '.html', '.svg', '.swf']; + const fileExtension = '.' + (file.name.split('.').pop()?.toLowerCase() || ''); + if (dangerousExtensions.includes(fileExtension)) { + setError('보안상 허용되지 않는 파일 형식입니다.'); + return; + } + + // accept가 지정된 경우 확장자 검증 + if (accept !== '*/*') { + const allowedExtensions = accept.split(',').map(ext => ext.trim().toLowerCase()); + const isAllowed = allowedExtensions.some(ext => { + if (ext.startsWith('.')) return fileExtension === ext; + if (ext.endsWith('/*')) return file.type.startsWith(ext.replace('/*', '/')); + return file.type === ext; + }); + if (!isAllowed) { + setError(`허용되지 않은 파일 형식입니다. (${accept})`); + return; + } + } + // 파일 크기 검증 const fileSizeMB = file.size / (1024 * 1024); if (fileSizeMB > maxSize) { diff --git a/src/components/material/ReceivingManagement/actions.ts b/src/components/material/ReceivingManagement/actions.ts index 62d265eb..bc74d8ac 100644 --- a/src/components/material/ReceivingManagement/actions.ts +++ b/src/components/material/ReceivingManagement/actions.ts @@ -17,8 +17,12 @@ const USE_MOCK_DATA = false; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { isNextRedirectError } from '@/lib/utils/redirect-error'; +import { executeServerAction } from '@/lib/api/execute-server-action'; + +const API_URL = process.env.NEXT_PUBLIC_API_URL; + import type { ReceivingItem, ReceivingDetail, @@ -577,86 +581,29 @@ export async function getReceivings(params?: { }; } - try { - const searchParams = new URLSearchParams(); + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('per_page', String(params.perPage)); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); + if (params?.search) searchParams.set('search', params.search); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('per_page', String(params.perPage)); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } - if (params?.search) searchParams.set('search', params.search); + const queryString = searchParams.toString(); + const emptyPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivings${queryString ? `?${queryString}` : ''}`, + errorMessage: '입고 목록 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, data: [], pagination: emptyPagination, __authError: true }; + if (!result.success || !result.data) return { success: false, data: [], pagination: emptyPagination, error: result.error }; - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '입고 목록 조회에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '입고 목록 조회에 실패했습니다.', - }; - } - - const paginatedData: ReceivingApiPaginatedResponse = result.data || { - data: [], - current_page: 1, - last_page: 1, - per_page: 20, - total: 0, - }; - - const receivings = (paginatedData.data || []).map(transformApiToListItem); - - return { - success: true, - data: receivings, - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] getReceivings error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + const pd = result.data; + return { + success: true, + data: (pd.data || []).map(transformApiToListItem), + pagination: { currentPage: pd.current_page, lastPage: pd.last_page, perPage: pd.per_page, total: pd.total }, + }; } // ===== 입고 통계 조회 ===== @@ -666,37 +613,15 @@ export async function getReceivingStats(): Promise<{ error?: string; __authError?: boolean; }> { - // ===== 목데이터 모드 ===== - if (USE_MOCK_DATA) { - return { success: true, data: MOCK_RECEIVING_STATS }; - } + if (USE_MOCK_DATA) return { success: true, data: MOCK_RECEIVING_STATS }; - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings/stats`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '입고 통계 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '입고 통계 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToStats(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] getReceivingStats error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivings/stats`, + transform: (data: ReceivingApiStatsResponse) => transformApiToStats(data), + errorMessage: '입고 통계 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 입고 상세 조회 ===== @@ -706,75 +631,34 @@ export async function getReceivingById(id: string): Promise<{ error?: string; __authError?: boolean; }> { - // ===== 목데이터 모드 ===== if (USE_MOCK_DATA) { const detail = MOCK_RECEIVING_DETAIL[id]; - if (detail) { - return { success: true, data: detail }; - } - return { success: false, error: '입고 정보를 찾을 수 없습니다.' }; + return detail ? { success: true, data: detail } : { success: false, error: '입고 정보를 찾을 수 없습니다.' }; } - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings/${id}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '입고 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '입고 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] getReceivingById error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivings/${id}`, + transform: (data: ReceivingApiData) => transformApiToDetail(data), + errorMessage: '입고 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 입고 등록 ===== export async function createReceiving( data: Partial ): Promise<{ success: boolean; data?: ReceivingDetail; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings`, - { method: 'POST', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '입고 등록에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '입고 등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] createReceiving error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivings`, + method: 'POST', + body: apiData, + transform: (d: ReceivingApiData) => transformApiToDetail(d), + errorMessage: '입고 등록에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 입고 수정 ===== @@ -782,66 +666,29 @@ export async function updateReceiving( id: string, data: Partial ): Promise<{ success: boolean; data?: ReceivingDetail; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings/${id}`, - { method: 'PUT', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '입고 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '입고 수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] updateReceiving error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivings/${id}`, + method: 'PUT', + body: apiData, + transform: (d: ReceivingApiData) => transformApiToDetail(d), + errorMessage: '입고 수정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 입고 삭제 ===== export async function deleteReceiving( id: string ): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings/${id}`, - { method: 'DELETE' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '입고 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '입고 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] deleteReceiving error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivings/${id}`, + method: 'DELETE', + errorMessage: '입고 삭제에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } // ===== 입고처리 ===== @@ -849,34 +696,16 @@ export async function processReceiving( id: string, data: ReceivingProcessFormData ): Promise<{ success: boolean; data?: ReceivingDetail; error?: string; __authError?: boolean }> { - try { - const apiData = transformProcessDataToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings/${id}/process`, - { method: 'POST', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '입고처리에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '입고처리에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] processReceiving error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const apiData = transformProcessDataToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/receivings/${id}/process`, + method: 'POST', + body: apiData, + transform: (d: ReceivingApiData) => transformApiToDetail(d), + errorMessage: '입고처리에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 품목 검색 (입고 등록용) ===== @@ -915,39 +744,24 @@ export async function searchItems(query?: string): Promise<{ return { success: true, data: filtered }; } - try { - const searchParams = new URLSearchParams(); - if (query) searchParams.set('search', query); - searchParams.set('per_page', '50'); + const searchParams = new URLSearchParams(); + if (query) searchParams.set('search', query); + searchParams.set('per_page', '50'); - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/items?${searchParams.toString()}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error || !response) { - return { success: false, data: [] }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - return { success: false, data: [] }; - } - - const items: ItemOption[] = (result.data?.data || []).map((item: Record) => ({ + interface ItemApiData { data: Array> } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/items?${searchParams.toString()}`, + transform: (d) => (d.data || []).map((item) => ({ value: item.item_code, label: item.item_code, description: `${item.item_name} (${item.specification || '-'})`, itemName: item.item_name, specification: item.specification || '', unit: item.unit || 'EA', - })); - - return { success: true, data: items }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - return { success: false, data: [] }; - } + })), + errorMessage: '품목 검색에 실패했습니다.', + }); + return { success: result.success, data: result.data || [] }; } // ===== 발주처 검색 (입고 등록용) ===== @@ -977,35 +791,20 @@ export async function searchSuppliers(query?: string): Promise<{ return { success: true, data: filtered }; } - try { - const searchParams = new URLSearchParams(); - if (query) searchParams.set('search', query); - searchParams.set('per_page', '50'); + const searchParams = new URLSearchParams(); + if (query) searchParams.set('search', query); + searchParams.set('per_page', '50'); - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/suppliers?${searchParams.toString()}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error || !response) { - return { success: false, data: [] }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - return { success: false, data: [] }; - } - - const suppliers: SupplierOption[] = (result.data?.data || []).map((s: Record) => ({ + interface SupplierApiData { data: Array> } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/suppliers?${searchParams.toString()}`, + transform: (d) => (d.data || []).map((s) => ({ value: s.name, label: s.name, - })); - - return { success: true, data: suppliers }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - return { success: false, data: [] }; - } + })), + errorMessage: '발주처 검색에 실패했습니다.', + }); + return { success: result.success, data: result.data || [] }; } // ===== 수입검사 템플릿 타입 (ImportInspectionDocument와 동일) ===== @@ -1251,7 +1050,7 @@ export async function checkInspectionTemplate(itemId?: number): Promise<{ searchParams.append('category', 'incoming_inspection'); searchParams.append('item_id', String(itemId)); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/documents/resolve?${searchParams.toString()}`; + const url = `${API_URL}/api/v1/documents/resolve?${searchParams.toString()}`; const { response, error } = await serverFetch(url, { method: 'GET' }); @@ -1446,45 +1245,20 @@ export async function getInspectionTemplate(params: { return { success: false, error: '품목 ID가 필요합니다.' }; } - try { - const searchParams = new URLSearchParams(); - searchParams.set('category', 'incoming_inspection'); - searchParams.set('item_id', String(params.itemId)); + const searchParams = new URLSearchParams(); + searchParams.set('category', 'incoming_inspection'); + searchParams.set('item_id', String(params.itemId)); - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/documents/resolve?${searchParams.toString()}`, - { method: 'GET', cache: 'no-store' } - ); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/documents/resolve?${searchParams.toString()}`, + errorMessage: '검사 템플릿 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '검사 템플릿 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '검사 템플릿 조회에 실패했습니다.' }; - } - - const resolveData: DocumentResolveResponse = result.data; - - // API 응답을 기존 InspectionTemplateResponse 형식으로 변환 - const template = transformResolveToTemplate(resolveData, params); - - return { - success: true, - data: template, - resolveData, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] getInspectionTemplate error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const resolveData = result.data; + const template = transformResolveToTemplate(resolveData, params); + return { success: true, data: template, resolveData }; } // ===== Tolerance 타입 정의 ===== @@ -2091,7 +1865,7 @@ export async function uploadInspectionFiles(files: File[]): Promise<{ formData.append('file', file); const response = await fetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/files/upload`, + `${API_URL}/api/v1/files/upload`, { method: 'POST', headers: { @@ -2112,7 +1886,7 @@ export async function uploadInspectionFiles(files: File[]): Promise<{ uploadedFiles.push({ id: result.data.id, name: result.data.display_name || file.name, - url: `${process.env.NEXT_PUBLIC_API_URL}/api/v1/files/${result.data.id}/download`, + url: `${API_URL}/api/v1/files/${result.data.id}/download`, size: result.data.file_size, }); } @@ -2140,62 +1914,41 @@ export async function saveInspectionData(params: { error?: string; __authError?: boolean; }> { - try { - // Step 1: POST /v1/documents/upsert - 검사 데이터 저장 - const upsertBody = { + // Step 1: POST /v1/documents/upsert - 검사 데이터 저장 + const docResult = await executeServerAction({ + url: `${API_URL}/api/v1/documents/upsert`, + method: 'POST', + body: { template_id: params.templateId, item_id: params.itemId, title: params.title || '수입검사 성적서', data: params.data, attachments: params.attachments || [], - }; + }, + errorMessage: '검사 데이터 저장에 실패했습니다.', + }); + if (docResult.__authError) return { success: false, __authError: true }; + if (!docResult.success) return { success: false, error: docResult.error }; - const { response: docResponse, error: docError } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/documents/upsert`, - { method: 'POST', body: JSON.stringify(upsertBody) } - ); + // Step 2: PUT /v1/receivings/{id} - 검사 완료 후 입고대기로 상태 변경 (비필수) + const today = new Date().toISOString().split('T')[0]; + const inspectionStatus = params.inspectionResult === 'pass' ? '적' : params.inspectionResult === 'fail' ? '부적' : '-'; + const inspectionResultLabel = params.inspectionResult === 'pass' ? '합격' : params.inspectionResult === 'fail' ? '불합격' : null; - if (docError) { - return { success: false, error: docError.message, __authError: docError.code === 'UNAUTHORIZED' }; - } - - if (!docResponse) { - return { success: false, error: '검사 데이터 저장에 실패했습니다.' }; - } - - const docResult = await docResponse.json(); - if (!docResponse.ok || !docResult.success) { - return { success: false, error: docResult.message || '검사 데이터 저장에 실패했습니다.' }; - } - - // Step 2: PUT /v1/receivings/{id} - 검사 완료 후 입고대기로 상태 변경 + 검사 정보 저장 - const today = new Date().toISOString().split('T')[0]; - const inspectionStatus = params.inspectionResult === 'pass' ? '적' : params.inspectionResult === 'fail' ? '부적' : '-'; - const inspectionResultLabel = params.inspectionResult === 'pass' ? '합격' : params.inspectionResult === 'fail' ? '불합격' : null; - - const { response: recResponse, error: recError } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/receivings/${params.receivingId}`, - { - method: 'PUT', - body: JSON.stringify({ - status: 'receiving_pending', - inspection_status: inspectionStatus, - inspection_date: today, - inspection_result: inspectionResultLabel, - }), - } - ); - - if (recError) { - console.error('[ReceivingActions] 입고 상태 업데이트 실패 (검사 데이터는 저장됨):', recError.message); - } else if (recResponse && !recResponse.ok) { - console.error('[ReceivingActions] 입고 상태 업데이트 실패 (검사 데이터는 저장됨)'); - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ReceivingActions] saveInspectionData error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + const recResult = await executeServerAction({ + url: `${API_URL}/api/v1/receivings/${params.receivingId}`, + method: 'PUT', + body: { + status: 'receiving_pending', + inspection_status: inspectionStatus, + inspection_date: today, + inspection_result: inspectionResultLabel, + }, + errorMessage: '입고 상태 업데이트에 실패했습니다.', + }); + if (!recResult.success) { + console.error('[ReceivingActions] 입고 상태 업데이트 실패 (검사 데이터는 저장됨):', recResult.error); } + + return { success: true }; } \ No newline at end of file diff --git a/src/components/material/StockStatus/actions.ts b/src/components/material/StockStatus/actions.ts index e6b77744..72d74926 100644 --- a/src/components/material/StockStatus/actions.ts +++ b/src/components/material/StockStatus/actions.ts @@ -11,8 +11,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { StockItem, StockDetail, @@ -234,312 +233,101 @@ interface PaginationMeta { total: number; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 재고 목록 조회 ===== export async function getStocks(params?: { - page?: number; - perPage?: number; - search?: string; - itemType?: string; - status?: string; - useStatus?: string; - location?: string; - sortBy?: string; - sortDir?: string; - startDate?: string; - endDate?: string; -}): Promise<{ - success: boolean; - data: StockItem[]; - pagination: PaginationMeta; - error?: string; - __authError?: boolean; -}> { - try { - const searchParams = new URLSearchParams(); + page?: number; perPage?: number; search?: string; itemType?: string; + status?: string; useStatus?: string; location?: string; + sortBy?: string; sortDir?: string; startDate?: string; endDate?: string; +}): Promise<{ success: boolean; data: StockItem[]; pagination: PaginationMeta; error?: string; __authError?: boolean }> { + const emptyPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('per_page', String(params.perPage)); + if (params?.search) searchParams.set('search', params.search); + if (params?.itemType && params.itemType !== 'all') searchParams.set('item_type', params.itemType); + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); + if (params?.useStatus && params.useStatus !== 'all') searchParams.set('is_active', params.useStatus === 'active' ? '1' : '0'); + if (params?.location) searchParams.set('location', params.location); + if (params?.sortBy) searchParams.set('sort_by', params.sortBy); + if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('per_page', String(params.perPage)); - if (params?.search) searchParams.set('search', params.search); - if (params?.itemType && params.itemType !== 'all') { - searchParams.set('item_type', params.itemType); - } - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } - if (params?.useStatus && params.useStatus !== 'all') { - searchParams.set('is_active', params.useStatus === 'active' ? '1' : '0'); - } - if (params?.location) searchParams.set('location', params.location); - if (params?.sortBy) searchParams.set('sort_by', params.sortBy); - if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/stocks${queryString ? `?${queryString}` : ''}`, + errorMessage: '재고 목록 조회에 실패했습니다.', + }); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/stocks${queryString ? `?${queryString}` : ''}`; + if (result.__authError) return { success: false, data: [], pagination: emptyPagination, __authError: true }; + if (!result.success || !result.data) return { success: false, data: [], pagination: emptyPagination, error: result.error }; - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '재고 목록 조회에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '재고 목록 조회에 실패했습니다.', - }; - } - - const paginatedData: ItemApiPaginatedResponse = result.data || { - data: [], - current_page: 1, - last_page: 1, - per_page: 20, - total: 0, - }; - - const stocks = (paginatedData.data || []).map(transformApiToListItem); - - return { - success: true, - data: stocks, - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[StockActions] getStocks error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + return { + success: true, + data: (result.data.data || []).map(transformApiToListItem), + pagination: { + currentPage: result.data.current_page, lastPage: result.data.last_page, + perPage: result.data.per_page, total: result.data.total, + }, + }; } // ===== 재고 통계 조회 ===== -export async function getStockStats(): Promise<{ - success: boolean; - data?: StockStats; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/stocks/stats`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '재고 통계 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '재고 통계 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToStats(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[StockActions] getStockStats error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function getStockStats(): Promise<{ success: boolean; data?: StockStats; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/stocks/stats`, + transform: (data: StockApiStatsResponse) => transformApiToStats(data), + errorMessage: '재고 통계 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 품목유형별 통계 조회 ===== -export async function getStockStatsByType(): Promise<{ - success: boolean; - data?: StockApiStatsByTypeResponse; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/stocks/stats-by-type`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '품목유형별 통계 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '품목유형별 통계 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[StockActions] getStockStatsByType error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function getStockStatsByType(): Promise<{ success: boolean; data?: StockApiStatsByTypeResponse; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/stocks/stats-by-type`, + errorMessage: '품목유형별 통계 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 재고 상세 조회 (Item 기준, LOT 포함) ===== -export async function getStockById(id: string): Promise<{ - success: boolean; - data?: StockDetail; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/stocks/${id}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '재고 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success || !result.data) { - return { success: false, error: result.message || '재고 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[StockActions] getStockById error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function getStockById(id: string): Promise<{ success: boolean; data?: StockDetail; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/stocks/${id}`, + transform: (data: ItemApiData) => transformApiToDetail(data), + errorMessage: '재고 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 재고 단건 수정 ===== export async function updateStock( - id: string, - data: { - safetyStock: number; - useStatus: 'active' | 'inactive'; - } -): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/stocks/${id}`, - { - method: 'PUT', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - safety_stock: data.safetyStock, - is_active: data.useStatus === 'active', - }), - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '재고 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '재고 수정에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[StockActions] updateStock error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + id: string, data: { safetyStock: number; useStatus: 'active' | 'inactive' } +): Promise<{ success: boolean; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/stocks/${id}`, + method: 'PUT', + body: { safety_stock: data.safetyStock, is_active: data.useStatus === 'active' }, + errorMessage: '재고 수정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } // ===== 재고 실사 (일괄 업데이트) ===== -export async function updateStockAudit(updates: { id: string; actualQty: number }[]): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/stocks/audit`, - { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - items: updates.map((u) => ({ - item_id: u.id, - actual_qty: u.actualQty, - })), - }), - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '재고 실사 저장에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '재고 실사 저장에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[StockActions] updateStockAudit error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function updateStockAudit(updates: { id: string; actualQty: number }[]): Promise<{ success: boolean; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/stocks/audit`, + method: 'POST', + body: { items: updates.map((u) => ({ item_id: u.id, actual_qty: u.actualQty })) }, + errorMessage: '재고 실사 저장에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } diff --git a/src/components/orders/actions.ts b/src/components/orders/actions.ts index c5c16352..c09dbed9 100644 --- a/src/components/orders/actions.ts +++ b/src/components/orders/actions.ts @@ -1,6 +1,6 @@ 'use server'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; // ============================================================================ // API 타입 정의 @@ -782,6 +782,8 @@ function transformQuoteItemForSelect(apiItem: ApiQuoteItem): QuotationItem { // API 함수 // ============================================================================ +const API_URL = process.env.NEXT_PUBLIC_API_URL; + /** * 수주 목록 조회 */ @@ -800,54 +802,34 @@ export async function getOrders(params?: { error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); - - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('size', String(params.size)); - if (params?.q) searchParams.set('q', params.q); - if (params?.status) { - // Frontend status를 API status로 변환 - const apiStatus = FRONTEND_TO_API_STATUS[params.status as OrderStatus]; - if (apiStatus) searchParams.set('status', apiStatus); - } - if (params?.order_type) searchParams.set('order_type', params.order_type); - if (params?.client_id) searchParams.set('client_id', String(params.client_id)); - if (params?.date_from) searchParams.set('date_from', params.date_from); - if (params?.date_to) searchParams.set('date_to', params.date_to); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders?${searchParams.toString()}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '목록 조회에 실패했습니다.' }; - } - - return { - success: true, - data: { - items: result.data.data.map(transformApiToFrontend), - total: result.data.total, - page: result.data.current_page, - totalPages: result.data.last_page, - }, - }; - } catch (error) { - console.error('[getOrders] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('size', String(params.size)); + if (params?.q) searchParams.set('q', params.q); + if (params?.status) { + const apiStatus = FRONTEND_TO_API_STATUS[params.status as OrderStatus]; + if (apiStatus) searchParams.set('status', apiStatus); } + if (params?.order_type) searchParams.set('order_type', params.order_type); + if (params?.client_id) searchParams.set('client_id', String(params.client_id)); + if (params?.date_from) searchParams.set('date_from', params.date_from); + if (params?.date_to) searchParams.set('date_to', params.date_to); + + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/orders?${searchParams.toString()}`, + errorMessage: '목록 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + items: result.data.data.map(transformApiToFrontend), + total: result.data.total, + page: result.data.current_page, + totalPages: result.data.last_page, + }, + }; } /** @@ -859,31 +841,13 @@ export async function getOrderById(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${id}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - console.error('[getOrderById] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/${id}`, + transform: (data: ApiOrder) => transformApiToFrontend(data), + errorMessage: '조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** @@ -895,33 +859,16 @@ export async function createOrder(data: OrderFormData | Record) error?: string; __authError?: boolean; }> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders`, - { method: 'POST', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '등록에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - console.error('[createOrder] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders`, + method: 'POST', + body: apiData, + transform: (d: ApiOrder) => transformApiToFrontend(d), + errorMessage: '등록에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** @@ -933,33 +880,16 @@ export async function updateOrder(id: string, data: OrderFormData | Record { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${id}`, - { method: 'PUT', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '수정에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - console.error('[updateOrder] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/${id}`, + method: 'PUT', + body: apiData, + transform: (d: ApiOrder) => transformApiToFrontend(d), + errorMessage: '수정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** @@ -970,31 +900,13 @@ export async function deleteOrder(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${id}`, - { method: 'DELETE' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '삭제에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - console.error('[deleteOrder] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/${id}`, + method: 'DELETE', + errorMessage: '삭제에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } /** @@ -1006,36 +918,19 @@ export async function updateOrderStatus(id: string, status: OrderStatus): Promis error?: string; __authError?: boolean; }> { - try { - const apiStatus = FRONTEND_TO_API_STATUS[status]; - if (!apiStatus) { - return { success: false, error: '유효하지 않은 상태입니다.' }; - } - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${id}/status`, - { method: 'PATCH', body: JSON.stringify({ status: apiStatus }) } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '상태 변경에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '상태 변경에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - console.error('[updateOrderStatus] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + const apiStatus = FRONTEND_TO_API_STATUS[status]; + if (!apiStatus) { + return { success: false, error: '유효하지 않은 상태입니다.' }; } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/${id}/status`, + method: 'PATCH', + body: { status: apiStatus }, + transform: (d: ApiOrder) => transformApiToFrontend(d), + errorMessage: '상태 변경에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** @@ -1047,43 +942,25 @@ export async function getOrderStats(): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/stats`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '통계 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '통계 조회에 실패했습니다.' }; - } - - return { - success: true, - data: { - total: result.data.total, - draft: result.data.draft, - confirmed: result.data.confirmed, - inProgress: result.data.in_progress, - completed: result.data.completed, - cancelled: result.data.cancelled, - totalAmount: result.data.total_amount, - confirmedAmount: result.data.confirmed_amount, - }, - }; - } catch (error) { - console.error('[getOrderStats] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/stats`, + errorMessage: '통계 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + total: result.data.total, + draft: result.data.draft, + confirmed: result.data.confirmed, + inProgress: result.data.in_progress, + completed: result.data.completed, + cancelled: result.data.cancelled, + totalAmount: result.data.total_amount, + confirmedAmount: result.data.confirmed_amount, + }, + }; } /** @@ -1132,35 +1009,19 @@ export async function createOrderFromQuote( error?: string; __authError?: boolean; }> { - try { - const apiData: Record = {}; - if (data?.deliveryDate) apiData.delivery_date = data.deliveryDate; - if (data?.memo) apiData.memo = data.memo; + const apiData: Record = {}; + if (data?.deliveryDate) apiData.delivery_date = data.deliveryDate; + if (data?.memo) apiData.memo = data.memo; - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/from-quote/${quoteId}`, - { method: 'POST', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '수주 생성에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '수주 생성에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - console.error('[createOrderFromQuote] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/from-quote/${quoteId}`, + method: 'POST', + body: apiData, + transform: (d: ApiOrder) => transformApiToFrontend(d), + errorMessage: '수주 생성에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** @@ -1175,66 +1036,41 @@ export async function createProductionOrder( error?: string; __authError?: boolean; }> { - try { - const apiData: Record = {}; - // 다중 공정 ID (우선) 또는 단일 공정 ID - if (data?.processIds && data.processIds.length > 0) { - apiData.process_ids = data.processIds; - } else if (data?.processId) { - apiData.process_id = data.processId; - } - if (data?.priority) apiData.priority = data.priority; - // 다중 담당자 ID (우선) 또는 단일 담당자 ID - if (data?.assigneeIds && data.assigneeIds.length > 0) { - apiData.assignee_ids = data.assigneeIds; - } else if (data?.assigneeId) { - apiData.assignee_id = data.assigneeId; - } - if (data?.teamId) apiData.team_id = data.teamId; - if (data?.departmentId) apiData.department_id = data.departmentId; - if (data?.scheduledDate) apiData.scheduled_date = data.scheduledDate; - if (data?.memo) apiData.memo = data.memo; - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${orderId}/production-order`, - { method: 'POST', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '생산지시 생성에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '생산지시 생성에 실패했습니다.' }; - } - - // 다중 또는 단일 작업지시 응답 처리 - const responseData: ProductionOrderResult = { - order: transformApiToFrontend(result.data.order), - }; - - if (result.data.work_orders && result.data.work_orders.length > 0) { - // 다중 작업지시 응답 - responseData.workOrders = result.data.work_orders.map(transformWorkOrderApiToFrontend); - } else if (result.data.work_order) { - // 단일 작업지시 응답 (하위 호환성) - responseData.workOrder = transformWorkOrderApiToFrontend(result.data.work_order); - } - - return { - success: true, - data: responseData, - }; - } catch (error) { - console.error('[createProductionOrder] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + const apiData: Record = {}; + if (data?.processIds && data.processIds.length > 0) { + apiData.process_ids = data.processIds; + } else if (data?.processId) { + apiData.process_id = data.processId; } + if (data?.priority) apiData.priority = data.priority; + if (data?.assigneeIds && data.assigneeIds.length > 0) { + apiData.assignee_ids = data.assigneeIds; + } else if (data?.assigneeId) { + apiData.assignee_id = data.assigneeId; + } + if (data?.teamId) apiData.team_id = data.teamId; + if (data?.departmentId) apiData.department_id = data.departmentId; + if (data?.scheduledDate) apiData.scheduled_date = data.scheduledDate; + if (data?.memo) apiData.memo = data.memo; + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/${orderId}/production-order`, + method: 'POST', + body: apiData, + errorMessage: '생산지시 생성에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + + const responseData: ProductionOrderResult = { + order: transformApiToFrontend(result.data.order), + }; + if (result.data.work_orders && result.data.work_orders.length > 0) { + responseData.workOrders = result.data.work_orders.map(transformWorkOrderApiToFrontend); + } else if (result.data.work_order) { + responseData.workOrder = transformWorkOrderApiToFrontend(result.data.work_order); + } + return { success: true, data: responseData }; } /** @@ -1244,60 +1080,36 @@ export async function revertProductionOrder(orderId: string): Promise<{ success: boolean; data?: { order: Order; - deletedCounts: { - workResults: number; - workOrderItems: number; - workOrders: number; - }; + deletedCounts: { workResults: number; workOrderItems: number; workOrders: number }; previousStatus: string; }; error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${orderId}/revert-production`, - { method: 'POST' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '생산지시 되돌리기에 실패했습니다.' }; - } - - const result: ApiResponse<{ - order: ApiOrder; - deleted_counts: { - work_results: number; - work_order_items: number; - work_orders: number; - }; - previous_status: string; - }> = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '생산지시 되돌리기에 실패했습니다.' }; - } - - return { - success: true, - data: { - order: transformApiToFrontend(result.data.order), - deletedCounts: { - workResults: result.data.deleted_counts.work_results, - workOrderItems: result.data.deleted_counts.work_order_items, - workOrders: result.data.deleted_counts.work_orders, - }, - previousStatus: result.data.previous_status, - }, - }; - } catch (error) { - console.error('[revertProductionOrder] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + interface RevertResponse { + order: ApiOrder; + deleted_counts: { work_results: number; work_order_items: number; work_orders: number }; + previous_status: string; } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/${orderId}/revert-production`, + method: 'POST', + errorMessage: '생산지시 되돌리기에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + order: transformApiToFrontend(result.data.order), + deletedCounts: { + workResults: result.data.deleted_counts.work_results, + workOrderItems: result.data.deleted_counts.work_order_items, + workOrders: result.data.deleted_counts.work_orders, + }, + previousStatus: result.data.previous_status, + }, + }; } /** @@ -1305,47 +1117,25 @@ export async function revertProductionOrder(orderId: string): Promise<{ */ export async function revertOrderConfirmation(orderId: string): Promise<{ success: boolean; - data?: { - order: Order; - previousStatus: string; - }; + data?: { order: Order; previousStatus: string }; error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/${orderId}/revert-confirmation`, - { method: 'POST' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '수주확정 되돌리기에 실패했습니다.' }; - } - - const result: ApiResponse<{ - order: ApiOrder; - previous_status: string; - }> = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '수주확정 되돌리기에 실패했습니다.' }; - } - - return { - success: true, - data: { - order: transformApiToFrontend(result.data.order), - previousStatus: result.data.previous_status, - }, - }; - } catch (error) { - console.error('[revertOrderConfirmation] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + interface RevertConfirmResponse { order: ApiOrder; previous_status: string } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders/${orderId}/revert-confirmation`, + method: 'POST', + errorMessage: '수주확정 되돌리기에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + order: transformApiToFrontend(result.data.order), + previousStatus: result.data.previous_status, + }, + }; } /** @@ -1358,38 +1148,13 @@ export async function getQuoteByIdForSelect(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); - // 품목 포함 - searchParams.set('with_items', 'true'); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}?${searchParams.toString()}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '견적 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '견적 조회에 실패했습니다.' }; - } - - return { - success: true, - data: transformQuoteForSelect(result.data), - }; - } catch (error) { - console.error('[getQuoteByIdForSelect] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}?with_items=true`, + transform: (data: ApiQuoteForSelect) => transformQuoteForSelect(data), + errorMessage: '견적 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** @@ -1406,47 +1171,25 @@ export async function getQuotesForSelect(params?: { error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); + const searchParams = new URLSearchParams(); + searchParams.set('status', 'finalized'); + searchParams.set('with_items', 'true'); + searchParams.set('for_order', 'true'); + if (params?.q) searchParams.set('q', params.q); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('size', String(params.size || 50)); - // 확정(finalized) 상태의 견적만 조회 - searchParams.set('status', 'finalized'); - // 품목 포함 (수주 전환용) - searchParams.set('with_items', 'true'); - // 수주 전환용: 이미 수주가 생성된 견적 제외 (이중 체크) - searchParams.set('for_order', 'true'); - if (params?.q) searchParams.set('q', params.q); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('size', String(params.size || 50)); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes?${searchParams.toString()}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '견적 목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '견적 목록 조회에 실패했습니다.' }; - } - - return { - success: true, - data: { - items: result.data.data.map(transformQuoteForSelect), - total: result.data.total, - }, - }; - } catch (error) { - console.error('[getQuotesForSelect] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/quotes?${searchParams.toString()}`, + errorMessage: '견적 목록 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + items: result.data.data.map(transformQuoteForSelect), + total: result.data.total, + }, + }; } diff --git a/src/components/outbound/ShipmentManagement/actions.ts b/src/components/outbound/ShipmentManagement/actions.ts index 81e65f4b..50b59976 100644 --- a/src/components/outbound/ShipmentManagement/actions.ts +++ b/src/components/outbound/ShipmentManagement/actions.ts @@ -18,8 +18,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { ShipmentItem, ShipmentDetail, @@ -308,523 +307,177 @@ interface PaginationMeta { total: number; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 출고 목록 조회 ===== export async function getShipments(params?: { - page?: number; - perPage?: number; - search?: string; - status?: string; - priority?: string; - deliveryMethod?: string; - scheduledFrom?: string; - scheduledTo?: string; - canShip?: boolean; - depositConfirmed?: boolean; - sortBy?: string; - sortDir?: string; -}): Promise<{ - success: boolean; - data: ShipmentItem[]; - pagination: PaginationMeta; - error?: string; - __authError?: boolean; -}> { - try { - const searchParams = new URLSearchParams(); + page?: number; perPage?: number; search?: string; status?: string; + priority?: string; deliveryMethod?: string; scheduledFrom?: string; scheduledTo?: string; + canShip?: boolean; depositConfirmed?: boolean; sortBy?: string; sortDir?: string; +}): Promise<{ success: boolean; data: ShipmentItem[]; pagination: PaginationMeta; error?: string; __authError?: boolean }> { + const emptyPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('per_page', String(params.perPage)); + if (params?.search) searchParams.set('search', params.search); + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); + if (params?.priority && params.priority !== 'all') searchParams.set('priority', params.priority); + if (params?.deliveryMethod && params.deliveryMethod !== 'all') searchParams.set('delivery_method', params.deliveryMethod); + if (params?.scheduledFrom) searchParams.set('scheduled_from', params.scheduledFrom); + if (params?.scheduledTo) searchParams.set('scheduled_to', params.scheduledTo); + if (params?.canShip !== undefined) searchParams.set('can_ship', String(params.canShip)); + if (params?.depositConfirmed !== undefined) searchParams.set('deposit_confirmed', String(params.depositConfirmed)); + if (params?.sortBy) searchParams.set('sort_by', params.sortBy); + if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('per_page', String(params.perPage)); - if (params?.search) searchParams.set('search', params.search); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } - if (params?.priority && params.priority !== 'all') { - searchParams.set('priority', params.priority); - } - if (params?.deliveryMethod && params.deliveryMethod !== 'all') { - searchParams.set('delivery_method', params.deliveryMethod); - } - if (params?.scheduledFrom) searchParams.set('scheduled_from', params.scheduledFrom); - if (params?.scheduledTo) searchParams.set('scheduled_to', params.scheduledTo); - if (params?.canShip !== undefined) searchParams.set('can_ship', String(params.canShip)); - if (params?.depositConfirmed !== undefined) { - searchParams.set('deposit_confirmed', String(params.depositConfirmed)); - } - if (params?.sortBy) searchParams.set('sort_by', params.sortBy); - if (params?.sortDir) searchParams.set('sort_dir', params.sortDir); + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments${queryString ? `?${queryString}` : ''}`, + errorMessage: '출고 목록 조회에 실패했습니다.', + }); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments${queryString ? `?${queryString}` : ''}`; + if (result.__authError) return { success: false, data: [], pagination: emptyPagination, __authError: true }; + if (!result.success || !result.data) return { success: false, data: [], pagination: emptyPagination, error: result.error }; - console.log('[ShipmentActions] GET shipments:', url); - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response || !response.ok) { - console.warn('[ShipmentActions] GET shipments error:', response?.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '출고 목록 조회에 실패했습니다.', - }; - } - - const paginatedData: ShipmentApiPaginatedResponse = result.data || { - data: [], - current_page: 1, - last_page: 1, - per_page: 20, - total: 0, - }; - - const shipments = (paginatedData.data || []).map(transformApiToListItem); - - return { - success: true, - data: shipments, - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] getShipments error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + return { + success: true, + data: (result.data.data || []).map(transformApiToListItem), + pagination: { + currentPage: result.data.current_page, lastPage: result.data.last_page, + perPage: result.data.per_page, total: result.data.total, + }, + }; } // ===== 출고 통계 조회 ===== -export async function getShipmentStats(): Promise<{ - success: boolean; - data?: ShipmentStats; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/stats`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response || !response.ok) { - console.warn('[ShipmentActions] GET stats error:', response?.status); - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { success: false, error: result.message || '출고 통계 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToStats(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] getShipmentStats error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function getShipmentStats(): Promise<{ success: boolean; data?: ShipmentStats; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/stats`, + transform: (data: ShipmentApiStatsResponse & { total_count?: number }) => transformApiToStats(data), + errorMessage: '출고 통계 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 상태별 통계 조회 (탭용) ===== -export async function getShipmentStatsByStatus(): Promise<{ - success: boolean; - data?: ShipmentStatusStats; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/stats-by-status`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response || !response.ok) { - console.warn('[ShipmentActions] GET stats-by-status error:', response?.status); - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { success: false, error: result.message || '상태별 통계 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToStatsByStatus(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] getShipmentStatsByStatus error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function getShipmentStatsByStatus(): Promise<{ success: boolean; data?: ShipmentStatusStats; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/stats-by-status`, + transform: (data: ShipmentApiStatsByStatusResponse) => transformApiToStatsByStatus(data), + errorMessage: '상태별 통계 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 출고 상세 조회 ===== -export async function getShipmentById(id: string): Promise<{ - success: boolean; - data?: ShipmentDetail; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/${id}`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response || !response.ok) { - console.error('[ShipmentActions] GET shipment error:', response?.status); - return { success: false, error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { success: false, error: result.message || '출고 조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] getShipmentById error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function getShipmentById(id: string): Promise<{ success: boolean; data?: ShipmentDetail; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/${id}`, + transform: (data: ShipmentApiData) => transformApiToDetail(data), + errorMessage: '출고 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 출고 등록 ===== export async function createShipment( data: ShipmentCreateFormData ): Promise<{ success: boolean; data?: ShipmentDetail; error?: string; __authError?: boolean }> { - try { - const apiData = transformCreateFormToApi(data); - console.log('[ShipmentActions] POST shipment request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '출고 등록에 실패했습니다.' }; - } - - const result = await response.json(); - console.log('[ShipmentActions] POST shipment response:', result); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '출고 등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] createShipment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const apiData = transformCreateFormToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments`, + method: 'POST', + body: apiData, + transform: (d: ShipmentApiData) => transformApiToDetail(d), + errorMessage: '출고 등록에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 출고 수정 ===== export async function updateShipment( - id: string, - data: Partial + id: string, data: Partial ): Promise<{ success: boolean; data?: ShipmentDetail; error?: string; __authError?: boolean }> { - try { - const apiData = transformEditFormToApi(data); - console.log('[ShipmentActions] PUT shipment request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '출고 수정에 실패했습니다.' }; - } - - const result = await response.json(); - console.log('[ShipmentActions] PUT shipment response:', result); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '출고 수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] updateShipment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const apiData = transformEditFormToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/${id}`, + method: 'PUT', + body: apiData, + transform: (d: ShipmentApiData) => transformApiToDetail(d), + errorMessage: '출고 수정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 출고 상태 변경 ===== export async function updateShipmentStatus( - id: string, - status: ShipmentStatus, + id: string, status: ShipmentStatus, additionalData?: { - loadingTime?: string; - loadingCompletedAt?: string; - vehicleNo?: string; - driverName?: string; - driverContact?: string; - confirmedArrival?: string; + loadingTime?: string; loadingCompletedAt?: string; vehicleNo?: string; + driverName?: string; driverContact?: string; confirmedArrival?: string; } ): Promise<{ success: boolean; data?: ShipmentDetail; error?: string; __authError?: boolean }> { - try { - const apiData: Record = { status }; - if (additionalData?.loadingTime) apiData.loading_time = additionalData.loadingTime; - if (additionalData?.loadingCompletedAt) apiData.loading_completed_at = additionalData.loadingCompletedAt; - if (additionalData?.vehicleNo) apiData.vehicle_no = additionalData.vehicleNo; - if (additionalData?.driverName) apiData.driver_name = additionalData.driverName; - if (additionalData?.driverContact) apiData.driver_contact = additionalData.driverContact; - if (additionalData?.confirmedArrival) apiData.confirmed_arrival = additionalData.confirmedArrival; + const apiData: Record = { status }; + if (additionalData?.loadingTime) apiData.loading_time = additionalData.loadingTime; + if (additionalData?.loadingCompletedAt) apiData.loading_completed_at = additionalData.loadingCompletedAt; + if (additionalData?.vehicleNo) apiData.vehicle_no = additionalData.vehicleNo; + if (additionalData?.driverName) apiData.driver_name = additionalData.driverName; + if (additionalData?.driverContact) apiData.driver_contact = additionalData.driverContact; + if (additionalData?.confirmedArrival) apiData.confirmed_arrival = additionalData.confirmedArrival; - console.log('[ShipmentActions] PATCH status request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/${id}/status`, - { - method: 'PATCH', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '상태 변경에 실패했습니다.' }; - } - - const result = await response.json(); - console.log('[ShipmentActions] PATCH status response:', result); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '상태 변경에 실패했습니다.' }; - } - - return { success: true, data: transformApiToDetail(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] updateShipmentStatus error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/${id}/status`, + method: 'PATCH', + body: apiData, + transform: (d: ShipmentApiData) => transformApiToDetail(d), + errorMessage: '상태 변경에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 출고 삭제 ===== -export async function deleteShipment( - id: string -): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/${id}`, - { - method: 'DELETE', - } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '출고 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - console.log('[ShipmentActions] DELETE shipment response:', result); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '출고 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] deleteShipment error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function deleteShipment(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/${id}`, + method: 'DELETE', + errorMessage: '출고 삭제에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } // ===== LOT 옵션 조회 ===== -export async function getLotOptions(): Promise<{ - success: boolean; - data: LotOption[]; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/options/lots`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { success: false, data: [], error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response || !response.ok) { - console.warn('[ShipmentActions] GET lot options error:', response?.status); - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message || 'LOT 옵션 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data || [] }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] getLotOptions error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; - } +export async function getLotOptions(): Promise<{ success: boolean; data: LotOption[]; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/options/lots`, + errorMessage: 'LOT 옵션 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, data: [], __authError: true }; + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 물류사 옵션 조회 ===== -export async function getLogisticsOptions(): Promise<{ - success: boolean; - data: LogisticsOption[]; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/options/logistics`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { success: false, data: [], error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response || !response.ok) { - console.warn('[ShipmentActions] GET logistics options error:', response?.status); - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message || '물류사 옵션 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data || [] }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] getLogisticsOptions error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; - } +export async function getLogisticsOptions(): Promise<{ success: boolean; data: LogisticsOption[]; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/options/logistics`, + errorMessage: '물류사 옵션 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, data: [], __authError: true }; + return { success: result.success, data: result.data || [], error: result.error }; } // ===== 차량 톤수 옵션 조회 ===== -export async function getVehicleTonnageOptions(): Promise<{ - success: boolean; - data: VehicleTonnageOption[]; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/shipments/options/vehicle-tonnage`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { success: false, data: [], error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response || !response.ok) { - console.warn('[ShipmentActions] GET vehicle tonnage options error:', response?.status); - return { success: false, data: [], error: `API 오류: ${response?.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { success: false, data: [], error: result.message || '차량 톤수 옵션 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data || [] }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ShipmentActions] getVehicleTonnageOptions error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; - } +export async function getVehicleTonnageOptions(): Promise<{ success: boolean; data: VehicleTonnageOption[]; error?: string; __authError?: boolean }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/shipments/options/vehicle-tonnage`, + errorMessage: '차량 톤수 옵션 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, data: [], __authError: true }; + return { success: result.success, data: result.data || [], error: result.error }; } diff --git a/src/components/pricing/actions.ts b/src/components/pricing/actions.ts index b84557b5..2cc2738e 100644 --- a/src/components/pricing/actions.ts +++ b/src/components/pricing/actions.ts @@ -14,8 +14,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { PricingData, ItemInfo } from './types'; // API 응답 타입 @@ -160,319 +159,80 @@ function transformFrontendToApi(data: PricingData): Record { }; } -/** - * 단가 상세 조회 - */ +const API_URL = process.env.NEXT_PUBLIC_API_URL; + export async function getPricingById(id: string): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/pricing/${id}`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - console.error('[PricingActions] GET pricing error:', error.message); - return null; - } - - if (!response) { - console.error('[PricingActions] GET pricing: 응답이 없습니다.'); - return null; - } - - if (!response.ok) { - console.error('[PricingActions] GET pricing error:', response.status); - return null; - } - - const result: ApiResponse = await response.json(); - console.log('[PricingActions] GET pricing response:', result); - - if (!result.success || !result.data) { - return null; - } - - return transformApiToFrontend(result.data); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PricingActions] getPricingById error:', error); - return null; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/pricing/${id}`, + transform: (data: PriceApiData) => transformApiToFrontend(data), + errorMessage: '단가 조회에 실패했습니다.', + }); + return result.success ? result.data || null : null; } -/** - * 품목 정보 조회 (통합 품목 API) - * - * GET /api/v1/items/{id} - */ export async function getItemInfo(itemId: string): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/items/${itemId}`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - console.error('[PricingActions] getItemInfo error:', error.message); - return null; - } - - if (!response) { - console.error('[PricingActions] getItemInfo: 응답이 없습니다.'); - return null; - } - - if (!response.ok) { - console.error('[PricingActions] Item not found:', itemId); - return null; - } - - const result = await response.json(); - if (!result.success || !result.data) { - return null; - } - - const item = result.data; - return { - id: String(item.id), - itemCode: item.code, - itemName: item.name, - itemType: item.item_type || 'PT', - specification: item.specification || undefined, - unit: item.unit || 'EA', - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PricingActions] getItemInfo error:', error); - return null; - } + interface ItemApiItem { id: number; code: string; name: string; item_type: string; specification?: string; unit?: string } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/items/${itemId}`, + errorMessage: '품목 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return null; + const item = result.data; + return { + id: String(item.id), itemCode: item.code, itemName: item.name, + itemType: item.item_type || 'PT', specification: item.specification || undefined, unit: item.unit || 'EA', + }; } -/** - * 단가 등록 - * item_type_code는 data.itemType에서 자동으로 가져옴 - */ export async function createPricing( data: PricingData ): Promise<{ success: boolean; data?: PricingData; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[PricingActions] POST pricing request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/pricing`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '단가 등록에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[PricingActions] POST pricing response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '단가 등록에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PricingActions] createPricing error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/pricing`, + method: 'POST', + body: apiData, + transform: (d: PriceApiData) => transformApiToFrontend(d), + errorMessage: '단가 등록에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } -/** - * 단가 수정 - */ export async function updatePricing( - id: string, - data: PricingData, - changeReason?: string + id: string, data: PricingData, changeReason?: string ): Promise<{ success: boolean; data?: PricingData; error?: string; __authError?: boolean }> { - try { - const apiData = { - ...transformFrontendToApi(data), - change_reason: changeReason || null, - } as Record; - - console.log('[PricingActions] PUT pricing request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/pricing/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '단가 수정에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[PricingActions] PUT pricing response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '단가 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PricingActions] updatePricing error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const apiData = { ...transformFrontendToApi(data), change_reason: changeReason || null }; + const result = await executeServerAction({ + url: `${API_URL}/api/v1/pricing/${id}`, + method: 'PUT', + body: apiData, + transform: (d: PriceApiData) => transformApiToFrontend(d), + errorMessage: '단가 수정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } -/** - * 단가 삭제 - */ export async function deletePricing(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/pricing/${id}`, - { - method: 'DELETE', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '단가 삭제에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[PricingActions] DELETE pricing response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '단가 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PricingActions] deletePricing error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/pricing/${id}`, + method: 'DELETE', + errorMessage: '단가 삭제에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } -/** - * 단가 확정 - */ export async function finalizePricing(id: string): Promise<{ success: boolean; data?: PricingData; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/pricing/${id}/finalize`, - { - method: 'POST', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '단가 확정에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[PricingActions] POST finalize response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '단가 확정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PricingActions] finalizePricing error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/pricing/${id}/finalize`, + method: 'POST', + transform: (d: PriceApiData) => transformApiToFrontend(d), + errorMessage: '단가 확정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ============================================ @@ -565,94 +325,57 @@ function mapStatusForList(apiStatus: string, isFinal: boolean): 'draft' | 'activ * 단가 목록 데이터 조회 (품목 + 단가 병합) */ export async function getPricingListData(): Promise { - try { - // 품목 목록 조회 - const { response: itemsResponse, error: itemsError } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/items?group_id=1&size=100`, - { method: 'GET' } - ); + interface ItemsPaginatedResponse { data: ItemApiData[]; current_page: number; last_page: number; per_page: number; total: number } + interface PricingPaginatedResponse { data: PriceApiListItem[]; current_page: number; last_page: number; per_page: number; total: number } - if (itemsError || !itemsResponse) { - console.error('[PricingActions] Items fetch error:', itemsError?.message); - return []; - } + const [itemsResult, pricingResult] = await Promise.all([ + executeServerAction({ + url: `${API_URL}/api/v1/items?group_id=1&size=100`, + errorMessage: '품목 목록 조회에 실패했습니다.', + }), + executeServerAction({ + url: `${API_URL}/api/v1/pricing?size=100`, + errorMessage: '단가 목록 조회에 실패했습니다.', + }), + ]); - const itemsResult = await itemsResponse.json(); - const items: ItemApiData[] = itemsResult.success ? (itemsResult.data?.data || []) : []; + const items: ItemApiData[] = itemsResult.success ? (itemsResult.data?.data || []) : []; + const pricings: PriceApiListItem[] = pricingResult.success ? (pricingResult.data?.data || []) : []; - // 단가 목록 조회 - const { response: pricingResponse, error: pricingError } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/pricing?size=100`, - { method: 'GET' } - ); + if (items.length === 0) return []; - if (pricingError || !pricingResponse) { - console.error('[PricingActions] Pricing fetch error:', pricingError?.message); - return []; - } - - const pricingResult = await pricingResponse.json(); - const pricings: PriceApiListItem[] = pricingResult.success ? (pricingResult.data?.data || []) : []; - - // 단가 정보를 빠르게 찾기 위한 Map 생성 - const pricingMap = new Map(); - for (const pricing of pricings) { - const key = `${pricing.item_type_code}_${pricing.item_id}`; - if (!pricingMap.has(key)) { - pricingMap.set(key, pricing); - } - } - - // 품목 목록을 기준으로 병합 - return items.map((item) => { - const key = `${item.item_type}_${item.id}`; - const pricing = pricingMap.get(key); - - if (pricing) { - return { - id: String(pricing.id), - itemId: String(item.id), - itemCode: item.code, - itemName: item.name, - itemType: mapItemTypeForList(item.item_type), - specification: undefined, - unit: item.unit || 'EA', - purchasePrice: pricing.purchase_price ? parseFloat(pricing.purchase_price) : undefined, - processingCost: pricing.processing_cost ? parseFloat(pricing.processing_cost) : undefined, - salesPrice: pricing.sales_price ? parseFloat(pricing.sales_price) : undefined, - marginRate: pricing.margin_rate ? parseFloat(pricing.margin_rate) : undefined, - effectiveDate: pricing.effective_from, - status: mapStatusForList(pricing.status, pricing.is_final), - currentRevision: 0, - isFinal: pricing.is_final, - itemTypeCode: item.item_type, - }; - } else { - return { - id: `item_${item.id}`, - itemId: String(item.id), - itemCode: item.code, - itemName: item.name, - itemType: mapItemTypeForList(item.item_type), - specification: undefined, - unit: item.unit || 'EA', - purchasePrice: undefined, - processingCost: undefined, - salesPrice: undefined, - marginRate: undefined, - effectiveDate: undefined, - status: 'not_registered' as const, - currentRevision: 0, - isFinal: false, - itemTypeCode: item.item_type, - }; - } - }); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PricingActions] getPricingListData error:', error); - return []; + const pricingMap = new Map(); + for (const pricing of pricings) { + const key = `${pricing.item_type_code}_${pricing.item_id}`; + if (!pricingMap.has(key)) pricingMap.set(key, pricing); } + + return items.map((item) => { + const key = `${item.item_type}_${item.id}`; + const pricing = pricingMap.get(key); + + if (pricing) { + return { + id: String(pricing.id), itemId: String(item.id), itemCode: item.code, itemName: item.name, + itemType: mapItemTypeForList(item.item_type), specification: undefined, unit: item.unit || 'EA', + purchasePrice: pricing.purchase_price ? parseFloat(pricing.purchase_price) : undefined, + processingCost: pricing.processing_cost ? parseFloat(pricing.processing_cost) : undefined, + salesPrice: pricing.sales_price ? parseFloat(pricing.sales_price) : undefined, + marginRate: pricing.margin_rate ? parseFloat(pricing.margin_rate) : undefined, + effectiveDate: pricing.effective_from, + status: mapStatusForList(pricing.status, pricing.is_final), + currentRevision: 0, isFinal: pricing.is_final, itemTypeCode: item.item_type, + }; + } else { + return { + id: `item_${item.id}`, itemId: String(item.id), itemCode: item.code, itemName: item.name, + itemType: mapItemTypeForList(item.item_type), specification: undefined, unit: item.unit || 'EA', + purchasePrice: undefined, processingCost: undefined, salesPrice: undefined, marginRate: undefined, + effectiveDate: undefined, status: 'not_registered' as const, + currentRevision: 0, isFinal: false, itemTypeCode: item.item_type, + }; + } + }); } /** @@ -661,77 +384,35 @@ export async function getPricingListData(): Promise { export async function getPricingRevisions(priceId: string): Promise<{ success: boolean; data?: Array<{ - revisionNumber: number; - revisionDate: string; - revisionBy: string; - revisionReason?: string; - beforeSnapshot: Record | null; - afterSnapshot: Record; + revisionNumber: number; revisionDate: string; revisionBy: string; revisionReason?: string; + beforeSnapshot: Record | null; afterSnapshot: Record; }>; - error?: string; - __authError?: boolean; + error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/pricing/${priceId}/revisions`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '이력 조회에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[PricingActions] GET revisions response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '이력 조회에 실패했습니다.', - }; - } - - const revisions = result.data.data?.map((rev: { - revision_number: number; - changed_at: string; - changed_by: number; - change_reason: string | null; - before_snapshot: Record | null; - after_snapshot: Record; - changed_by_user?: { name: string }; - }) => ({ - revisionNumber: rev.revision_number, - revisionDate: rev.changed_at, - revisionBy: rev.changed_by_user?.name || `User ${rev.changed_by}`, - revisionReason: rev.change_reason || undefined, - beforeSnapshot: rev.before_snapshot, - afterSnapshot: rev.after_snapshot, - })) || []; - - return { - success: true, - data: revisions, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PricingActions] getPricingRevisions error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + interface RevisionApiData { + data?: Array<{ + revision_number: number; changed_at: string; changed_by: number; + change_reason: string | null; before_snapshot: Record | null; + after_snapshot: Record; changed_by_user?: { name: string }; + }>; } + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/pricing/${priceId}/revisions`, + errorMessage: '이력 조회에 실패했습니다.', + }); + + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + + const revisions = (result.data.data || []).map((rev) => ({ + revisionNumber: rev.revision_number, + revisionDate: rev.changed_at, + revisionBy: rev.changed_by_user?.name || `User ${rev.changed_by}`, + revisionReason: rev.change_reason || undefined, + beforeSnapshot: rev.before_snapshot, + afterSnapshot: rev.after_snapshot, + })); + + return { success: true, data: revisions }; } \ No newline at end of file diff --git a/src/components/process-management/actions.ts b/src/components/process-management/actions.ts index 215d7284..9e5b6494 100644 --- a/src/components/process-management/actions.ts +++ b/src/components/process-management/actions.ts @@ -1,8 +1,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { Process, ProcessFormData, ClassificationRule, IndividualItem, ProcessStep } from '@/types/process'; // ============================================================================ @@ -201,6 +200,8 @@ function transformFrontendToApi(data: ProcessFormData): Record // API 함수 // ============================================================================ +const API_URL = process.env.NEXT_PUBLIC_API_URL; + /** * 공정 목록 조회 */ @@ -211,244 +212,113 @@ export async function getProcessList(params?: { status?: string; process_type?: string; }): Promise<{ success: boolean; data?: { items: Process[]; total: number; page: number; totalPages: number }; error?: string; __authError?: boolean }> { - try { - const searchParams = new URLSearchParams(); + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('size', String(params.size)); + if (params?.q) searchParams.set('q', params.q); + if (params?.status) searchParams.set('status', params.status); + if (params?.process_type) searchParams.set('process_type', params.process_type); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('size', String(params.size)); - if (params?.q) searchParams.set('q', params.q); - if (params?.status) searchParams.set('status', params.status); - if (params?.process_type) searchParams.set('process_type', params.process_type); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes?${searchParams.toString()}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse> = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '목록 조회에 실패했습니다.' }; - } - - const transformed = result.data.data.map(transformApiToFrontend); - - return { - success: true, - data: { - items: transformed, - total: result.data.total, - page: result.data.current_page, - totalPages: result.data.last_page, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getProcessList] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/processes?${searchParams.toString()}`, + errorMessage: '공정 목록 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + items: result.data.data.map(transformApiToFrontend), + total: result.data.total, + page: result.data.current_page, + totalPages: result.data.last_page, + }, + }; } /** * 공정 상세 조회 */ export async function getProcessById(id: string): Promise<{ success: boolean; data?: Process; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${id}`, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '조회에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getProcessById] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${id}`, + transform: (data: ApiProcess) => transformApiToFrontend(data), + errorMessage: '공정 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** * 공정 생성 */ export async function createProcess(data: ProcessFormData): Promise<{ success: boolean; data?: Process; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes`, { - method: 'POST', - body: JSON.stringify(apiData), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '등록에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[createProcess] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes`, + method: 'POST', + body: transformFrontendToApi(data), + transform: (d: ApiProcess) => transformApiToFrontend(d), + errorMessage: '공정 등록에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** * 공정 수정 */ export async function updateProcess(id: string, data: ProcessFormData): Promise<{ success: boolean; data?: Process; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${id}`, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '수정에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[updateProcess] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${id}`, + method: 'PUT', + body: transformFrontendToApi(data), + transform: (d: ApiProcess) => transformApiToFrontend(d), + errorMessage: '공정 수정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** * 공정 삭제 */ export async function deleteProcess(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${id}`, { - method: 'DELETE', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '삭제에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteProcess] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${id}`, + method: 'DELETE', + errorMessage: '공정 삭제에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } /** * 공정 일괄 삭제 */ export async function deleteProcesses(ids: string[]): Promise<{ success: boolean; deletedCount?: number; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes`, { - method: 'DELETE', - body: JSON.stringify({ ids: ids.map((id) => parseInt(id, 10)) }), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '일괄 삭제에 실패했습니다.' }; - } - - const result: ApiResponse<{ deleted_count: number }> = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '일괄 삭제에 실패했습니다.' }; - } - - return { success: true, deletedCount: result.data.deleted_count }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteProcesses] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction<{ deleted_count: number }>({ + url: `${API_URL}/api/v1/processes`, + method: 'DELETE', + body: { ids: ids.map((id) => parseInt(id, 10)) }, + errorMessage: '공정 일괄 삭제에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { success: true, deletedCount: result.data.deleted_count }; } /** * 공정 상태 토글 */ export async function toggleProcessActive(id: string): Promise<{ success: boolean; data?: Process; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${id}/toggle`, { - method: 'PATCH', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '상태 변경에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '상태 변경에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[toggleProcessActive] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${id}/toggle`, + method: 'PATCH', + transform: (d: ApiProcess) => transformApiToFrontend(d), + errorMessage: '공정 상태 변경에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } /** @@ -460,42 +330,23 @@ export async function getProcessOptions(): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/options`, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '옵션 조회에 실패했습니다.' }; - } - - const result: ApiResponse> = - await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '옵션 조회에 실패했습니다.' }; - } - - return { - success: true, - data: result.data.map((item) => ({ - id: String(item.id), - processCode: item.process_code, - processName: item.process_name, - processType: item.process_type, - department: item.department ?? '', - })), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getProcessOptions] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + interface ApiOptionItem { id: number; process_code: string; process_name: string; process_type: string; department: string } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/options`, + errorMessage: '공정 옵션 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: result.data.map((item) => ({ + id: String(item.id), + processCode: item.process_code, + processName: item.process_name, + processType: item.process_type, + department: item.department ?? '', + })), + }; } /** @@ -507,40 +358,22 @@ export async function getProcessStats(): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch(`${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/stats`, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '통계 조회에 실패했습니다.' }; - } - - const result: ApiResponse<{ total: number; active: number; inactive: number; by_type: Record }> = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '통계 조회에 실패했습니다.' }; - } - - return { - success: true, - data: { - total: result.data.total, - active: result.data.active, - inactive: result.data.inactive, - byType: result.data.by_type, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getProcessStats] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + interface ApiStats { total: number; active: number; inactive: number; by_type: Record } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/stats`, + errorMessage: '공정 통계 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + return { + success: true, + data: { + total: result.data.total, + active: result.data.active, + inactive: result.data.inactive, + byType: result.data.by_type, + }, + }; } // ============================================================================ @@ -557,50 +390,30 @@ export interface DepartmentOption { * 부서 목록 조회 */ export async function getDepartmentOptions(): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/departments`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error || !response?.ok) { - // 기본 부서 옵션 반환 - return [ - { id: 'default-1', value: '생산부', label: '생산부' }, - { id: 'default-2', value: '품질관리부', label: '품질관리부' }, - { id: 'default-3', value: '물류부', label: '물류부' }, - { id: 'default-4', value: '영업부', label: '영업부' }, - ]; - } - - const result = await response.json(); - if (result.success && result.data?.data) { - // 중복 부서명 제거 (같은 이름이 여러 개일 경우 첫 번째만 사용) - const seenNames = new Set(); - return result.data.data - .filter((dept: { id: number; name: string }) => { - if (seenNames.has(dept.name)) { - return false; - } - seenNames.add(dept.name); - return true; - }) - .map((dept: { id: number; name: string }) => ({ - id: String(dept.id), - value: dept.name, - label: dept.name, - })); - } - - return []; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getDepartmentOptions] Error:', error); - return []; - } + const defaultOptions: DepartmentOption[] = [ + { id: 'default-1', value: '생산부', label: '생산부' }, + { id: 'default-2', value: '품질관리부', label: '품질관리부' }, + { id: 'default-3', value: '물류부', label: '물류부' }, + { id: 'default-4', value: '영업부', label: '영업부' }, + ]; + interface DeptResponse { data: Array<{ id: number; name: string }> } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/departments`, + errorMessage: '부서 목록 조회에 실패했습니다.', + }); + if (!result.success || !result.data?.data) return defaultOptions; + const seenNames = new Set(); + return result.data.data + .filter((dept) => { + if (seenNames.has(dept.name)) return false; + seenNames.add(dept.name); + return true; + }) + .map((dept) => ({ + id: String(dept.id), + value: dept.name, + label: dept.name, + })); } // ============================================================================ @@ -636,76 +449,38 @@ interface GetItemListParams { * - 파라미터에 processName, processCategory 필터 추가 필요 (공정/구분 필터링용) */ export async function getItemList(params?: GetItemListParams): Promise { - try { - const searchParams = new URLSearchParams(); - searchParams.set('size', String(params?.size || 1000)); - if (params?.q) searchParams.set('q', params.q); - if (params?.itemType) searchParams.set('item_type', params.itemType); - if (params?.excludeProcessId) searchParams.set('exclude_process_id', params.excludeProcessId); + const searchParams = new URLSearchParams(); + searchParams.set('size', String(params?.size || 1000)); + if (params?.q) searchParams.set('q', params.q); + if (params?.itemType) searchParams.set('item_type', params.itemType); + if (params?.excludeProcessId) searchParams.set('exclude_process_id', params.excludeProcessId); - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/items?${searchParams.toString()}`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error || !response?.ok) { - return []; - } - - const result = await response.json(); - if (result.success && result.data?.data) { - return result.data.data.map((item: { id: number; name: string; item_code?: string; item_type?: string; item_type_name?: string }) => ({ - value: String(item.id), - label: item.name, - code: item.item_code || '', - id: String(item.id), - fullName: item.name, - type: item.item_type_name || item.item_type || '', - })); - } - - return []; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getItemList] Error:', error); - return []; - } + interface ItemListResponse { data: Array<{ id: number; name: string; item_code?: string; item_type?: string; item_type_name?: string }> } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/items?${searchParams.toString()}`, + errorMessage: '품목 목록 조회에 실패했습니다.', + }); + if (!result.success || !result.data?.data) return []; + return result.data.data.map((item) => ({ + value: String(item.id), + label: item.name, + code: item.item_code || '', + id: String(item.id), + fullName: item.name, + type: item.item_type_name || item.item_type || '', + })); } /** * 품목 유형 옵션 조회 (common_codes에서 동적 조회) */ export async function getItemTypeOptions(): Promise> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/settings/common/item_type`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error || !response?.ok) { - return []; - } - - const result = await response.json(); - if (result.success && Array.isArray(result.data)) { - return result.data.map((item: { code: string; name: string }) => ({ - value: item.code, - label: item.name, - })); - } - - return []; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getItemTypeOptions] Error:', error); - return []; - } + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/settings/common/item_type`, + errorMessage: '품목 유형 옵션 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return []; + return result.data.map((item) => ({ value: item.code, label: item.name })); } // ============================================================================ @@ -753,32 +528,12 @@ export async function getProcessSteps(processId: string): Promise<{ data?: ProcessStep[]; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${processId}/steps`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '단계 목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '단계 목록 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data.map(transformStepApiToFrontend) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getProcessSteps] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${processId}/steps`, + errorMessage: '공정 단계 목록 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, error: result.error }; + return { success: true, data: result.data.map(transformStepApiToFrontend) }; } /** @@ -789,32 +544,12 @@ export async function getProcessStepById(processId: string, stepId: string): Pro data?: ProcessStep; error?: string; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${processId}/steps/${stepId}`, - { method: 'GET', cache: 'no-store' } - ); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '단계 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '단계 조회에 실패했습니다.' }; - } - - return { success: true, data: transformStepApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getProcessStepById] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${processId}/steps/${stepId}`, + transform: (d: ApiProcessStep) => transformStepApiToFrontend(d), + errorMessage: '공정 단계 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } /** @@ -824,8 +559,10 @@ export async function createProcessStep( processId: string, data: Omit ): Promise<{ success: boolean; data?: ProcessStep; error?: string }> { - try { - const apiData = { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${processId}/steps`, + method: 'POST', + body: { step_name: data.stepName, is_required: data.isRequired, needs_approval: data.needsApproval, @@ -834,33 +571,11 @@ export async function createProcessStep( connection_type: data.connectionType || null, connection_target: data.connectionTarget || null, completion_type: data.completionType || null, - }; - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${processId}/steps`, - { method: 'POST', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '단계 등록에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '단계 등록에 실패했습니다.' }; - } - - return { success: true, data: transformStepApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[createProcessStep] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + }, + transform: (d: ApiProcessStep) => transformStepApiToFrontend(d), + errorMessage: '공정 단계 등록에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } /** @@ -871,42 +586,24 @@ export async function updateProcessStep( stepId: string, data: Partial ): Promise<{ success: boolean; data?: ProcessStep; error?: string }> { - try { - const apiData: Record = {}; - if (data.stepName !== undefined) apiData.step_name = data.stepName; - if (data.isRequired !== undefined) apiData.is_required = data.isRequired; - if (data.needsApproval !== undefined) apiData.needs_approval = data.needsApproval; - if (data.needsInspection !== undefined) apiData.needs_inspection = data.needsInspection; - if (data.isActive !== undefined) apiData.is_active = data.isActive; - if (data.connectionType !== undefined) apiData.connection_type = data.connectionType || null; - if (data.connectionTarget !== undefined) apiData.connection_target = data.connectionTarget || null; - if (data.completionType !== undefined) apiData.completion_type = data.completionType || null; + const apiData: Record = {}; + if (data.stepName !== undefined) apiData.step_name = data.stepName; + if (data.isRequired !== undefined) apiData.is_required = data.isRequired; + if (data.needsApproval !== undefined) apiData.needs_approval = data.needsApproval; + if (data.needsInspection !== undefined) apiData.needs_inspection = data.needsInspection; + if (data.isActive !== undefined) apiData.is_active = data.isActive; + if (data.connectionType !== undefined) apiData.connection_type = data.connectionType || null; + if (data.connectionTarget !== undefined) apiData.connection_target = data.connectionTarget || null; + if (data.completionType !== undefined) apiData.completion_type = data.completionType || null; - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${processId}/steps/${stepId}`, - { method: 'PUT', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '단계 수정에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '단계 수정에 실패했습니다.' }; - } - - return { success: true, data: transformStepApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[updateProcessStep] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${processId}/steps/${stepId}`, + method: 'PUT', + body: apiData, + transform: (d: ApiProcessStep) => transformStepApiToFrontend(d), + errorMessage: '공정 단계 수정에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } /** @@ -916,32 +613,12 @@ export async function deleteProcessStep( processId: string, stepId: string ): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${processId}/steps/${stepId}`, - { method: 'DELETE' } - ); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '단계 삭제에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '단계 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteProcessStep] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${processId}/steps/${stepId}`, + method: 'DELETE', + errorMessage: '공정 단계 삭제에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } /** @@ -951,37 +628,17 @@ export async function reorderProcessSteps( processId: string, steps: { id: string; order: number }[] ): Promise<{ success: boolean; data?: ProcessStep[]; error?: string }> { - try { - const apiData = { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/${processId}/steps/reorder`, + method: 'PATCH', + body: { items: steps.map((s) => ({ id: parseInt(s.id, 10), sort_order: s.order, })), - }; - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/${processId}/steps/reorder`, - { method: 'PATCH', body: JSON.stringify(apiData) } - ); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '순서 변경에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '순서 변경에 실패했습니다.' }; - } - - return { success: true, data: result.data.map(transformStepApiToFrontend) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[reorderProcessSteps] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + }, + errorMessage: '공정 단계 순서 변경에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, error: result.error }; + return { success: true, data: result.data.map(transformStepApiToFrontend) }; } diff --git a/src/components/production/ProductionDashboard/actions.ts b/src/components/production/ProductionDashboard/actions.ts index a927b83f..f9bae954 100644 --- a/src/components/production/ProductionDashboard/actions.ts +++ b/src/components/production/ProductionDashboard/actions.ts @@ -1,15 +1,12 @@ /** * 생산 현황판 서버 액션 - * API 연동 완료 (2025-12-26) - * serverFetch 마이그레이션 (2025-12-30) - * 공정 기반 동적 탭 전환 (2025-01-15) + * 공정 기반 동적 탭 전환 */ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { WorkOrder, WorkerStatus, DashboardStats, ProcessOption } from './types'; // ===== API 타입 ===== @@ -18,22 +15,14 @@ interface WorkOrderApiItem { work_order_no: string; project_name: string | null; process_id: number | null; - process?: { - id: number; - process_code: string; - process_name: string; - }; + process?: { id: number; process_code: string; process_name: string }; status: 'unassigned' | 'pending' | 'waiting' | 'in_progress' | 'completed' | 'shipped'; scheduled_date: string | null; memo: string | null; created_at: string; sales_order?: { - id: number; - order_no: string; - client_id?: number; - client_name?: string; - client?: { id: number; name: string }; - root_nodes_count?: number; + id: number; order_no: string; client_id?: number; client_name?: string; + client?: { id: number; name: string }; root_nodes_count?: number; }; assignee?: { id: number; name: string }; items?: { id: number; item_name: string; quantity: number }[]; @@ -42,13 +31,9 @@ interface WorkOrderApiItem { // ===== 상태 변환 ===== function mapApiStatus(status: WorkOrderApiItem['status']): 'waiting' | 'inProgress' | 'completed' { switch (status) { - case 'in_progress': - return 'inProgress'; - case 'completed': - case 'shipped': - return 'completed'; - default: - return 'waiting'; + case 'in_progress': return 'inProgress'; + case 'completed': case 'shipped': return 'completed'; + default: return 'waiting'; } } @@ -56,8 +41,6 @@ function mapApiStatus(status: WorkOrderApiItem['status']): 'waiting' | 'inProgre function transformToProductionFormat(api: WorkOrderApiItem): WorkOrder { const totalQuantity = (api.items || []).reduce((sum, item) => sum + Number(item.quantity), 0); const productName = api.items?.[0]?.item_name || '-'; - - // 납기일 계산 (지연 여부) const dueDate = api.scheduled_date || ''; const today = new Date(); today.setHours(0, 0, 0, 0); @@ -66,8 +49,6 @@ function transformToProductionFormat(api: WorkOrderApiItem): WorkOrder { const delayDays = due && isDelayed ? Math.ceil((today.getTime() - due.getTime()) / (1000 * 60 * 60 * 24)) : undefined; - - // 긴급 여부 (3일 이내 납기) const isUrgent = due ? due.getTime() - today.getTime() <= 3 * 24 * 60 * 60 * 1000 && due.getTime() >= today.getTime() : false; @@ -94,74 +75,40 @@ function transformToProductionFormat(api: WorkOrderApiItem): WorkOrder { }; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 공정 옵션 목록 조회 ===== export async function getProcessOptions(): Promise<{ success: boolean; data: ProcessOption[]; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/options`; - console.log('[ProductionDashboardActions] GET processes:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - console.warn('[ProductionDashboardActions] GET processes error:', error?.message); - return { - success: false, - data: [], - error: error?.message || '공정 목록 조회에 실패했습니다.', - }; - } - - if (!response.ok) { - console.warn('[ProductionDashboardActions] GET processes error:', response.status); - return { - success: false, - data: [], - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '공정 목록 조회에 실패했습니다.', - }; - } - - // API 응답: { success, data: [{ id, process_code, process_name, process_type, department }] } - const processes: ProcessOption[] = (result.data || []).map((p: { - id: number; - process_code: string; - process_name: string; - process_type?: string; - department?: string; - }) => ({ - id: p.id, - code: p.process_code, - name: p.process_name, - type: p.process_type, - department: p.department, - })); - - return { - success: true, - data: processes, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ProductionDashboardActions] getProcessOptions error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; + interface ProcessApiData { + id: number; + process_code: string; + process_name: string; + process_type?: string; + department?: string; } + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/options`, + transform: (data: ProcessApiData[]) => + (data || []).map(p => ({ + id: p.id, + code: p.process_code, + name: p.process_name, + type: p.process_type, + department: p.department, + })), + errorMessage: '공정 목록 조회에 실패했습니다.', + }); + + return { + success: result.success, + data: result.data || [], + error: result.error, + }; } // ===== 대시보드 데이터 조회 ===== @@ -179,97 +126,50 @@ export async function getDashboardData(processCode?: string): Promise<{ stats: { total: 0, waiting: 0, inProgress: 0, completed: 0, urgent: 0, delayed: 0 }, }; - try { - // 작업지시 목록 조회 - const params = new URLSearchParams({ per_page: '100' }); - if (processCode && processCode !== 'all') { - params.set('process_code', processCode); - } + const params = new URLSearchParams({ per_page: '100' }); + if (processCode && processCode !== 'all') params.set('process_code', processCode); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders?${params.toString()}`; - console.log('[ProductionDashboardActions] GET:', url); + const result = await executeServerAction<{ data: WorkOrderApiItem[] }>({ + url: `${API_URL}/api/v1/work-orders?${params.toString()}`, + errorMessage: '데이터 조회에 실패했습니다.', + }); - const { response, error } = await serverFetch(url, { method: 'GET' }); - - // serverFetch handles 401 with redirect, so we only check for other errors - if (error || !response) { - console.warn('[ProductionDashboardActions] GET error:', error?.message); - return { - ...emptyResult, - error: error?.message || '데이터 조회에 실패했습니다.', - }; - } - - if (!response.ok) { - console.warn('[ProductionDashboardActions] GET error:', response.status); - return { - ...emptyResult, - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - ...emptyResult, - error: result.message || '데이터 조회에 실패했습니다.', - }; - } - - const apiData: WorkOrderApiItem[] = result.data?.data || []; - const workOrders = apiData.map(transformToProductionFormat); - - // 통계 계산 - const stats: DashboardStats = { - total: workOrders.length, - waiting: workOrders.filter((o) => o.status === 'waiting').length, - inProgress: workOrders.filter((o) => o.status === 'inProgress').length, - completed: workOrders.filter((o) => o.status === 'completed').length, - urgent: workOrders.filter((o) => o.isUrgent).length, - delayed: workOrders.filter((o) => o.isDelayed).length, - }; - - // 작업자별 현황 집계 - const workerMap = new Map(); - workOrders.forEach((order) => { - order.assignees.forEach((name) => { - if (!name || name === '-') return; - - if (!workerMap.has(name)) { - workerMap.set(name, { - id: name, - name, - inProgress: 0, - completed: 0, - assigned: 0, - }); - } - - const worker = workerMap.get(name)!; - worker.assigned++; - if (order.status === 'inProgress') { - worker.inProgress++; - } else if (order.status === 'completed') { - worker.completed++; - } - }); - }); - - const workerStatus = Array.from(workerMap.values()).slice(0, 10); - - return { - success: true, - workOrders, - workerStatus, - stats, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ProductionDashboardActions] getDashboardData error:', error); - return { - ...emptyResult, - error: '서버 오류가 발생했습니다.', - }; + if (!result.success || !result.data) { + return { ...emptyResult, error: result.error }; } + + const apiData = result.data.data || []; + const workOrders = apiData.map(transformToProductionFormat); + + // 통계 계산 + const stats: DashboardStats = { + total: workOrders.length, + waiting: workOrders.filter(o => o.status === 'waiting').length, + inProgress: workOrders.filter(o => o.status === 'inProgress').length, + completed: workOrders.filter(o => o.status === 'completed').length, + urgent: workOrders.filter(o => o.isUrgent).length, + delayed: workOrders.filter(o => o.isDelayed).length, + }; + + // 작업자별 현황 집계 + const workerMap = new Map(); + workOrders.forEach(order => { + order.assignees.forEach(name => { + if (!name || name === '-') return; + if (!workerMap.has(name)) { + workerMap.set(name, { id: name, name, inProgress: 0, completed: 0, assigned: 0 }); + } + const worker = workerMap.get(name)!; + worker.assigned++; + if (order.status === 'inProgress') worker.inProgress++; + else if (order.status === 'completed') worker.completed++; + }); + }); + + return { + success: true, + workOrders, + workerStatus: Array.from(workerMap.values()).slice(0, 10), + stats, + }; } diff --git a/src/components/production/WorkOrders/actions.ts b/src/components/production/WorkOrders/actions.ts index 450f14f1..5e92954b 100644 --- a/src/components/production/WorkOrders/actions.ts +++ b/src/components/production/WorkOrders/actions.ts @@ -19,12 +19,12 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { WorkOrder, WorkOrderStats, WorkOrderStatus, + WorkOrderApi, WorkOrderApiPaginatedResponse, WorkOrderStatsApi, } from './types'; @@ -42,14 +42,16 @@ interface PaginationMeta { total: number; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 작업지시 목록 조회 ===== export async function getWorkOrders(params?: { page?: number; perPage?: number; status?: WorkOrderStatus | 'all'; - processId?: number | 'all' | 'none'; // 공정 ID (FK → processes.id), 'none' = 미지정 - processType?: 'screen' | 'slat' | 'bending'; // 공정 타입 필터 - priority?: string; // 우선순위 필터 (urgent/priority/normal) + processId?: number | 'all' | 'none'; + processType?: 'screen' | 'slat' | 'bending'; + priority?: string; search?: string; startDate?: string; endDate?: string; @@ -59,84 +61,39 @@ export async function getWorkOrders(params?: { pagination: PaginationMeta; error?: string; }> { - const emptyResponse = { - success: false, - data: [] as WorkOrder[], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - }; + const emptyPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('per_page', String(params.perPage)); + if (params?.status && params.status !== 'all') searchParams.set('status', params.status); + if (params?.processId && params.processId !== 'all') searchParams.set('process_id', String(params.processId)); + if (params?.processType) searchParams.set('process_type', params.processType); + if (params?.priority && params.priority !== 'all') searchParams.set('priority', params.priority); + if (params?.search) searchParams.set('search', params.search); + if (params?.startDate) searchParams.set('start_date', params.startDate); + if (params?.endDate) searchParams.set('end_date', params.endDate); - try { - const searchParams = new URLSearchParams(); + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders${queryString ? `?${queryString}` : ''}`, + errorMessage: '작업지시 목록 조회에 실패했습니다.', + }); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('per_page', String(params.perPage)); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } - if (params?.processId && params.processId !== 'all') { - // 'none': 공정 미지정 필터 (process_id IS NULL) - searchParams.set('process_id', String(params.processId)); - } - if (params?.processType) { - searchParams.set('process_type', params.processType); - } - if (params?.priority && params.priority !== 'all') { - searchParams.set('priority', params.priority); - } - if (params?.search) searchParams.set('search', params.search); - if (params?.startDate) searchParams.set('start_date', params.startDate); - if (params?.endDate) searchParams.set('end_date', params.endDate); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders${queryString ? `?${queryString}` : ''}`; - - console.log('[WorkOrderActions] GET work-orders:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { ...emptyResponse, error: error?.message || 'API 요청 실패' }; - } - - if (!response.ok) { - console.warn('[WorkOrderActions] GET work-orders error:', response.status); - return { ...emptyResponse, error: `API 오류: ${response.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { - ...emptyResponse, - error: result.message || '작업지시 목록 조회에 실패했습니다.', - }; - } - - const paginatedData: WorkOrderApiPaginatedResponse = result.data || { - data: [], - current_page: 1, - last_page: 1, - per_page: 20, - total: 0, - }; - - const workOrders = (paginatedData.data || []).map(transformApiToFrontend); - - return { - success: true, - data: workOrders, - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] getWorkOrders error:', error); - return { ...emptyResponse, error: '서버 오류가 발생했습니다.' }; + if (!result.success || !result.data) { + return { success: false, data: [], pagination: emptyPagination, error: result.error }; } + + const paginatedData = result.data; + return { + success: true, + data: (paginatedData.data || []).map(transformApiToFrontend), + pagination: { + currentPage: paginatedData.current_page, + lastPage: paginatedData.last_page, + perPage: paginatedData.per_page, + total: paginatedData.total, + }, + }; } // ===== 작업지시 통계 조회 ===== @@ -145,42 +102,12 @@ export async function getWorkOrderStats(): Promise<{ data?: WorkOrderStats; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/stats`; - - console.log('[WorkOrderActions] GET stats:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - if (!response.ok) { - console.warn('[WorkOrderActions] GET stats error:', response.status); - return { success: false, error: `API 오류: ${response.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '통계 조회에 실패했습니다.', - }; - } - - const statsApi: WorkOrderStatsApi = result.data; - - return { - success: true, - data: transformStatsApiToFrontend(statsApi), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] getWorkOrderStats error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/stats`, + transform: (data: WorkOrderStatsApi) => transformStatsApiToFrontend(data), + errorMessage: '통계 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업지시 상세 조회 ===== @@ -189,99 +116,42 @@ export async function getWorkOrderById(id: string): Promise<{ data?: WorkOrder; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${id}`; - - console.log('[WorkOrderActions] GET work-order:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - if (!response.ok) { - console.error('[WorkOrderActions] GET work-order error:', response.status); - return { success: false, error: `API 오류: ${response.status}` }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { - success: false, - error: result.message || '작업지시 조회에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] getWorkOrderById error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${id}`, + transform: (data: WorkOrderApi) => transformApiToFrontend(data), + errorMessage: '작업지시 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업지시 등록 ===== export async function createWorkOrder( data: Partial & { salesOrderId?: number; - assigneeId?: number; // 단일 담당자 (하위 호환) - assigneeIds?: number[]; // 다중 담당자 + assigneeId?: number; + assigneeIds?: number[]; teamId?: number; } ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { - try { - // 다중 담당자 우선, 없으면 단일 담당자 배열로 변환 - const assigneeIds = data.assigneeIds && data.assigneeIds.length > 0 - ? data.assigneeIds - : data.assigneeId - ? [data.assigneeId] - : undefined; + const assigneeIds = data.assigneeIds && data.assigneeIds.length > 0 + ? data.assigneeIds + : data.assigneeId ? [data.assigneeId] : undefined; - const apiData = { - ...transformFrontendToApi(data), - sales_order_id: data.salesOrderId, - assignee_ids: assigneeIds, // 배열로 전송 - team_id: data.teamId, - }; + const apiData = { + ...transformFrontendToApi(data), + sales_order_id: data.salesOrderId, + assignee_ids: assigneeIds, + team_id: data.teamId, + }; - console.log('[WorkOrderActions] POST work-order request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] POST work-order response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '작업지시 등록에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] createWorkOrder error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders`, + method: 'POST', + body: apiData, + transform: (d: WorkOrderApi) => transformApiToFrontend(d), + errorMessage: '작업지시 등록에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업지시 수정 ===== @@ -289,72 +159,25 @@ export async function updateWorkOrder( id: string, data: Partial & { assigneeIds?: number[] } ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[WorkOrderActions] PUT work-order request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] PUT work-order response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '작업지시 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] updateWorkOrder error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${id}`, + method: 'PUT', + body: apiData, + transform: (d: WorkOrderApi) => transformApiToFrontend(d), + errorMessage: '작업지시 수정에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업지시 삭제 ===== export async function deleteWorkOrder(id: string): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${id}`, - { method: 'DELETE' } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] DELETE work-order response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '작업지시 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] deleteWorkOrder error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${id}`, + method: 'DELETE', + errorMessage: '작업지시 삭제에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } // ===== 작업지시 상태 변경 ===== @@ -362,87 +185,34 @@ export async function updateWorkOrderStatus( id: string, status: WorkOrderStatus ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { - try { - console.log('[WorkOrderActions] PATCH status request:', { status }); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${id}/status`, - { - method: 'PATCH', - body: JSON.stringify({ status }), - } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] PATCH status response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '상태 변경에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] updateWorkOrderStatus error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${id}/status`, + method: 'PATCH', + body: { status }, + transform: (d: WorkOrderApi) => transformApiToFrontend(d), + errorMessage: '상태 변경에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 담당자 배정 ===== export async function assignWorkOrder( id: string, - assigneeIds: number | number[], // 단일 또는 다중 담당자 + assigneeIds: number | number[], teamId?: number ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { - try { - // 배열로 통일 - const ids = Array.isArray(assigneeIds) ? assigneeIds : [assigneeIds]; - const body: { assignee_ids: number[]; team_id?: number } = { assignee_ids: ids }; - if (teamId) body.team_id = teamId; + const ids = Array.isArray(assigneeIds) ? assigneeIds : [assigneeIds]; + const body: { assignee_ids: number[]; team_id?: number } = { assignee_ids: ids }; + if (teamId) body.team_id = teamId; - console.log('[WorkOrderActions] PATCH assign request:', body); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${id}/assign`, - { - method: 'PATCH', - body: JSON.stringify(body), - } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] PATCH assign response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '담당자 배정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] assignWorkOrder error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${id}/assign`, + method: 'PATCH', + body, + transform: (d: WorkOrderApi) => transformApiToFrontend(d), + errorMessage: '담당자 배정에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 벤딩 필드 토글 ===== @@ -450,40 +220,14 @@ export async function toggleBendingField( id: string, field: string ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { - try { - console.log('[WorkOrderActions] PATCH bending toggle request:', { field }); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${id}/bending/toggle`, - { - method: 'PATCH', - body: JSON.stringify({ field }), - } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] PATCH bending toggle response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '벤딩 필드 토글에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] toggleBendingField error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${id}/bending/toggle`, + method: 'PATCH', + body: { field }, + transform: (d: WorkOrderApi) => transformApiToFrontend(d), + errorMessage: '벤딩 필드 토글에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 이슈 등록 ===== @@ -495,40 +239,14 @@ export async function addWorkOrderIssue( priority?: 'low' | 'medium' | 'high'; } ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { - try { - console.log('[WorkOrderActions] POST issue request:', data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${id}/issues`, - { - method: 'POST', - body: JSON.stringify(data), - } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] POST issue response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '이슈 등록에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] addWorkOrderIssue error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${id}/issues`, + method: 'POST', + body: data, + transform: (d: WorkOrderApi) => transformApiToFrontend(d), + errorMessage: '이슈 등록에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 이슈 해결 ===== @@ -536,37 +254,13 @@ export async function resolveWorkOrderIssue( workOrderId: string, issueId: string ): Promise<{ success: boolean; data?: WorkOrder; error?: string }> { - try { - console.log('[WorkOrderActions] PATCH issue resolve:', { workOrderId, issueId }); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/issues/${issueId}/resolve`, - { method: 'PATCH' } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] PATCH issue resolve response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '이슈 해결 처리에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] resolveWorkOrderIssue error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/issues/${issueId}/resolve`, + method: 'PATCH', + transform: (d: WorkOrderApi) => transformApiToFrontend(d), + errorMessage: '이슈 해결 처리에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 품목 상태 변경 ===== @@ -584,45 +278,29 @@ export async function updateWorkOrderItemStatus( workOrderStatusChanged?: boolean; error?: string; }> { - try { - console.log('[WorkOrderActions] PATCH item status request:', { workOrderId, itemId, status }); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/items/${itemId}/status`, - { - method: 'PATCH', - body: JSON.stringify({ status }), - } - ); - - if (error || !response) { - return { success: false, itemId, status, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] PATCH item status response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - itemId, - status, - error: result.message || '품목 상태 변경에 실패했습니다.', - }; - } - - return { - success: true, - itemId, - status: result.data?.item?.status || status, - workOrderStatus: result.data?.work_order_status, - workOrderStatusChanged: result.data?.work_order_status_changed || false, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] updateWorkOrderItemStatus error:', error); - return { success: false, itemId, status, error: '서버 오류가 발생했습니다.' }; + interface ItemStatusResponse { + item?: { status: WorkOrderItemStatus }; + work_order_status?: string; + work_order_status_changed?: boolean; } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/items/${itemId}/status`, + method: 'PATCH', + body: { status }, + errorMessage: '품목 상태 변경에 실패했습니다.', + }); + + if (!result.success || !result.data) { + return { success: false, itemId, status, error: result.error }; + } + + return { + success: true, + itemId, + status: result.data.item?.status || status, + workOrderStatus: result.data.work_order_status, + workOrderStatusChanged: result.data.work_order_status_changed || false, + }; } // ===== 중간검사 데이터 저장 (deprecated: WorkerScreen/actions.ts의 saveItemInspection 사용) ===== @@ -632,40 +310,13 @@ export async function saveInspectionData( processType: string, data: unknown ): Promise<{ success: boolean; error?: string }> { - try { - console.log('[WorkOrderActions] POST inspection data:', { workOrderId, processType }); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/inspection`, - { - method: 'POST', - body: JSON.stringify({ - process_type: processType, - inspection_data: data, - }), - } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkOrderActions] POST inspection response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '검사 데이터 저장에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] saveInspectionData error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/inspection`, + method: 'POST', + body: { process_type: processType, inspection_data: data }, + errorMessage: '검사 데이터 저장에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } // ===== 수주 목록 조회 (작업지시 생성용) ===== @@ -688,72 +339,54 @@ export async function getSalesOrdersForWorkOrder(params?: { data: SalesOrderForWorkOrder[]; error?: string; }> { - try { - const searchParams = new URLSearchParams(); + const searchParams = new URLSearchParams(); + searchParams.set('for_work_order', '1'); + if (params?.q) searchParams.set('q', params.q); + if (params?.status) searchParams.set('status', params.status); - // 작업지시 생성 가능한 상태만 조회 (예: 회계확인 완료) - searchParams.set('for_work_order', '1'); - if (params?.q) searchParams.set('q', params.q); - if (params?.status) searchParams.set('status', params.status); + const queryString = searchParams.toString(); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders${queryString ? `?${queryString}` : ''}`; - - console.log('[WorkOrderActions] GET orders for work-order:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, data: [], error: error?.message || 'API 요청 실패' }; - } - - if (!response.ok) { - console.warn('[WorkOrderActions] GET orders error:', response.status); - return { success: false, data: [], error: `API 오류: ${response.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '수주 목록 조회에 실패했습니다.', - }; - } - - // API 응답 변환 - const salesOrders: SalesOrderForWorkOrder[] = (result.data?.data || result.data || []).map( - (item: { - id: number; - order_no: string; - client?: { name: string }; - project_name?: string; - due_date?: string; - status: string; - items_count?: number; - split_count?: number; - }) => ({ - id: item.id, - orderNo: item.order_no, - client: item.client?.name || '-', - projectName: item.project_name || '-', - dueDate: item.due_date || '-', - status: item.status, - itemCount: item.items_count || 0, - splitCount: item.split_count || 0, - }) - ); - - return { - success: true, - data: salesOrders, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] getSalesOrdersForWorkOrder error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; + interface SalesOrderApiItem { + id: number; + order_no: string; + client?: { name: string }; + project_name?: string; + due_date?: string; + status: string; + items_count?: number; + split_count?: number; } + interface SalesOrderApiResponse { + data?: SalesOrderApiItem[]; + } + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/orders${queryString ? `?${queryString}` : ''}`, + errorMessage: '수주 목록 조회에 실패했습니다.', + }); + + if (!result.success || !result.data) { + return { success: false, data: [], error: result.error }; + } + + const rawData = result.data; + const items: SalesOrderApiItem[] = Array.isArray(rawData) + ? rawData + : (rawData as SalesOrderApiResponse).data || []; + + return { + success: true, + data: items.map((item) => ({ + id: item.id, + orderNo: item.order_no, + client: item.client?.name || '-', + projectName: item.project_name || '-', + dueDate: item.due_date || '-', + status: item.status, + itemCount: item.items_count || 0, + splitCount: item.split_count || 0, + })), + }; } // ===== 부서 + 사용자 조회 (담당자 선택용) ===== @@ -776,64 +409,32 @@ export async function getDepartmentsWithUsers(): Promise<{ data: DepartmentWithUsers[]; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/departments/tree?with_users=1`; - - console.log('[WorkOrderActions] GET departments with users:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, data: [], error: error?.message || 'API 요청 실패' }; - } - - if (!response.ok) { - console.warn('[WorkOrderActions] GET departments error:', response.status); - return { success: false, data: [], error: `API 오류: ${response.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '부서 목록 조회에 실패했습니다.', - }; - } - - // API 응답을 프론트엔드 형식으로 변환 - const transformDepartment = (dept: { - id: number; - name: string; - code: string | null; - users?: { id: number; name: string; email: string }[]; - children?: unknown[]; - }): DepartmentWithUsers => ({ - id: dept.id, - name: dept.name, - code: dept.code, - users: (dept.users || []).map((u) => ({ - id: u.id, - name: u.name, - email: u.email, - })), - children: (dept.children || []).map((child) => - transformDepartment(child as typeof dept) - ), - }); - - const departments = (result.data || []).map(transformDepartment); - - return { - success: true, - data: departments, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] getDepartmentsWithUsers error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; + interface DeptApiItem { + id: number; + name: string; + code: string | null; + users?: { id: number; name: string; email: string }[]; + children?: DeptApiItem[]; } + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/departments/tree?with_users=1`, + errorMessage: '부서 목록 조회에 실패했습니다.', + }); + + if (!result.success || !result.data) { + return { success: false, data: [], error: result.error }; + } + + const transformDepartment = (dept: DeptApiItem): DepartmentWithUsers => ({ + id: dept.id, + name: dept.name, + code: dept.code, + users: (dept.users || []).map((u) => ({ id: u.id, name: u.name, email: u.email })), + children: (dept.children || []).map(transformDepartment), + }); + + return { success: true, data: result.data.map(transformDepartment) }; } // ===== 공정 목록 조회 (작업지시 생성용) ===== @@ -848,52 +449,26 @@ export async function getProcessOptions(): Promise<{ data: ProcessOption[]; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/processes/options`; - - console.log('[WorkOrderActions] GET process options:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, data: [], error: error?.message || 'API 요청 실패' }; - } - - if (!response.ok) { - console.warn('[WorkOrderActions] GET process options error:', response.status); - return { success: false, data: [], error: `API 오류: ${response.status}` }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '공정 목록 조회에 실패했습니다.', - }; - } - - // API 응답 변환 - const processes: ProcessOption[] = (result.data || []).map( - (item: { - id: number; - process_code: string; - process_name: string; - }) => ({ - id: item.id, - processCode: item.process_code, - processName: item.process_name, - }) - ); - - return { - success: true, - data: processes, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkOrderActions] getProcessOptions error:', error); - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; + interface ProcessApiItem { + id: number; + process_code: string; + process_name: string; } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/processes/options`, + errorMessage: '공정 목록 조회에 실패했습니다.', + }); + + if (!result.success || !result.data) { + return { success: false, data: [], error: result.error }; + } + + return { + success: true, + data: result.data.map((item) => ({ + id: item.id, + processCode: item.process_code, + processName: item.process_name, + })), + }; } diff --git a/src/components/production/WorkResults/actions.ts b/src/components/production/WorkResults/actions.ts index 63f2c60c..2e0e7258 100644 --- a/src/components/production/WorkResults/actions.ts +++ b/src/components/production/WorkResults/actions.ts @@ -1,7 +1,6 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; /** * 작업실적 관리 Server Actions * @@ -16,7 +15,7 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; * - PATCH /api/v1/work-results/{id}/packaging - 포장 상태 토글 */ -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { ProcessType } from '../WorkOrders/types'; import type { WorkResult, @@ -38,505 +37,157 @@ interface PaginationMeta { total: number; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 작업실적 목록 조회 ===== export async function getWorkResults(params?: { - page?: number; - size?: number; - q?: string; - processType?: ProcessType | 'all'; - workOrderId?: number; - workerId?: number; - workDateFrom?: string; - workDateTo?: string; - isInspected?: boolean; - isPackaged?: boolean; -}): Promise<{ - success: boolean; - data: WorkResult[]; - pagination: PaginationMeta; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + page?: number; size?: number; q?: string; + processType?: ProcessType | 'all'; workOrderId?: number; workerId?: number; + workDateFrom?: string; workDateTo?: string; + isInspected?: boolean; isPackaged?: boolean; +}): Promise<{ success: boolean; data: WorkResult[]; pagination: PaginationMeta; error?: string }> { + const emptyPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('size', String(params.size)); + if (params?.q) searchParams.set('q', params.q); + if (params?.processType && params.processType !== 'all') searchParams.set('process_type', params.processType); + if (params?.workOrderId) searchParams.set('work_order_id', String(params.workOrderId)); + if (params?.workerId) searchParams.set('worker_id', String(params.workerId)); + if (params?.workDateFrom) searchParams.set('work_date_from', params.workDateFrom); + if (params?.workDateTo) searchParams.set('work_date_to', params.workDateTo); + if (params?.isInspected !== undefined) searchParams.set('is_inspected', params.isInspected ? '1' : '0'); + if (params?.isPackaged !== undefined) searchParams.set('is_packaged', params.isPackaged ? '1' : '0'); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('size', String(params.size)); - if (params?.q) searchParams.set('q', params.q); - if (params?.processType && params.processType !== 'all') { - searchParams.set('process_type', params.processType); - } - if (params?.workOrderId) searchParams.set('work_order_id', String(params.workOrderId)); - if (params?.workerId) searchParams.set('worker_id', String(params.workerId)); - if (params?.workDateFrom) searchParams.set('work_date_from', params.workDateFrom); - if (params?.workDateTo) searchParams.set('work_date_to', params.workDateTo); - if (params?.isInspected !== undefined) { - searchParams.set('is_inspected', params.isInspected ? '1' : '0'); - } - if (params?.isPackaged !== undefined) { - searchParams.set('is_packaged', params.isPackaged ? '1' : '0'); - } + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-results${queryString ? `?${queryString}` : ''}`, + errorMessage: '작업실적 목록 조회에 실패했습니다.', + }); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-results${queryString ? `?${queryString}` : ''}`; - - console.log('[WorkResultActions] GET work-results:', url); - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error || !response) { - console.warn('[WorkResultActions] GET work-results error:', error?.message); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - if (!response.ok) { - console.warn('[WorkResultActions] GET work-results error:', response.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '작업실적 목록 조회에 실패했습니다.', - }; - } - - const paginatedData: WorkResultApiPaginatedResponse = result.data || { - data: [], - current_page: 1, - last_page: 1, - per_page: 20, - total: 0, - }; - - return { - success: true, - data: paginatedData.data.map(transformApiToFrontend), - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkResultActions] getWorkResults error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; + if (!result.success || !result.data) { + return { success: false, data: [], pagination: emptyPagination, error: result.error }; } + + return { + success: true, + data: result.data.data.map(transformApiToFrontend), + pagination: { + currentPage: result.data.current_page, + lastPage: result.data.last_page, + perPage: result.data.per_page, + total: result.data.total, + }, + }; } // ===== 작업실적 통계 조회 ===== export async function getWorkResultStats(params?: { - workDateFrom?: string; - workDateTo?: string; - processType?: ProcessType | 'all'; -}): Promise<{ - success: boolean; - data?: WorkResultStats; - error?: string; -}> { - try { - const searchParams = new URLSearchParams(); + workDateFrom?: string; workDateTo?: string; processType?: ProcessType | 'all'; +}): Promise<{ success: boolean; data?: WorkResultStats; error?: string }> { + const searchParams = new URLSearchParams(); + if (params?.workDateFrom) searchParams.set('work_date_from', params.workDateFrom); + if (params?.workDateTo) searchParams.set('work_date_to', params.workDateTo); + if (params?.processType && params.processType !== 'all') searchParams.set('process_type', params.processType); - if (params?.workDateFrom) searchParams.set('work_date_from', params.workDateFrom); - if (params?.workDateTo) searchParams.set('work_date_to', params.workDateTo); - if (params?.processType && params.processType !== 'all') { - searchParams.set('process_type', params.processType); - } - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-results/stats${queryString ? `?${queryString}` : ''}`; - - console.log('[WorkResultActions] GET stats:', url); - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error || !response) { - console.warn('[WorkResultActions] GET stats error:', error?.message); - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - if (!response.ok) { - console.warn('[WorkResultActions] GET stats error:', response.status); - return { - success: false, - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '통계 조회에 실패했습니다.', - }; - } - - const statsApi: WorkResultStatsApi = result.data; - - return { - success: true, - data: transformStatsApiToFrontend(statsApi), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkResultActions] getWorkResultStats error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-results/stats${queryString ? `?${queryString}` : ''}`, + transform: (data: WorkResultStatsApi) => transformStatsApiToFrontend(data), + errorMessage: '통계 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업실적 상세 조회 ===== export async function getWorkResultById(id: string): Promise<{ - success: boolean; - data?: WorkResult; - error?: string; + success: boolean; data?: WorkResult; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-results/${id}`; - - console.log('[WorkResultActions] GET work-result:', url); - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error || !response) { - console.error('[WorkResultActions] GET work-result error:', error?.message); - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - if (!response.ok) { - console.error('[WorkResultActions] GET work-result error:', response.status); - return { - success: false, - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { - success: false, - error: result.message || '작업실적 조회에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkResultActions] getWorkResultById error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-results/${id}`, + transform: transformApiToFrontend, + errorMessage: '작업실적 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업실적 등록 ===== export async function createWorkResult(data: { - workOrderId: number; - lotNo: string; - workDate: string; - productName: string; - productionQty: number; - defectQty: number; - processType?: ProcessType; - specification?: string; - goodQty?: number; - workerId?: number; - isInspected?: boolean; - isPackaged?: boolean; - memo?: string; -}): Promise<{ - success: boolean; - data?: WorkResult; - error?: string; -}> { - try { - const apiData: Record = { - work_order_id: data.workOrderId, - lot_no: data.lotNo, - work_date: data.workDate, - product_name: data.productName, - production_qty: data.productionQty, - defect_qty: data.defectQty, - }; + workOrderId: number; lotNo: string; workDate: string; + productName: string; productionQty: number; defectQty: number; + processType?: ProcessType; specification?: string; goodQty?: number; + workerId?: number; isInspected?: boolean; isPackaged?: boolean; memo?: string; +}): Promise<{ success: boolean; data?: WorkResult; error?: string }> { + const apiData: Record = { + work_order_id: data.workOrderId, lot_no: data.lotNo, work_date: data.workDate, + product_name: data.productName, production_qty: data.productionQty, defect_qty: data.defectQty, + }; + if (data.processType) apiData.process_type = data.processType; + if (data.specification) apiData.specification = data.specification; + if (data.goodQty !== undefined) apiData.good_qty = data.goodQty; + if (data.workerId) apiData.worker_id = data.workerId; + if (data.isInspected !== undefined) apiData.is_inspected = data.isInspected; + if (data.isPackaged !== undefined) apiData.is_packaged = data.isPackaged; + if (data.memo) apiData.memo = data.memo; - if (data.processType) apiData.process_type = data.processType; - if (data.specification) apiData.specification = data.specification; - if (data.goodQty !== undefined) apiData.good_qty = data.goodQty; - if (data.workerId) apiData.worker_id = data.workerId; - if (data.isInspected !== undefined) apiData.is_inspected = data.isInspected; - if (data.isPackaged !== undefined) apiData.is_packaged = data.isPackaged; - if (data.memo) apiData.memo = data.memo; - - console.log('[WorkResultActions] POST work-result request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-results`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error || !response) { - console.error('[WorkResultActions] POST work-result error:', error?.message); - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkResultActions] POST work-result response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '작업실적 등록에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkResultActions] createWorkResult error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-results`, + method: 'POST', + body: apiData, + transform: transformApiToFrontend, + errorMessage: '작업실적 등록에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업실적 수정 ===== export async function updateWorkResult( id: string, data: Partial & { workOrderId?: number; workerId?: number } -): Promise<{ - success: boolean; - data?: WorkResult; - error?: string; -}> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[WorkResultActions] PUT work-result request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-results/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error || !response) { - console.error('[WorkResultActions] PUT work-result error:', error?.message); - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkResultActions] PUT work-result response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '작업실적 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkResultActions] updateWorkResult error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise<{ success: boolean; data?: WorkResult; error?: string }> { + const apiData = transformFrontendToApi(data); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-results/${id}`, + method: 'PUT', + body: apiData, + transform: transformApiToFrontend, + errorMessage: '작업실적 수정에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업실적 삭제 ===== -export async function deleteWorkResult(id: string): Promise<{ - success: boolean; - error?: string; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-results/${id}`, - { - method: 'DELETE', - } - ); - - if (error || !response) { - console.error('[WorkResultActions] DELETE work-result error:', error?.message); - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkResultActions] DELETE work-result response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '작업실적 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkResultActions] deleteWorkResult error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function deleteWorkResult(id: string): Promise<{ success: boolean; error?: string }> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-results/${id}`, + method: 'DELETE', + errorMessage: '작업실적 삭제에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } // ===== 검사 상태 토글 ===== export async function toggleInspection(id: string): Promise<{ - success: boolean; - data?: WorkResult; - error?: string; + success: boolean; data?: WorkResult; error?: string; }> { - try { - console.log('[WorkResultActions] PATCH inspection toggle:', id); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-results/${id}/inspection`, - { - method: 'PATCH', - } - ); - - if (error || !response) { - console.error('[WorkResultActions] PATCH inspection error:', error?.message); - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkResultActions] PATCH inspection response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '검사 상태 변경에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkResultActions] toggleInspection error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-results/${id}/inspection`, + method: 'PATCH', + transform: transformApiToFrontend, + errorMessage: '검사 상태 변경에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 포장 상태 토글 ===== export async function togglePackaging(id: string): Promise<{ - success: boolean; - data?: WorkResult; - error?: string; + success: boolean; data?: WorkResult; error?: string; }> { - try { - console.log('[WorkResultActions] PATCH packaging toggle:', id); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-results/${id}/packaging`, - { - method: 'PATCH', - } - ); - - if (error || !response) { - console.error('[WorkResultActions] PATCH packaging error:', error?.message); - return { - success: false, - error: error?.message || '서버 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkResultActions] PATCH packaging response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '포장 상태 변경에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkResultActions] togglePackaging error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-results/${id}/packaging`, + method: 'PATCH', + transform: transformApiToFrontend, + errorMessage: '포장 상태 변경에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } diff --git a/src/components/production/WorkerScreen/actions.ts b/src/components/production/WorkerScreen/actions.ts index 13c102f6..e6c45770 100644 --- a/src/components/production/WorkerScreen/actions.ts +++ b/src/components/production/WorkerScreen/actions.ts @@ -8,8 +8,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { WorkOrder, WorkOrderStatus } from '../ProductionDashboard/types'; import type { WorkItemData, WorkStepData, ProcessTab } from './types'; @@ -161,68 +160,24 @@ function transformToWorkerScreenFormat(api: WorkOrderApiItem): WorkOrder { }; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 내 작업 목록 조회 ===== export async function getMyWorkOrders(): Promise<{ success: boolean; data: WorkOrder[]; error?: string; }> { - try { - // 작업자 화면용 캐스케이드 필터: 개인 배정 → 부서 → 전체 - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders?per_page=100&worker_screen=1`; - - console.log('[WorkerScreenActions] GET my work orders:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - console.warn('[WorkerScreenActions] GET error:', error?.message); - return { - success: false, - data: [], - error: error?.message || '네트워크 오류가 발생했습니다.', - }; - } - - if (!response.ok) { - console.warn('[WorkerScreenActions] GET error:', response.status); - return { - success: false, - data: [], - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '작업 목록 조회에 실패했습니다.', - }; - } - - const apiData = result.data?.data || []; - - // 완료/출하 상태 제외하고 변환 - const workOrders = apiData - .filter((item: WorkOrderApiItem) => !['completed', 'shipped'].includes(item.status)) - .map(transformToWorkerScreenFormat); - - return { - success: true, - data: workOrders, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] getMyWorkOrders error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; - } + interface PaginatedWO { data: WorkOrderApiItem[] } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders?per_page=100&worker_screen=1`, + errorMessage: '작업 목록 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, data: [], error: result.error }; + const workOrders = (result.data.data || []) + .filter((item) => !['completed', 'shipped'].includes(item.status)) + .map(transformToWorkerScreenFormat); + return { success: true, data: workOrders }; } // ===== 작업 완료 처리 ===== @@ -230,51 +185,15 @@ export async function completeWorkOrder( id: string, materials?: { materialId: number; quantity: number; lotNo?: string }[] ): Promise<{ success: boolean; lotNo?: string; error?: string }> { - try { - // 상태를 completed로 변경 - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${id}/status`, - { - method: 'PATCH', - body: JSON.stringify({ - status: 'completed', - materials, - }), - } - ); - - if (error || !response) { - return { - success: false, - error: error?.message || '네트워크 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkerScreenActions] Complete response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '작업 완료 처리에 실패했습니다.', - }; - } - - // LOT 번호 생성 (임시) - const lotNo = `KD-SA-${new Date().toISOString().slice(2, 10).replace(/-/g, '')}-01`; - - return { - success: true, - lotNo, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] completeWorkOrder error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${id}/status`, + method: 'PATCH', + body: { status: 'completed', materials }, + errorMessage: '작업 완료 처리에 실패했습니다.', + }); + if (!result.success) return { success: false, error: result.error }; + const lotNo = `KD-SA-${new Date().toISOString().slice(2, 10).replace(/-/g, '')}-01`; + return { success: true, lotNo }; } // ===== 자재 목록 조회 (로트 기준) ===== @@ -298,80 +217,25 @@ export async function getMaterialsForWorkOrder( data: MaterialForInput[]; error?: string; }> { - try { - // 작업지시 BOM 기준 자재 목록 조회 - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/materials`; - - console.log('[WorkerScreenActions] GET materials for work order:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - console.warn('[WorkerScreenActions] GET materials error:', error?.message); - return { - success: false, - data: [], - error: error?.message || '네트워크 오류가 발생했습니다.', - }; - } - - if (!response.ok) { - console.warn('[WorkerScreenActions] GET materials error:', response.status); - return { - success: false, - data: [], - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '자재 목록 조회에 실패했습니다.', - }; - } - - // API 응답을 MaterialForInput 형식으로 변환 (로트 단위) - const materials: MaterialForInput[] = (result.data || []).map((item: { - stock_lot_id: number | null; - item_id: number; - lot_no: string | null; - material_code: string; - material_name: string; - specification: string; - unit: string; - required_qty: number; - lot_available_qty: number; - fifo_rank: number; - }) => ({ - stockLotId: item.stock_lot_id, - itemId: item.item_id, - lotNo: item.lot_no, - materialCode: item.material_code, - materialName: item.material_name, - specification: item.specification ?? '', - unit: item.unit, - requiredQty: item.required_qty, - lotAvailableQty: item.lot_available_qty, - fifoRank: item.fifo_rank, - })); - - return { - success: true, - data: materials, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] getMaterialsForWorkOrder error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; + interface MaterialApiItem { + stock_lot_id: number | null; item_id: number; lot_no: string | null; + material_code: string; material_name: string; specification: string; + unit: string; required_qty: number; lot_available_qty: number; fifo_rank: number; } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/materials`, + errorMessage: '자재 목록 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, data: [], error: result.error }; + return { + success: true, + data: result.data.map((item) => ({ + stockLotId: item.stock_lot_id, itemId: item.item_id, lotNo: item.lot_no, + materialCode: item.material_code, materialName: item.material_name, + specification: item.specification ?? '', unit: item.unit, + requiredQty: item.required_qty, lotAvailableQty: item.lot_available_qty, fifoRank: item.fifo_rank, + })), + }; } // ===== 자재 투입 등록 (로트별 수량) ===== @@ -379,41 +243,13 @@ export async function registerMaterialInput( workOrderId: string, inputs: { stock_lot_id: number; qty: number }[] ): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/material-inputs`, - { - method: 'POST', - body: JSON.stringify({ inputs }), - } - ); - - if (error || !response) { - return { - success: false, - error: error?.message || '네트워크 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkerScreenActions] Register material input response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '자재 투입 등록에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] registerMaterialInput error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/material-inputs`, + method: 'POST', + body: { inputs }, + errorMessage: '자재 투입 등록에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } // ===== 이슈 보고 ===== @@ -425,41 +261,13 @@ export async function reportIssue( priority?: 'low' | 'medium' | 'high'; } ): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/issues`, - { - method: 'POST', - body: JSON.stringify(data), - } - ); - - if (error || !response) { - return { - success: false, - error: error?.message || '네트워크 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkerScreenActions] Report issue response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '이슈 보고에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] reportIssue error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/issues`, + method: 'POST', + body: data, + errorMessage: '이슈 보고에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } // ===== 공정 단계 조회 ===== @@ -490,89 +298,27 @@ export async function getProcessSteps( data: ProcessStep[]; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/process-steps`; - - console.log('[WorkerScreenActions] GET process steps:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - console.warn('[WorkerScreenActions] GET process steps error:', error?.message); - return { - success: false, - data: [], - error: error?.message || '네트워크 오류가 발생했습니다.', - }; - } - - if (!response.ok) { - console.warn('[WorkerScreenActions] GET process steps error:', response.status); - return { - success: false, - data: [], - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '공정 단계 조회에 실패했습니다.', - }; - } - - // API 응답을 ProcessStep 형식으로 변환 - const steps: ProcessStep[] = (result.data || []).map((step: { - id: number; - step_no: number; - name: string; - is_inspection?: boolean; - completed: number; - total: number; - items?: { - id: number; - item_no: string; - location: string; - is_priority: boolean; - spec: string; - material: string; - lot: string; - }[]; - }) => ({ - id: String(step.id), - stepNo: step.step_no, - name: step.name, - isInspection: step.is_inspection, - completed: step.completed, - total: step.total, - items: (step.items || []).map((item) => ({ - id: String(item.id), - itemNo: item.item_no, - location: item.location, - isPriority: item.is_priority, - spec: item.spec, - material: item.material, - lot: item.lot, - })), - })); - - return { - success: true, - data: steps, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] getProcessSteps error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; + interface StepApiItem { + id: number; step_no: number; name: string; is_inspection?: boolean; + completed: number; total: number; + items?: { id: number; item_no: string; location: string; is_priority: boolean; spec: string; material: string; lot: string }[]; } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/process-steps`, + errorMessage: '공정 단계 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, data: [], error: result.error }; + return { + success: true, + data: result.data.map((step) => ({ + id: String(step.id), stepNo: step.step_no, name: step.name, + isInspection: step.is_inspection, completed: step.completed, total: step.total, + items: (step.items || []).map((item) => ({ + id: String(item.id), itemNo: item.item_no, location: item.location, + isPriority: item.is_priority, spec: item.spec, material: item.material, lot: item.lot, + })), + })), + }; } // ===== 검사 요청 ===== @@ -580,41 +326,13 @@ export async function requestInspection( workOrderId: string, stepId: string ): Promise<{ success: boolean; error?: string }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/process-steps/${stepId}/inspection-request`, - { - method: 'POST', - body: JSON.stringify({}), - } - ); - - if (error || !response) { - return { - success: false, - error: error?.message || '네트워크 오류가 발생했습니다.', - }; - } - - const result = await response.json(); - console.log('[WorkerScreenActions] Inspection request response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '검사 요청에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] requestInspection error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/process-steps/${stepId}/inspection-request`, + method: 'POST', + body: {}, + errorMessage: '검사 요청에 실패했습니다.', + }); + return { success: result.success, error: result.error }; } // ===== 공정 단계 진행 현황 조회 ===== @@ -640,27 +358,12 @@ export async function getStepProgress( data: StepProgressItem[]; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/step-progress`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, data: [], error: error?.message || '네트워크 오류' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, data: [], error: result.message || '단계 진행 조회 실패' }; - } - - return { success: true, data: result.data || [] }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] getStepProgress error:', error); - return { success: false, data: [], error: '서버 오류' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/step-progress`, + errorMessage: '단계 진행 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, data: [], error: result.error }; + return { success: true, data: result.data }; } // ===== 공정 단계 완료 토글 ===== @@ -668,27 +371,12 @@ export async function toggleStepProgress( workOrderId: string, progressId: number ): Promise<{ success: boolean; data?: StepProgressItem; error?: string }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/step-progress/${progressId}/toggle`; - - const { response, error } = await serverFetch(url, { method: 'PATCH' }); - - if (error || !response) { - return { success: false, error: error?.message || '네트워크 오류' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '단계 토글 실패' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] toggleStepProgress error:', error); - return { success: false, error: '서버 오류' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/step-progress/${progressId}/toggle`, + method: 'PATCH', + errorMessage: '단계 토글에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업지시 상세 조회 (items + options 포함) ===== @@ -699,134 +387,91 @@ export async function getWorkOrderDetail( data: WorkItemData[]; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}`; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const result = await executeServerAction({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}`, + errorMessage: '작업지시 상세 조회에 실패했습니다.', + }); + if (!result.success || !result.data) return { success: false, data: [], error: result.error }; - const { response, error } = await serverFetch(url, { method: 'GET' }); + const wo = result.data; + const processName = (wo.process?.process_name || '').toLowerCase(); + const processType: ProcessTab = + processName.includes('스크린') ? 'screen' : + processName.includes('슬랫') ? 'slat' : + processName.includes('절곡') ? 'bending' : 'screen'; - if (error || !response) { - return { success: false, data: [], error: error?.message || '네트워크 오류' }; - } + const items: WorkItemData[] = (wo.items || []).map((item: { + id: number; item_name: string; specification: string | null; + quantity: string; unit: string | null; status: string; + sort_order: number; options: Record | null; + }, index: number) => { + const opts = item.options || {}; + const stepProgressList = wo.step_progress || []; + const processSteps = wo.process?.steps || []; - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, data: [], error: result.message || '상세 조회 실패' }; - } - - const wo = result.data; - const processName = (wo.process?.process_name || '').toLowerCase(); - const processType: ProcessTab = - processName.includes('스크린') ? 'screen' : - processName.includes('슬랫') ? 'slat' : - processName.includes('절곡') ? 'bending' : 'screen'; - - // items → WorkItemData 변환 (options 파싱) - const items: WorkItemData[] = (wo.items || []).map((item: { - id: number; - item_name: string; - specification: string | null; - quantity: string; - unit: string | null; - status: string; - sort_order: number; - options: Record | null; - }, index: number) => { - const opts = item.options || {}; - - // steps: stepProgress에서 가져오거나 process.steps에서 생성 - const stepProgressList = wo.step_progress || []; - const processSteps = wo.process?.steps || []; - - let steps: WorkStepData[]; - if (stepProgressList.length > 0) { - steps = stepProgressList - .filter((sp: { work_order_item_id: number | null }) => !sp.work_order_item_id || sp.work_order_item_id === item.id) - .map((sp: { id: number; process_step: { step_name: string; step_code: string } | null; status: string }) => ({ - id: String(sp.id), - name: sp.process_step?.step_name || '', - isMaterialInput: (sp.process_step?.step_code || '').includes('MAT') || (sp.process_step?.step_name || '').includes('자재투입'), - isCompleted: sp.status === 'completed', - })); - } else { - steps = processSteps.map((ps: { id: number; step_name: string; step_code: string }, si: number) => ({ - id: `${item.id}-step-${si}`, - name: ps.step_name, - isMaterialInput: ps.step_code.includes('MAT') || ps.step_name.includes('자재투입'), - isCompleted: false, + let steps: WorkStepData[]; + if (stepProgressList.length > 0) { + steps = stepProgressList + .filter((sp: { work_order_item_id: number | null }) => !sp.work_order_item_id || sp.work_order_item_id === item.id) + .map((sp: { id: number; process_step: { step_name: string; step_code: string } | null; status: string }) => ({ + id: String(sp.id), + name: sp.process_step?.step_name || '', + isMaterialInput: (sp.process_step?.step_code || '').includes('MAT') || (sp.process_step?.step_name || '').includes('자재투입'), + isCompleted: sp.status === 'completed', })); - } + } else { + steps = processSteps.map((ps: { id: number; step_name: string; step_code: string }, si: number) => ({ + id: `${item.id}-step-${si}`, + name: ps.step_name, + isMaterialInput: ps.step_code.includes('MAT') || ps.step_name.includes('자재투입'), + isCompleted: false, + })); + } - const workItem: WorkItemData = { - id: String(item.id), - itemNo: index + 1, - itemCode: wo.work_order_no || '-', - itemName: item.item_name || '-', - floor: (opts.floor as string) || '-', - code: (opts.code as string) || '-', - width: (opts.width as number) || 0, - height: (opts.height as number) || 0, - quantity: Number(item.quantity) || 0, - processType, - steps, - materialInputs: [], + const workItem: WorkItemData = { + id: String(item.id), itemNo: index + 1, + itemCode: wo.work_order_no || '-', itemName: item.item_name || '-', + floor: (opts.floor as string) || '-', code: (opts.code as string) || '-', + width: (opts.width as number) || 0, height: (opts.height as number) || 0, + quantity: Number(item.quantity) || 0, processType, steps, materialInputs: [], + }; + + if (opts.cutting_info) { + const ci = opts.cutting_info as { width: number; sheets: number }; + workItem.cuttingInfo = { width: ci.width, sheets: ci.sheets }; + } + if (opts.slat_info) { + const si = opts.slat_info as { length: number; slat_count: number; joint_bar: number }; + workItem.slatInfo = { length: si.length, slatCount: si.slat_count, jointBar: si.joint_bar }; + } + if (opts.bending_info) { + const bi = opts.bending_info as { + common: { kind: string; type: string; length_quantities: { length: number; quantity: number }[] }; + detail_parts: { part_name: string; material: string; barcy_info: string }[]; }; + workItem.bendingInfo = { + common: { kind: bi.common.kind, type: bi.common.type, lengthQuantities: bi.common.length_quantities || [] }, + detailParts: (bi.detail_parts || []).map(dp => ({ partName: dp.part_name, material: dp.material, barcyInfo: dp.barcy_info })), + }; + } + if (opts.is_wip) { + workItem.isWip = true; + const wi = opts.wip_info as { specification: string; length_quantity: string; drawing_url?: string } | undefined; + if (wi) { + workItem.wipInfo = { specification: wi.specification, lengthQuantity: wi.length_quantity, drawingUrl: wi.drawing_url }; + } + } + if (opts.is_joint_bar) { + workItem.isJointBar = true; + const jb = opts.slat_joint_bar_info as { specification: string; length: number; quantity: number } | undefined; + if (jb) workItem.slatJointBarInfo = jb; + } - // 공정별 상세 정보 파싱 (options에서) - if (opts.cutting_info) { - const ci = opts.cutting_info as { width: number; sheets: number }; - workItem.cuttingInfo = { width: ci.width, sheets: ci.sheets }; - } - if (opts.slat_info) { - const si = opts.slat_info as { length: number; slat_count: number; joint_bar: number }; - workItem.slatInfo = { length: si.length, slatCount: si.slat_count, jointBar: si.joint_bar }; - } - if (opts.bending_info) { - const bi = opts.bending_info as { - common: { kind: string; type: string; length_quantities: { length: number; quantity: number }[] }; - detail_parts: { part_name: string; material: string; barcy_info: string }[]; - }; - workItem.bendingInfo = { - common: { - kind: bi.common.kind, - type: bi.common.type, - lengthQuantities: bi.common.length_quantities || [], - }, - detailParts: (bi.detail_parts || []).map(dp => ({ - partName: dp.part_name, - material: dp.material, - barcyInfo: dp.barcy_info, - })), - }; - } - if (opts.is_wip) { - workItem.isWip = true; - const wi = opts.wip_info as { specification: string; length_quantity: string; drawing_url?: string } | undefined; - if (wi) { - workItem.wipInfo = { - specification: wi.specification, - lengthQuantity: wi.length_quantity, - drawingUrl: wi.drawing_url, - }; - } - } - if (opts.is_joint_bar) { - workItem.isJointBar = true; - const jb = opts.slat_joint_bar_info as { specification: string; length: number; quantity: number } | undefined; - if (jb) { - workItem.slatJointBarInfo = jb; - } - } + return workItem; + }); - return workItem; - }); - - return { success: true, data: items }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] getWorkOrderDetail error:', error); - return { success: false, data: [], error: '서버 오류' }; - } + return { success: true, data: items }; } // ===== 개소별 중간검사 데이터 저장 ===== @@ -836,37 +481,13 @@ export async function saveItemInspection( processType: string, inspectionData: Record ): Promise<{ success: boolean; data?: Record; error?: string }> { - try { - console.log('[WorkerScreenActions] POST item inspection:', { workOrderId, itemId, processType }); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/items/${itemId}/inspection`, - { - method: 'POST', - body: JSON.stringify({ - process_type: processType, - inspection_data: inspectionData, - }), - } - ); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - console.log('[WorkerScreenActions] POST item inspection response:', result); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '검사 데이터 저장에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] saveItemInspection error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/items/${itemId}/inspection`, + method: 'POST', + body: { process_type: processType, inspection_data: inspectionData }, + errorMessage: '검사 데이터 저장에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } // ===== 작업지시 전체 검사 데이터 조회 ===== @@ -887,27 +508,9 @@ export async function getWorkOrderInspectionData( data?: { work_order_id: number; items: InspectionDataItem[]; total: number }; error?: string; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/work-orders/${workOrderId}/inspection-data`; - - console.log('[WorkerScreenActions] GET inspection data:', url); - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response) { - return { success: false, error: error?.message || 'API 요청 실패' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '검사 데이터 조회에 실패했습니다.' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[WorkerScreenActions] getWorkOrderInspectionData error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction<{ work_order_id: number; items: InspectionDataItem[]; total: number }>({ + url: `${API_URL}/api/v1/work-orders/${workOrderId}/inspection-data`, + errorMessage: '검사 데이터 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data, error: result.error }; } \ No newline at end of file diff --git a/src/components/quality/InspectionManagement/actions.ts b/src/components/quality/InspectionManagement/actions.ts index 4cfe2031..c4c48355 100644 --- a/src/components/quality/InspectionManagement/actions.ts +++ b/src/components/quality/InspectionManagement/actions.ts @@ -15,8 +15,7 @@ * - GET /api/v1/orders/select - 수주 선택 목록 조회 */ -import { serverFetch } from '@/lib/api/fetch-wrapper'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { ProductInspection, InspectionStats, @@ -307,81 +306,60 @@ export async function getInspections(params?: { }> { const defaultPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; - try { - const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('per_page', String(params.size)); - if (params?.q) searchParams.set('q', params.q); - if (params?.status && params.status !== '전체') { - searchParams.set('status', mapFrontendStatus(params.status)); - } - if (params?.dateFrom) searchParams.set('date_from', params.dateFrom); - if (params?.dateTo) searchParams.set('date_to', params.dateTo); + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('per_page', String(params.size)); + if (params?.q) searchParams.set('q', params.q); + if (params?.status && params.status !== '전체') { + searchParams.set('status', mapFrontendStatus(params.status)); + } + if (params?.dateFrom) searchParams.set('date_from', params.dateFrom); + if (params?.dateTo) searchParams.set('date_to', params.dateTo); - const queryString = searchParams.toString(); - const url = `${API_BASE}${queryString ? `?${queryString}` : ''}`; + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_BASE}${queryString ? `?${queryString}` : ''}`, + errorMessage: '제품검사 목록 조회에 실패했습니다.', + }); - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response || !response.ok) { - if (USE_MOCK_FALLBACK) { - console.warn('[InspectionActions] API 실패, Mock 데이터 사용'); - let filtered = [...mockInspections]; - if (params?.status && params.status !== '전체') { - filtered = filtered.filter(i => i.status === params.status); - } - if (params?.q) { - const q = params.q.toLowerCase(); - filtered = filtered.filter(i => - i.siteName.toLowerCase().includes(q) || - i.client.toLowerCase().includes(q) || - i.qualityDocNumber.toLowerCase().includes(q) || - i.inspector.toLowerCase().includes(q) - ); - } - const page = params?.page || 1; - const size = params?.size || 20; - const start = (page - 1) * size; - const paged = filtered.slice(start, start + size); - return { - success: true, - data: paged, - pagination: { currentPage: page, lastPage: Math.ceil(filtered.length / size), perPage: size, total: filtered.length }, - }; - } - const errMsg = error ? error.message : `API 오류: ${response?.status || 'no response'}`; - return { success: false, data: [], pagination: defaultPagination, error: errMsg, __authError: error?.code === 'UNAUTHORIZED' }; - } - - const result = await response.json(); - if (!result.success) { - return { success: false, data: [], pagination: defaultPagination, error: result.message || '목록 조회 실패' }; - } - - const paginatedData: PaginatedResponse = result.data || { items: [], current_page: 1, last_page: 1, per_page: 20, total: 0 }; - - return { - success: true, - data: paginatedData.items.map(transformApiToFrontend), - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] getInspections error:', error); + if (!result.success) { if (USE_MOCK_FALLBACK) { + let filtered = [...mockInspections]; + if (params?.status && params.status !== '전체') { + filtered = filtered.filter(i => i.status === params.status); + } + if (params?.q) { + const q = params.q.toLowerCase(); + filtered = filtered.filter(i => + i.siteName.toLowerCase().includes(q) || + i.client.toLowerCase().includes(q) || + i.qualityDocNumber.toLowerCase().includes(q) || + i.inspector.toLowerCase().includes(q) + ); + } + const page = params?.page || 1; + const size = params?.size || 20; + const start = (page - 1) * size; return { success: true, - data: mockInspections, - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: mockInspections.length }, + data: filtered.slice(start, start + size), + pagination: { currentPage: page, lastPage: Math.ceil(filtered.length / size), perPage: size, total: filtered.length }, }; } - return { success: false, data: [], pagination: defaultPagination, error: '서버 오류가 발생했습니다.' }; + return { success: false, data: [], pagination: defaultPagination, error: result.error, __authError: result.__authError }; } + + const d = result.data || { items: [], current_page: 1, last_page: 1, per_page: 20, total: 0 }; + return { + success: true, + data: d.items.map(transformApiToFrontend), + pagination: { + currentPage: d.current_page, + lastPage: d.last_page, + perPage: d.per_page, + total: d.total, + }, + }; } // ===== 통계 조회 ===== @@ -395,45 +373,30 @@ export async function getInspectionStats(params?: { error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); - if (params?.dateFrom) searchParams.set('date_from', params.dateFrom); - if (params?.dateTo) searchParams.set('date_to', params.dateTo); + const searchParams = new URLSearchParams(); + if (params?.dateFrom) searchParams.set('date_from', params.dateFrom); + if (params?.dateTo) searchParams.set('date_to', params.dateTo); - const queryString = searchParams.toString(); - const url = `${API_BASE}/stats${queryString ? `?${queryString}` : ''}`; + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_BASE}/stats${queryString ? `?${queryString}` : ''}`, + errorMessage: '제품검사 통계 조회에 실패했습니다.', + }); - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response || !response.ok) { - if (USE_MOCK_FALLBACK) { - console.warn('[InspectionActions] Stats API 실패, Mock 데이터 사용'); - return { success: true, data: mockStats }; - } - const errMsg = error ? error.message : `API 오류: ${response?.status || 'no response'}`; - return { success: false, error: errMsg, __authError: error?.code === 'UNAUTHORIZED' }; - } - - const result = await response.json(); - if (!result.success) { - return { success: false, error: result.message || '통계 조회 실패' }; - } - - const statsApi: InspectionStatsApi = result.data; - return { - success: true, - data: { - receptionCount: statsApi.reception_count, - inProgressCount: statsApi.in_progress_count, - completedCount: statsApi.completed_count, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] getInspectionStats error:', error); + if (!result.success) { if (USE_MOCK_FALLBACK) return { success: true, data: mockStats }; - return { success: false, error: '서버 오류가 발생했습니다.' }; + return { success: false, error: result.error, __authError: result.__authError }; } + + const s = result.data; + return { + success: true, + data: s ? { + receptionCount: s.reception_count, + inProgressCount: s.in_progress_count, + completedCount: s.completed_count, + } : undefined, + }; } // ===== 캘린더 스케줄 조회 ===== @@ -449,52 +412,37 @@ export async function getInspectionCalendar(params?: { error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); - if (params?.year) searchParams.set('year', String(params.year)); - if (params?.month) searchParams.set('month', String(params.month)); - if (params?.inspector) searchParams.set('inspector', params.inspector); - if (params?.status && params.status !== '전체') { - searchParams.set('status', mapFrontendStatus(params.status)); - } - - const queryString = searchParams.toString(); - const url = `${API_BASE}/calendar${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response || !response.ok) { - if (USE_MOCK_FALLBACK) { - console.warn('[InspectionActions] Calendar API 실패, Mock 데이터 사용'); - return { success: true, data: mockCalendarItems }; - } - const errMsg = error ? error.message : `API 오류: ${response?.status || 'no response'}`; - return { success: false, data: [], error: errMsg, __authError: error?.code === 'UNAUTHORIZED' }; - } - - const result = await response.json(); - if (!result.success) { - return { success: false, data: [], error: result.message || '캘린더 조회 실패' }; - } - - const items: CalendarItemApi[] = result.data || []; - return { - success: true, - data: items.map((item) => ({ - id: String(item.id), - startDate: item.start_date, - endDate: item.end_date, - inspector: item.inspector, - siteName: item.site_name, - status: mapApiStatus(item.status as ProductInspectionApi['status']), - })), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] getInspectionCalendar error:', error); - if (USE_MOCK_FALLBACK) return { success: true, data: mockCalendarItems }; - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; + const searchParams = new URLSearchParams(); + if (params?.year) searchParams.set('year', String(params.year)); + if (params?.month) searchParams.set('month', String(params.month)); + if (params?.inspector) searchParams.set('inspector', params.inspector); + if (params?.status && params.status !== '전체') { + searchParams.set('status', mapFrontendStatus(params.status)); } + + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_BASE}/calendar${queryString ? `?${queryString}` : ''}`, + errorMessage: '캘린더 스케줄 조회에 실패했습니다.', + }); + + if (!result.success) { + if (USE_MOCK_FALLBACK) return { success: true, data: mockCalendarItems }; + return { success: false, data: [], error: result.error, __authError: result.__authError }; + } + + const items = result.data || []; + return { + success: true, + data: items.map((item) => ({ + id: String(item.id), + startDate: item.start_date, + endDate: item.end_date, + inspector: item.inspector, + siteName: item.site_name, + status: mapApiStatus(item.status as ProductInspectionApi['status']), + })), + }; } // ===== 상세 조회 ===== @@ -505,36 +453,23 @@ export async function getInspectionById(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${API_BASE}/${id}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); + const result = await executeServerAction({ + url: `${API_BASE}/${id}`, + errorMessage: '제품검사 상세 조회에 실패했습니다.', + }); - if (error || !response || !response.ok) { - if (USE_MOCK_FALLBACK) { - console.warn('[InspectionActions] Detail API 실패, Mock 데이터 사용'); - const mockItem = mockInspections.find(i => i.id === id); - if (mockItem) return { success: true, data: mockItem }; - return { success: false, error: '해당 데이터를 찾을 수 없습니다.' }; - } - const errMsg = error ? error.message : `API 오류: ${response?.status || 'no response'}`; - return { success: false, error: errMsg, __authError: error?.code === 'UNAUTHORIZED' }; - } - - const result = await response.json(); - if (!result.success || !result.data) { - return { success: false, error: result.message || '상세 조회 실패' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] getInspectionById error:', error); + if (!result.success) { if (USE_MOCK_FALLBACK) { const mockItem = mockInspections.find(i => i.id === id); if (mockItem) return { success: true, data: mockItem }; + return { success: false, error: '해당 데이터를 찾을 수 없습니다.' }; } - return { success: false, error: '서버 오류가 발생했습니다.' }; + return { success: false, error: result.error, __authError: result.__authError }; } + + return result.data + ? { success: true, data: transformApiToFrontend(result.data) } + : { success: false, error: '상세 조회 실패' }; } // ===== 등록 ===== @@ -545,32 +480,18 @@ export async function createInspection(data: InspectionFormData): Promise<{ error?: string; __authError?: boolean; }> { - try { - const apiData = transformFormToApi(data); + const apiData = transformFormToApi(data); + const result = await executeServerAction({ + url: API_BASE, + method: 'POST', + body: apiData, + errorMessage: '제품검사 등록에 실패했습니다.', + }); - const { response, error } = await serverFetch(API_BASE, { - method: 'POST', - body: JSON.stringify(apiData), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - if (!response) { - return { success: false, error: '등록에 실패했습니다.' }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - return { success: false, error: result.message || '등록에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] createInspection error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + if (!result.success) return { success: false, error: result.error, __authError: result.__authError }; + return result.data + ? { success: true, data: transformApiToFrontend(result.data) } + : { success: true }; } // ===== 수정 ===== @@ -584,93 +505,80 @@ export async function updateInspection( error?: string; __authError?: boolean; }> { - try { - const apiData: Record = {}; + const apiData: Record = {}; - if (data.qualityDocNumber !== undefined) apiData.quality_doc_number = data.qualityDocNumber; - if (data.siteName !== undefined) apiData.site_name = data.siteName; - if (data.client !== undefined) apiData.client = data.client; - if (data.manager !== undefined) apiData.manager = data.manager; - if (data.managerContact !== undefined) apiData.manager_contact = data.managerContact; + if (data.qualityDocNumber !== undefined) apiData.quality_doc_number = data.qualityDocNumber; + if (data.siteName !== undefined) apiData.site_name = data.siteName; + if (data.client !== undefined) apiData.client = data.client; + if (data.manager !== undefined) apiData.manager = data.manager; + if (data.managerContact !== undefined) apiData.manager_contact = data.managerContact; - if (data.constructionSite) { - apiData.construction_site = { - site_name: data.constructionSite.siteName, - land_location: data.constructionSite.landLocation, - lot_number: data.constructionSite.lotNumber, - }; - } - if (data.materialDistributor) { - apiData.material_distributor = { - company_name: data.materialDistributor.companyName, - company_address: data.materialDistributor.companyAddress, - representative_name: data.materialDistributor.representativeName, - phone: data.materialDistributor.phone, - }; - } - if (data.constructorInfo) { - apiData.constructor_info = { - company_name: data.constructorInfo.companyName, - company_address: data.constructorInfo.companyAddress, - name: data.constructorInfo.name, - phone: data.constructorInfo.phone, - }; - } - if (data.supervisor) { - apiData.supervisor = { - office_name: data.supervisor.officeName, - office_address: data.supervisor.officeAddress, - name: data.supervisor.name, - phone: data.supervisor.phone, - }; - } - if (data.scheduleInfo) { - apiData.schedule_info = { - visit_request_date: data.scheduleInfo.visitRequestDate, - start_date: data.scheduleInfo.startDate, - end_date: data.scheduleInfo.endDate, - inspector: data.scheduleInfo.inspector, - site_postal_code: data.scheduleInfo.sitePostalCode, - site_address: data.scheduleInfo.siteAddress, - site_address_detail: data.scheduleInfo.siteAddressDetail, - }; - } - if (data.orderItems) { - apiData.order_items = data.orderItems.map((item) => ({ - order_number: item.orderNumber, - floor: item.floor, - symbol: item.symbol, - order_width: item.orderWidth, - order_height: item.orderHeight, - construction_width: item.constructionWidth, - construction_height: item.constructionHeight, - change_reason: item.changeReason, - })); - } - - const { response, error } = await serverFetch(`${API_BASE}/${id}`, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - if (!response) { - return { success: false, error: '수정에 실패했습니다.' }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - return { success: false, error: result.message || '수정에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] updateInspection error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + if (data.constructionSite) { + apiData.construction_site = { + site_name: data.constructionSite.siteName, + land_location: data.constructionSite.landLocation, + lot_number: data.constructionSite.lotNumber, + }; } + if (data.materialDistributor) { + apiData.material_distributor = { + company_name: data.materialDistributor.companyName, + company_address: data.materialDistributor.companyAddress, + representative_name: data.materialDistributor.representativeName, + phone: data.materialDistributor.phone, + }; + } + if (data.constructorInfo) { + apiData.constructor_info = { + company_name: data.constructorInfo.companyName, + company_address: data.constructorInfo.companyAddress, + name: data.constructorInfo.name, + phone: data.constructorInfo.phone, + }; + } + if (data.supervisor) { + apiData.supervisor = { + office_name: data.supervisor.officeName, + office_address: data.supervisor.officeAddress, + name: data.supervisor.name, + phone: data.supervisor.phone, + }; + } + if (data.scheduleInfo) { + apiData.schedule_info = { + visit_request_date: data.scheduleInfo.visitRequestDate, + start_date: data.scheduleInfo.startDate, + end_date: data.scheduleInfo.endDate, + inspector: data.scheduleInfo.inspector, + site_postal_code: data.scheduleInfo.sitePostalCode, + site_address: data.scheduleInfo.siteAddress, + site_address_detail: data.scheduleInfo.siteAddressDetail, + }; + } + if (data.orderItems) { + apiData.order_items = data.orderItems.map((item) => ({ + order_number: item.orderNumber, + floor: item.floor, + symbol: item.symbol, + order_width: item.orderWidth, + order_height: item.orderHeight, + construction_width: item.constructionWidth, + construction_height: item.constructionHeight, + change_reason: item.changeReason, + })); + } + + const result = await executeServerAction({ + url: `${API_BASE}/${id}`, + method: 'PUT', + body: apiData, + errorMessage: '제품검사 수정에 실패했습니다.', + }); + + if (!result.success) return { success: false, error: result.error, __authError: result.__authError }; + return result.data + ? { success: true, data: transformApiToFrontend(result.data) } + : { success: true }; } // ===== 삭제 ===== @@ -680,27 +588,13 @@ export async function deleteInspection(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch(`${API_BASE}/${id}`, { method: 'DELETE' }); + const result = await executeServerAction({ + url: `${API_BASE}/${id}`, + method: 'DELETE', + errorMessage: '제품검사 삭제에 실패했습니다.', + }); - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - if (!response) { - return { success: false, error: '삭제에 실패했습니다.' }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - return { success: false, error: result.message || '삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] deleteInspection error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + return { success: result.success, error: result.error, __authError: result.__authError }; } // ===== 검사 완료 처리 ===== @@ -714,35 +608,22 @@ export async function completeInspection( error?: string; __authError?: boolean; }> { - try { - const apiData: Record = {}; - if (data?.result) { - apiData.result = data.result === '합격' ? 'pass' : 'fail'; - } - - const { response, error } = await serverFetch(`${API_BASE}/${id}/complete`, { - method: 'PATCH', - body: JSON.stringify(apiData), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - if (!response) { - return { success: false, error: '검사 완료 처리에 실패했습니다.' }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - return { success: false, error: result.message || '검사 완료 처리에 실패했습니다.' }; - } - - return { success: true, data: transformApiToFrontend(result.data) }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] completeInspection error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; + const apiData: Record = {}; + if (data?.result) { + apiData.result = data.result === '합격' ? 'pass' : 'fail'; } + + const result = await executeServerAction({ + url: `${API_BASE}/${id}/complete`, + method: 'PATCH', + body: apiData, + errorMessage: '검사 완료 처리에 실패했습니다.', + }); + + if (!result.success) return { success: false, error: result.error, __authError: result.__authError }; + return result.data + ? { success: true, data: transformApiToFrontend(result.data) } + : { success: true }; } // ===== 수주 선택 목록 조회 ===== @@ -755,51 +636,38 @@ export async function getOrderSelectList(params?: { error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); - if (params?.q) searchParams.set('q', params.q); + const searchParams = new URLSearchParams(); + if (params?.q) searchParams.set('q', params.q); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/select${queryString ? `?${queryString}` : ''}`; + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${process.env.NEXT_PUBLIC_API_URL}/api/v1/orders/select${queryString ? `?${queryString}` : ''}`, + errorMessage: '수주 선택 목록 조회에 실패했습니다.', + }); - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response || !response.ok) { - if (USE_MOCK_FALLBACK) { - console.warn('[InspectionActions] OrderSelect API 실패, Mock 데이터 사용'); - let filtered = [...mockOrderSelectItems]; - if (params?.q) { - const q = params.q.toLowerCase(); - filtered = filtered.filter(i => - i.orderNumber.toLowerCase().includes(q) || i.siteName.toLowerCase().includes(q) - ); - } - return { success: true, data: filtered }; + if (!result.success) { + if (USE_MOCK_FALLBACK) { + let filtered = [...mockOrderSelectItems]; + if (params?.q) { + const q = params.q.toLowerCase(); + filtered = filtered.filter(i => + i.orderNumber.toLowerCase().includes(q) || i.siteName.toLowerCase().includes(q) + ); } - const errMsg = error ? error.message : `API 오류: ${response?.status || 'no response'}`; - return { success: false, data: [], error: errMsg, __authError: error?.code === 'UNAUTHORIZED' }; + return { success: true, data: filtered }; } - - const result = await response.json(); - if (!result.success) { - return { success: false, data: [], error: result.message || '수주 목록 조회 실패' }; - } - - const items: OrderSelectItemApi[] = result.data || []; - return { - success: true, - data: items.map((item) => ({ - id: String(item.id), - orderNumber: item.order_number, - siteName: item.site_name, - deliveryDate: item.delivery_date, - locationCount: item.location_count, - })), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[InspectionActions] getOrderSelectList error:', error); - if (USE_MOCK_FALLBACK) return { success: true, data: mockOrderSelectItems }; - return { success: false, data: [], error: '서버 오류가 발생했습니다.' }; + return { success: false, data: [], error: result.error, __authError: result.__authError }; } + + const items = result.data || []; + return { + success: true, + data: items.map((item) => ({ + id: String(item.id), + orderNumber: item.order_number, + siteName: item.site_name, + deliveryDate: item.delivery_date, + locationCount: item.location_count, + })), + }; } diff --git a/src/components/quality/PerformanceReportManagement/actions.ts b/src/components/quality/PerformanceReportManagement/actions.ts index efb3eed9..dd9c8d41 100644 --- a/src/components/quality/PerformanceReportManagement/actions.ts +++ b/src/components/quality/PerformanceReportManagement/actions.ts @@ -13,8 +13,7 @@ * - PATCH /api/v1/performance-reports/memo - 메모 일괄 적용 */ -import { serverFetch } from '@/lib/api/fetch-wrapper'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { PerformanceReport, PerformanceReportStats, @@ -58,80 +57,56 @@ export async function getPerformanceReports(params?: { }> { const defaultPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; - try { - const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('per_page', String(params.size)); - if (params?.q) searchParams.set('q', params.q); - if (params?.year) searchParams.set('year', String(params.year)); - if (params?.quarter && params.quarter !== '전체') { - searchParams.set('quarter', params.quarter); - } + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('per_page', String(params.size)); + if (params?.q) searchParams.set('q', params.q); + if (params?.year) searchParams.set('year', String(params.year)); + if (params?.quarter && params.quarter !== '전체') { + searchParams.set('quarter', params.quarter); + } - const queryString = searchParams.toString(); - const url = `${API_BASE}${queryString ? `?${queryString}` : ''}`; + const queryString = searchParams.toString(); + interface ApiListData { items?: PerformanceReport[]; current_page?: number; last_page?: number; per_page?: number; total?: number } + const result = await executeServerAction({ + url: `${API_BASE}${queryString ? `?${queryString}` : ''}`, + errorMessage: '실적신고 목록 조회에 실패했습니다.', + }); - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response || !response.ok) { - if (USE_MOCK_FALLBACK) { - console.warn('[PerformanceReportActions] API 실패, Mock 데이터 사용'); - let filtered = [...mockPerformanceReports]; - if (params?.year) { - filtered = filtered.filter(i => i.year === params.year); - } - if (params?.quarter && params.quarter !== '전체') { - filtered = filtered.filter(i => i.quarter === params.quarter); - } - if (params?.q) { - const q = params.q.toLowerCase(); - filtered = filtered.filter(i => - i.siteName.toLowerCase().includes(q) || - i.client.toLowerCase().includes(q) || - i.qualityDocNumber.toLowerCase().includes(q) - ); - } - const page = params?.page || 1; - const size = params?.size || 20; - const start = (page - 1) * size; - const paged = filtered.slice(start, start + size); - return { - success: true, - data: paged, - pagination: { currentPage: page, lastPage: Math.ceil(filtered.length / size), perPage: size, total: filtered.length }, - }; - } - const errMsg = error ? error.message : `API 오류: ${response?.status || 'no response'}`; - return { success: false, data: [], pagination: defaultPagination, error: errMsg, __authError: error?.code === 'UNAUTHORIZED' }; - } - - const result = await response.json(); - if (!result.success) { - return { success: false, data: [], pagination: defaultPagination, error: result.message || '목록 조회 실패' }; - } - - return { - success: true, - data: result.data?.items || [], - pagination: { - currentPage: result.data?.current_page || 1, - lastPage: result.data?.last_page || 1, - perPage: result.data?.per_page || 20, - total: result.data?.total || 0, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PerformanceReportActions] getPerformanceReports error:', error); + if (!result.success) { if (USE_MOCK_FALLBACK) { + let filtered = [...mockPerformanceReports]; + if (params?.year) filtered = filtered.filter(i => i.year === params.year); + if (params?.quarter && params.quarter !== '전체') filtered = filtered.filter(i => i.quarter === params.quarter); + if (params?.q) { + const q = params.q.toLowerCase(); + filtered = filtered.filter(i => + i.siteName.toLowerCase().includes(q) || i.client.toLowerCase().includes(q) || i.qualityDocNumber.toLowerCase().includes(q) + ); + } + const page = params?.page || 1; + const size = params?.size || 20; + const start = (page - 1) * size; return { success: true, - data: mockPerformanceReports, - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: mockPerformanceReports.length }, + data: filtered.slice(start, start + size), + pagination: { currentPage: page, lastPage: Math.ceil(filtered.length / size), perPage: size, total: filtered.length }, }; } - return { success: false, data: [], pagination: defaultPagination, error: '서버 오류가 발생했습니다.' }; + return { success: false, data: [], pagination: defaultPagination, error: result.error, __authError: result.__authError }; } + + const d = result.data; + return { + success: true, + data: d?.items || [], + pagination: { + currentPage: d?.current_page || 1, + lastPage: d?.last_page || 1, + perPage: d?.per_page || 20, + total: d?.total || 0, + }, + }; } // ===== 통계 조회 ===== @@ -145,39 +120,23 @@ export async function getPerformanceReportStats(params?: { error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); - if (params?.year) searchParams.set('year', String(params.year)); - if (params?.quarter && params.quarter !== '전체') { - searchParams.set('quarter', params.quarter); - } - - const queryString = searchParams.toString(); - const url = `${API_BASE}/stats${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response || !response.ok) { - if (USE_MOCK_FALLBACK) { - console.warn('[PerformanceReportActions] Stats API 실패, Mock 데이터 사용'); - return { success: true, data: mockPerformanceReportStats }; - } - const errMsg = error ? error.message : `API 오류: ${response?.status || 'no response'}`; - return { success: false, error: errMsg, __authError: error?.code === 'UNAUTHORIZED' }; - } - - const result = await response.json(); - if (!result.success) { - return { success: false, error: result.message || '통계 조회 실패' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PerformanceReportActions] getPerformanceReportStats error:', error); - if (USE_MOCK_FALLBACK) return { success: true, data: mockPerformanceReportStats }; - return { success: false, error: '서버 오류가 발생했습니다.' }; + const searchParams = new URLSearchParams(); + if (params?.year) searchParams.set('year', String(params.year)); + if (params?.quarter && params.quarter !== '전체') { + searchParams.set('quarter', params.quarter); } + + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_BASE}/stats${queryString ? `?${queryString}` : ''}`, + errorMessage: '실적신고 통계 조회에 실패했습니다.', + }); + + if (!result.success) { + if (USE_MOCK_FALLBACK) return { success: true, data: mockPerformanceReportStats }; + return { success: false, error: result.error, __authError: result.__authError }; + } + return { success: true, data: result.data }; } // ===== 누락체크 목록 조회 ===== @@ -195,70 +154,50 @@ export async function getMissedReports(params?: { }> { const defaultPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; - try { - const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('per_page', String(params.size)); - if (params?.q) searchParams.set('q', params.q); + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('per_page', String(params.size)); + if (params?.q) searchParams.set('q', params.q); - const queryString = searchParams.toString(); - const url = `${API_BASE}/missed${queryString ? `?${queryString}` : ''}`; + const queryString = searchParams.toString(); + interface ApiMissedData { items?: MissedReport[]; current_page?: number; last_page?: number; per_page?: number; total?: number } + const result = await executeServerAction({ + url: `${API_BASE}/missed${queryString ? `?${queryString}` : ''}`, + errorMessage: '누락체크 목록 조회에 실패했습니다.', + }); - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error || !response || !response.ok) { - if (USE_MOCK_FALLBACK) { - console.warn('[PerformanceReportActions] Missed API 실패, Mock 데이터 사용'); - let filtered = [...mockMissedReports]; - if (params?.q) { - const q = params.q.toLowerCase(); - filtered = filtered.filter(i => - i.siteName.toLowerCase().includes(q) || - i.client.toLowerCase().includes(q) || - i.qualityDocNumber.toLowerCase().includes(q) - ); - } - const page = params?.page || 1; - const size = params?.size || 20; - const start = (page - 1) * size; - const paged = filtered.slice(start, start + size); - return { - success: true, - data: paged, - pagination: { currentPage: page, lastPage: Math.ceil(filtered.length / size), perPage: size, total: filtered.length }, - }; - } - const errMsg = error ? error.message : `API 오류: ${response?.status || 'no response'}`; - return { success: false, data: [], pagination: defaultPagination, error: errMsg, __authError: error?.code === 'UNAUTHORIZED' }; - } - - const result = await response.json(); - if (!result.success) { - return { success: false, data: [], pagination: defaultPagination, error: result.message || '누락체크 조회 실패' }; - } - - return { - success: true, - data: result.data?.items || [], - pagination: { - currentPage: result.data?.current_page || 1, - lastPage: result.data?.last_page || 1, - perPage: result.data?.per_page || 20, - total: result.data?.total || 0, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PerformanceReportActions] getMissedReports error:', error); + if (!result.success) { if (USE_MOCK_FALLBACK) { + let filtered = [...mockMissedReports]; + if (params?.q) { + const q = params.q.toLowerCase(); + filtered = filtered.filter(i => + i.siteName.toLowerCase().includes(q) || i.client.toLowerCase().includes(q) || i.qualityDocNumber.toLowerCase().includes(q) + ); + } + const page = params?.page || 1; + const size = params?.size || 20; + const start = (page - 1) * size; return { success: true, - data: mockMissedReports, - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: mockMissedReports.length }, + data: filtered.slice(start, start + size), + pagination: { currentPage: page, lastPage: Math.ceil(filtered.length / size), perPage: size, total: filtered.length }, }; } - return { success: false, data: [], pagination: defaultPagination, error: '서버 오류가 발생했습니다.' }; + return { success: false, data: [], pagination: defaultPagination, error: result.error, __authError: result.__authError }; } + + const d = result.data; + return { + success: true, + data: d?.items || [], + pagination: { + currentPage: d?.current_page || 1, + lastPage: d?.last_page || 1, + perPage: d?.per_page || 20, + total: d?.total || 0, + }, + }; } // ===== 선택 확정 ===== @@ -268,34 +207,14 @@ export async function confirmReports(ids: string[]): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch(`${API_BASE}/confirm`, { - method: 'PATCH', - body: JSON.stringify({ ids }), - }); - - if (error) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - if (!response) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: '확정 처리에 실패했습니다.' }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: result.message || '확정 처리에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PerformanceReportActions] confirmReports error:', error); - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_BASE}/confirm`, + method: 'PATCH', + body: { ids }, + errorMessage: '확정 처리에 실패했습니다.', + }); + if (!result.success && USE_MOCK_FALLBACK) return { success: true }; + return { success: result.success, error: result.error, __authError: result.__authError }; } // ===== 확정 해제 ===== @@ -305,34 +224,14 @@ export async function unconfirmReports(ids: string[]): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch(`${API_BASE}/unconfirm`, { - method: 'PATCH', - body: JSON.stringify({ ids }), - }); - - if (error) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - if (!response) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: '확정 해제에 실패했습니다.' }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: result.message || '확정 해제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PerformanceReportActions] unconfirmReports error:', error); - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_BASE}/unconfirm`, + method: 'PATCH', + body: { ids }, + errorMessage: '확정 해제에 실패했습니다.', + }); + if (!result.success && USE_MOCK_FALLBACK) return { success: true }; + return { success: result.success, error: result.error, __authError: result.__authError }; } // ===== 배포 ===== @@ -342,34 +241,14 @@ export async function distributeReports(ids: string[]): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch(`${API_BASE}/distribute`, { - method: 'POST', - body: JSON.stringify({ ids }), - }); - - if (error) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - if (!response) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: '배포에 실패했습니다.' }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: result.message || '배포에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PerformanceReportActions] distributeReports error:', error); - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_BASE}/distribute`, + method: 'POST', + body: { ids }, + errorMessage: '배포에 실패했습니다.', + }); + if (!result.success && USE_MOCK_FALLBACK) return { success: true }; + return { success: result.success, error: result.error, __authError: result.__authError }; } // ===== 메모 일괄 적용 ===== @@ -379,32 +258,12 @@ export async function updateMemo(ids: string[], memo: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch(`${API_BASE}/memo`, { - method: 'PATCH', - body: JSON.stringify({ ids, memo }), - }); - - if (error) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - if (!response) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: '메모 저장에 실패했습니다.' }; - } - - const result = await response.json(); - if (!response.ok || !result.success) { - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: result.message || '메모 저장에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PerformanceReportActions] updateMemo error:', error); - if (USE_MOCK_FALLBACK) return { success: true }; - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_BASE}/memo`, + method: 'PATCH', + body: { ids, memo }, + errorMessage: '메모 저장에 실패했습니다.', + }); + if (!result.success && USE_MOCK_FALLBACK) return { success: true }; + return { success: result.success, error: result.error, __authError: result.__authError }; } diff --git a/src/components/quotes/actions.ts b/src/components/quotes/actions.ts index 0ccdd67b..f674f2e9 100644 --- a/src/components/quotes/actions.ts +++ b/src/components/quotes/actions.ts @@ -22,6 +22,7 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import type { Quote, QuoteApiData, @@ -43,6 +44,8 @@ export interface PaginationMeta { total: number; } +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 견적 목록 조회 ===== export async function getQuotes(params?: QuoteListParams): Promise<{ success: boolean; @@ -51,100 +54,39 @@ export async function getQuotes(params?: QuoteListParams): Promise<{ error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); + const emptyPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.perPage) searchParams.set('size', String(params.perPage)); + if (params?.search) searchParams.set('q', params.search); + if (params?.status) searchParams.set('status', params.status); + if (params?.productCategory) searchParams.set('product_category', params.productCategory); + if (params?.clientId) searchParams.set('client_id', params.clientId); + if (params?.dateFrom) searchParams.set('date_from', params.dateFrom); + if (params?.dateTo) searchParams.set('date_to', params.dateTo); + if (params?.sortBy) searchParams.set('sort_by', params.sortBy); + if (params?.sortOrder) searchParams.set('sort_order', params.sortOrder); - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.perPage) searchParams.set('size', String(params.perPage)); - if (params?.search) searchParams.set('q', params.search); - if (params?.status) searchParams.set('status', params.status); - if (params?.productCategory) searchParams.set('product_category', params.productCategory); - if (params?.clientId) searchParams.set('client_id', params.clientId); - if (params?.dateFrom) searchParams.set('date_from', params.dateFrom); - if (params?.dateTo) searchParams.set('date_to', params.dateTo); - if (params?.sortBy) searchParams.set('sort_by', params.sortBy); - if (params?.sortOrder) searchParams.set('sort_order', params.sortOrder); + const queryString = searchParams.toString(); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes${queryString ? `?${queryString}` : ''}`, + errorMessage: '견적 목록 조회에 실패했습니다.', + }); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes${queryString ? `?${queryString}` : ''}`; + if (result.__authError) return { success: false, data: [], pagination: emptyPagination, __authError: true }; + if (!result.success || !result.data) return { success: false, data: [], pagination: emptyPagination, error: result.error }; - console.log('[QuoteActions] GET quotes:', url); - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '견적 목록 조회에 실패했습니다.', - }; - } - - if (!response.ok) { - console.warn('[QuoteActions] GET quotes error:', response.status); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '견적 목록 조회에 실패했습니다.', - }; - } - - // API 응답 구조: { success, data: { data: [], current_page, last_page, per_page, total } } - const paginatedData: QuoteApiPaginatedResponse = result.data || { - data: [], - current_page: 1, - last_page: 1, - per_page: 20, - total: 0, - }; - - const quotes = (paginatedData.data || []).map(transformApiToFrontend); - - return { - success: true, - data: quotes, - pagination: { - currentPage: paginatedData.current_page, - lastPage: paginatedData.last_page, - perPage: paginatedData.per_page, - total: paginatedData.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] getQuotes error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + const paginatedData = result.data; + return { + success: true, + data: (paginatedData.data || []).map(transformApiToFrontend), + pagination: { + currentPage: paginatedData.current_page, + lastPage: paginatedData.last_page, + perPage: paginatedData.per_page, + total: paginatedData.total, + }, + }; } // ===== 견적 상세 조회 ===== @@ -154,278 +96,67 @@ export async function getQuoteById(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '견적 조회에 실패했습니다.', - }; - } - - if (!response.ok) { - console.error('[QuoteActions] GET quote error:', response.status); - return { - success: false, - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { - success: false, - error: result.message || '견적 조회에 실패했습니다.', - }; - } - - // 디버깅: API 응답 구조 확인 - console.log('[QuoteActions] getQuoteById raw data:', JSON.stringify({ - client_name: result.data.client_name, - client: result.data.client, - calculation_inputs: result.data.calculation_inputs, - items: result.data.items?.map((item: Record) => ({ - id: item.id, - item_name: item.item_name, - calculated_quantity: item.calculated_quantity, - base_quantity: item.base_quantity, - unit_price: item.unit_price, - total_price: item.total_price, - })), - }, null, 2)); - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] getQuoteById error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}`, + transform: (data: QuoteApiData) => transformApiToFrontend(data), + errorMessage: '견적 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 견적 등록 ===== -// 주의: 호출자가 transformFormDataToApi 또는 transformFrontendToApi로 변환한 데이터를 전달해야 함 export async function createQuote( data: Record ): Promise<{ success: boolean; data?: Quote; error?: string; __authError?: boolean }> { - try { - // 이미 변환된 API 형식 데이터를 그대로 사용 - const apiData = data; - - console.log('[QuoteActions] POST quote request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(apiData), - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '견적 등록에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] POST quote response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '견적 등록에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] createQuote error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes`, + method: 'POST', + body: data, + transform: (d: QuoteApiData) => transformApiToFrontend(d), + errorMessage: '견적 등록에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 견적 수정 ===== -// 주의: 호출자가 transformFormDataToApi 또는 transformFrontendToApi로 변환한 데이터를 전달해야 함 export async function updateQuote( id: string, data: Record ): Promise<{ success: boolean; data?: Quote; error?: string; __authError?: boolean }> { - try { - // 이미 변환된 API 형식 데이터를 그대로 사용 - const apiData = data; - - console.log('[QuoteActions] PUT quote request:', apiData); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}`; - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '견적 수정에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] PUT quote response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '견적 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] updateQuote error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}`, + method: 'PUT', + body: data, + transform: (d: QuoteApiData) => transformApiToFrontend(d), + errorMessage: '견적 수정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 견적 삭제 ===== export async function deleteQuote(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}`; - - const { response, error } = await serverFetch(url, { - method: 'DELETE', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '견적 삭제에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] DELETE quote response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '견적 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] deleteQuote error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}`, + method: 'DELETE', + errorMessage: '견적 삭제에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } // ===== 견적 일괄 삭제 ===== export async function bulkDeleteQuotes(ids: string[]): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/bulk`; - - const { response, error } = await serverFetch(url, { - method: 'DELETE', - body: JSON.stringify({ ids: ids.map(id => parseInt(id, 10)) }), - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '견적 일괄 삭제에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] BULK DELETE quotes response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '견적 일괄 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] bulkDeleteQuotes error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/bulk`, + method: 'DELETE', + body: { ids: ids.map(id => parseInt(id, 10)) }, + errorMessage: '견적 일괄 삭제에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } // ===== 견적 최종 확정 ===== @@ -435,50 +166,14 @@ export async function finalizeQuote(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}/finalize`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '견적 확정에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] POST finalize response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '견적 확정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] finalizeQuote error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}/finalize`, + method: 'POST', + transform: (d: QuoteApiData) => transformApiToFrontend(d), + errorMessage: '견적 확정에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 견적 확정 취소 ===== @@ -488,50 +183,14 @@ export async function cancelFinalizeQuote(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}/cancel-finalize`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '견적 확정 취소에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] POST cancel-finalize response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '견적 확정 취소에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] cancelFinalizeQuote error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}/cancel-finalize`, + method: 'POST', + transform: (d: QuoteApiData) => transformApiToFrontend(d), + errorMessage: '견적 확정 취소에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, data: result.data, error: result.error }; } // ===== 견적 → 수주 전환 ===== @@ -542,51 +201,23 @@ export async function convertQuoteToOrder(id: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}/convert`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '수주 전환에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] POST convert response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '수주 전환에 실패했습니다.', - }; - } - - return { - success: true, - data: result.data?.quote ? transformApiToFrontend(result.data.quote) : undefined, - orderId: result.data?.order?.id ? String(result.data.order.id) : undefined, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] convertQuoteToOrder error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + interface ConvertResponse { + quote?: QuoteApiData; + order?: { id: number }; } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}/convert`, + method: 'POST', + errorMessage: '수주 전환에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; + + return { + success: true, + data: result.data.quote ? transformApiToFrontend(result.data.quote) : undefined, + orderId: result.data.order?.id ? String(result.data.order.id) : undefined, + }; } // ===== 견적번호 미리보기 ===== @@ -596,49 +227,17 @@ export async function getQuoteNumberPreview(): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/number/preview`; + interface PreviewResponse { quote_number?: string } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/number/preview`, + errorMessage: '견적번호 미리보기에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + if (!result.success || !result.data) return { success: false, error: result.error }; - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '견적번호 미리보기에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '견적번호 미리보기에 실패했습니다.', - }; - } - - return { - success: true, - data: result.data?.quote_number || result.data, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] getQuoteNumberPreview error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const data = result.data; + const quoteNumber = typeof data === 'string' ? data : (data as PreviewResponse).quote_number || ''; + return { success: true, data: quoteNumber }; } // ===== PDF 생성 ===== @@ -698,48 +297,14 @@ export async function sendQuoteEmail( id: string, emailData: { email: string; subject?: string; message?: string } ): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}/send/email`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(emailData), - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '이메일 발송에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] POST send email response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '이메일 발송에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] sendQuoteEmail error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}/send/email`, + method: 'POST', + body: emailData, + errorMessage: '이메일 발송에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } // ===== 카카오 발송 ===== @@ -747,48 +312,14 @@ export async function sendQuoteKakao( id: string, kakaoData: { phone: string; templateId?: string } ): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/${id}/send/kakao`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify(kakaoData), - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '카카오 발송에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] POST send kakao response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '카카오 발송에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] sendQuoteKakao error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/${id}/send/kakao`, + method: 'POST', + body: kakaoData, + errorMessage: '카카오 발송에 실패했습니다.', + }); + if (result.__authError) return { success: false, __authError: true }; + return { success: result.success, error: result.error }; } // ===== 완제품(FG) 목록 조회 ===== @@ -809,84 +340,39 @@ export async function getFinishedGoods(category?: string): Promise<{ error?: string; __authError?: boolean; }> { - try { - const searchParams = new URLSearchParams(); - searchParams.set('item_type', 'FG'); - searchParams.set('has_bom', '1'); // BOM이 있는 제품만 조회 - if (category) { - searchParams.set('item_category', category); - } - searchParams.set('size', '5000'); // 전체 조회 (테넌트별 FG 품목 수에 따라 조정) + const searchParams = new URLSearchParams(); + searchParams.set('item_type', 'FG'); + searchParams.set('has_bom', '1'); + if (category) searchParams.set('item_category', category); + searchParams.set('size', '5000'); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/items?${searchParams.toString()}`; + interface FGApiResponse { data?: Record[] } + const result = await executeServerAction[]>({ + url: `${API_URL}/api/v1/items?${searchParams.toString()}`, + errorMessage: '완제품 목록 조회에 실패했습니다.', + }); - console.log('[QuoteActions] GET finished goods:', url); + if (result.__authError) return { success: false, data: [], __authError: true }; + if (!result.success || !result.data) return { success: false, data: [], error: result.error }; - const { response, error } = await serverFetch(url, { - method: 'GET', - }); + const rawData = result.data; + const items: Record[] = Array.isArray(rawData) + ? rawData + : (rawData as FGApiResponse).data || []; - if (error) { - return { - success: false, - data: [], - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: [], - error: '완제품 목록 조회에 실패했습니다.', - }; - } - - if (!response.ok) { - console.warn('[QuoteActions] GET finished goods error:', response.status); - return { - success: false, - data: [], - error: `API 오류: ${response.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: [], - error: result.message || '완제품 목록 조회에 실패했습니다.', - }; - } - - // API 응답: { success, data: { data: [], ... } } 또는 { success, data: [] } - const items = result.data?.data || result.data || []; - - return { - success: true, - data: items.map((item: Record) => ({ - id: item.id, - item_code: (item.item_code || item.code) as string, // API가 code → item_code로 변환 - item_name: item.name as string, - item_category: (item.item_category as string) || '', - specification: item.specification as string | undefined, - unit: item.unit as string | undefined, - has_bom: item.has_bom as boolean | undefined, - bom: item.bom as unknown[] | undefined, - })), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] getFinishedGoods error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; - } + return { + success: true, + data: items.map((item) => ({ + id: item.id as number, + item_code: (item.item_code || item.code) as string, + item_name: item.name as string, + item_category: (item.item_category as string) || '', + specification: item.specification as string | undefined, + unit: item.unit as string | undefined, + has_bom: item.has_bom as boolean | undefined, + bom: item.bom as unknown[] | undefined, + })), + }; } // ===== BOM 기반 자동 견적 산출 (다건) ===== @@ -929,70 +415,14 @@ export async function calculateBomBulk(items: BomCalculateItem[], debug: boolean error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/calculate/bom/bulk`; - - console.log('[QuoteActions] POST calculate BOM bulk:', { items, debug }); - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({ items, debug }), - }); - - if (error) { - return { - success: false, - data: null, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: null, - error: 'BOM 계산에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] POST calculate BOM bulk response:', result); - - if (!response.ok || !result.success) { - // 검증 에러의 상세 메시지 추출 - let errorMessage = result.message || 'BOM 계산에 실패했습니다.'; - - // error.details에 상세 검증 에러가 있는 경우 - if (result.error?.details && typeof result.error.details === 'object') { - const detailMessages = Object.values(result.error.details) - .flat() - .filter((msg): msg is string => typeof msg === 'string'); - if (detailMessages.length > 0) { - errorMessage = detailMessages.join(', '); - } - } - - return { - success: false, - data: null, - error: errorMessage, - }; - } - - return { - success: true, - data: result.data || null, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] calculateBomBulk error:', error); - return { - success: false, - data: null, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/calculate/bom/bulk`, + method: 'POST', + body: { items, debug }, + errorMessage: 'BOM 계산에 실패했습니다.', + }); + if (result.__authError) return { success: false, data: null, __authError: true }; + return { success: result.success, data: result.data || null, error: result.error }; } // ===== 품목 단가 조회 ===== @@ -1007,57 +437,14 @@ export async function getItemPrices(itemCodes: string[]): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/items/prices`; - - console.log('[QuoteActions] POST getItemPrices:', { itemCodes }); - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({ item_codes: itemCodes }), - }); - - if (error) { - return { - success: false, - data: null, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: null, - error: '단가 조회에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[QuoteActions] POST getItemPrices response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - data: null, - error: result.message || '단가 조회에 실패했습니다.', - }; - } - - return { - success: true, - data: result.data || null, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] getItemPrices error:', error); - return { - success: false, - data: null, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction>({ + url: `${API_URL}/api/v1/quotes/items/prices`, + method: 'POST', + body: { item_codes: itemCodes }, + errorMessage: '단가 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, data: null, __authError: true }; + return { success: result.success, data: result.data || null, error: result.error }; } // ===== 견적 요약 통계 ===== @@ -1147,56 +534,21 @@ export async function getQuoteReferenceData(): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/quotes/reference-data`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - }); - - if (error) { - return { - success: false, - data: { siteNames: [], locationCodes: [] }, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response?.ok) { - return { - success: false, - data: { siteNames: [], locationCodes: [] }, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - data: { siteNames: [], locationCodes: [] }, - error: result.message || '참조 데이터 조회 실패', - }; - } - - return { - success: true, - data: { - siteNames: result.data?.site_names || [], - locationCodes: result.data?.location_codes || [], - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] getQuoteReferenceData error:', error); - return { - success: false, - data: { siteNames: [], locationCodes: [] }, - error: '서버 오류가 발생했습니다.', - }; - } + interface RefApiData { site_names?: string[]; location_codes?: string[] } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/quotes/reference-data`, + errorMessage: '참조 데이터 조회에 실패했습니다.', + }); + const empty: QuoteReferenceData = { siteNames: [], locationCodes: [] }; + if (result.__authError) return { success: false, data: empty, __authError: true }; + if (!result.success || !result.data) return { success: false, data: empty, error: result.error }; + return { + success: true, + data: { + siteNames: result.data.site_names || [], + locationCodes: result.data.location_codes || [], + }, + }; } /** @deprecated getQuoteReferenceData 사용 */ @@ -1231,38 +583,10 @@ export async function getItemCategoryTree(): Promise<{ error?: string; __authError?: boolean; }> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/categories/tree?code_group=item_category&only_active=true`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { - success: false, - data: [], - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response || !response.ok) { - console.error('[getItemCategoryTree] response status:', response?.status, response?.statusText); - const errorBody = response ? await response.text().catch(() => '') : ''; - console.error('[getItemCategoryTree] response body:', errorBody); - return { success: false, data: [], error: `카테고리 조회 실패 (${response?.status || 'no response'})` }; - } - - const result = await response.json(); - return { - success: true, - data: result.data || [], - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[QuoteActions] getItemCategoryTree error:', error); - return { - success: false, - data: [], - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/categories/tree?code_group=item_category&only_active=true`, + errorMessage: '카테고리 조회에 실패했습니다.', + }); + if (result.__authError) return { success: false, data: [], __authError: true }; + return { success: result.success, data: result.data || [], error: result.error }; } \ No newline at end of file diff --git a/src/components/reports/actions.ts b/src/components/reports/actions.ts index 5065f65c..7c46c0b4 100644 --- a/src/components/reports/actions.ts +++ b/src/components/reports/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { ComprehensiveAnalysisData } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface TodayIssueItemApi { id: string; @@ -59,41 +60,23 @@ interface ComprehensiveAnalysisDataApi { // ===== API → Frontend 변환 ===== function transformCheckPoint(item: CheckPointApi): ComprehensiveAnalysisData['monthlyExpense']['checkPoints'][0] { - return { - id: item.id, - type: item.type, - message: item.message, - highlight: item.highlight, - }; + return { id: item.id, type: item.type, message: item.message, highlight: item.highlight }; } function transformAmountCard(item: AmountCardApi): ComprehensiveAnalysisData['monthlyExpense']['cards'][0] { return { - id: item.id, - label: item.label, - amount: item.amount, - subAmount: item.sub_amount, - subLabel: item.sub_label, - previousAmount: item.previous_amount, - previousLabel: item.previous_label, + id: item.id, label: item.label, amount: item.amount, + subAmount: item.sub_amount, subLabel: item.sub_label, + previousAmount: item.previous_amount, previousLabel: item.previous_label, }; } function transformTodayIssueItem(item: TodayIssueItemApi): ComprehensiveAnalysisData['todayIssue']['items'][0] { - return { - id: item.id, - category: item.category, - description: item.description, - requiresApproval: item.requires_approval, - time: item.time, - }; + return { id: item.id, category: item.category, description: item.description, requiresApproval: item.requires_approval, time: item.time }; } function transformExpenseSection(section: ExpenseSectionApi): ComprehensiveAnalysisData['monthlyExpense'] { - return { - cards: section.cards.map(transformAmountCard), - checkPoints: section.check_points.map(transformCheckPoint), - }; + return { cards: section.cards.map(transformAmountCard), checkPoints: section.check_points.map(transformCheckPoint) }; } function transformReceivableSection(section: ReceivableSectionApi): ComprehensiveAnalysisData['receivable'] { @@ -108,10 +91,7 @@ function transformReceivableSection(section: ReceivableSectionApi): Comprehensiv function transformAnalysisData(data: ComprehensiveAnalysisDataApi): ComprehensiveAnalysisData { return { - todayIssue: { - filterOptions: data.today_issue.filter_options, - items: data.today_issue.items.map(transformTodayIssueItem), - }, + todayIssue: { filterOptions: data.today_issue.filter_options, items: data.today_issue.items.map(transformTodayIssueItem) }, monthlyExpense: transformExpenseSection(data.monthly_expense), cardManagement: transformExpenseSection(data.card_management), entertainment: transformExpenseSection(data.entertainment), @@ -124,137 +104,33 @@ function transformAnalysisData(data: ComprehensiveAnalysisDataApi): Comprehensiv // ===== 종합 분석 데이터 조회 ===== export async function getComprehensiveAnalysis(params?: { date?: string; -}): Promise<{ - success: boolean; - data?: ComprehensiveAnalysisData; - error?: string; - __authError?: boolean; -}> { - try { - const searchParams = new URLSearchParams(); +}): Promise> { + const searchParams = new URLSearchParams(); + if (params?.date) searchParams.set('date', params.date); + const queryString = searchParams.toString(); - if (params?.date) searchParams.set('date', params.date); - - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/comprehensive-analysis${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '종합 분석 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '종합 분석 조회에 실패했습니다.', - }; - } - - const transformedData = transformAnalysisData(result.data); - - return { - success: true, - data: transformedData, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ComprehensiveAnalysisActions] getComprehensiveAnalysis error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/comprehensive-analysis${queryString ? `?${queryString}` : ''}`, + transform: (data: ComprehensiveAnalysisDataApi) => transformAnalysisData(data), + errorMessage: '종합 분석 조회에 실패했습니다.', + }); } // ===== 이슈 승인 ===== -export async function approveIssue(issueId: string): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${issueId}/approve`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '승인에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '승인에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ComprehensiveAnalysisActions] approveIssue error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function approveIssue(issueId: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${issueId}/approve`, + method: 'POST', + errorMessage: '승인에 실패했습니다.', + }); } // ===== 이슈 반려 ===== -export async function rejectIssue(issueId: string, reason?: string): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/approvals/${issueId}/reject`; - - const { response, error } = await serverFetch(url, { - method: 'POST', - body: JSON.stringify({ comment: reason }), - }); - - if (error) { - return { success: false, error: error.message, __authError: error.code === 'UNAUTHORIZED' }; - } - - if (!response) { - return { success: false, error: '반려에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '반려에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[ComprehensiveAnalysisActions] rejectIssue error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function rejectIssue(issueId: string, reason?: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/approvals/${issueId}/reject`, + method: 'POST', + body: { comment: reason }, + errorMessage: '반려에 실패했습니다.', + }); } diff --git a/src/components/settings/AccountInfoManagement/actions.ts b/src/components/settings/AccountInfoManagement/actions.ts index f22df157..0679e2f4 100644 --- a/src/components/settings/AccountInfoManagement/actions.ts +++ b/src/components/settings/AccountInfoManagement/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { AccountInfo, TermsAgreement, MarketingConsent } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + /** * 상대 경로를 절대 URL로 변환 * /storage/... 또는 1/temp/... → https://api.example.com/storage/tenants/... @@ -34,243 +35,80 @@ export async function getAccountInfo(): Promise<{ error?: string; __authError?: boolean; }> { - try { - // 1. 사용자 기본 정보 조회 - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/users/me`, - { - method: 'GET', - } - ); + // 1. 사용자 기본 정보 조회 + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const userResult = await executeServerAction({ + url: `${API_URL}/api/v1/users/me`, + errorMessage: '계정 정보를 불러올 수 없습니다.', + }); + if (userResult.__authError) return { success: false, __authError: true }; + if (!userResult.success || !userResult.data) return { success: false, error: userResult.error }; - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } + const user = userResult.data; - if (!response) { - return { - success: false, - error: '계정 정보를 불러올 수 없습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '계정 정보 조회에 실패했습니다.', - }; - } - - const user = result.data; - - // 2. 프로필 정보 조회 (프로필 이미지 포함) - let profileImage: string | undefined; - try { - const { response: profileResponse } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/profiles/me`, - { - method: 'GET', - } - ); - - if (profileResponse?.ok) { - const profileResult = await profileResponse.json(); - if (profileResult.success && profileResult.data) { - // profile_photo_path 필드에서 이미지 경로 가져오기 - profileImage = toAbsoluteUrl(profileResult.data.profile_photo_path); - } - } - } catch { - // 프로필 조회 실패해도 계속 진행 - console.warn('[getAccountInfo] Failed to fetch profile image'); - } - - return { - success: true, - data: { - accountInfo: { - id: user.id?.toString() || '', - email: user.email || '', - profileImage, // 프로필 API에서 가져온 이미지 - role: user.role?.name || user.role || '', - status: user.status || 'active', - isTenantMaster: user.is_tenant_master || false, - createdAt: user.created_at || '', - updatedAt: user.updated_at || '', - }, - termsAgreements: user.terms_agreements || [], - marketingConsent: user.marketing_consent || { - email: { agreed: false }, - sms: { agreed: false }, - }, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[AccountInfoActions] getAccountInfo error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + // 2. 프로필 정보 조회 (프로필 이미지 포함 - 실패해도 계속 진행) + let profileImage: string | undefined; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const profileResult = await executeServerAction({ + url: `${API_URL}/api/v1/profiles/me`, + errorMessage: '프로필 조회 실패', + }); + if (profileResult.success && profileResult.data) { + profileImage = toAbsoluteUrl(profileResult.data.profile_photo_path); } + + return { + success: true, + data: { + accountInfo: { + id: user.id?.toString() || '', + email: user.email || '', + profileImage, + role: user.role?.name || user.role || '', + status: user.status || 'active', + isTenantMaster: user.is_tenant_master || false, + createdAt: user.created_at || '', + updatedAt: user.updated_at || '', + }, + termsAgreements: user.terms_agreements || [], + marketingConsent: user.marketing_consent || { + email: { agreed: false }, + sms: { agreed: false }, + }, + }, + }; } // ===== 계정 탈퇴 ===== -export async function withdrawAccount(password: string): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/users/withdraw`, - { - method: 'POST', - body: JSON.stringify({ password }), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '계정 탈퇴에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '계정 탈퇴에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[AccountInfoActions] withdrawAccount error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function withdrawAccount(password: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/users/withdraw`, + method: 'POST', + body: { password }, + errorMessage: '계정 탈퇴에 실패했습니다.', + }); } // ===== 테넌트 사용 중지 ===== -export async function suspendTenant(): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/tenants/suspend`, - { - method: 'POST', - body: JSON.stringify({}), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '사용 중지에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '사용 중지에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[AccountInfoActions] suspendTenant error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function suspendTenant(): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/tenants/suspend`, + method: 'POST', + body: {}, + errorMessage: '사용 중지에 실패했습니다.', + }); } // ===== 약관 동의 수정 ===== export async function updateAgreements( agreements: Array<{ type: string; agreed: boolean }> -): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/account/agreements`, - { - method: 'PUT', - body: JSON.stringify({ agreements }), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '약관 동의 수정에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '약관 동의 수정에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[AccountInfoActions] updateAgreements error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/account/agreements`, + method: 'PUT', + body: { agreements }, + errorMessage: '약관 동의 수정에 실패했습니다.', + }); } // ===== 프로필 이미지 업로드 ===== @@ -280,113 +118,36 @@ export async function uploadProfileImage(formData: FormData): Promise<{ error?: string; __authError?: boolean; }> { - try { - console.log('[uploadProfileImage] Starting upload...'); + // 1. 파일 업로드 + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const uploadResult = await executeServerAction({ + url: `${API_URL}/api/v1/files/upload`, + method: 'POST', + body: formData, + errorMessage: '파일 업로드에 실패했습니다.', + }); + if (uploadResult.__authError) return { success: false, __authError: true }; + if (!uploadResult.success || !uploadResult.data) return { success: false, error: uploadResult.error }; - // 1. 먼저 파일 업로드 (일반 파일 업로드 엔드포인트 사용) - const { response: uploadResponse, error: uploadError } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/files/upload`, - { - method: 'POST', - body: formData, - } - ); + const uploadedPath = uploadResult.data.file_path || uploadResult.data.path || uploadResult.data.url; + if (!uploadedPath) return { success: false, error: '업로드된 파일 경로를 가져올 수 없습니다.' }; - console.log('[uploadProfileImage] Upload response status:', uploadResponse?.status); + // 2. 프로필 업데이트 (업로드된 파일 경로로) + const updateResult = await executeServerAction({ + url: `${API_URL}/api/v1/profiles/me`, + method: 'PATCH', + body: { profile_photo_path: uploadedPath }, + errorMessage: '프로필 업데이트에 실패했습니다.', + }); + if (updateResult.__authError) return { success: false, __authError: true }; + if (!updateResult.success) return { success: false, error: updateResult.error }; - if (uploadError) { - console.error('[uploadProfileImage] Upload error:', uploadError); - return { - success: false, - error: uploadError.message, - __authError: uploadError.code === 'UNAUTHORIZED', - }; - } + const storagePath = uploadedPath.startsWith('/storage/') + ? uploadedPath + : `/storage/tenants/${uploadedPath}`; - if (!uploadResponse) { - console.error('[uploadProfileImage] No upload response'); - return { - success: false, - error: '파일 업로드에 실패했습니다.', - }; - } - - const uploadResult = await uploadResponse.json(); - console.log('[uploadProfileImage] Upload result:', JSON.stringify(uploadResult, null, 2)); - - if (!uploadResponse.ok || !uploadResult.success) { - return { - success: false, - error: uploadResult.message || '파일 업로드에 실패했습니다.', - }; - } - - // 업로드된 파일 경로 추출 (API 응답: file_path 필드) - const uploadedPath = uploadResult.data?.file_path || uploadResult.data?.path || uploadResult.data?.url; - console.log('[uploadProfileImage] Uploaded path:', uploadedPath); - - if (!uploadedPath) { - console.error('[uploadProfileImage] No file path in response. Full data:', uploadResult.data); - return { - success: false, - error: '업로드된 파일 경로를 가져올 수 없습니다.', - }; - } - - // 2. 프로필 업데이트 (업로드된 파일 경로로) - console.log('[uploadProfileImage] Updating profile with path:', uploadedPath); - const { response: updateResponse, error: updateError } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/profiles/me`, - { - method: 'PATCH', - body: JSON.stringify({ profile_photo_path: uploadedPath }), - } - ); - - if (updateError) { - console.error('[uploadProfileImage] Profile update error:', updateError); - return { - success: false, - error: updateError.message, - __authError: updateError.code === 'UNAUTHORIZED', - }; - } - - if (!updateResponse) { - console.error('[uploadProfileImage] No profile update response'); - return { - success: false, - error: '프로필 업데이트에 실패했습니다.', - }; - } - - const updateResult = await updateResponse.json(); - console.log('[uploadProfileImage] Profile update result:', JSON.stringify(updateResult, null, 2)); - - if (!updateResponse.ok || !updateResult.success) { - return { - success: false, - error: updateResult.message || '프로필 업데이트에 실패했습니다.', - }; - } - - // /storage/tenants/ 경로로 변환 (tenant disk 파일은 이 경로로 접근 가능) - const storagePath = uploadedPath.startsWith('/storage/') - ? uploadedPath - : `/storage/tenants/${uploadedPath}`; - - return { - success: true, - data: { - imageUrl: toAbsoluteUrl(storagePath) || '', - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[AccountInfoActions] uploadProfileImage error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + return { + success: true, + data: { imageUrl: toAbsoluteUrl(storagePath) || '' }, + }; } diff --git a/src/components/settings/AccountManagement/actions.ts b/src/components/settings/AccountManagement/actions.ts index 45b34f3f..f6111c6a 100644 --- a/src/components/settings/AccountManagement/actions.ts +++ b/src/components/settings/AccountManagement/actions.ts @@ -1,11 +1,13 @@ 'use server'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; import type { Account, AccountFormData, AccountStatus } from './types'; import { BANK_LABELS } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface BankAccountApiData { id: number; @@ -21,34 +23,15 @@ interface BankAccountApiData { updated_at?: string; } -interface PaginationMeta { - current_page: number; - last_page: number; - per_page: number; - total: number; -} - -interface PaginatedData { - current_page: number; - last_page: number; - per_page: number; - total: number; +interface BankAccountPaginatedResponse { data: BankAccountApiData[]; + current_page: number; + last_page: number; + per_page: number; + total: number; } -interface ApiListResponse { - success: boolean; - message?: string; - data: PaginatedData; -} - -interface ApiSingleResponse { - success: boolean; - message?: string; - data: BankAccountApiData; -} - -// ===== 데이터 변환: API → Frontend ===== +// ===== 데이터 변환 ===== function transformApiToFrontend(apiData: BankAccountApiData): Account { return { id: apiData.id, @@ -65,7 +48,6 @@ function transformApiToFrontend(apiData: BankAccountApiData): Account { }; } -// ===== 데이터 변환: Frontend → API ===== function transformFrontendToApi(data: Partial): Record { return { bank_code: data.bankCode, @@ -79,328 +61,91 @@ function transformFrontendToApi(data: Partial): Record { - try { - const searchParams = new URLSearchParams(); + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', params.page.toString()); + if (params?.perPage) searchParams.set('per_page', params.perPage.toString()); + if (params?.search) searchParams.set('search', params.search); + const queryString = searchParams.toString(); - if (params?.page) searchParams.set('page', params.page.toString()); - if (params?.perPage) searchParams.set('per_page', params.perPage.toString()); - if (params?.search) searchParams.set('search', params.search); - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '계좌 목록 조회에 실패했습니다.' }; - } - - const result: ApiListResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '계좌 목록 조회에 실패했습니다.' }; - } - - const accounts = result.data.data.map(transformApiToFrontend); - const meta: PaginationMeta = { - current_page: result.data.current_page, - last_page: result.data.last_page, - per_page: result.data.per_page, - total: result.data.total, - }; - return { success: true, data: accounts, meta }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getBankAccounts] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts${queryString ? `?${queryString}` : ''}`, + transform: (data: BankAccountPaginatedResponse) => ({ + accounts: (data?.data || []).map(transformApiToFrontend), + meta: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 20, total: data?.total || 0 }, + }), + errorMessage: '계좌 목록 조회에 실패했습니다.', + }); + return { success: result.success, data: result.data?.accounts, meta: result.data?.meta, error: result.error, __authError: result.__authError }; } // ===== 계좌 상세 조회 ===== -export async function getBankAccount(id: number): Promise<{ - success: boolean; - data?: Account; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts/${id}`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '계좌 조회에 실패했습니다.' }; - } - - const result: ApiSingleResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '계좌 조회에 실패했습니다.' }; - } - - const account = transformApiToFrontend(result.data); - return { success: true, data: account }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getBankAccount] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function getBankAccount(id: number): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts/${id}`, + transform: (data: BankAccountApiData) => transformApiToFrontend(data), + errorMessage: '계좌 조회에 실패했습니다.', + }); } // ===== 계좌 생성 ===== -export async function createBankAccount(data: AccountFormData): Promise<{ - success: boolean; - data?: Account; - error?: string; - __authError?: boolean; -}> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '계좌 등록에 실패했습니다.' }; - } - - const result: ApiSingleResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '계좌 등록에 실패했습니다.' }; - } - - const account = transformApiToFrontend(result.data); - return { success: true, data: account }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[createBankAccount] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function createBankAccount(data: AccountFormData): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts`, + method: 'POST', + body: transformFrontendToApi(data), + transform: (d: BankAccountApiData) => transformApiToFrontend(d), + errorMessage: '계좌 등록에 실패했습니다.', + }); } // ===== 계좌 수정 ===== -export async function updateBankAccount( - id: number, - data: Partial -): Promise<{ - success: boolean; - data?: Account; - error?: string; - __authError?: boolean; -}> { - try { - const apiData = transformFrontendToApi(data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '계좌 수정에 실패했습니다.' }; - } - - const result: ApiSingleResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '계좌 수정에 실패했습니다.' }; - } - - const account = transformApiToFrontend(result.data); - return { success: true, data: account }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[updateBankAccount] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function updateBankAccount(id: number, data: Partial): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts/${id}`, + method: 'PUT', + body: transformFrontendToApi(data), + transform: (d: BankAccountApiData) => transformApiToFrontend(d), + errorMessage: '계좌 수정에 실패했습니다.', + }); } // ===== 계좌 삭제 ===== -export async function deleteBankAccount(id: number): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts/${id}`, - { - method: 'DELETE', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '계좌 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '계좌 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteBankAccount] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function deleteBankAccount(id: number): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts/${id}`, + method: 'DELETE', + errorMessage: '계좌 삭제에 실패했습니다.', + }); } // ===== 계좌 상태 토글 ===== -export async function toggleBankAccountStatus(id: number): Promise<{ - success: boolean; - data?: Account; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts/${id}/toggle`, - { - method: 'PATCH', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '상태 변경에 실패했습니다.' }; - } - - const result: ApiSingleResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '상태 변경에 실패했습니다.' }; - } - - const account = transformApiToFrontend(result.data); - return { success: true, data: account }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[toggleBankAccountStatus] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function toggleBankAccountStatus(id: number): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts/${id}/toggle`, + method: 'PATCH', + transform: (data: BankAccountApiData) => transformApiToFrontend(data), + errorMessage: '상태 변경에 실패했습니다.', + }); } // ===== 대표 계좌 설정 ===== -export async function setPrimaryBankAccount(id: number): Promise<{ - success: boolean; - data?: Account; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/bank-accounts/${id}/set-primary`, - { - method: 'PATCH', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '대표 계좌 설정에 실패했습니다.' }; - } - - const result: ApiSingleResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '대표 계좌 설정에 실패했습니다.' }; - } - - const account = transformApiToFrontend(result.data); - return { success: true, data: account }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[setPrimaryBankAccount] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function setPrimaryBankAccount(id: number): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/bank-accounts/${id}/set-primary`, + method: 'PATCH', + transform: (data: BankAccountApiData) => transformApiToFrontend(data), + errorMessage: '대표 계좌 설정에 실패했습니다.', + }); } // ===== 다중 삭제 ===== export async function deleteBankAccounts(ids: number[]): Promise<{ - success: boolean; - deletedCount?: number; - error?: string; + success: boolean; deletedCount?: number; error?: string; }> { try { const results = await Promise.all(ids.map(id => deleteBankAccount(id))); @@ -410,19 +155,12 @@ export async function deleteBankAccounts(ids: number[]): Promise<{ if (failedCount > 0 && successCount === 0) { return { success: false, error: '계좌 삭제에 실패했습니다.' }; } - if (failedCount > 0) { - return { - success: true, - deletedCount: successCount, - error: `${failedCount}개의 계좌 삭제에 실패했습니다.` - }; + return { success: true, deletedCount: successCount, error: `${failedCount}개의 계좌 삭제에 실패했습니다.` }; } - return { success: true, deletedCount: successCount }; } catch (error) { if (isNextRedirectError(error)) throw error; - console.error('[deleteBankAccounts] Error:', error); return { success: false, error: '서버 오류가 발생했습니다.' }; } } \ No newline at end of file diff --git a/src/components/settings/AttendanceSettingsManagement/actions.ts b/src/components/settings/AttendanceSettingsManagement/actions.ts index 9a8bce3d..31fb191f 100644 --- a/src/components/settings/AttendanceSettingsManagement/actions.ts +++ b/src/components/settings/AttendanceSettingsManagement/actions.ts @@ -1,8 +1,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; const API_URL = process.env.NEXT_PUBLIC_API_URL; @@ -47,13 +46,6 @@ interface ApiDepartment { children?: ApiDepartment[]; } -// API 응답 공통 타입 -interface ApiResponse { - success: boolean; - data?: T; - error?: string; -} - // ===== 데이터 변환 ===== /** @@ -75,151 +67,64 @@ function transformFromApi(data: ApiAttendanceSetting): AttendanceSettingFormData */ function transformToApi(data: Partial): Record { const apiData: Record = {}; - if (data.useGps !== undefined) apiData.use_gps = data.useGps; if (data.useAuto !== undefined) apiData.use_auto = data.useAuto; if (data.allowedRadius !== undefined) apiData.allowed_radius = data.allowedRadius; if (data.hqAddress !== undefined) apiData.hq_address = data.hqAddress; if (data.hqLatitude !== undefined) apiData.hq_latitude = data.hqLatitude; if (data.hqLongitude !== undefined) apiData.hq_longitude = data.hqLongitude; - return apiData; } -// ===== API 호출 ===== - -/** - * 출퇴근 설정 조회 - */ -export async function getAttendanceSetting(): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/settings/attendance`, { - method: 'GET', - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '출퇴근 설정 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '출퇴근 설정 조회 실패' }; - } - - return { - success: true, - data: transformFromApi(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('getAttendanceSetting error:', error); - return { - success: false, - error: '출퇴근 설정을 불러오는데 실패했습니다.', - }; - } -} - -/** - * 출퇴근 설정 수정 - */ -export async function updateAttendanceSetting( - data: Partial -): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/settings/attendance`, { - method: 'PUT', - body: JSON.stringify(transformToApi(data)), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '출퇴근 설정 저장에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '출퇴근 설정 저장 실패' }; - } - - return { - success: true, - data: transformFromApi(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('updateAttendanceSetting error:', error); - return { - success: false, - error: '출퇴근 설정 저장에 실패했습니다.', - }; - } -} - /** * 트리 구조를 평탄화 (재귀) */ function flattenDepartmentTree(departments: ApiDepartment[], depth: number = 0): Department[] { const result: Department[] = []; - for (const dept of departments) { - result.push({ - id: String(dept.id), - name: dept.name, - depth, - }); - + result.push({ id: String(dept.id), name: dept.name, depth }); if (dept.children && dept.children.length > 0) { result.push(...flattenDepartmentTree(dept.children, depth + 1)); } } - return result; } +// ===== API 호출 ===== + +/** + * 출퇴근 설정 조회 + */ +export async function getAttendanceSetting(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/settings/attendance`, + transform: (data: ApiAttendanceSetting) => transformFromApi(data), + errorMessage: '출퇴근 설정을 불러오는데 실패했습니다.', + }); +} + +/** + * 출퇴근 설정 수정 + */ +export async function updateAttendanceSetting( + data: Partial +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/settings/attendance`, + method: 'PUT', + body: transformToApi(data), + transform: (data: ApiAttendanceSetting) => transformFromApi(data), + errorMessage: '출퇴근 설정 저장에 실패했습니다.', + }); +} + /** * 부서 목록 조회 (트리 구조) */ -export async function getDepartments(): Promise> { - try { - // 트리 API 사용 - const { response, error } = await serverFetch(`${API_URL}/api/v1/departments/tree`, { - method: 'GET', - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '부서 목록 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '부서 목록 조회 실패' }; - } - - // 트리를 평탄화하여 depth 포함된 배열로 변환 - const departments = flattenDepartmentTree(result.data || []); - - return { success: true, data: departments }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('getDepartments error:', error); - return { - success: false, - error: '부서 목록을 불러오는데 실패했습니다.', - }; - } +export async function getDepartments(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/departments/tree`, + transform: (data: ApiDepartment[]) => flattenDepartmentTree(data || []), + errorMessage: '부서 목록을 불러오는데 실패했습니다.', + }); } \ No newline at end of file diff --git a/src/components/settings/CompanyInfoManagement/actions.ts b/src/components/settings/CompanyInfoManagement/actions.ts index 701312d1..5c68fa31 100644 --- a/src/components/settings/CompanyInfoManagement/actions.ts +++ b/src/components/settings/CompanyInfoManagement/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { CompanyFormData } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // API 응답 타입 interface TenantApiData { id: number; @@ -35,138 +36,61 @@ interface TenantApiData { updated_at?: string; } -/** - * 테넌트 정보 조회 - */ -export async function getCompanyInfo(): Promise<{ - success: boolean; - data?: CompanyFormData & { tenantId: number }; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/tenants`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '회사 정보 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '회사 정보 조회에 실패했습니다.' }; - } - - const apiData: TenantApiData = result.data; - const formData = transformApiToFrontend(apiData); - - return { success: true, data: formData }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getCompanyInfo] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +// ===== 테넌트 정보 조회 ===== +export async function getCompanyInfo(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/tenants`, + transform: (data: TenantApiData) => transformApiToFrontend(data), + errorMessage: '회사 정보 조회에 실패했습니다.', + }); } -/** - * 테넌트 정보 수정 - */ +// ===== 테넌트 정보 수정 ===== export async function updateCompanyInfo( tenantId: number, data: Partial -): Promise<{ - success: boolean; - data?: CompanyFormData; - error?: string; - __authError?: boolean; -}> { - try { - const apiData = transformFrontendToApi(tenantId, data); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/tenants`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '회사 정보 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '회사 정보 수정에 실패했습니다.' }; - } - - const updatedData = transformApiToFrontend(result.data); - return { success: true, data: updatedData }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[updateCompanyInfo] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/tenants`, + method: 'PUT', + body: transformFrontendToApi(tenantId, data), + transform: (d: TenantApiData) => transformApiToFrontend(d), + errorMessage: '회사 정보 수정에 실패했습니다.', + }); } -/** - * 상대 경로를 절대 URL로 변환 - * /storage/... → https://api.example.com/storage/... - */ +// ===== 회사 로고 업로드 ===== +export async function uploadCompanyLogo(formData: FormData): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/tenants/logo`, + method: 'POST', + body: formData, + transform: (data: { logo_url?: string }) => ({ + logoUrl: toAbsoluteUrl(data?.logo_url) || '', + }), + errorMessage: '로고 업로드에 실패했습니다.', + }); +} + +// ===== 유틸리티 ===== + function toAbsoluteUrl(path: string | undefined): string | undefined { if (!path) return undefined; - // 이미 절대 URL이면 그대로 반환 - if (path.startsWith('http://') || path.startsWith('https://')) { - return path; - } - // 상대 경로면 API URL 붙이기 + if (path.startsWith('http://') || path.startsWith('https://')) return path; const apiUrl = process.env.NEXT_PUBLIC_API_URL || ''; return `${apiUrl}${path}`; } -/** - * API 응답 → Frontend 변환 - * - * 기본 필드: company_name, ceo_name, email, phone, business_num, address - * 확장 필드: options JSON에서 읽어옴 - */ function transformApiToFrontend(apiData: TenantApiData): CompanyFormData & { tenantId: number } { const opts = apiData.options || {}; - return { - // tenantId (API 응답의 id 필드) tenantId: apiData.id, - // 기본 필드 companyName: apiData.company_name || '', representativeName: apiData.ceo_name || '', email: apiData.email || '', managerPhone: apiData.phone || '', businessNumber: apiData.business_num || '', address: apiData.address || '', - // 로고 URL (상대 경로 → 절대 URL 변환) companyLogo: toAbsoluteUrl(apiData.logo), businessType: opts.business_type || '', businessCategory: opts.business_category || '', @@ -182,25 +106,12 @@ function transformApiToFrontend(apiData: TenantApiData): CompanyFormData & { ten }; } -/** - * Frontend → API 변환 - * - * 기본 필드: tenant_id, company_name, ceo_name, email, phone, business_num, address - * 확장 필드: options JSON에 저장 (businessType, businessCategory, taxInvoiceEmail 등) - */ -function transformFrontendToApi( - tenantId: number, - data: Partial -): Record { - // 로고 URL에서 상대 경로 추출 (API는 상대 경로 기대) +function transformFrontendToApi(tenantId: number, data: Partial): Record { let logoPath: string | null = null; if (data.companyLogo && typeof data.companyLogo === 'string') { const apiUrl = process.env.NEXT_PUBLIC_API_URL || ''; - logoPath = data.companyLogo.startsWith(apiUrl) - ? data.companyLogo.replace(apiUrl, '') - : data.companyLogo; + logoPath = data.companyLogo.startsWith(apiUrl) ? data.companyLogo.replace(apiUrl, '') : data.companyLogo; } - return { tenant_id: tenantId, company_name: data.companyName, @@ -208,75 +119,14 @@ function transformFrontendToApi( email: data.email, phone: data.managerPhone, business_num: data.businessNumber, - // 로고 (삭제 시 null) logo: logoPath, - // address: 우편번호 + 주소 + 상세주소 결합 - address: [data.zipCode, data.address, data.addressDetail] - .filter(Boolean) - .join(' '), - // 확장 필드 (options JSON) + address: [data.zipCode, data.address, data.addressDetail].filter(Boolean).join(' '), options: { - business_type: data.businessType, - business_category: data.businessCategory, - zip_code: data.zipCode, - address_detail: data.addressDetail, - tax_invoice_email: data.taxInvoiceEmail, - manager_name: data.managerName, - payment_bank: data.paymentBank, - payment_account: data.paymentAccount, - payment_account_holder: data.paymentAccountHolder, - payment_day: data.paymentDay, + business_type: data.businessType, business_category: data.businessCategory, + zip_code: data.zipCode, address_detail: data.addressDetail, + tax_invoice_email: data.taxInvoiceEmail, manager_name: data.managerName, + payment_bank: data.paymentBank, payment_account: data.paymentAccount, + payment_account_holder: data.paymentAccountHolder, payment_day: data.paymentDay, }, }; -} - -/** - * 회사 로고 업로드 - * @param formData - FormData (클라이언트에서 생성, 'logo' 키로 파일 포함) - */ -export async function uploadCompanyLogo(formData: FormData): Promise<{ - success: boolean; - data?: { logoUrl: string }; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/tenants/logo`, - { - method: 'POST', - body: formData, - // FormData는 Content-Type을 자동으로 설정하므로 headers 제거 - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '로고 업로드에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '로고 업로드에 실패했습니다.' }; - } - - return { - success: true, - data: { - logoUrl: toAbsoluteUrl(result.data?.logo_url) || '', - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[uploadCompanyLogo] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } } \ No newline at end of file diff --git a/src/components/settings/LeavePolicyManagement/actions.ts b/src/components/settings/LeavePolicyManagement/actions.ts index 0a13760e..f416138f 100644 --- a/src/components/settings/LeavePolicyManagement/actions.ts +++ b/src/components/settings/LeavePolicyManagement/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { LeavePolicySettings } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface LeavePolicyApi { id: number; @@ -40,7 +41,6 @@ function transformLeavePolicy(data: LeavePolicyApi): LeavePolicySettings { // ===== Frontend → API 변환 ===== function transformToApi(data: Partial): Record { const result: Record = {}; - if (data.standardType !== undefined) result.standard_type = data.standardType; if (data.fiscalStartMonth !== undefined) result.fiscal_start_month = data.fiscalStartMonth; if (data.fiscalStartDay !== undefined) result.fiscal_start_day = data.fiscalStartDay; @@ -50,119 +50,27 @@ function transformToApi(data: Partial): Record { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/leave-policy`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response || !response.ok) { - console.warn('[LeavePolicyActions] GET error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '휴가 정책 조회에 실패했습니다.', - }; - } - - const transformedData = transformLeavePolicy(result.data); - - return { - success: true, - data: transformedData, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[LeavePolicyActions] getLeavePolicy error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function getLeavePolicy(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/leave-policy`, + transform: (data: LeavePolicyApi) => transformLeavePolicy(data), + errorMessage: '휴가 정책 조회에 실패했습니다.', + }); } // ===== 휴가 정책 업데이트 ===== -export async function updateLeavePolicy(data: Partial): Promise<{ - success: boolean; - data?: LeavePolicySettings; - error?: string; - __authError?: boolean; -}> { - try { - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/leave-policy`; - const apiData = transformToApi(data); - - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify(apiData), - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response || !response.ok) { - console.warn('[LeavePolicyActions] PUT error:', response?.status); - return { - success: false, - error: `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - if (!result.success) { - return { - success: false, - error: result.message || '휴가 정책 저장에 실패했습니다.', - }; - } - - const transformedData = transformLeavePolicy(result.data); - - return { - success: true, - data: transformedData, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[LeavePolicyActions] updateLeavePolicy error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function updateLeavePolicy( + data: Partial +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/leave-policy`, + method: 'PUT', + body: transformToApi(data), + transform: (data: LeavePolicyApi) => transformLeavePolicy(data), + errorMessage: '휴가 정책 저장에 실패했습니다.', + }); } diff --git a/src/components/settings/NotificationSettings/actions.ts b/src/components/settings/NotificationSettings/actions.ts index 3b0c0a6e..879f636f 100644 --- a/src/components/settings/NotificationSettings/actions.ts +++ b/src/components/settings/NotificationSettings/actions.ts @@ -1,116 +1,40 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { NotificationSettings } from './types'; import { DEFAULT_NOTIFICATION_SETTINGS } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 알림 설정 조회 ===== export async function getNotificationSettings(): Promise<{ - success: boolean; - data: NotificationSettings; - error?: string; - __authError?: boolean; + success: boolean; data: NotificationSettings; error?: string; __authError?: boolean; }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/settings/notifications`, - { - method: 'GET', - cache: 'no-store', - } - ); + const result = await executeServerAction({ + url: `${API_URL}/api/v1/settings/notifications`, + transform: (data: Record) => transformApiToFrontend(data), + errorMessage: '알림 설정 조회에 실패했습니다.', + }); - if (error) { - return { - success: false, - data: DEFAULT_NOTIFICATION_SETTINGS, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response || !response.ok) { - console.warn('[NotificationActions] GET settings error:', response?.status); - return { - success: true, - data: DEFAULT_NOTIFICATION_SETTINGS, - }; - } - - const result = await response.json(); - - if (!result.success || !result.data) { - return { - success: true, - data: DEFAULT_NOTIFICATION_SETTINGS, - }; - } - - // API → Frontend 변환 - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[NotificationActions] getNotificationSettings error:', error); - return { - success: true, - data: DEFAULT_NOTIFICATION_SETTINGS, - }; + // 인증 에러는 전파, 그 외 에러는 기본값 반환 (설정 미존재 시 정상 동작) + if (result.__authError) { + return { success: false, data: DEFAULT_NOTIFICATION_SETTINGS, error: result.error, __authError: true }; } + if (!result.success || !result.data) { + return { success: true, data: DEFAULT_NOTIFICATION_SETTINGS }; + } + return { success: true, data: result.data }; } // ===== 알림 설정 저장 ===== -export async function saveNotificationSettings( - settings: NotificationSettings -): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(settings); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/settings/notifications`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '알림 설정 저장에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '알림 설정 저장에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[NotificationActions] saveNotificationSettings error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function saveNotificationSettings(settings: NotificationSettings): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/settings/notifications`, + method: 'PUT', + body: transformFrontendToApi(settings), + errorMessage: '알림 설정 저장에 실패했습니다.', + }); } // ===== API → Frontend 변환 (기본값과 병합) ===== diff --git a/src/components/settings/PaymentHistoryManagement/actions.ts b/src/components/settings/PaymentHistoryManagement/actions.ts index 1a0d6ead..2c1de5d6 100644 --- a/src/components/settings/PaymentHistoryManagement/actions.ts +++ b/src/components/settings/PaymentHistoryManagement/actions.ts @@ -1,246 +1,108 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { PaymentApiData, PaymentHistory } from './types'; import { transformApiToFrontend } from './utils'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + +// ===== API 응답 타입 ===== +interface PaymentPaginatedResponse { + data: PaymentApiData[]; + current_page: number; + last_page: number; + per_page: number; + total: number; +} + +interface PaymentStatementApiData { + statement_no: string; + issued_at: string; + payment: { id: number; amount: number; formatted_amount: string; payment_method: string; payment_method_label: string; transaction_id: string | null; status: string; status_label: string; paid_at: string | null; memo: string | null }; + subscription: { id: number; started_at: string | null; ended_at: string | null; status: string; status_label: string }; + plan: { id: number; name: string; code: string; price: number; billing_cycle: string; billing_cycle_label: string } | null; + customer: { tenant_id: number; company_name: string; business_number: string | null; representative: string | null; address: string | null; email: string | null; phone: string | null }; + items: Array<{ description: string; quantity: number; unitPrice: number; amount: number }>; + subtotal: number; + tax: number; + total: number; +} + +interface StatementData { + statementNo: string; + issuedAt: string; + payment: { id: number; amount: number; formattedAmount: string; paymentMethod: string; paymentMethodLabel: string; transactionId: string | null; status: string; statusLabel: string; paidAt: string | null; memo: string | null }; + subscription: { id: number; startedAt: string | null; endedAt: string | null; status: string; statusLabel: string }; + plan: { id: number; name: string; code: string; price: number; billingCycle: string; billingCycleLabel: string } | null; + customer: { tenantId: number; companyName: string; businessNumber: string | null; representative: string | null; address: string | null; email: string | null; phone: string | null }; + items: Array<{ description: string; quantity: number; unitPrice: number; amount: number }>; + subtotal: number; + tax: number; + total: number; +} + +interface FrontendPagination { currentPage: number; lastPage: number; perPage: number; total: number } +const DEFAULT_PAGINATION: FrontendPagination = { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }; + // ===== 결제 목록 조회 ===== export async function getPayments(params?: { - page?: number; - perPage?: number; - status?: string; - startDate?: string; - endDate?: string; - search?: string; + page?: number; perPage?: number; status?: string; startDate?: string; endDate?: string; search?: string; }): Promise<{ - success: boolean; - data: PaymentHistory[]; - pagination: { - currentPage: number; - lastPage: number; - perPage: number; - total: number; - }; - error?: string; - __authError?: boolean; + success: boolean; data: PaymentHistory[]; pagination: FrontendPagination; + error?: string; __authError?: boolean; }> { - try { - // 쿼리 파라미터 생성 - const searchParams = new URLSearchParams(); - if (params?.page) searchParams.append('page', String(params.page)); - if (params?.perPage) searchParams.append('per_page', String(params.perPage)); - if (params?.status) searchParams.append('status', params.status); - if (params?.startDate) searchParams.append('start_date', params.startDate); - if (params?.endDate) searchParams.append('end_date', params.endDate); - if (params?.search) searchParams.append('search', params.search); + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.append('page', String(params.page)); + if (params?.perPage) searchParams.append('per_page', String(params.perPage)); + if (params?.status) searchParams.append('status', params.status); + if (params?.startDate) searchParams.append('start_date', params.startDate); + if (params?.endDate) searchParams.append('end_date', params.endDate); + if (params?.search) searchParams.append('search', params.search); + const queryString = searchParams.toString(); - const queryString = searchParams.toString(); - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/payments${queryString ? `?${queryString}` : ''}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '결제 내역을 불러오는데 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: result.message || '결제 내역을 불러오는데 실패했습니다.', - }; - } - - const payments = result.data.data.map(transformApiToFrontend); - - return { - success: true, - data: payments, - pagination: { - currentPage: result.data.current_page, - lastPage: result.data.last_page, - perPage: result.data.per_page, - total: result.data.total, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PaymentActions] getPayments error:', error); - return { - success: false, - data: [], - pagination: { currentPage: 1, lastPage: 1, perPage: 20, total: 0 }, - error: '서버 오류가 발생했습니다.', - }; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/payments${queryString ? `?${queryString}` : ''}`, + transform: (data: PaymentPaginatedResponse) => ({ + items: (data?.data || []).map(transformApiToFrontend), + pagination: { currentPage: data?.current_page || 1, lastPage: data?.last_page || 1, perPage: data?.per_page || 20, total: data?.total || 0 }, + }), + errorMessage: '결제 내역을 불러오는데 실패했습니다.', + }); + return { success: result.success, data: result.data?.items || [], pagination: result.data?.pagination || DEFAULT_PAGINATION, error: result.error, __authError: result.__authError }; } // ===== 결제 명세서 조회 ===== -export async function getPaymentStatement(id: string): Promise<{ - success: boolean; - data?: { - statementNo: string; - issuedAt: string; - payment: { - id: number; - amount: number; - formattedAmount: string; - paymentMethod: string; - paymentMethodLabel: string; - transactionId: string | null; - status: string; - statusLabel: string; - paidAt: string | null; - memo: string | null; - }; - subscription: { - id: number; - startedAt: string | null; - endedAt: string | null; - status: string; - statusLabel: string; - }; - plan: { - id: number; - name: string; - code: string; - price: number; - billingCycle: string; - billingCycleLabel: string; - } | null; - customer: { - tenantId: number; - companyName: string; - businessNumber: string | null; - representative: string | null; - address: string | null; - email: string | null; - phone: string | null; - }; - items: Array<{ - description: string; - quantity: number; - unitPrice: number; - amount: number; - }>; - subtotal: number; - tax: number; - total: number; - }; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/payments/${id}/statement`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '명세서를 불러오는데 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '명세서를 불러오는데 실패했습니다.', - }; - } - - // snake_case → camelCase 변환 - const data = result.data; - return { - success: true, - data: { - statementNo: data.statement_no, - issuedAt: data.issued_at, - payment: { - id: data.payment.id, - amount: data.payment.amount, - formattedAmount: data.payment.formatted_amount, - paymentMethod: data.payment.payment_method, - paymentMethodLabel: data.payment.payment_method_label, - transactionId: data.payment.transaction_id, - status: data.payment.status, - statusLabel: data.payment.status_label, - paidAt: data.payment.paid_at, - memo: data.payment.memo, - }, - subscription: { - id: data.subscription.id, - startedAt: data.subscription.started_at, - endedAt: data.subscription.ended_at, - status: data.subscription.status, - statusLabel: data.subscription.status_label, - }, - plan: data.plan ? { - id: data.plan.id, - name: data.plan.name, - code: data.plan.code, - price: data.plan.price, - billingCycle: data.plan.billing_cycle, - billingCycleLabel: data.plan.billing_cycle_label, - } : null, - customer: { - tenantId: data.customer.tenant_id, - companyName: data.customer.company_name, - businessNumber: data.customer.business_number, - representative: data.customer.representative, - address: data.customer.address, - email: data.customer.email, - phone: data.customer.phone, - }, - items: data.items, - subtotal: data.subtotal, - tax: data.tax, - total: data.total, +export async function getPaymentStatement(id: string): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/payments/${id}/statement`, + transform: (data: PaymentStatementApiData): StatementData => ({ + statementNo: data.statement_no, + issuedAt: data.issued_at, + payment: { + id: data.payment.id, amount: data.payment.amount, formattedAmount: data.payment.formatted_amount, + paymentMethod: data.payment.payment_method, paymentMethodLabel: data.payment.payment_method_label, + transactionId: data.payment.transaction_id, status: data.payment.status, statusLabel: data.payment.status_label, + paidAt: data.payment.paid_at, memo: data.payment.memo, }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PaymentActions] getPaymentStatement error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } + subscription: { + id: data.subscription.id, startedAt: data.subscription.started_at, endedAt: data.subscription.ended_at, + status: data.subscription.status, statusLabel: data.subscription.status_label, + }, + plan: data.plan ? { + id: data.plan.id, name: data.plan.name, code: data.plan.code, price: data.plan.price, + billingCycle: data.plan.billing_cycle, billingCycleLabel: data.plan.billing_cycle_label, + } : null, + customer: { + tenantId: data.customer.tenant_id, companyName: data.customer.company_name, + businessNumber: data.customer.business_number, representative: data.customer.representative, + address: data.customer.address, email: data.customer.email, phone: data.customer.phone, + }, + items: data.items, + subtotal: data.subtotal, + tax: data.tax, + total: data.total, + }), + errorMessage: '명세서를 불러오는데 실패했습니다.', + }); } diff --git a/src/components/settings/PermissionManagement/actions.ts b/src/components/settings/PermissionManagement/actions.ts index 8bbe9a7f..b41c5725 100644 --- a/src/components/settings/PermissionManagement/actions.ts +++ b/src/components/settings/PermissionManagement/actions.ts @@ -1,451 +1,139 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import { revalidatePath } from 'next/cache'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; -import type { Role, RoleStats, PermissionMatrix, MenuTreeItem, ApiResponse, PaginatedResponse } from './types'; +import type { Role, RoleStats, PermissionMatrix, MenuTreeItem, PaginatedResponse } from './types'; const API_URL = process.env.NEXT_PUBLIC_API_URL; // ========== Role CRUD ========== -/** - * 역할 목록 조회 - */ export async function fetchRoles(params?: { - page?: number; - size?: number; - q?: string; - is_hidden?: boolean; -}): Promise>> { - try { - const searchParams = new URLSearchParams(); - if (params?.page) searchParams.set('page', params.page.toString()); - if (params?.size) searchParams.set('per_page', params.size.toString()); - if (params?.q) searchParams.set('q', params.q); - if (params?.is_hidden !== undefined) searchParams.set('is_hidden', params.is_hidden.toString()); + page?: number; size?: number; q?: string; is_hidden?: boolean; +}): Promise>> { + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', params.page.toString()); + if (params?.size) searchParams.set('per_page', params.size.toString()); + if (params?.q) searchParams.set('q', params.q); + if (params?.is_hidden !== undefined) searchParams.set('is_hidden', params.is_hidden.toString()); + const queryString = searchParams.toString(); - const url = `${API_URL}/api/v1/roles?${searchParams.toString()}`; - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '역할 목록 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '역할 목록 조회 실패' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to fetch roles:', error); - return { success: false, error: error instanceof Error ? error.message : '역할 목록 조회 실패' }; - } + return executeServerAction>({ + url: `${API_URL}/api/v1/roles${queryString ? `?${queryString}` : ''}`, + errorMessage: '역할 목록 조회에 실패했습니다.', + }); } -/** - * 역할 상세 조회 - */ -export async function fetchRole(id: number): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/${id}`, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '역할 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '역할 조회 실패' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to fetch role:', error); - return { success: false, error: error instanceof Error ? error.message : '역할 조회 실패' }; - } +export async function fetchRole(id: number): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/roles/${id}`, + errorMessage: '역할 조회에 실패했습니다.', + }); } -/** - * 역할 생성 - */ export async function createRole(data: { - name: string; - description?: string; - is_hidden?: boolean; -}): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles`, { - method: 'POST', - body: JSON.stringify(data), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '역할 생성에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '역할 생성 실패' }; - } - - revalidatePath('/settings/permissions'); - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to create role:', error); - return { success: false, error: error instanceof Error ? error.message : '역할 생성 실패' }; - } + name: string; description?: string; is_hidden?: boolean; +}): Promise> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/roles`, + method: 'POST', + body: data, + errorMessage: '역할 생성에 실패했습니다.', + }); + if (result.success) revalidatePath('/settings/permissions'); + return result; } -/** - * 역할 수정 - */ -export async function updateRole( - id: number, - data: { - name?: string; - description?: string; - is_hidden?: boolean; - } -): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/${id}`, { - method: 'PATCH', - body: JSON.stringify(data), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '역할 수정에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '역할 수정 실패' }; - } - +export async function updateRole(id: number, data: { + name?: string; description?: string; is_hidden?: boolean; +}): Promise> { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/roles/${id}`, + method: 'PATCH', + body: data, + errorMessage: '역할 수정에 실패했습니다.', + }); + if (result.success) { revalidatePath('/settings/permissions'); revalidatePath(`/settings/permissions/${id}`); - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to update role:', error); - return { success: false, error: error instanceof Error ? error.message : '역할 수정 실패' }; } + return result; } -/** - * 역할 삭제 - */ -export async function deleteRole(id: number): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/${id}`, { - method: 'DELETE', - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '역할 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '역할 삭제 실패' }; - } - - revalidatePath('/settings/permissions'); - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to delete role:', error); - return { success: false, error: error instanceof Error ? error.message : '역할 삭제 실패' }; - } +export async function deleteRole(id: number): Promise { + const result = await executeServerAction({ + url: `${API_URL}/api/v1/roles/${id}`, + method: 'DELETE', + errorMessage: '역할 삭제에 실패했습니다.', + }); + if (result.success) revalidatePath('/settings/permissions'); + return result; } -/** - * 역할 통계 조회 - */ -export async function fetchRoleStats(): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/stats`, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '역할 통계 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '역할 통계 조회 실패' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to fetch role stats:', error); - return { success: false, error: error instanceof Error ? error.message : '역할 통계 조회 실패' }; - } +export async function fetchRoleStats(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/roles/stats`, + errorMessage: '역할 통계 조회에 실패했습니다.', + }); } -/** - * 활성 역할 목록 (드롭다운용) - */ -export async function fetchActiveRoles(): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/active`, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '활성 역할 목록 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '활성 역할 목록 조회 실패' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to fetch active roles:', error); - return { success: false, error: error instanceof Error ? error.message : '활성 역할 목록 조회 실패' }; - } +export async function fetchActiveRoles(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/roles/active`, + errorMessage: '활성 역할 목록 조회에 실패했습니다.', + }); } // ========== Permission Matrix ========== -/** - * 권한 매트릭스용 메뉴 트리 조회 - */ -export async function fetchPermissionMenus(): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/role-permissions/menus`, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '메뉴 트리 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '메뉴 트리 조회 실패' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to fetch permission menus:', error); - return { success: false, error: error instanceof Error ? error.message : '메뉴 트리 조회 실패' }; - } + return executeServerAction({ + url: `${API_URL}/api/v1/role-permissions/menus`, + errorMessage: '메뉴 트리 조회에 실패했습니다.', + }); } -/** - * 역할의 권한 매트릭스 조회 - */ -export async function fetchPermissionMatrix(roleId: number): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/${roleId}/permissions/matrix`, { method: 'GET' }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '권한 매트릭스 조회에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '권한 매트릭스 조회 실패' }; - } - - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to fetch permission matrix:', error); - return { success: false, error: error instanceof Error ? error.message : '권한 매트릭스 조회 실패' }; - } +export async function fetchPermissionMatrix(roleId: number): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/roles/${roleId}/permissions/matrix`, + errorMessage: '권한 매트릭스 조회에 실패했습니다.', + }); } -/** - * 특정 메뉴의 특정 권한 토글 - */ -export async function togglePermission( - roleId: number, - menuId: number, - permissionType: string -): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/${roleId}/permissions/toggle`, { - method: 'POST', - body: JSON.stringify({ - menu_id: menuId, - permission_type: permissionType, - }), - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '권한 토글에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '권한 토글 실패' }; - } - - revalidatePath(`/settings/permissions/${roleId}`); - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to toggle permission:', error); - return { success: false, error: error instanceof Error ? error.message : '권한 토글 실패' }; - } + const result = await executeServerAction<{ granted: boolean; propagated_to: number[] }>({ + url: `${API_URL}/api/v1/roles/${roleId}/permissions/toggle`, + method: 'POST', + body: { menu_id: menuId, permission_type: permissionType }, + errorMessage: '권한 토글에 실패했습니다.', + }); + if (result.success) revalidatePath(`/settings/permissions/${roleId}`); + return result; } -/** - * 모든 권한 허용 - */ -export async function allowAllPermissions(roleId: number): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/${roleId}/permissions/allow-all`, { - method: 'POST', - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '전체 허용에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '전체 허용 실패' }; - } - - revalidatePath(`/settings/permissions/${roleId}`); - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to allow all permissions:', error); - return { success: false, error: error instanceof Error ? error.message : '전체 허용 실패' }; - } +async function rolePermissionAction(roleId: number, action: string, errorMessage: string): Promise> { + const result = await executeServerAction<{ count: number }>({ + url: `${API_URL}/api/v1/roles/${roleId}/permissions/${action}`, + method: 'POST', + errorMessage, + }); + if (result.success) revalidatePath(`/settings/permissions/${roleId}`); + return result; } -/** - * 모든 권한 거부 - */ -export async function denyAllPermissions(roleId: number): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/${roleId}/permissions/deny-all`, { - method: 'POST', - }); - - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '전체 거부에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '전체 거부 실패' }; - } - - revalidatePath(`/settings/permissions/${roleId}`); - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to deny all permissions:', error); - return { success: false, error: error instanceof Error ? error.message : '전체 거부 실패' }; - } +export async function allowAllPermissions(roleId: number): Promise> { + return rolePermissionAction(roleId, 'allow-all', '전체 허용에 실패했습니다.'); } -/** - * 기본 권한으로 초기화 (view만 허용) - */ -export async function resetPermissions(roleId: number): Promise> { - try { - const { response, error } = await serverFetch(`${API_URL}/api/v1/roles/${roleId}/permissions/reset`, { - method: 'POST', - }); +export async function denyAllPermissions(roleId: number): Promise> { + return rolePermissionAction(roleId, 'deny-all', '전체 거부에 실패했습니다.'); +} - if (error) { - return { success: false, error: error.message }; - } - - if (!response) { - return { success: false, error: '권한 초기화에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '권한 초기화 실패' }; - } - - revalidatePath(`/settings/permissions/${roleId}`); - return { success: true, data: result.data }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('Failed to reset permissions:', error); - return { success: false, error: error instanceof Error ? error.message : '권한 초기화 실패' }; - } +export async function resetPermissions(roleId: number): Promise> { + return rolePermissionAction(roleId, 'reset', '권한 초기화에 실패했습니다.'); } \ No newline at end of file diff --git a/src/components/settings/PopupManagement/PopupDetail.tsx b/src/components/settings/PopupManagement/PopupDetail.tsx index 37b7cd60..f263c24e 100644 --- a/src/components/settings/PopupManagement/PopupDetail.tsx +++ b/src/components/settings/PopupManagement/PopupDetail.tsx @@ -17,6 +17,7 @@ import { Button } from '@/components/ui/button'; import { Badge } from '@/components/ui/badge'; import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; import { type Popup } from './types'; +import { sanitizeHTML } from '@/lib/sanitize'; interface PopupDetailProps { popup: Popup; @@ -91,7 +92,7 @@ export function PopupDetail({ popup, onEdit, onDelete }: PopupDetailProps) {
diff --git a/src/components/settings/PopupManagement/actions.ts b/src/components/settings/PopupManagement/actions.ts index 4176dd91..194aa757 100644 --- a/src/components/settings/PopupManagement/actions.ts +++ b/src/components/settings/PopupManagement/actions.ts @@ -13,24 +13,16 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { Popup, PopupFormData } from './types'; import { transformApiToFrontend, transformFrontendToApi, type PopupApiData } from './utils'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ============================================ // API 응답 타입 정의 // ============================================ -interface ApiResponse { - success: boolean; - data: T; - message: string; -} - -// ============================================ -// API 함수 -// ============================================ - interface PaginatedResponse { current_page: number; data: T[]; @@ -39,6 +31,10 @@ interface PaginatedResponse { last_page: number; } +// ============================================ +// API 함수 +// ============================================ + /** * 팝업 목록 조회 */ @@ -47,82 +43,31 @@ export async function getPopups(params?: { size?: number; status?: string; }): Promise { - try { - const searchParams = new URLSearchParams(); - - if (params?.page) searchParams.set('page', String(params.page)); - if (params?.size) searchParams.set('size', String(params.size)); - if (params?.status && params.status !== 'all') { - searchParams.set('status', params.status); - } - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/popups?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error || !response) { - console.error('[PopupActions] GET list error:', error?.message); - return []; - } - - if (!response.ok) { - console.error('[PopupActions] GET list error:', response.status); - return []; - } - - const result: ApiResponse> = await response.json(); - - if (!result.success || !result.data?.data) { - console.warn('[PopupActions] No data in response'); - return []; - } - - return result.data.data.map(transformApiToFrontend); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PopupActions] getPopups error:', error); - return []; + const searchParams = new URLSearchParams(); + if (params?.page) searchParams.set('page', String(params.page)); + if (params?.size) searchParams.set('size', String(params.size)); + if (params?.status && params.status !== 'all') { + searchParams.set('status', params.status); } + + const result = await executeServerAction({ + url: `${API_URL}/api/v1/popups?${searchParams.toString()}`, + transform: (data: PaginatedResponse) => data.data.map(transformApiToFrontend), + errorMessage: '팝업 목록 조회에 실패했습니다.', + }); + return result.data || []; } /** * 팝업 상세 조회 */ export async function getPopupById(id: string): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/popups/${id}`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error || !response) { - console.error('[PopupActions] GET popup error:', error?.message); - return null; - } - - if (!response.ok) { - console.error('[PopupActions] GET popup error:', response.status); - return null; - } - - const result: ApiResponse = await response.json(); - - if (!result.success || !result.data) { - return null; - } - - return transformApiToFrontend(result.data); - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PopupActions] getPopupById error:', error); - return null; - } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/popups/${id}`, + transform: (data: PopupApiData) => transformApiToFrontend(data), + errorMessage: '팝업 조회에 실패했습니다.', + }); + return result.data || null; } /** @@ -130,57 +75,14 @@ export async function getPopupById(id: string): Promise { */ export async function createPopup( data: PopupFormData -): Promise<{ success: boolean; data?: Popup; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[PopupActions] POST popup request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/popups`, - { - method: 'POST', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '팝업 등록에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[PopupActions] POST popup response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '팝업 등록에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PopupActions] createPopup error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/popups`, + method: 'POST', + body: transformFrontendToApi(data), + transform: (data: PopupApiData) => transformApiToFrontend(data), + errorMessage: '팝업 등록에 실패했습니다.', + }); } /** @@ -189,105 +91,25 @@ export async function createPopup( export async function updatePopup( id: string, data: PopupFormData -): Promise<{ success: boolean; data?: Popup; error?: string; __authError?: boolean }> { - try { - const apiData = transformFrontendToApi(data); - - console.log('[PopupActions] PUT popup request:', apiData); - - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/popups/${id}`, - { - method: 'PUT', - body: JSON.stringify(apiData), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '팝업 수정에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[PopupActions] PUT popup response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '팝업 수정에 실패했습니다.', - }; - } - - return { - success: true, - data: transformApiToFrontend(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PopupActions] updatePopup error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/popups/${id}`, + method: 'PUT', + body: transformFrontendToApi(data), + transform: (data: PopupApiData) => transformApiToFrontend(data), + errorMessage: '팝업 수정에 실패했습니다.', + }); } /** * 팝업 삭제 */ -export async function deletePopup(id: string): Promise<{ success: boolean; error?: string; __authError?: boolean }> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/popups/${id}`, - { - method: 'DELETE', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '팝업 삭제에 실패했습니다.', - }; - } - - const result = await response.json(); - console.log('[PopupActions] DELETE popup response:', result); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '팝업 삭제에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[PopupActions] deletePopup error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +export async function deletePopup(id: string): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/popups/${id}`, + method: 'DELETE', + errorMessage: '팝업 삭제에 실패했습니다.', + }); } /** @@ -297,21 +119,13 @@ export async function deletePopups(ids: string[]): Promise<{ success: boolean; e try { const results = await Promise.all(ids.map(id => deletePopup(id))); const failed = results.filter(r => !r.success); - if (failed.length > 0) { - return { - success: false, - error: `${failed.length}개 팝업 삭제에 실패했습니다.`, - }; + return { success: false, error: `${failed.length}개 팝업 삭제에 실패했습니다.` }; } - return { success: true }; } catch (error) { if (isNextRedirectError(error)) throw error; console.error('[PopupActions] deletePopups error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + return { success: false, error: '서버 오류가 발생했습니다.' }; } } diff --git a/src/components/settings/PopupManagement/popupDetailConfig.ts b/src/components/settings/PopupManagement/popupDetailConfig.ts index 3719d4ed..30dd3885 100644 --- a/src/components/settings/PopupManagement/popupDetailConfig.ts +++ b/src/components/settings/PopupManagement/popupDetailConfig.ts @@ -8,6 +8,7 @@ import type { DetailConfig, FieldDefinition, SectionDefinition } from '@/compone import type { Popup, PopupFormData, PopupTarget, PopupStatus } from './types'; import { RichTextEditor } from '@/components/board/RichTextEditor'; import { createElement } from 'react'; +import { sanitizeHTML } from '@/lib/sanitize'; // ===== 대상 옵션 ===== const TARGET_OPTIONS = [ @@ -94,7 +95,7 @@ export const popupFields: FieldDefinition[] = [ // View 모드: HTML 렌더링 return createElement('div', { className: 'border border-gray-200 rounded-md p-4 bg-gray-50 min-h-[100px] prose prose-sm max-w-none', - dangerouslySetInnerHTML: { __html: (value as string) || '' }, + dangerouslySetInnerHTML: { __html: sanitizeHTML((value as string) || '') }, }); } // Edit/Create 모드: RichTextEditor @@ -110,7 +111,7 @@ export const popupFields: FieldDefinition[] = [ if (!value) return '-'; return createElement('div', { className: 'border border-gray-200 rounded-md p-4 bg-gray-50 min-h-[100px] prose prose-sm max-w-none', - dangerouslySetInnerHTML: { __html: value as string }, + dangerouslySetInnerHTML: { __html: sanitizeHTML(value as string) }, }); }, }, diff --git a/src/components/settings/RankManagement/actions.ts b/src/components/settings/RankManagement/actions.ts index 088febc1..cd57b9a3 100644 --- a/src/components/settings/RankManagement/actions.ts +++ b/src/components/settings/RankManagement/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { Rank } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface PositionApiData { id: number; @@ -17,12 +18,6 @@ interface PositionApiData { updated_at?: string; } -interface ApiResponse { - success: boolean; - message?: string; - data: T; -} - // ===== 데이터 변환: API → Frontend ===== function transformApiToFrontend(apiData: PositionApiData): Rank { return { @@ -39,55 +34,21 @@ function transformApiToFrontend(apiData: PositionApiData): Rank { export async function getRanks(params?: { is_active?: boolean; q?: string; -}): Promise<{ - success: boolean; - data?: Rank[]; - error?: string; - __authError?: boolean; -}> { - try { - const searchParams = new URLSearchParams(); - searchParams.set('type', 'rank'); - - if (params?.is_active !== undefined) { - searchParams.set('is_active', params.is_active.toString()); - } - if (params?.q) { - searchParams.set('q', params.q); - } - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '직급 목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '직급 목록 조회에 실패했습니다.' }; - } - - const ranks = result.data.map(transformApiToFrontend); - return { success: true, data: ranks }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getRanks] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; +}): Promise> { + const searchParams = new URLSearchParams(); + searchParams.set('type', 'rank'); + if (params?.is_active !== undefined) { + searchParams.set('is_active', params.is_active.toString()); } + if (params?.q) { + searchParams.set('q', params.q); + } + + return executeServerAction({ + url: `${API_URL}/api/v1/positions?${searchParams.toString()}`, + transform: (data: PositionApiData[]) => data.map(transformApiToFrontend), + errorMessage: '직급 목록 조회에 실패했습니다.', + }); } // ===== 직급 생성 ===== @@ -95,51 +56,19 @@ export async function createRank(data: { name: string; sort_order?: number; is_active?: boolean; -}): Promise<{ - success: boolean; - data?: Rank; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions`, - { - method: 'POST', - body: JSON.stringify({ - type: 'rank', - name: data.name, - sort_order: data.sort_order, - is_active: data.is_active ?? true, - }), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '직급 생성에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '직급 생성에 실패했습니다.' }; - } - - const rank = transformApiToFrontend(result.data); - return { success: true, data: rank }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[createRank] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +}): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/positions`, + method: 'POST', + body: { + type: 'rank', + name: data.name, + sort_order: data.sort_order, + is_active: data.is_active ?? true, + }, + transform: transformApiToFrontend, + errorMessage: '직급 생성에 실패했습니다.', + }); } // ===== 직급 수정 ===== @@ -150,127 +79,33 @@ export async function updateRank( sort_order?: number; is_active?: boolean; } -): Promise<{ - success: boolean; - data?: Rank; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions/${id}`, - { - method: 'PUT', - body: JSON.stringify(data), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '직급 수정에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '직급 수정에 실패했습니다.' }; - } - - const rank = transformApiToFrontend(result.data); - return { success: true, data: rank }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[updateRank] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/positions/${id}`, + method: 'PUT', + body: data, + transform: transformApiToFrontend, + errorMessage: '직급 수정에 실패했습니다.', + }); } // ===== 직급 삭제 ===== -export async function deleteRank(id: number): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions/${id}`, - { - method: 'DELETE', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '직급 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '직급 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteRank] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function deleteRank(id: number): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/positions/${id}`, + method: 'DELETE', + errorMessage: '직급 삭제에 실패했습니다.', + }); } // ===== 직급 순서 변경 ===== export async function reorderRanks( items: { id: number; sort_order: number }[] -): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions/reorder`, - { - method: 'PUT', - body: JSON.stringify({ items }), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '순서 변경에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '순서 변경에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[reorderRanks] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/positions/reorder`, + method: 'PUT', + body: { items }, + errorMessage: '순서 변경에 실패했습니다.', + }); } \ No newline at end of file diff --git a/src/components/settings/SubscriptionManagement/actions.ts b/src/components/settings/SubscriptionManagement/actions.ts index f5067430..5edd2c51 100644 --- a/src/components/settings/SubscriptionManagement/actions.ts +++ b/src/components/settings/SubscriptionManagement/actions.ts @@ -2,236 +2,52 @@ import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { SubscriptionApiData, UsageApiData, SubscriptionInfo } from './types'; import { transformApiToFrontend } from './utils'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== 현재 활성 구독 조회 ===== -export async function getCurrentSubscription(): Promise<{ - success: boolean; - data: SubscriptionApiData | null; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/subscriptions/current`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { - success: false, - data: null, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: null, - error: '구독 정보를 불러오는데 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - data: null, - error: result.message || '구독 정보를 불러오는데 실패했습니다.', - }; - } - - return { - success: true, - data: result.data, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[SubscriptionActions] getCurrentSubscription error:', error); - return { - success: false, - data: null, - error: '서버 오류가 발생했습니다.', - }; - } +export async function getCurrentSubscription(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/subscriptions/current`, + errorMessage: '구독 정보를 불러오는데 실패했습니다.', + }); } // ===== 사용량 조회 ===== -export async function getUsage(): Promise<{ - success: boolean; - data: UsageApiData | null; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/subscriptions/usage`, - { - method: 'GET', - cache: 'no-store', - } - ); - - if (error) { - return { - success: false, - data: null, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - data: null, - error: '사용량 정보를 불러오는데 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - data: null, - error: result.message || '사용량 정보를 불러오는데 실패했습니다.', - }; - } - - return { - success: true, - data: result.data, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[SubscriptionActions] getUsage error:', error); - return { - success: false, - data: null, - error: '서버 오류가 발생했습니다.', - }; - } +export async function getUsage(): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/subscriptions/usage`, + errorMessage: '사용량 정보를 불러오는데 실패했습니다.', + }); } // ===== 구독 취소 ===== export async function cancelSubscription( id: number, reason?: string -): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/subscriptions/${id}/cancel`, - { - method: 'POST', - body: JSON.stringify({ reason }), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '구독 취소에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '구독 취소에 실패했습니다.', - }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[SubscriptionActions] cancelSubscription error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/subscriptions/${id}/cancel`, + method: 'POST', + body: { reason }, + errorMessage: '구독 취소에 실패했습니다.', + }); } // ===== 데이터 내보내기 요청 ===== export async function requestDataExport( exportType: string = 'all' -): Promise<{ - success: boolean; - data?: { id: number; status: string }; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/subscriptions/export`, - { - method: 'POST', - body: JSON.stringify({ export_type: exportType }), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { - success: false, - error: '내보내기 요청에 실패했습니다.', - }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '내보내기 요청에 실패했습니다.', - }; - } - - return { - success: true, - data: { - id: result.data.id, - status: result.data.status, - }, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[SubscriptionActions] requestDataExport error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/subscriptions/export`, + method: 'POST', + body: { export_type: exportType }, + transform: (data: { id: number; status: string }) => ({ id: data.id, status: data.status }), + errorMessage: '내보내기 요청에 실패했습니다.', + }); } // ===== 통합 데이터 조회 (현재 구독 + 사용량) ===== @@ -255,21 +71,14 @@ export async function getSubscriptionData(): Promise<{ } const data = transformApiToFrontend( - subscriptionResult.data, - usageResult.data + subscriptionResult.data ?? null, + usageResult.data ?? null ); - return { - success: true, - data, - }; + return { success: true, data }; } catch (error) { if (isNextRedirectError(error)) throw error; console.error('[SubscriptionActions] getSubscriptionData error:', error); - return { - success: false, - data: null, - error: '서버 오류가 발생했습니다.', - }; + return { success: false, data: null, error: '서버 오류가 발생했습니다.' }; } } diff --git a/src/components/settings/TitleManagement/actions.ts b/src/components/settings/TitleManagement/actions.ts index 3e11a28c..a1a2ce5d 100644 --- a/src/components/settings/TitleManagement/actions.ts +++ b/src/components/settings/TitleManagement/actions.ts @@ -1,10 +1,11 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; import type { Title } from './types'; +const API_URL = process.env.NEXT_PUBLIC_API_URL; + // ===== API 응답 타입 ===== interface PositionApiData { id: number; @@ -17,12 +18,6 @@ interface PositionApiData { updated_at?: string; } -interface ApiResponse { - success: boolean; - message?: string; - data: T; -} - // ===== 데이터 변환: API → Frontend ===== function transformApiToFrontend(apiData: PositionApiData): Title { return { @@ -39,55 +34,21 @@ function transformApiToFrontend(apiData: PositionApiData): Title { export async function getTitles(params?: { is_active?: boolean; q?: string; -}): Promise<{ - success: boolean; - data?: Title[]; - error?: string; - __authError?: boolean; -}> { - try { - const searchParams = new URLSearchParams(); - searchParams.set('type', 'title'); - - if (params?.is_active !== undefined) { - searchParams.set('is_active', params.is_active.toString()); - } - if (params?.q) { - searchParams.set('q', params.q); - } - - const url = `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions?${searchParams.toString()}`; - - const { response, error } = await serverFetch(url, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '직책 목록 조회에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '직책 목록 조회에 실패했습니다.' }; - } - - const titles = result.data.map(transformApiToFrontend); - return { success: true, data: titles }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[getTitles] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; +}): Promise> { + const searchParams = new URLSearchParams(); + searchParams.set('type', 'title'); + if (params?.is_active !== undefined) { + searchParams.set('is_active', params.is_active.toString()); } + if (params?.q) { + searchParams.set('q', params.q); + } + + return executeServerAction({ + url: `${API_URL}/api/v1/positions?${searchParams.toString()}`, + transform: (data: PositionApiData[]) => data.map(transformApiToFrontend), + errorMessage: '직책 목록 조회에 실패했습니다.', + }); } // ===== 직책 생성 ===== @@ -95,51 +56,19 @@ export async function createTitle(data: { name: string; sort_order?: number; is_active?: boolean; -}): Promise<{ - success: boolean; - data?: Title; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions`, - { - method: 'POST', - body: JSON.stringify({ - type: 'title', - name: data.name, - sort_order: data.sort_order, - is_active: data.is_active ?? true, - }), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '직책 생성에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '직책 생성에 실패했습니다.' }; - } - - const title = transformApiToFrontend(result.data); - return { success: true, data: title }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[createTitle] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +}): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/positions`, + method: 'POST', + body: { + type: 'title', + name: data.name, + sort_order: data.sort_order, + is_active: data.is_active ?? true, + }, + transform: transformApiToFrontend, + errorMessage: '직책 생성에 실패했습니다.', + }); } // ===== 직책 수정 ===== @@ -150,127 +79,33 @@ export async function updateTitle( sort_order?: number; is_active?: boolean; } -): Promise<{ - success: boolean; - data?: Title; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions/${id}`, - { - method: 'PUT', - body: JSON.stringify(data), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '직책 수정에 실패했습니다.' }; - } - - const result: ApiResponse = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '직책 수정에 실패했습니다.' }; - } - - const title = transformApiToFrontend(result.data); - return { success: true, data: title }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[updateTitle] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise> { + return executeServerAction({ + url: `${API_URL}/api/v1/positions/${id}`, + method: 'PUT', + body: data, + transform: transformApiToFrontend, + errorMessage: '직책 수정에 실패했습니다.', + }); } // ===== 직책 삭제 ===== -export async function deleteTitle(id: number): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions/${id}`, - { - method: 'DELETE', - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '직책 삭제에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '직책 삭제에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[deleteTitle] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +export async function deleteTitle(id: number): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/positions/${id}`, + method: 'DELETE', + errorMessage: '직책 삭제에 실패했습니다.', + }); } // ===== 직책 순서 변경 ===== export async function reorderTitles( items: { id: number; sort_order: number }[] -): Promise<{ - success: boolean; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/positions/reorder`, - { - method: 'PUT', - body: JSON.stringify({ items }), - } - ); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response) { - return { success: false, error: '순서 변경에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { success: false, error: result.message || '순서 변경에 실패했습니다.' }; - } - - return { success: true }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[reorderTitles] Error:', error); - return { success: false, error: '서버 오류가 발생했습니다.' }; - } +): Promise { + return executeServerAction({ + url: `${API_URL}/api/v1/positions/reorder`, + method: 'PUT', + body: { items }, + errorMessage: '순서 변경에 실패했습니다.', + }); } \ No newline at end of file diff --git a/src/components/settings/WorkScheduleManagement/actions.ts b/src/components/settings/WorkScheduleManagement/actions.ts index 34d9a145..bfc008f3 100644 --- a/src/components/settings/WorkScheduleManagement/actions.ts +++ b/src/components/settings/WorkScheduleManagement/actions.ts @@ -1,8 +1,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction, type ActionResult } from '@/lib/api/execute-server-action'; const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL || 'http://sam.kr:8080'; @@ -49,7 +48,7 @@ function transformFromApi(data: ApiWorkSetting): WorkSettingFormData { return { workType: data.work_type, workDays: data.work_days || ['mon', 'tue', 'wed', 'thu', 'fri'], - workStartTime: data.start_time?.substring(0, 5) || '09:00', // HH:mm:ss → HH:mm + workStartTime: data.start_time?.substring(0, 5) || '09:00', workEndTime: data.end_time?.substring(0, 5) || '18:00', weeklyWorkHours: data.standard_hours, weeklyOvertimeHours: data.overtime_hours, @@ -65,10 +64,9 @@ function transformFromApi(data: ApiWorkSetting): WorkSettingFormData { */ function transformToApi(data: Partial): Record { const apiData: Record = {}; - if (data.workType !== undefined) apiData.work_type = data.workType; if (data.workDays !== undefined) apiData.work_days = data.workDays; - if (data.workStartTime !== undefined) apiData.start_time = `${data.workStartTime}:00`; // HH:mm → HH:mm:ss + if (data.workStartTime !== undefined) apiData.start_time = `${data.workStartTime}:00`; if (data.workEndTime !== undefined) apiData.end_time = `${data.workEndTime}:00`; if (data.weeklyWorkHours !== undefined) apiData.standard_hours = data.weeklyWorkHours; if (data.weeklyOvertimeHours !== undefined) apiData.overtime_hours = data.weeklyOvertimeHours; @@ -76,7 +74,6 @@ function transformToApi(data: Partial): Record): Record { - try { - const { response, error } = await serverFetch(`${API_BASE_URL}/api/v1/settings/work`, { - method: 'GET', - cache: 'no-store', - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response || !response.ok) { - const errorData = await response?.json().catch(() => ({})); - return { - success: false, - error: errorData?.message || `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - return { - success: true, - data: transformFromApi(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('getWorkSetting error:', error); - return { - success: false, - error: '근무 설정을 불러오는데 실패했습니다.', - }; - } +export async function getWorkSetting(): Promise> { + return executeServerAction({ + url: `${API_BASE_URL}/api/v1/settings/work`, + transform: (data: ApiWorkSetting) => transformFromApi(data), + errorMessage: '근무 설정을 불러오는데 실패했습니다.', + }); } /** @@ -134,46 +95,12 @@ export async function getWorkSetting(): Promise<{ */ export async function updateWorkSetting( data: Partial -): Promise<{ - success: boolean; - data?: WorkSettingFormData; - error?: string; - __authError?: boolean; -}> { - try { - const { response, error } = await serverFetch(`${API_BASE_URL}/api/v1/settings/work`, { - method: 'PUT', - body: JSON.stringify(transformToApi(data)), - }); - - if (error) { - return { - success: false, - error: error.message, - __authError: error.code === 'UNAUTHORIZED', - }; - } - - if (!response || !response.ok) { - const errorData = await response?.json().catch(() => ({})); - return { - success: false, - error: errorData?.message || `API 오류: ${response?.status}`, - }; - } - - const result = await response.json(); - - return { - success: true, - data: transformFromApi(result.data), - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('updateWorkSetting error:', error); - return { - success: false, - error: '근무 설정 저장에 실패했습니다.', - }; - } +): Promise> { + return executeServerAction({ + url: `${API_BASE_URL}/api/v1/settings/work`, + method: 'PUT', + body: transformToApi(data), + transform: (data: ApiWorkSetting) => transformFromApi(data), + errorMessage: '근무 설정 저장에 실패했습니다.', + }); } \ No newline at end of file diff --git a/src/components/ui/file-input.tsx b/src/components/ui/file-input.tsx index 5978a030..67f6c4a0 100644 --- a/src/components/ui/file-input.tsx +++ b/src/components/ui/file-input.tsx @@ -80,6 +80,28 @@ export function FileInput({ if (!file) return; + // 위험한 확장자 차단 + const dangerousExtensions = ['.exe', '.bat', '.cmd', '.sh', '.js', '.jsx', '.ts', '.tsx', '.mjs', '.jar', '.app', '.scr', '.vbs', '.ps1', '.htm', '.html', '.svg', '.swf']; + const fileExtension = '.' + (file.name.split('.').pop()?.toLowerCase() || ''); + if (dangerousExtensions.includes(fileExtension)) { + setValidationError('보안상 허용되지 않는 파일 형식입니다.'); + return; + } + + // accept가 지정된 경우 확장자 검증 + if (accept !== '*/*') { + const allowedExtensions = accept.split(',').map(ext => ext.trim().toLowerCase()); + const isAllowed = allowedExtensions.some(ext => { + if (ext.startsWith('.')) return fileExtension === ext; + if (ext.endsWith('/*')) return file.type.startsWith(ext.replace('/*', '/')); + return file.type === ext; + }); + if (!isAllowed) { + setValidationError(`허용되지 않은 파일 형식입니다. (${accept})`); + return; + } + } + // 파일 크기 검증 const fileSizeMB = file.size / (1024 * 1024); if (fileSizeMB > maxSize) { diff --git a/src/hooks/useUserRole.ts b/src/hooks/useUserRole.ts index 9d04b44e..09d4f051 100644 --- a/src/hooks/useUserRole.ts +++ b/src/hooks/useUserRole.ts @@ -1,4 +1,5 @@ import { useState, useEffect } from 'react'; +import { safeJsonParse } from '@/lib/utils'; /** * 사용자 역할을 관리하는 최적화된 훅 @@ -8,16 +9,14 @@ export function useUserRole() { const [userRole, setUserRole] = useState(() => { // SSR-safe: 서버에서는 기본값 반환 if (typeof window === 'undefined') return "CEO"; - const userDataStr = localStorage.getItem("user"); - const userData = userDataStr ? JSON.parse(userDataStr) : null; - return userData?.role || "CEO"; + const userData = safeJsonParse | null>(localStorage.getItem("user"), null); + return (userData?.role as string) || "CEO"; }); useEffect(() => { const handleStorageChange = () => { - const userDataStr = localStorage.getItem("user"); - const userData = userDataStr ? JSON.parse(userDataStr) : null; - const newRole = userData?.role || "CEO"; + const userData = safeJsonParse | null>(localStorage.getItem("user"), null); + const newRole = (userData?.role as string) || "CEO"; setUserRole(newRole); }; diff --git a/src/layouts/AuthenticatedLayout.tsx b/src/layouts/AuthenticatedLayout.tsx index 584f5e1a..f0932550 100644 --- a/src/layouts/AuthenticatedLayout.tsx +++ b/src/layouts/AuthenticatedLayout.tsx @@ -47,6 +47,7 @@ import { useTheme } from '@/contexts/ThemeContext'; import { useAuth } from '@/contexts/AuthContext'; import { deserializeMenuItems } from '@/lib/utils/menuTransform'; import { stripLocalePrefix } from '@/lib/utils/locale'; +import { safeJsonParse } from '@/lib/utils'; import { useMenuPolling } from '@/hooks/useMenuPolling'; import { Select, @@ -367,13 +368,14 @@ export default function AuthenticatedLayout({ children }: AuthenticatedLayoutPro // localStorage에서 사용자 정보 가져오기 const userDataStr = localStorage.getItem("user"); if (userDataStr) { - const userData = JSON.parse(userDataStr); + const userData = safeJsonParse | null>(userDataStr, null); + if (!userData) return; // 사용자 이름, 직책, 이메일, 회사 설정 - setUserName(userData.name || "사용자"); - setUserPosition(userData.position || "직책"); - setUserEmail(userData.email || ""); - setUserCompany(userData.company || userData.company_name || ""); + setUserName((userData.name as string) || "사용자"); + setUserPosition((userData.position as string) || "직책"); + setUserEmail((userData.email as string) || ""); + setUserCompany((userData.company as string) || (userData.company_name as string) || ""); // 서버에서 받은 메뉴 배열이 있으면 사용, 없으면 기본 메뉴 사용 if (userData.menu && Array.isArray(userData.menu) && userData.menu.length > 0) { diff --git a/src/lib/actions/bulk-actions.ts b/src/lib/actions/bulk-actions.ts index c39e31f8..268fa561 100644 --- a/src/lib/actions/bulk-actions.ts +++ b/src/lib/actions/bulk-actions.ts @@ -8,7 +8,7 @@ * - 엑셀 내보내기 (근태/급여) */ -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; import { cookies } from 'next/headers'; const API_URL = process.env.NEXT_PUBLIC_API_URL; @@ -36,41 +36,25 @@ export async function bulkUpdateAccountCode( ids: string[], accountCode: string ): Promise { - try { - const url = `${API_URL}${endpoint}`; - const { response, error } = await serverFetch(url, { - method: 'PUT', - body: JSON.stringify({ - ids: ids.map((id) => parseInt(id, 10)), - account_code: accountCode, - }), - }); + interface BulkUpdateData { updated_count?: number } + const result = await executeServerAction({ + url: `${API_URL}${endpoint}`, + method: 'PUT', + body: { + ids: ids.map((id) => parseInt(id, 10)), + account_code: accountCode, + }, + errorMessage: '계정과목 변경에 실패했습니다.', + }); - if (error?.__authError) { - return { success: false, __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || '서버 오류가 발생했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || '계정과목 변경에 실패했습니다.', - }; - } - - return { - success: true, - updatedCount: result.data?.updated_count || ids.length, - }; - } catch (err) { - console.error('[BulkActions] bulkUpdateAccountCode error:', err); - return { success: false, error: '서버 오류가 발생했습니다.' }; + if (!result.success) { + return { success: false, error: result.error, __authError: result.__authError }; } + + return { + success: true, + updatedCount: result.data?.updated_count || ids.length, + }; } // ============================================ diff --git a/src/lib/actions/fcm.ts b/src/lib/actions/fcm.ts index e10906ea..60c3f0e4 100644 --- a/src/lib/actions/fcm.ts +++ b/src/lib/actions/fcm.ts @@ -13,8 +13,7 @@ 'use server'; -import { isNextRedirectError } from '@/lib/utils/redirect-error'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; // ============================================ // 타입 정의 @@ -58,44 +57,22 @@ export interface FcmResult { export async function sendFcmNotification( params: FcmNotificationParams ): Promise { - try { - const { response, error } = await serverFetch( - `${process.env.NEXT_PUBLIC_API_URL}/api/v1/admin/fcm/send`, - { - method: 'POST', - body: JSON.stringify(params), - } - ); + interface FcmResponseData { success?: number } + const result = await executeServerAction({ + url: `${process.env.NEXT_PUBLIC_API_URL}/api/v1/admin/fcm/send`, + method: 'POST', + body: params, + errorMessage: 'FCM 발송에 실패했습니다.', + }); - if (error?.__authError) { - return { success: false, error: '인증이 필요합니다.', __authError: true }; - } - - if (!response) { - return { success: false, error: error?.message || 'FCM 발송에 실패했습니다.' }; - } - - const result = await response.json(); - - if (!response.ok || !result.success) { - return { - success: false, - error: result.message || 'FCM 발송에 실패했습니다.', - }; - } - - return { - success: true, - sentCount: result.data?.success || 0, - }; - } catch (error) { - if (isNextRedirectError(error)) throw error; - console.error('[FCM] sendFcmNotification error:', error); - return { - success: false, - error: '서버 오류가 발생했습니다.', - }; + if (!result.success) { + return { success: false, error: result.error, __authError: result.__authError }; } + + return { + success: true, + sentCount: result.data?.success || 0, + }; } // ============================================ diff --git a/src/lib/api/execute-server-action.ts b/src/lib/api/execute-server-action.ts new file mode 100644 index 00000000..24e65e6b --- /dev/null +++ b/src/lib/api/execute-server-action.ts @@ -0,0 +1,144 @@ +/** + * Server Action 공통 실행 유틸리티 + * + * 82개 action.ts 파일에서 반복되는 보일러플레이트를 제거합니다: + * - try/catch + isNextRedirectError + * - serverFetch 호출 + 에러 체크 + * - response.json() + success 검증 + * - 일관된 ActionResult 반환 + * + * @example + * ```typescript + * // Before: ~20줄 + * export async function getRanks() { + * try { + * const { response, error } = await serverFetch(url, { method: 'GET' }); + * if (error) return { success: false, error: error.message, __authError: error.__authError }; + * if (!response) return { success: false, error: '...' }; + * const result = await response.json(); + * if (!response.ok || !result.success) return { success: false, error: result.message }; + * return { success: true, data: result.data.map(transform) }; + * } catch (error) { + * if (isNextRedirectError(error)) throw error; + * return { success: false, error: '...' }; + * } + * } + * + * // After: ~5줄 + * export async function getRanks() { + * return executeServerAction({ + * url: `${API_URL}/api/v1/positions?type=rank`, + * transform: (data: PositionApiData[]) => data.map(transformApiToFrontend), + * errorMessage: '직급 목록 조회에 실패했습니다.', + * }); + * } + * ``` + */ + +import { serverFetch } from './fetch-wrapper'; +import { isNextRedirectError } from '@/lib/utils/redirect-error'; + +// ===== 공통 반환 타입 ===== +export interface ActionResult { + success: boolean; + data?: T; + error?: string; + __authError?: boolean; +} + +// ===== 옵션 타입 ===== +interface ExecuteOptions { + /** API URL (전체 경로) */ + url: string; + /** HTTP 메서드 (기본: GET) */ + method?: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE'; + /** 요청 본문 (POST/PUT/PATCH) - FormData 또는 JSON-직렬화 가능 객체 */ + body?: unknown; + /** API 응답 데이터 → 프론트엔드 타입 변환 함수 */ + transform?: (data: TApi) => TResult; + /** 실패 시 기본 에러 메시지 */ + errorMessage?: string; + /** fetch 캐시 설정 (기본: no-store) */ + cache?: RequestCache; +} + +/** + * Server Action 실행 유틸리티 + * + * serverFetch 호출 → 에러 처리 → JSON 파싱 → transform 적용 → ActionResult 반환 + */ +export async function executeServerAction( + options: ExecuteOptions +): Promise> { + const { + url, + method = 'GET', + body, + transform, + errorMessage = '처리에 실패했습니다.', + cache = 'no-store', + } = options; + + try { + const fetchOptions: RequestInit & { cache?: RequestCache } = { + method, + cache, + }; + + if (body !== undefined) { + fetchOptions.body = body instanceof FormData ? body : JSON.stringify(body); + } + + const { response, error } = await serverFetch(url, fetchOptions); + + // serverFetch 에러 (네트워크, 403 등) + if (error) { + return { + success: false, + error: error.message, + __authError: error.__authError, + }; + } + + // 응답 없음 + if (!response) { + return { success: false, error: errorMessage }; + } + + // 204 No Content (DELETE 성공 등) + if (response.status === 204) { + return { success: true }; + } + + // JSON 파싱 + const result = await response.json(); + + // API 실패 응답 + if (!response.ok || !result.success) { + let errorMsg = result.message || errorMessage; + // Laravel validation errors: { errors: { field: ['msg1', 'msg2'] } } + if (result.errors && typeof result.errors === 'object') { + const validationErrors = Object.values(result.errors).flat().join(', '); + if (validationErrors) errorMsg = validationErrors; + } + return { + success: false, + error: errorMsg, + }; + } + + // 성공 + transform + if (transform && result.data !== undefined) { + return { success: true, data: transform(result.data) }; + } + + // 성공 (data 없거나 transform 없음) + return { success: true, data: result.data }; + } catch (error) { + // Next.js redirect()는 다시 throw + if (isNextRedirectError(error)) throw error; + + console.error(`[executeServerAction] ${method} ${url}:`, error); + return { success: false, error: errorMessage }; + } +} diff --git a/src/lib/api/quote.ts b/src/lib/api/quote.ts index a7b11331..83f5cb5c 100644 --- a/src/lib/api/quote.ts +++ b/src/lib/api/quote.ts @@ -175,7 +175,7 @@ class QuoteApiClient extends ApiClient { constructor() { super({ mode: 'bearer', - apiKey: process.env.NEXT_PUBLIC_API_KEY, + apiKey: process.env.API_KEY, getToken: () => { if (typeof window !== 'undefined') { return localStorage.getItem('auth_token'); diff --git a/src/lib/permissions/actions.ts b/src/lib/permissions/actions.ts index a725a41d..b8750694 100644 --- a/src/lib/permissions/actions.ts +++ b/src/lib/permissions/actions.ts @@ -1,6 +1,6 @@ 'use server'; -import { serverFetch } from '@/lib/api/fetch-wrapper'; +import { executeServerAction } from '@/lib/api/execute-server-action'; const API_URL = process.env.NEXT_PUBLIC_API_URL; @@ -11,48 +11,33 @@ const API_URL = process.env.NEXT_PUBLIC_API_URL; * URL 매핑을 보완하기 위해 사용. */ export async function getPermissionMenuUrlMap(): Promise> { - try { - const url = `${API_URL}/api/v1/role-permissions/menus`; - const { response, error } = await serverFetch(url, { method: 'GET' }); + interface MenusData { menus: Array<{ id: number; url: string }> } + const result = await executeServerAction({ + url: `${API_URL}/api/v1/role-permissions/menus`, + errorMessage: '권한 메뉴 조회에 실패했습니다.', + }); - if (error || !response?.ok) return {}; + if (!result.success || !Array.isArray(result.data?.menus)) return {}; - const json = await response.json(); - if (!json.success || !Array.isArray(json.data?.menus)) return {}; - - const map: Record = {}; - for (const menu of json.data.menus) { - if (menu.id && menu.url) { - map[String(menu.id)] = menu.url; - } + const map: Record = {}; + for (const menu of result.data.menus) { + if (menu.id && menu.url) { + map[String(menu.id)] = menu.url; } - return map; - } catch { - return {}; } + return map; } /** 역할(Role) 기반 권한 매트릭스 조회 (설정 페이지와 동일 API) */ -export async function getRolePermissionMatrix(roleId: number) { - try { - const url = `${API_URL}/api/v1/roles/${roleId}/permissions/matrix`; +export async function getRolePermissionMatrix(roleId: number): Promise<{ + success: boolean; + data: { permissions: Record> }; +}> { + const result = await executeServerAction<{ permissions: Record> }>({ + url: `${API_URL}/api/v1/roles/${roleId}/permissions/matrix`, + errorMessage: '권한 매트릭스 조회에 실패했습니다.', + }); - const { response, error } = await serverFetch(url, { method: 'GET' }); - - if (error) { - console.error('[Permission Action] serverFetch error:', error); - return { success: false, data: null }; - } - - if (!response?.ok) { - console.error('[Permission Action] HTTP 에러:', response?.status, response?.statusText); - return { success: false, data: null }; - } - - const json = await response.json(); - return json; - } catch (err) { - console.error('[Permission Action] 예외:', err); - return { success: false, data: null }; - } + if (!result.success || !result.data) return { success: false, data: { permissions: {} } }; + return { success: true, data: result.data }; } diff --git a/src/lib/print-utils.ts b/src/lib/print-utils.ts index 88116452..e28cb7f2 100644 --- a/src/lib/print-utils.ts +++ b/src/lib/print-utils.ts @@ -3,6 +3,8 @@ * 특정 요소만 인쇄하기 위한 헬퍼 함수들 */ +import { sanitizeHTMLForPrint } from '@/lib/sanitize'; + interface PrintOptions { /** 문서 제목 (브라우저 인쇄 다이얼로그에 표시) */ title?: string; @@ -164,7 +166,7 @@ export function printElement(
- ${contentClone.innerHTML} + ${sanitizeHTMLForPrint(contentClone.innerHTML)}