repair: shift db & roles

db/roles.db.js

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