zet-lib 3.3.5 → 3.3.7

package/lib/connection.js

@@ -414,15 +414,12 @@ 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');
@@ -435,29 +432,23 @@ connection.insertData = async(tableName, data) => {
             RETURNING *
         `;
     const values = columns.map(col => data[col]);
-    const result = await pgPool.query(insertQuery, values);
+    const result = await pool.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');
@@ -470,21 +461,17 @@ connection.deleteData = async(tableName, where) => {
             RETURNING *
         `;
     const values = whereColumns.map(col => where[col]);
-    const result = await pgPool.query(deleteQuery, values);
+    const result = await pool.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) {
@@ -492,8 +479,6 @@ connection.insertMultipleRecords = async(tableName,records) => {
       return [];
     }
 
-    pgPool = new Pool(configPG);
-
     // Validasi bahwa semua records memiliki struktur yang sama
     const firstRecord = records[0];
     if (!firstRecord || typeof firstRecord !== 'object') {
@@ -528,16 +513,13 @@ connection.insertMultipleRecords = async(tableName,records) => {
             RETURNING *
         `;
     const values = records.flatMap(record => columns.map(col => record[col]));
-    const result = await pgPool.query(insertQuery, values);
+    const result = await pool.query(insertQuery, values);
     console.log(`Successfully inserted ${records.length} records into ${tableName}`);
     return result.rows;
   } catch (error) {
     console.error(`Error inserting multiple records into ${tableName}:`, error);
     throw error;
   } finally {
-    if (pgPool) {
-      await pgPool.end();
-    }
   }
 }
 

package/lib/zRoute.js

@@ -205,12 +205,52 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
 
       case "dragdrop":
         let cleaning2;
-        if (Array.isArray(post[routeName][key])) {
-          cleaning2 = post[routeName][key]
-              ? post[routeName][key].filter((item) => item)
-              : null;
+        let dragdropValue = post[routeName] && post[routeName][key] !== undefined ? post[routeName][key] : null;
+
+        // Helper function to convert object with numeric keys to array
+        const convertToArray = (value) => {
+          if (Array.isArray(value)) {
+            return value;
+          }
+          if (value && typeof value === 'object' && !Array.isArray(value)) {
+            // Check if it's an object with numeric keys (like {"0":"111","1":"138"})
+            const keys = Object.keys(value);
+            const numericKeys = keys.filter(k => /^\d+$/.test(k));
+            if (numericKeys.length === keys.length && numericKeys.length > 0) {
+              // Convert object with numeric keys to array
+              return numericKeys.map(k => value[k]).filter(item => item !== null && item !== undefined && item !== '');
+            }
+          }
+          return null;
+        };
+
+        // Handle case where value might be string (JSON) or already an array
+        if (dragdropValue === null || dragdropValue === undefined) {
+          cleaning2 = null;
+        } else if (typeof dragdropValue === 'string') {
+          try {
+            dragdropValue = JSON.parse(dragdropValue);
+            let arr = convertToArray(dragdropValue);
+            if (arr) {
+              cleaning2 = arr.filter((item) => item !== null && item !== undefined && item !== '');
+            } else {
+              cleaning2 = dragdropValue ? [dragdropValue] : null;
+            }
+          } catch (e) {
+            // If not valid JSON, treat as single value array
+            cleaning2 = dragdropValue ? [dragdropValue] : null;
+          }
+        } else if (Array.isArray(dragdropValue)) {
+          cleaning2 = dragdropValue.filter((item) => item !== null && item !== undefined && item !== '');
+        } else if (dragdropValue && typeof dragdropValue === 'object') {
+          // Handle object with numeric keys (converted by qs.parse for large arrays)
+          let arr = convertToArray(dragdropValue);
+          cleaning2 = arr ? arr.filter((item) => item !== null && item !== undefined && item !== '') : null;
+        } else {
+          // Single value, convert to array
+          cleaning2 = dragdropValue ? [dragdropValue] : null;
         }
-        post[routeName][key] = cleaning2 ? JSON.stringify(cleaning2) : null;
+        post[routeName][key] = cleaning2 && cleaning2.length > 0 ? JSON.stringify(cleaning2) : null;
         break;
 
       case "lexical":

package/package.json

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