hyungi/tk-factory-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(tksupport): Sprint 001 Section C — 전사 휴가관리 구현

Browse Source 
- 전사 휴가 부여/관리 (company-holidays) CRUD + 연차차감 트랜잭션
- 전체 휴가관리 대시보드 (vacation-dashboard) 부서별/직원별 현황
- 내 휴가 현황 개선 (/my-status) balance_type별 카드, 전사 휴가일
- requireSupportTeam 미들웨어, 부서명 JOIN, 마이그레이션 002 추가
- 사이드바 roles 기반 메뉴 필터링 (하위호환 유지)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Hyungi Ahn
2026-03-23 08:16:50 +09:00
parent a3f7a324b1
commit 36391c02e1
19 changed files with 1040 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tksupport/api/models/vacationRequestModel.js
View File

@@ -14,11 +14,13 @@ const vacationRequestModel = {
vr.*,
su.name as user_name,
su.username,
COALESCE(d.department_name, '미배정') as department_name,
vt.type_name as vacation_type_name,
vt.type_code,
reviewer.name as reviewer_name
FROM sp_vacation_requests vr
INNER JOIN sso_users su ON vr.user_id = su.user_id
LEFT JOIN departments d ON su.department_id = d.department_id
INNER JOIN vacation_types vt ON vr.vacation_type_id = vt.id
LEFT JOIN sso_users reviewer ON vr.reviewed_by = reviewer.user_id
WHERE 1=1
@@ -45,6 +47,10 @@ const vacationRequestModel = {
query += ' AND vr.vacation_type_id = ?';
params.push(filters.vacation_type_id);
}
if (filters.department_id) {
query += ' AND su.department_id = ?';
params.push(filters.department_id);
}
query += ' ORDER BY vr.created_at DESC';
@@ -59,11 +65,13 @@ const vacationRequestModel = {
vr.*,
su.name as user_name,
su.username,
COALESCE(d.department_name, '미배정') as department_name,
vt.type_name as vacation_type_name,
vt.type_code,
reviewer.name as reviewer_name
FROM sp_vacation_requests vr
INNER JOIN sso_users su ON vr.user_id = su.user_id
LEFT JOIN departments d ON su.department_id = d.department_id
INNER JOIN vacation_types vt ON vr.vacation_type_id = vt.id
LEFT JOIN sso_users reviewer ON vr.reviewed_by = reviewer.user_id
WHERE vr.request_id = ?
@@ -113,10 +121,12 @@ const vacationRequestModel = {
vr.*,
su.name as user_name,
su.username,
COALESCE(d.department_name, '미배정') as department_name,
vt.type_name as vacation_type_name,
vt.type_code
FROM sp_vacation_requests vr
INNER JOIN sso_users su ON vr.user_id = su.user_id
LEFT JOIN departments d ON su.department_id = d.department_id
INNER JOIN vacation_types vt ON vr.vacation_type_id = vt.id
WHERE vr.status = 'pending'
ORDER BY vr.created_at ASC
@@ -128,17 +138,21 @@ const vacationRequestModel = {
const db = getPool();
const fs = require('fs');
const path = require('path');
const sqlFile = path.join(__dirname, '..', 'db', 'migrations', '001_create_sp_tables.sql');
const sql = fs.readFileSync(sqlFile, 'utf8');
const statements = sql.split(';').map(s => s.trim()).filter(s => s.length > 0);
for (const stmt of statements) {
try {
await db.query(stmt);
} catch (err) {
if (err.code === 'ER_DUP_FIELDNAME' || err.code === 'ER_TABLE_EXISTS_ERROR') {
// Already migrated
} else {
throw err;
const migrationFiles = ['001_create_sp_tables.sql', '002_section_c_additions.sql'];
for (const file of migrationFiles) {
const sqlFile = path.join(__dirname, '..', 'db', 'migrations', file);
if (!fs.existsSync(sqlFile)) continue;
const sql = fs.readFileSync(sqlFile, 'utf8');
const statements = sql.split(';').map(s => s.trim()).filter(s => s.length > 0);
for (const stmt of statements) {
try {
await db.query(stmt);
} catch (err) {
if (err.code === 'ER_DUP_FIELDNAME' || err.code === 'ER_TABLE_EXISTS_ERROR') {
// Already migrated
} else {
throw err;
}
}
}
}