hyungi/TK-FB-Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Implement daily attendance tracking system

Browse Source 
- Backend: Auto-sync work reports with attendance records
- Backend: Lazy initialization of daily active worker records
- Frontend: Real-time attendance status on Group Leader Dashboard
This commit is contained in:
Hyungi Ahn
2026-01-06 17:15:56 +09:00
parent b4037c9395
commit 7d89ec448c
7 changed files with 604 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
api.hyungi.net/models/dailyWorkReportModel.js
View File

@@ -50,15 +50,15 @@ const createDailyReport = async (reportData, callback) => {
console.log(`📝 ${created_by_name}이 ${report_date} ${worker_id}번 작업자에게 데이터 추가 중...`);
// ✅ 수정된 쿼리 (테이블 alias 추가):
const [existingReports] = await conn.query(
`SELECT dwr.created_by, u.name as created_by_name, COUNT(*) as count, SUM(dwr.work_hours) as total_hours
// ✅ 수정된 쿼리 (테이블 alias 추가):
const [existingReports] = await conn.query(
`SELECT dwr.created_by, u.name as created_by_name, COUNT(*) as count, SUM(dwr.work_hours) as total_hours
FROM daily_work_reports dwr
LEFT JOIN users u ON dwr.created_by = u.user_id
WHERE dwr.report_date = ? AND dwr.worker_id = ?
GROUP BY dwr.created_by`,
[report_date, worker_id]
);
[report_date, worker_id]
);
console.log('기존 데이터 (삭제하지 않음):', existingReports);
@@ -67,26 +67,26 @@ const [existingReports] = await conn.query(
const insertedIds = [];
for (const entry of work_entries) {
const { project_id, work_type_id, work_status_id, error_type_id, work_hours } = entry;
const [insertResult] = await conn.query(
`INSERT INTO daily_work_reports
(report_date, worker_id, project_id, work_type_id, work_status_id, error_type_id, work_hours, created_by, created_at)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW())`,
[report_date, worker_id, project_id, work_type_id, work_status_id || 1, error_type_id || null, work_hours, created_by]
);
insertedIds.push(insertResult.insertId);
}
// ✅ 수정된 쿼리:
const [finalReports] = await conn.query(
`SELECT dwr.created_by, u.name as created_by_name, COUNT(*) as count, SUM(dwr.work_hours) as total_hours
// ✅ 수정된 쿼리:
const [finalReports] = await conn.query(
`SELECT dwr.created_by, u.name as created_by_name, COUNT(*) as count, SUM(dwr.work_hours) as total_hours
FROM daily_work_reports dwr
LEFT JOIN users u ON dwr.created_by = u.user_id
WHERE dwr.report_date = ? AND dwr.worker_id = ?
GROUP BY dwr.created_by`,
[report_date, worker_id]
);
[report_date, worker_id]
);
const grandTotal = finalReports.reduce((sum, report) => sum + parseFloat(report.total_hours || 0), 0);
const myTotal = finalReports.find(r => r.created_by === created_by)?.total_hours || 0;
@@ -104,7 +104,7 @@ const [finalReports] = await conn.query(
(action, report_id, new_values, changed_by, change_reason, created_at)
VALUES (?, ?, ?, ?, ?, NOW())`,
[
'ADD_ACCUMULATE',
'ADD_ACCUMULATE',
insertedIds[0] || null,
JSON.stringify({
report_date,
@@ -124,9 +124,18 @@ const [finalReports] = await conn.query(
}
await conn.commit();
callback(null, {
success: true,
// 5. 근태 기록 동기화 (추가)
try {
const AttendanceModel = require('./attendanceModel');
await AttendanceModel.syncWithWorkReports(worker_id, report_date);
} catch (syncErr) {
console.error('근태 기록 동기화 실패:', syncErr);
// 메인 트랜잭션은 성공했으므로 동기화 실패로 롤백하지 않음 (비동기 처리 또는 무시)
}
callback(null, {
success: true,
inserted_count: insertedIds.length,
deleted_count: 0, // 항상 0 (삭제 안함)
action: 'accumulated',
@@ -138,7 +147,7 @@ const [finalReports] = await conn.query(
contributors: finalReports
}
});
} catch (err) {
await conn.rollback();
console.error('작업보고서 누적 추가 오류:', err);
@@ -154,7 +163,7 @@ const [finalReports] = await conn.query(
const getMyAccumulatedHours = async (date, worker_id, created_by, callback) => {
try {
const db = await getDb();
const sql = `
SELECT
SUM(work_hours) as my_total_hours,
@@ -167,7 +176,7 @@ const getMyAccumulatedHours = async (date, worker_id, created_by, callback) => {
LEFT JOIN projects p ON dwr.project_id = p.project_id
WHERE dwr.report_date = ? AND dwr.worker_id = ? AND dwr.created_by = ?
`;
const [rows] = await db.query(sql, [date, worker_id, created_by]);
callback(null, rows[0] || { my_total_hours: 0, my_entry_count: 0, my_entries: null });
} catch (err) {
@@ -182,12 +191,12 @@ const getMyAccumulatedHours = async (date, worker_id, created_by, callback) => {
const getAccumulatedReportsByDate = async (date, worker_id, callback) => {
try {
const db = await getDb();
const sql = getSelectQuery() + `
WHERE dwr.report_date = ? AND dwr.worker_id = ?
ORDER BY dwr.created_by, dwr.created_at ASC
`;
const [rows] = await db.query(sql, [date, worker_id]);
callback(null, rows);
} catch (err) {
@@ -202,7 +211,7 @@ const getAccumulatedReportsByDate = async (date, worker_id, callback) => {
const getContributorsByDate = async (date, worker_id, callback) => {
try {
const db = await getDb();
const sql = `
SELECT
dwr.created_by,
@@ -222,7 +231,7 @@ const getContributorsByDate = async (date, worker_id, callback) => {
GROUP BY dwr.created_by
ORDER BY total_hours DESC, first_entry ASC
`;
const [rows] = await db.query(sql, [date, worker_id]);
callback(null, rows);
} catch (err) {
@@ -237,10 +246,10 @@ const getContributorsByDate = async (date, worker_id, callback) => {
const removeSpecificEntry = async (entry_id, deleted_by, callback) => {
const db = await getDb();
const conn = await db.getConnection();
try {
await conn.beginTransaction();
// 삭제 전 정보 확인
const [entryInfo] = await conn.query(
`SELECT dwr.*, w.worker_name, p.project_name, u.name as created_by_name
@@ -267,12 +276,12 @@ const removeSpecificEntry = async (entry_id, deleted_by, callback) => {
// 개별 항목 삭제
const [result] = await conn.query('DELETE FROM daily_work_reports WHERE id = ?', [entry_id]);
// 감사 로그 (삭제된 테이블이므로 콘솔 로그로 대체)
console.log(`[삭제 로그] 작업자: ${entry.worker_name}, 프로젝트: ${entry.project_name}, 작업시간: ${entry.work_hours}시간, 삭제자: ${deleted_by}`);
await conn.commit();
callback(null, {
callback(null, {
success: true,
deleted_entry: {
worker_name: entry.worker_name,
@@ -280,7 +289,7 @@ const removeSpecificEntry = async (entry_id, deleted_by, callback) => {
work_hours: entry.work_hours
}
});
} catch (err) {
await conn.rollback();
console.error('개별 항목 삭제 오류:', err);
@@ -431,10 +440,10 @@ const getByRange = async (start_date, end_date, callback) => {
*/
const searchWithDetails = async (params, callback) => {
const { start_date, end_date, worker_id, project_id, work_status_id, created_by, page, limit } = params;
try {
const db = await getDb();
// 조건 구성
let whereConditions = ['dwr.report_date BETWEEN ? AND ?'];
let queryParams = [start_date, end_date];
@@ -460,7 +469,7 @@ const searchWithDetails = async (params, callback) => {
}
const whereClause = whereConditions.join(' AND ');
// 총 개수 조회
const countQuery = `
SELECT COUNT(*) as total
@@ -477,7 +486,7 @@ const searchWithDetails = async (params, callback) => {
ORDER BY dwr.report_date DESC, w.worker_name ASC, dwr.created_at DESC
LIMIT ? OFFSET ?
`;
const dataParams = [...queryParams, limit, offset];
const [rows] = await db.query(dataQuery, dataParams);
@@ -494,7 +503,7 @@ const searchWithDetails = async (params, callback) => {
const getSummaryByDate = async (date, callback) => {
try {
const db = await getDb();
const sql = `
SELECT
dwr.worker_id,
@@ -523,7 +532,7 @@ const getSummaryByDate = async (date, callback) => {
const getSummaryByWorker = async (worker_id, callback) => {
try {
const db = await getDb();
const sql = `
SELECT
dwr.report_date,
@@ -554,7 +563,7 @@ const getMonthlySummary = async (year, month, callback) => {
const db = await getDb();
const start = `${year.padStart(4, '0')}-${month.padStart(2, '0')}-01`;
const end = `${year.padStart(4, '0')}-${month.padStart(2, '0')}-31`;
const sql = `
SELECT
dwr.report_date,
@@ -588,47 +597,61 @@ const getMonthlySummary = async (year, month, callback) => {
const updateById = async (id, updateData, callback) => {
try {
const db = await getDb();
const setFields = [];
const values = [];
if (updateData.work_hours !== undefined) {
setFields.push('work_hours = ?');
values.push(updateData.work_hours);
}
if (updateData.work_status_id !== undefined) {
setFields.push('work_status_id = ?');
values.push(updateData.work_status_id);
}
if (updateData.error_type_id !== undefined) {
setFields.push('error_type_id = ?');
values.push(updateData.error_type_id);
}
if (updateData.project_id !== undefined) {
setFields.push('project_id = ?');
values.push(updateData.project_id);
}
if (updateData.work_type_id !== undefined) {
setFields.push('work_type_id = ?');
values.push(updateData.work_type_id);
}
setFields.push('updated_at = NOW()');
if (updateData.updated_by) {
setFields.push('updated_by = ?');
values.push(updateData.updated_by);
}
values.push(id);
const sql = `UPDATE daily_work_reports SET ${setFields.join(', ')} WHERE id = ?`;
const [result] = await db.query(sql, values);
// [Sync] 근태 기록 동기화
try {
const [targetReport] = await db.query('SELECT worker_id, report_date FROM daily_work_reports WHERE id = ?', [id]);
if (targetReport.length > 0) {
const { worker_id, report_date } = targetReport[0];
const AttendanceModel = require('./attendanceModel');
await AttendanceModel.syncWithWorkReports(worker_id, report_date);
}
} catch (syncErr) {
console.error('근태 기록 동기화 실패 (Update):', syncErr);
}
callback(null, result.affectedRows);
} catch (err) {
console.error('작업보고서 수정 오류:', err);
@@ -642,16 +665,16 @@ const updateById = async (id, updateData, callback) => {
const removeById = async (id, deletedBy, callback) => {
const db = await getDb();
const conn = await db.getConnection();
try {
await conn.beginTransaction();
// 삭제 전 정보 저장 (감사 로그용)
const [reportInfo] = await conn.query('SELECT * FROM daily_work_reports WHERE id = ?', [id]);
// 작업보고서 삭제
const [result] = await conn.query('DELETE FROM daily_work_reports WHERE id = ?', [id]);
// 감사 로그 추가
if (reportInfo.length > 0 && deletedBy) {
try {
@@ -665,8 +688,21 @@ const removeById = async (id, deletedBy, callback) => {
console.warn('감사 로그 추가 실패:', auditErr.message);
}
}
await conn.commit();
// [Sync] 근태 기록 동기화
if (reportInfo.length > 0) {
try {
const { worker_id, report_date } = reportInfo[0];
const AttendanceModel = require('./attendanceModel');
await AttendanceModel.syncWithWorkReports(worker_id, report_date);
} catch (syncErr) {
console.error('근태 기록 동기화 실패 (Delete):', syncErr);
}
}
callback(null, result.affectedRows);
} catch (err) {
await conn.rollback();
@@ -683,22 +719,22 @@ const removeById = async (id, deletedBy, callback) => {
const removeByDateAndWorker = async (date, worker_id, deletedBy, callback) => {
const db = await getDb();
const conn = await db.getConnection();
try {
await conn.beginTransaction();
// 삭제 전 정보 저장 (감사 로그용)
const [reportInfos] = await conn.query(
'SELECT id, report_date, worker_id, project_id, work_type_id, work_status_id, error_type_id, work_hours, created_at, updated_at, created_by, updated_by FROM daily_work_reports WHERE report_date = ? AND worker_id = ?',
'SELECT id, report_date, worker_id, project_id, work_type_id, work_status_id, error_type_id, work_hours, created_at, updated_at, created_by, updated_by FROM daily_work_reports WHERE report_date = ? AND worker_id = ?',
[date, worker_id]
);
// 작업보고서 삭제
const [result] = await conn.query(
'DELETE FROM daily_work_reports WHERE report_date = ? AND worker_id = ?',
[date, worker_id]
);
// 감사 로그 추가
if (reportInfos.length > 0 && deletedBy) {
try {
@@ -712,8 +748,18 @@ const removeByDateAndWorker = async (date, worker_id, deletedBy, callback) => {
console.warn('감사 로그 추가 실패:', auditErr.message);
}
}
await conn.commit();
// [Sync] 근태 기록 동기화
try {
const AttendanceModel = require('./attendanceModel');
await AttendanceModel.syncWithWorkReports(worker_id, date);
} catch (syncErr) {
console.error('근태 기록 동기화 실패 (Batch Delete):', syncErr);
}
callback(null, result.affectedRows);
} catch (err) {
await conn.rollback();
@@ -730,7 +776,7 @@ const removeByDateAndWorker = async (date, worker_id, deletedBy, callback) => {
const getStatistics = async (start_date, end_date) => {
try {
const db = await getDb();
const overallSql = `
SELECT
COUNT(*) as total_reports,
@@ -741,7 +787,7 @@ const getStatistics = async (start_date, end_date) => {
WHERE report_date BETWEEN ? AND ?
`;
const [overallRows] = await db.query(overallSql, [start_date, end_date]);
const dailyStatsSql = `
SELECT
report_date,
@@ -753,7 +799,7 @@ const getStatistics = async (start_date, end_date) => {
ORDER BY report_date DESC
`;
const [dailyStats] = await db.query(dailyStatsSql, [start_date, end_date]);
return {
overall: overallRows[0],
daily_breakdown: dailyStats
@@ -798,7 +844,17 @@ const createReportEntries = async ({ report_date, worker_id, entries }) => {
}
await conn.commit();
// [Sync] 근태 기록 동기화
try {
const AttendanceModel = require('./attendanceModel');
await AttendanceModel.syncWithWorkReports(worker_id, report_date);
} catch (syncErr) {
console.error('근태 기록 동기화 실패 (V2 Create):', syncErr);
}
console.log(`[Model] ${insertedIds.length}개 작업 항목 생성 완료.`);
return {
inserted_ids: insertedIds,
@@ -863,7 +919,7 @@ const getReportsWithOptions = async (options) => {
whereConditions.push('dwr.report_date BETWEEN ? AND ?');
queryParams.push(options.start_date, options.end_date);
}
if (options.worker_id) {
whereConditions.push('dwr.worker_id = ?');
queryParams.push(options.worker_id);
@@ -898,7 +954,7 @@ const getReportsWithOptions = async (options) => {
*/
const updateReportById = async (reportId, updateData) => {
const db = await getDb();
// 허용된 필드 목록 (보안 및 안정성) - 실제 테이블 컬럼명 사용
const allowedFields = ['project_id', 'work_type_id', 'work_hours', 'work_status_id', 'error_type_id'];
const setClauses = [];
@@ -913,8 +969,8 @@ const updateReportById = async (reportId, updateData) => {
// updated_by_user_id는 항상 업데이트
if (updateData.updated_by_user_id) {
setClauses.push('updated_by_user_id = ?');
queryParams.push(updateData.updated_by_user_id);
setClauses.push('updated_by_user_id = ?');
queryParams.push(updateData.updated_by_user_id);
}
if (setClauses.length === 0) {
@@ -923,10 +979,28 @@ const updateReportById = async (reportId, updateData) => {
queryParams.push(reportId);
// [Sync] 업데이트 전 정보 조회 (동기화를 위해)
let targetInfo = null;
try {
const [rows] = await db.query('SELECT worker_id, report_date FROM daily_work_reports WHERE id = ?', [reportId]);
if (rows.length > 0) targetInfo = rows[0];
} catch (e) { console.warn('Sync fetch failed', e); }
const sql = `UPDATE daily_work_reports SET ${setClauses.join(', ')} WHERE id = ?`;
try {
const [result] = await db.query(sql, queryParams);
// [Sync] 근태 기록 동기화
if (targetInfo) {
try {
const AttendanceModel = require('./attendanceModel');
await AttendanceModel.syncWithWorkReports(targetInfo.worker_id, targetInfo.report_date);
} catch (syncErr) {
console.error('근태 기록 동기화 실패 (V2 Update):', syncErr);
}
}
return result.affectedRows;
} catch (err) {
console.error(`[Model] 작업 보고서 수정 오류 (id: ${reportId}):`, err);
@@ -943,22 +1017,34 @@ const updateReportById = async (reportId, updateData) => {
const removeReportById = async (reportId, deletedByUserId) => {
const db = await getDb();
const conn = await db.getConnection();
try {
await conn.beginTransaction();
// 감사 로그를 위해 삭제 전 정보 조회
const [reportInfo] = await conn.query('SELECT id, report_date, worker_id, project_id, work_type_id, work_status_id, error_type_id, work_hours, created_at, updated_at, created_by, updated_by FROM daily_work_reports WHERE id = ?', [reportId]);
// 실제 삭제 작업
const [result] = await conn.query('DELETE FROM daily_work_reports WHERE id = ?', [reportId]);
// 감사 로그 (삭제된 테이블이므로 콘솔 로그로 대체)
if (reportInfo.length > 0 && deletedByUserId) {
console.log(`[삭제 로그] 보고서 ID: ${reportId}, 삭제자: ${deletedByUserId}, 사유: Manual deletion by user`);
}
await conn.commit();
// [Sync] 근태 기록 동기화
if (reportInfo.length > 0) {
try {
const { worker_id, report_date } = reportInfo[0];
const AttendanceModel = require('./attendanceModel');
await AttendanceModel.syncWithWorkReports(worker_id, report_date);
} catch (syncErr) {
console.error('근태 기록 동기화 실패 (V2 Delete):', syncErr);
}
}
return result.affectedRows;
} catch (err) {
@@ -1141,7 +1227,7 @@ module.exports = {
getAllWorkTypes,
getAllWorkStatusTypes,
getAllErrorTypes,
// 마스터 데이터 CRUD
createWorkType,
updateWorkType,