feat(tkpurchase): 체크인 worker_names 배열 저장 + 구매팀 체크인 관리 기능
- doCheckIn()에서 worker_names를 콤마 split 배열로 전송 (DB에 JSON 배열로 저장) - 구매팀 일정 페이지에 체크인 조회/수정/삭제 모달 추가 - DELETE /checkins/:id endpoint + 트랜잭션 삭제 (reports cascade) - PUT /checkins/:id에 requirePage 권한 guard 추가 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -108,4 +108,16 @@ async function stats(req, res) {
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { list, myCheckins, checkIn, checkOut, update, stats };
|
||||
// 체크인 삭제
|
||||
async function deleteCheckin(req, res) {
|
||||
try {
|
||||
const result = await checkinModel.deleteCheckin(req.params.id);
|
||||
if (!result) return res.status(404).json({ success: false, error: '체크인 기록을 찾을 수 없습니다' });
|
||||
res.json({ success: true });
|
||||
} catch (err) {
|
||||
console.error('Checkin delete error:', err);
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { list, myCheckins, checkIn, checkOut, update, stats, deleteCheckin };
|
||||
|
||||
@@ -78,4 +78,32 @@ async function countActive() {
|
||||
return rows[0].cnt;
|
||||
}
|
||||
|
||||
module.exports = { findBySchedule, findById, findTodayByCompany, checkIn, checkOut, update, resetCheckout, countActive };
|
||||
async function deleteCheckin(id) {
|
||||
const checkin = await findById(id);
|
||||
if (!checkin) return false;
|
||||
|
||||
const db = getPool();
|
||||
const conn = await db.getConnection();
|
||||
try {
|
||||
await conn.beginTransaction();
|
||||
await conn.query('DELETE FROM partner_work_reports WHERE checkin_id = ?', [id]);
|
||||
await conn.query('DELETE FROM partner_work_checkins WHERE id = ?', [id]);
|
||||
const [remaining] = await conn.query(
|
||||
'SELECT COUNT(*) AS cnt FROM partner_work_checkins WHERE schedule_id = ?',
|
||||
[checkin.schedule_id]);
|
||||
if (remaining[0].cnt === 0) {
|
||||
await conn.query(
|
||||
"UPDATE partner_schedules SET status = 'scheduled' WHERE id = ? AND status = 'in_progress'",
|
||||
[checkin.schedule_id]);
|
||||
}
|
||||
await conn.commit();
|
||||
return true;
|
||||
} catch (err) {
|
||||
await conn.rollback();
|
||||
throw err;
|
||||
} finally {
|
||||
conn.release();
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { findBySchedule, findById, findTodayByCompany, checkIn, checkOut, update, resetCheckout, countActive, deleteCheckin };
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const { requireAuth } = require('../middleware/auth');
|
||||
const { requireAuth, requirePage } = require('../middleware/auth');
|
||||
const ctrl = require('../controllers/checkinController');
|
||||
|
||||
router.use(requireAuth);
|
||||
@@ -10,6 +10,7 @@ router.get('/schedule/:scheduleId', ctrl.list);
|
||||
router.get('/my', ctrl.myCheckins); // partner portal
|
||||
router.post('/', ctrl.checkIn); // partner can do this
|
||||
router.put('/:id/checkout', ctrl.checkOut);
|
||||
router.put('/:id', ctrl.update);
|
||||
router.put('/:id', requirePage('purchasing_schedule'), ctrl.update);
|
||||
router.delete('/:id', requirePage('purchasing_schedule'), ctrl.deleteCheckin);
|
||||
|
||||
module.exports = router;
|
||||
|
||||
Reference in New Issue
Block a user