From 15851e58530cf6e6f74b5af1375b754911450c82 Mon Sep 17 00:00:00 2001
From: Antony Kurniawan <antonynugroho467@gmail.com>
Date: Wed, 1 Oct 2025 10:17:43 +0700
Subject: [PATCH] update: user db

---
 db/user.db.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/db/user.db.js b/db/user.db.js
index c098119..f2096f9 100644
--- a/db/user.db.js
+++ b/db/user.db.js
@@ -7,8 +7,8 @@ const getAllUsersDb = async () => {
            u.is_active, u.created_at, u.updated_at, u.deleted_at,
            u.updated_by, u.deleted_by,
            r.role_id, r.role_name
-    FROM users u
-    LEFT JOIN roles r ON u.role_id = r.role_id
+    FROM m_users u
+    LEFT JOIN m_roles r ON u.role_id = r.role_id
     WHERE u.deleted_at IS NULL
     ORDER BY u.user_id ASC
   `;
@@ -23,8 +23,8 @@ const getUserByIdDb = async (id) => {
            u.is_active, u.created_at, u.updated_at, u.deleted_at,
            u.updated_by, u.deleted_by,
            r.role_id, r.role_name
-    FROM users u
-    LEFT JOIN roles r ON u.role_id = r.role_id
+    FROM m_users u
+    LEFT JOIN m_roles r ON u.role_id = r.role_id
     WHERE u.user_id = $1 AND u.deleted_at IS NULL
   `;
   const result = await pool.query(queryText, [id]);
@@ -37,21 +37,22 @@ const getUserByUserEmailDb = async (email) => {
     SELECT u.user_id, u.user_fullname, u.user_name, u.user_email, u.user_phone,
            u.user_password, u.is_active, u.is_sa,
            r.role_id, r.role_name
-    FROM users u
-    LEFT JOIN roles r ON u.role_id = r.role_id
+    FROM m_users u
+    LEFT JOIN m_roles r ON u.role_id = r.role_id
     WHERE u.user_email = $1 AND u.deleted_at IS NULL
   `;
   const result = await pool.query(queryText, [email]);
   return result.recordset[0];
 };
 
+// Get user by username
 const getUserByUsernameDb = async (username) => {
   const queryText = `
     SELECT u.user_id, u.user_fullname, u.user_name, u.user_email, u.user_phone, u.user_password,
            u.is_active, u.role_id,
            r.role_name
-    FROM users u
-    LEFT JOIN roles r ON u.role_id = r.role_id
+    FROM m_users u
+    LEFT JOIN m_roles r ON u.role_id = r.role_id
     WHERE u.user_name = $1 AND u.deleted_at IS NULL
   `;
   const result = await pool.query(queryText, [username]);
@@ -60,14 +61,14 @@ const getUserByUsernameDb = async (username) => {
 
 // Create user
 const createUserDb = async (data) => {
-  const { query: queryText, values } = pool.buildDynamicInsert("users", data);
+  const { query: queryText, values } = pool.buildDynamicInsert("m_users", data);
   const result = await pool.query(queryText, values);
   return result.recordset[0]?.inserted_id || null;
 };
 
 // Update user
 const updateUserDb = async (userId, data) => {
-  const { query: queryText, values } = pool.buildDynamicUpdate("users", data, { user_id: userId });
+  const { query: queryText, values } = pool.buildDynamicUpdate("m_users", data, { user_id: userId });
   await pool.query(queryText, values);
   return true;
 };
@@ -75,7 +76,7 @@ const updateUserDb = async (userId, data) => {
 // Change user password
 const changeUserPasswordDb = async (userId, newPassword) => {
   const queryText = `
-    UPDATE users
+    UPDATE m_users
     SET user_password = $1, updated_at = GETDATE()
     WHERE user_id = $2 AND deleted_at IS NULL
   `;
@@ -86,7 +87,7 @@ const changeUserPasswordDb = async (userId, newPassword) => {
 // Soft delete user
 const deleteUserDb = async (userId, deletedBy) => {
   const queryText = `
-    UPDATE users
+    UPDATE m_users
     SET deleted_at = GETDATE(),
         deleted_by = $1
     WHERE user_id = $2
@@ -99,7 +100,7 @@ const deleteUserDb = async (userId, deletedBy) => {
 const getAllRoleDb = async () => {
   const queryText = `
     SELECT role_id, role_name
-    FROM roles
+    FROM m_roles
     ORDER BY role_id ASC
   `;
   const result = await pool.query(queryText);