yogiedigital/cod-api
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wisdom #2

Merged
yogiedigital merged 126 commits from wisdom into main 2025-10-20 03:26:33 +00:00
Conversation 0 Commits 126 Files Changed 66 +2 -3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 47051766e3 - Show all commits

5
db/schedule.db.js
View File

@@ -31,7 +31,7 @@ const getAllScheduleDb = async (searchParams = {}) => {
c.shift_id
FROM schedule a
LEFT JOIN m_shift b ON a.shift_id = b.shift_id
LEFT JOIN user_schedule c ON a.user_schedule_id = c.user_schedule_id
LEFT JOIN user_schedule c ON a.schedule_id = c.user_schedule_id
WHERE a.deleted_at IS NULL
${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}
${whereOrConditions ? ` ${whereOrConditions}` : ""}
@@ -59,7 +59,6 @@ const getAllScheduleDb = async (searchParams = {}) => {
const getScheduleByIdDb = async (id) => {
const queryText = `
SELECT
COUNT(*) OVER() AS total_data,
a.*,
b.shift_id,
b.shift_name,
@@ -69,7 +68,7 @@ const getScheduleByIdDb = async (id) => {
c.user_id
FROM schedule a
LEFT JOIN m_shift b ON a.shift_id = b.shift_id
LEFT JOIN user_schedule c ON a.user_schedule_id = c.user_schedule_id
LEFT JOIN user_schedule c ON a.schedule_id = c.user_schedule_id
WHERE a.schedule_id = $1 AND a.deleted_at IS NULL
`;
const result = await pool.query(queryText, [id]);