@opengis/fastify-table 1.3.40 → 1.3.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.3.40",
+  "version": "1.3.41",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/crud/funcs/dataInsert.js

@@ -5,7 +5,6 @@ import pgClients from '../../pg/pgClients.js';
 
 import logChanges from './utils/logChanges.js';
 import extraData from '../../extra/extraData.js';
-import logger from '../../logger/getLogger.js';
 
 const rclient = getRedis();
 
@@ -28,33 +27,29 @@ export default async function dataInsert({
   if (!columns) return null;
 
   const names = columns.map((el) => el.name);
-  const types = columns.reduce((acc, { name, dataTypeID }) => ({ ...acc, [name]: pg.pgType?.[dataTypeID] }), {});
 
   Object.assign(data, {
     ...(id && pg.pk?.[table] ? { [pg.pk?.[table]]: id } : {}),
     ...(table !== 'admin.users' ? { uid } : {}),
+    editor_id: uid, created_by: uid, updated_by: uid,
     // editor_id: uid,
   });
-  const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
+
+  const systemColumns = ['cdate', 'editor_date', 'created_at', 'updated_at'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
+  const systemColumnNames = systemColumns.map(el => el[0]);
 
   const filterData = Object.keys(data)
-    .filter((el) => !['cdate', 'editor_date'].includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
-  if (!filterData?.length) {
-    return null;
-  }
+    .filter((el) => !systemColumnNames.includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
 
   const insertQuery = `insert into ${table}
 
-    ( ${filterData?.map((key) => `"${key[0]}"`).concat(systemColumns.map((el) => el[0])).join(',')}) 
+    ( ${filterData?.map((key) => `"${key[0]}"`).concat(systemColumnNames).join(',')}) 
 
     values  (${filterData?.map((key, i) => (key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`)).concat(systemColumns.map((el) => el[1])).join(',')}) 
     
     returning *`;
 
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && types[el[0]]?.includes?.('json') ? JSON.stringify(el[1]) : el[1]))]).catch(err => {
-    logger.file('crud/insert', { error: err.toString(), stack: err.stack, table, id, referer, uid, data, q: insertQuery });
-    throw new Error(err.toString());
-  }) || {};
+  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
 
   const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
 

package/server/plugins/crud/funcs/dataUpdate.js

@@ -46,7 +46,7 @@ export default async function dataUpdate({
   const filterData = Object.keys(data)
     .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el) && !['editor_date', 'editor_id'].includes(el)));
 
-  const systemColumns = [['editor_date', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
+  const systemColumns = [['editor_date', 'now()', 'updated_at', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`, 'updated_by', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
 
   const filterValue = filterData.map((el) => {
     const { dataTypeID = 25 } = columns.find((col) => col?.name === el) || {};