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

repair: shift db & roles

Browse Source
This commit is contained in:
Muhammad Afif
2025-10-13 11:52:09 +07:00
parent 8de83c2716
commit 9b8cb9d752
5 changed files with 60 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
db/roles.db.js
View File

@@ -1,96 +1,71 @@
const pool = require("../config"); const pool = require("../config");
// Get all roles
const getAllRolesDb = async (searchParams = {}) => { const getAllRolesDb = async (searchParams = {}) => {
let queryParams = []; let queryParams = [];
// Pagination // Handle pagination
if (searchParams.limit) { if (searchParams.limit) {
const page = Number(searchParams.page ?? 1) - 1; const page = Number(searchParams.page ?? 1) - 1;
queryParams = [Number(searchParams.limit ?? 10), page]; queryParams = [Number(searchParams.limit ?? 10), page];
} }
// Filtering const { whereOrConditions, whereParamOr } = pool.buildStringOrIlike(
["a.role_name", "a.role_level", "a.role_description"],
searchParams.criteria,
queryParams
);
if (whereParamOr) queryParams = whereParamOr;
const { whereConditions, whereParamAnd } = pool.buildFilterQuery( const { whereConditions, whereParamAnd } = pool.buildFilterQuery(
[ [
{ column: "r.role_name", param: searchParams.role_name, type: "string" }, { column: "a.role_name", param: searchParams.role_name, type: "string" },
{ { column: "a.role_level", param: searchParams.start_time, type: "string" },
column: "r.role_level", { column: "a.role_description", param: searchParams.role_description, type: "string" },
param: searchParams.role_level,
type: "number",
},
], ],
queryParams queryParams
); );
if (whereParamAnd) queryParams = whereParamAnd;
queryParams = whereParamAnd ? whereParamAnd : queryParams;
const queryText = ` const queryText = `
SELECT SELECT
COUNT(*) OVER() AS total_data, COUNT(*) OVER() AS total_data,
r.role_id, a.*
r.role_name, FROM m_roles a
r.role_description, WHERE a.deleted_at IS NULL
r.role_level, ${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}
r.created_at, ${whereOrConditions ? ` ${whereOrConditions}` : ""}
r.updated_at, ORDER BY a.role_id ASC
r.updated_by, ${searchParams.limit ? `OFFSET $2 ROWS FETCH NEXT $1 ROWS ONLY` : ""}
r.deleted_at,
r.deleted_by,
r.created_by
FROM m_roles r
WHERE r.deleted_at IS NULL
${whereConditions.length > 0 ? `AND ${whereConditions.join(" AND ")}` : ""}
ORDER BY r.role_id ASC
${searchParams.limit ? `OFFSET $2 ROWS FETCH NEXT $1 ROWS ONLY` : ""};
`; `;
const result = await pool.query(queryText, queryParams); const result = await pool.query(queryText, queryParams);
const total = const total =
result?.recordset.length > 0 result?.recordset?.length > 0
? parseInt(result.recordset[0].total_data, 10) ? parseInt(result.recordset[0].total_data, 10)
: 0; : 0;
return { data: result.recordset, total }; return { data: result.recordset, total };
}; };
// Get role by ID
const getRolesByIdDb = async (id) => { const getRolesByIdDb = async (id) => {
const queryText = ` const queryText = `
SELECT SELECT
r.role_id, a.*
r.role_name, FROM m_roles a
r.role_description, WHERE a.role_id = $1 AND a.deleted_at IS NULL
r.role_level,
r.created_at,
r.updated_at,
r.updated_by,
r.deleted_at,
r.deleted_by,
r.created_by
FROM m_roles r
WHERE r.role_id = $1 AND r.deleted_at IS NULL
`; `;
const result = await pool.query(queryText, [id]); const result = await pool.query(queryText, [id]);
return result.recordset; return result.recordset?.[0] || null;
}; };
// Create role const insertRolesDb = async (store) => {
const createRolesDB = async (data) => { const { query: queryText, values } = pool.buildDynamicInsert("m_roles", store);
const store = { ...data };
const { query: queryText, values } = pool.buildDynamicInsert(
"m_roles",
store
);
const result = await pool.query(queryText, values); const result = await pool.query(queryText, values);
const insertedId = result.recordset?.[0]?.inserted_id;
const insertedId = result.recordset[0]?.inserted_id;
return insertedId ? await getRolesByIdDb(insertedId) : null; return insertedId ? await getRolesByIdDb(insertedId) : null;
}; };
// Update role
const updateRolesDb = async (id, data) => { const updateRolesDb = async (id, data) => {
const store = { ...data }; const store = { ...data };
const whereData = { role_id: id }; const whereData = { role_id: id };
@@ -100,17 +75,15 @@ const updateRolesDb = async (id, data) => {
store, store,
whereData whereData
); );
await pool.query(`${queryText} AND deleted_at IS NULL`, values);
await pool.query(`${queryText} AND deleted_at IS NULL`, values);
return getRolesByIdDb(id); return getRolesByIdDb(id);
}; };
// Soft delete role
const deleteRolesDb = async (id, deletedBy) => { const deleteRolesDb = async (id, deletedBy) => {
const queryText = ` const queryText = `
UPDATE m_roles UPDATE m_roles
SET deleted_at = CURRENT_TIMESTAMP, SET deleted_at = CURRENT_TIMESTAMP, deleted_by = $1
deleted_by = $1
WHERE role_id = $2 AND deleted_at IS NULL WHERE role_id = $2 AND deleted_at IS NULL
`; `;
await pool.query(queryText, [deletedBy, id]); await pool.query(queryText, [deletedBy, id]);
@@ -120,7 +93,7 @@ const deleteRolesDb = async (id, deletedBy) => {
module.exports = { module.exports = {
getAllRolesDb, getAllRolesDb,
getRolesByIdDb, getRolesByIdDb,
createRolesDB, insertRolesDb,
updateRolesDb, updateRolesDb,
deleteRolesDb, deleteRolesDb,
}; };

63
db/shift.db.js
View File

@@ -1,83 +1,71 @@
const pool = require("../config"); const pool = require("../config");
// Get all roles
const getAllShiftDb = async (searchParams = {}) => { const getAllShiftDb = async (searchParams = {}) => {
let queryParams = []; let queryParams = [];
// Pagination // Handle pagination
if (searchParams.limit) { if (searchParams.limit) {
const page = Number(searchParams.page ?? 1) - 1; const page = Number(searchParams.page ?? 1) - 1;
queryParams = [Number(searchParams.limit ?? 10), page]; queryParams = [Number(searchParams.limit ?? 10), page];
} }
// Filtering const { whereOrConditions, whereParamOr } = pool.buildStringOrIlike(
["a.shift_name", "a.start_time", "a.end_time"],
searchParams.criteria,
queryParams
);
if (whereParamOr) queryParams = whereParamOr;
const { whereConditions, whereParamAnd } = pool.buildFilterQuery( const { whereConditions, whereParamAnd } = pool.buildFilterQuery(
[ [
{ column: "a.shift_name", param: searchParams.shift_name, type: "string" }, { column: "a.shift_name", param: searchParams.name, type: "string" },
{ { column: "a.start_time", param: searchParams.start_time, type: "time" },
column: "a.start_time", { column: "a.end_time", param: searchParams.end_time, type: "time" },
param: searchParams.start_time,
type: "time",
},
{
column: "a.end_time",
param: searchParams.end_time,
type: "time",
},
], ],
queryParams queryParams
); );
if (whereParamAnd) queryParams = whereParamAnd;
queryParams = whereParamAnd ? whereParamAnd : queryParams;
const queryText = ` const queryText = `
SELECT SELECT
COUNT(*) OVER() AS total_data, COUNT(*) OVER() AS total_data,
a.* a.*
FROM m_shift a FROM m_shift a
WHERE a.deleted_at IS NULL WHERE a.deleted_at IS NULL
${whereConditions.length > 0 ? `AND ${whereConditions.join(" AND ")}` : ""} ${whereConditions.length > 0 ? ` AND ${whereConditions.join(" AND ")}` : ""}
${whereOrConditions ? ` ${whereOrConditions}` : ""}
ORDER BY a.shift_id ASC ORDER BY a.shift_id ASC
${searchParams.limit ? `OFFSET $2 ROWS FETCH NEXT $1 ROWS ONLY` : ""}; ${searchParams.limit ? `OFFSET $2 ROWS FETCH NEXT $1 ROWS ONLY` : ""}
`; `;
const result = await pool.query(queryText, queryParams); const result = await pool.query(queryText, queryParams);
const total = const total =
result?.recordset.length > 0 result?.recordset?.length > 0
? parseInt(result.recordset[0].total_data, 10) ? parseInt(result.recordset[0].total_data, 10)
: 0; : 0;
return { data: result.recordset, total }; return { data: result.recordset, total };
}; };
// Get role by ID
const getShiftByIdDb = async (id) => { const getShiftByIdDb = async (id) => {
const queryText = ` const queryText = `
SELECT SELECT
a.* a.*
FROM m_shift a FROM m_shift a
WHERE a.shift_id = $1 AND a.deleted_at IS NULL WHERE a.shift_id = $1 AND a.deleted_at IS NULL
`; `;
const result = await pool.query(queryText, [id]); const result = await pool.query(queryText, [id]);
return result.recordset; return result.recordset?.[0] || null;
}; };
// Create role const insertShiftDb = async (store) => {
const createShiftDB = async (data) => { const { query: queryText, values } = pool.buildDynamicInsert("m_shift", store);
const store = { ...data };
const { query: queryText, values } = pool.buildDynamicInsert(
"m_shift",
store
);
const result = await pool.query(queryText, values); const result = await pool.query(queryText, values);
const insertedId = result.recordset?.[0]?.inserted_id;
const insertedId = result.recordset[0]?.inserted_id;
return insertedId ? await getShiftByIdDb(insertedId) : null; return insertedId ? await getShiftByIdDb(insertedId) : null;
}; };
// Update role
const updateShiftDb = async (id, data) => { const updateShiftDb = async (id, data) => {
const store = { ...data }; const store = { ...data };
const whereData = { shift_id: id }; const whereData = { shift_id: id };
@@ -87,16 +75,15 @@ const updateShiftDb = async (id, data) => {
store, store,
whereData whereData
); );
await pool.query(`${queryText} AND deleted_at IS NULL`, values);
await pool.query(`${queryText} AND deleted_at IS NULL`, values);
return getShiftByIdDb(id); return getShiftByIdDb(id);
}; };
const deleteShiftDb = async (id, deletedBy) => { const deleteShiftDb = async (id, deletedBy) => {
const queryText = ` const queryText = `
UPDATE m_shift UPDATE m_shift
SET deleted_at = CURRENT_TIMESTAMP, SET deleted_at = CURRENT_TIMESTAMP, deleted_by = $1
deleted_by = $1
WHERE shift_id = $2 AND deleted_at IS NULL WHERE shift_id = $2 AND deleted_at IS NULL
`; `;
await pool.query(queryText, [deletedBy, id]); await pool.query(queryText, [deletedBy, id]);
@@ -106,7 +93,7 @@ const deleteShiftDb = async (id, deletedBy) => {
module.exports = { module.exports = {
getAllShiftDb, getAllShiftDb,
getShiftByIdDb, getShiftByIdDb,
createShiftDB, insertShiftDb,
updateShiftDb, updateShiftDb,
deleteShiftDb, deleteShiftDb,
}; };

4
services/roles.service.js
View File

@@ -1,7 +1,7 @@
const { const {
getAllRolesDb, getAllRolesDb,
getRolesByIdDb, getRolesByIdDb,
createRolesDB, insertRolesDb,
updateRolesDb, updateRolesDb,
deleteRolesDb deleteRolesDb
} = require('../db/roles.db'); } = require('../db/roles.db');
@@ -40,7 +40,7 @@ class RolesService {
try { try {
if (!data || typeof data !== 'object') data = {}; if (!data || typeof data !== 'object') data = {};
const result = await createRolesDB(data); const result = await insertRolesDb(data);
return result; return result;
} catch (error) { } catch (error) {

4
services/shift.service.js
View File

@@ -1,7 +1,7 @@
const { const {
getAllShiftDb, getAllShiftDb,
getShiftByIdDb, getShiftByIdDb,
createShiftDB, insertShiftDb,
updateShiftDb, updateShiftDb,
deleteShiftDb deleteShiftDb
} = require('../db/shift.db'); } = require('../db/shift.db');
@@ -40,7 +40,7 @@ class ShiftService {
try { try {
if (!data || typeof data !== 'object') data = {}; if (!data || typeof data !== 'object') data = {};
const result = await createShiftDB(data); const result = await insertShiftDb(data);
return result; return result;
} catch (error) { } catch (error) {

11
utils/time.js
View File

@@ -1,11 +0,0 @@
module.exports = {
formattedTime: (timestamp) => {
let date = new Date(timestamp);
let hours = date.getHours().toString().padStart(2, "0");
let minutes = date.getMinutes().toString().padStart(2, "0");
let seconds = date.getSeconds().toString().padStart(2, "0");
let formattedTime = `${hours}:${minutes}:${seconds}`;
return formattedTime;
},
};