zet-lib 1.5.13 → 1.5.15

package/lib/Mail.js

@@ -6,6 +6,10 @@ const io = require('./io')
 const moment = require('moment')
 const config = require('dotenv').config()
 
+if (typeof global.dirRoot === 'undefined') {
+    global.dirRoot = Util.dirRoot;
+}
+
 const MAIL = {}
 //process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 

package/lib/Util.js

@@ -7,6 +7,42 @@ const sha256 = require("js-sha256");
 
 const Util = {};
 
+
+// Global directory root - automatically detect application root
+Util.dirRoot = (() => {
+  // Start from the zet-lib directory and navigate up to find the main application root
+  let currentDir = __dirname; // This is zet-lib/lib/
+
+  // Navigate up 3 levels: lib/ -> zet-lib/ -> node_modules/ -> fins_node/
+  currentDir = path.dirname(currentDir); // zet-lib/
+  currentDir = path.dirname(currentDir); // node_modules/
+  currentDir = path.dirname(currentDir); // fins_node/ (main app root)
+
+  // Verify this is the correct application root
+  const hasPackageJson = fs.existsSync(path.join(currentDir, 'package.json'));
+  const hasAppJs = fs.existsSync(path.join(currentDir, 'app.js'));
+
+  if (hasPackageJson && hasAppJs) {
+    return currentDir;
+  }
+
+  // Fallback: try to find the app root by looking for typical Node.js app files
+  let searchDir = currentDir;
+  while (searchDir !== path.dirname(searchDir)) {
+    const hasPackageJson = fs.existsSync(path.join(searchDir, 'package.json'));
+    const hasAppJs = fs.existsSync(path.join(searchDir, 'app.js'));
+
+    if (hasPackageJson && hasAppJs) {
+      return searchDir;
+    }
+
+    searchDir = path.dirname(searchDir);
+  }
+
+  // Final fallback to the calculated directory
+  return currentDir;
+})();
+
 // Constants
 Util.tab = "\t";
 Util.NEW_LINE = "\n";

package/lib/connection.js

@@ -324,7 +324,7 @@ connection.delete = async (obj) => {
   }
   wherequery = arr.length ? wherequery.join(' AND ') : ''
   const wheres = arr.length ? ' WHERE ' + wherequery : ''
-  const sql = `DELETE FROM "${table}" ${wheres}`
+  const sql = `DELETE FROM "${table}" ${wheres} RETURNING *`
   /*console.log(sql);
     console.log(arr)*/
   try {
@@ -337,14 +337,114 @@ connection.delete = async (obj) => {
   }
 }
 
+connection.insertData = async(tableName, data) => {
+  let pgPool;
+  try {
+    // Validasi input
+    if (!data || typeof data !== 'object') {
+      throw new Error('Invalid data provided for insert');
+    }
+
+    pgPool = new Pool(configPG);
+    
+    const columns = Object.keys(data);
+    if (columns.length === 0) {
+      throw new Error('No columns found in the data object');
+    }
+
+    const placeholders = columns.map((_, index) => `$${index + 1}`).join(',');
+    const insertQuery = `
+            INSERT INTO "${tableName}" (${columns.map(col => `"${col}"`).join(',')})
+            VALUES (${placeholders})
+            RETURNING *
+        `;
+    const values = columns.map(col => data[col]);
+    const result = await pgPool.query(insertQuery, values);
+    console.log(`Successfully inserted 1 record into ${tableName}`);
+    return result.rows[0];
+  } catch (error) {
+    console.error(`Error inserting record into ${tableName}:`, error);
+    throw error;
+  } finally {
+    if (pgPool) {
+      await pgPool.end();
+    }
+  }
+}
+
+connection.deleteData = async(tableName, where) => {
+  let pgPool;
+  try {
+    // Validasi input
+    if (!where || typeof where !== 'object') {
+      throw new Error('Invalid where clause provided for delete');
+    }
+
+    pgPool = new Pool(configPG);
+    
+    const whereColumns = Object.keys(where);
+    if (whereColumns.length === 0) {
+      throw new Error('No where conditions provided for delete');
+    }
+
+    const whereConditions = whereColumns.map((col, index) => `"${col}" = $${index + 1}`).join(' AND ');
+    const deleteQuery = `
+            DELETE FROM "${tableName}"
+            WHERE ${whereConditions}
+            RETURNING *
+        `;
+    const values = whereColumns.map(col => where[col]);
+    const result = await pgPool.query(deleteQuery, values);
+    console.log(`Successfully deleted ${result.rowCount} records from ${tableName}`);
+    return result.rowCount;
+  } catch (error) {
+    console.error(`Error deleting records from ${tableName}:`, error);
+    throw error;
+  } finally {
+    if (pgPool) {
+      await pgPool.end();
+    }
+  }
+}
+
 connection.insertMultipleRecords = async(tableName,records) => {
   let pgPool;
   try {
+    // Validasi input
+    if (!records || !Array.isArray(records) || records.length === 0) {
+      console.warn(`No records to insert into ${tableName}`);
+      return [];
+    }
+
     pgPool = new Pool(configPG);
-    const columns = Object.keys(records[0]);
+    
+    // Validasi bahwa semua records memiliki struktur yang sama
+    const firstRecord = records[0];
+    if (!firstRecord || typeof firstRecord !== 'object') {
+      throw new Error('First record is invalid or empty');
+    }
+    
+    const columns = Object.keys(firstRecord);
+    if (columns.length === 0) {
+      throw new Error('No columns found in the first record');
+    }
+
+    // Validasi bahwa semua records memiliki kolom yang sama
+    for (let i = 1; i < records.length; i++) {
+      const record = records[i];
+      if (!record || typeof record !== 'object') {
+        throw new Error(`Record at index ${i} is invalid`);
+      }
+      const recordColumns = Object.keys(record);
+      if (recordColumns.length !== columns.length || !recordColumns.every(col => columns.includes(col))) {
+        throw new Error(`Record at index ${i} has different structure than the first record`);
+      }
+    }
+
     const placeholders = records.map((_, rowIndex) =>
         `(${columns.map((_, colIndex) => `$${rowIndex * columns.length + colIndex + 1}`).join(',')})`
     ).join(',');
+    
     // Create the INSERT query
     const insertQuery = `
             INSERT INTO "${tableName}" (${columns.map(col => `"${col}"`).join(',')})
@@ -353,7 +453,7 @@ connection.insertMultipleRecords = async(tableName,records) => {
         `;
     const values = records.flatMap(record => columns.map(col => record[col]));
     const result = await pgPool.query(insertQuery, values);
-    //console.log(`Successfully inserted ${records.length} records into ${tableName}`);
+    console.log(`Successfully inserted ${records.length} records into ${tableName}`);
     return result.rows;
   } catch (error) {
     console.error(`Error inserting multiple records into ${tableName}:`, error);

package/lib/zAppRouter.js

@@ -29,6 +29,10 @@ const fetch = require("isomorphic-fetch");
 const JSZip = require("jszip");
 const zDropbox = require("./zDropbox");
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
+
 /*
  ajax Post
  */

package/lib/zDropbox.js

@@ -3,6 +3,10 @@ const { Dropbox } = require("dropbox");
 const fetch = require("isomorphic-fetch");
 const Util = require("./Util");
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
+
 const zDropbox = {};
 
 let dbx = new Dropbox({

package/lib/zGeneratorRouter.js

@@ -16,6 +16,10 @@ const ejs = require("ejs");
 var app = express();
 const path = require("path");
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
+
 const nots = [
   "index",
   "uploads",

package/lib/zMenuRouter.js

@@ -12,6 +12,9 @@ const moduleLib = require('./moduleLib');
 const config = require('dotenv').config();
 const ejs = require('ejs');
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
 /*
 icons list for tabler and set to /public/js
  */

package/lib/zPage.js

@@ -12,6 +12,9 @@ const connection = require('./connection');
 const Util = require('./Util');
 const myCache = require('./cache');
 
+if (typeof global.dirRoot === 'undefined') {
+    global.dirRoot = Util.dirRoot;
+}
 const zpage = {};
 
 zpage.build = async (req, res) => {

package/lib/zReport.js

@@ -14,6 +14,9 @@ const config = require('dotenv').config()
 const zReport = {}
 const myCache = require('./cache')
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
 /*
  Custom Reports
  Report Generator

package/lib/zRoute.js

@@ -24,6 +24,9 @@ const readXlsxFile = require("read-excel-file/node");
 //const { Dropbox } = require("dropbox");
 const zDropbox = require("./zDropbox");
 
+if (typeof global.dirRoot === 'undefined') {
+  global.dirRoot = Util.dirRoot;
+}
 const zRoute = {};
 
 zRoute.tableHasNoCompanyId = ["zcompany", "zrole", "zgrid"];

package/lib/zViewGenerator.js

@@ -11,6 +11,10 @@ const Model = require('./Model')
 const ejs = require('ejs')
 const pm2 = require("pm2");
 
+if (typeof global.dirRoot === 'undefined') {
+    global.dirRoot = Util.dirRoot;
+}
+
 router.get('/', csrfProtection, async (req, res) => {
     const nots = ['index', 'uploads', 'js', 'css', 'log', 'generator', 'zmenu', 'zgenerator', 'zfields', 'zrole', 'zfunction', 'zgrid', 'zgrid_default', 'zpage', 'zlayout', 'zerror', 'zuser_company']
     let table = req.query.table || '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.5.13",
+  "version": "1.5.15",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"