@opengis/fastify-table 1.0.90 → 1.0.92

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.92 - 03.08.2024
+
+- fix getTemplate
+
+## 1.0.91 - 30.08.2024
+
+- add CRUD and Auth logs
+
 ## 1.0.90 - 27.08.2024
 
 - logger file API to core

package/crud/controllers/deleteCrud.js

@@ -13,7 +13,10 @@ export default async function deleteCrud(req) {
 
   if (!table) return { status: 404, message: 'table is required' };
 
-  const data = await dataDelete({ table, id });
+  const { user = {} } = req;
+  const data = await dataDelete({
+    table, id, uid: user?.uid,
+  });
 
   return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
 }

package/crud/controllers/insert.js

@@ -36,14 +36,18 @@ export default async function insert(req) {
 
   const { uid } = funcs.config?.auth?.disable || ispublic ? { uid: '1' } : user || {};
   Object.assign(req.body, { uid, editor_id: uid });
-  const res = await dataInsert({ table: add || table, data: req.body });
+  const res = await dataInsert({
+    table: add || table, data: req.body, uid,
+  });
 
   const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && req.body[key].length);
   if (extraKeys?.length) {
     res.extra = {};
     await Promise.all(extraKeys?.map(async (key) => {
       const extraRows = await Promise.all(req.body[key].map(async (row) => {
-        const extraRes = await dataInsert({ table: formData[key].table, data: { ...row, [formData[key].parent_id]: req.body[formData[key].parent_id] } });
+        const extraRes = await dataInsert({
+          table: formData[key].table, data: { ...row, [formData[key].parent_id]: req.body[formData[key].parent_id] }, uid,
+        });
         return extraRes?.rows?.[0];
       }));
       Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });

package/crud/controllers/update.js

@@ -38,17 +38,19 @@ export default async function update(req) {
     return { message: 'Дані містять заборонені символи. Приберіть їх та спробуйте ще раз', status: 409 };
   }
 
-  const res = await dataUpdate({ table: tokenData?.table || table, id: tokenData?.id || id, data: req.body });
+  const res = await dataUpdate({
+    table: tokenData?.table || table, id: tokenData?.id || id, data: req.body, uid,
+  });
 
   const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && req.body[key].length);
   if (extraKeys?.length) {
     res.extra = {};
     await Promise.all(extraKeys?.map(async (key) => {
       // delete old extra data
-      await pgClients.client.query(`delete from ${formData[key].table} where ${formData[key].parent_id}=$1`, [req.body[formData[key].parent_id]]);
+      await pgClients.client.query(`delete from ${formData[key].table} where ${formData[key].parent_id}=$1`, [req.body[formData[key].parent_id]]); // rewrite?
       // insert new extra data
       const extraRows = await Promise.all(req.body[key].map(async (row) => {
-        const extraRes = await dataInsert({ table: formData[key].table, data: { ...row, [formData[key].parent_id]: req.body[formData[key].parent_id] } });
+        const extraRes = await dataInsert({ table: formData[key].table, data: { ...row, [formData[key].parent_id]: req.body[formData[key].parent_id] }, uid });
         return extraRes?.rows?.[0];
       }));
       Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });

package/crud/funcs/dataDelete.js

@@ -1,9 +1,10 @@
 import getPG from '../../pg/funcs/getPG.js';
 
 import getMeta from '../../pg/funcs/getMeta.js';
+import logChanges from './utils/logChanges.js';
 
 export default async function dataDelete({
-  table, id, pg: pg1,
+  table, id, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
   const { pk } = await getMeta(table);
@@ -11,5 +12,8 @@ export default async function dataDelete({
   const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
   //  console.log(updateDataset);
   const res = await pg.one(delQuery, [id]) || {};
+  await logChanges({
+    pg, table, id, uid, type: 'DELETE',
+  });
   return res;
 }

package/crud/funcs/dataInsert.js

@@ -1,7 +1,10 @@
 import getPG from '../../pg/funcs/getPG.js';
 import getMeta from '../../pg/funcs/getMeta.js';
+import logChanges from './utils/logChanges.js';
 
-export default async function dataInsert({ table, data, pg: pg1 }) {
+export default async function dataInsert({
+  table, data, pg: pg1, uid,
+}) {
   const pg = pg1 || getPG({ name: 'client' });
   if (!data) return null;
   const { columns } = await getMeta(table);
@@ -20,5 +23,8 @@ export default async function dataInsert({ table, data, pg: pg1 }) {
     returning *`;
 
   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]))]) || {};
+  await logChanges({
+    pg, table, data, id: res.rows?.[0]?.[pg.pk[table]], uid, type: 'INSERT',
+  });
   return res;
 }

package/crud/funcs/dataUpdate.js

@@ -1,9 +1,10 @@
 import getPG from '../../pg/funcs/getPG.js';
 
 import getMeta from '../../pg/funcs/getMeta.js';
+import logChanges from './utils/logChanges.js';
 
 export default async function dataUpdate({
-  table, id, data, pg: pg1,
+  table, id, data, pg: pg1, uid,
 }) {
   if (!data || !table || !id) return null;
 
@@ -14,11 +15,16 @@ export default async function dataUpdate({
   const filterData = Object.keys(data)
     .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el)));
 
-  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
+  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
 
   const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => (key === 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)` : `"${key}"=$${i + 2}`)).join(',')} 
       WHERE ${pk} = $1 returning *`;
   // console.log(updateQuery, filterValue);
   const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
+  
+  await logChanges({
+    pg, table, data, id, uid, type: 'UPDATE',
+  });
+  
   return res;
 }

package/crud/funcs/utils/logChanges.js

@@ -0,0 +1,71 @@
+function formatData(fieldType = 'text', value = null) {
+  if (!value) return null;
+  if (fieldType === 'geometry') {
+    return typeof value === 'object' ? `st_astext(st_geomfromgeojson('${JSON.stringify(value)}'::json))` : `st_astext('${value}'::geometry)`;
+  }
+  if (['integer', 'numeric', 'double precision'].includes(fieldType)) {
+    return value || null;
+  }
+  if (fieldType.includes('timestamp') || fieldType === 'date') {
+    if (typeof value === 'object') {
+      return value ? `'${value.toISOString()}'::${fieldType}` : null;
+    }
+    return value ? `'${value}'::${fieldType}` : null;
+  }
+  /* if (fieldType.includes('json') && Array.isArray(value)) {
+    return value;
+  } */
+  if (Array.isArray(value)) {
+    return `'{ ${value.join(',')} }'::${fieldType}`;
+  }
+  return typeof value === 'object' ? JSON.stringify(value) : `'${value || null}'`;
+}
+
+export default async function logChanges({
+  pg, table, id, data, uid = 1, type,
+}) {
+  if (!id) {
+    console.error('param id is required');
+    return null;
+  }
+  if (!table || !pg.pk?.[table]) {
+    console.error('table not found');
+    return null;
+  }
+  if (!pg.pk?.['log.table_changes'] || !pg.pk?.['log.table_changes_data']) {
+    console.error('log table not found');
+    return null;
+  }
+  if (!type) {
+    console.error('invalid type');
+    return null;
+  }
+
+  try {
+    const { change_id: changeId } = await pg.query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
+    values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id]).then((res) => res.rows?.[0] || {});
+
+    const q = `select ${Object.keys(data || {}).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
+    // console.log(q, type, id);
+    const { fields = [] } = await pg.query(`select * from ${table} limit 0`);
+    const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};
+
+    const fieldTypes = fields?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: pg.pgType[curr.dataTypeID] }), {}) || {};
+    const q1 = Object.keys(data || {}).map((el) => `insert into log.table_changes_data(change_id,entity_key,value_old,value_new) 
+      values('${changeId}', '${el}', ${formatData(fieldTypes[el], old[el])}, ${formatData(fieldTypes[el], data[el])}) returning *`).join(';\n');
+    // console.log(q1);
+    const res = await pg.query(q1);
+
+    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.rows?.[0].entity_key]: curr.rows?.[0].value_new }), {});
+    // console.log('logChanges OK', type);
+    return {
+      change_id: changeId, entity_type: table, entity_id: id, uid, change_type: type, old, new: newData,
+    };
+  }
+  catch (err) {
+    console.error('logChanges error', type, table, id, data, err.toString());
+    return {
+      error: err.toString(), entity_type: table, entity_id: id, uid, change_type: type,
+    };
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/migrations/log.sql

@@ -1,44 +1,81 @@
 create schema if not exists log;
 
+-- DROP TABLE IF EXISTS log.table_changes cascade;
 CREATE TABLE IF NOT EXISTS log.table_changes();
-ALTER TABLE log.table_changes DROP CONSTRAINT IF EXISTS log_table_changes_pkey;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS table_change_id text NOT NULL DEFAULT next_id();
-
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_type text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_id text NOT NULL DEFAULT next_id();
 ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_type text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_key text;
 ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_date date;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS json_old json;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS json_new json;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS date_old timestamp without time zone;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS date_new timestamp without time zone;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS number_old numeric;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS number_new numeric;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS bool_old boolean;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS bool_new boolean;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS text_old text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS text_new text;
-
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_user_id text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_type text; -- table_name
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
 ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS uid text;
 ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
 ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE log.table_changes ADD CONSTRAINT log_table_changes_pkey PRIMARY KEY (table_change_id);
 
-CREATE TABLE IF NOT EXISTS log.user_auth();
-ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_pkey;
-ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_user_id_fkey;
+-- DROP TABLE IF EXISTS log.table_changes_data;
+CREATE TABLE IF NOT EXISTS log.table_changes_data();
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_data_id text NOT NULL DEFAULT next_id();
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_id text not null;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS entity_key text; -- column_name
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_old text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_new text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
 
+-- DROP TABLE IF EXISTS log.user_auth;
+CREATE TABLE IF NOT EXISTS log.user_auth();
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_auth_id text NOT NULL DEFAULT next_id();
-
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_id text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_auth_date timestamp without time zone;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_auth_type text;
-
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_date timestamp without time zone;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_type text;
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS uid text;
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+
+COMMENT ON TABLE log.table_changes IS 'Логи подій змін в БД';
+COMMENT ON COLUMN log.table_changes.change_type IS 'Тип події (insert / update / delete)';
+COMMENT ON COLUMN log.table_changes.change_date IS 'Дата внесення змін до БД';
+COMMENT ON COLUMN log.table_changes.entity_type IS 'Таблиця, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes.entity_id IS 'ID строки, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes.change_user_id IS 'Ініціатор внесення змін';
+
+COMMENT ON TABLE log.table_changes_data IS 'Логи змін в таблицях БД';
+COMMENT ON COLUMN log.table_changes_data.change_id IS 'ID події зміни в БД';
+COMMENT ON COLUMN log.table_changes_data.entity_key IS 'Колонка таблиці, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes_data.value_old IS 'Старе значення';
+COMMENT ON COLUMN log.table_changes_data.value_new IS 'Нове значення';
+
+COMMENT ON TABLE log.user_auth IS 'Логи авторизації';
+COMMENT ON COLUMN log.user_auth.user_id IS 'ID користувача';
+COMMENT ON COLUMN log.user_auth.auth_date IS 'Дата авторизації';
+COMMENT ON COLUMN log.user_auth.auth_type IS 'Тип авторизації';
+
+ALTER TABLE log.table_changes DROP CONSTRAINT IF EXISTS log_table_changes_pkey cascade;
+ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_pkey;
+ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_change_id_fkey;
+ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_pkey;
+ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_user_id_fkey;
+
+ALTER TABLE log.table_changes ADD CONSTRAINT log_table_changes_pkey PRIMARY KEY (change_id);
+ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_pkey PRIMARY KEY (change_data_id);
+ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_change_id_fkey FOREIGN KEY (change_id)
+REFERENCES log.table_changes (change_id);
 ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_pkey PRIMARY KEY (user_auth_id);
--- ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_user_id_fkey FOREIGN KEY (user_id) REFERENCES admin.users (uid) MATCH SIMPLE;
+-- ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_user_id_fkey FOREIGN KEY (user_id) REFERENCES admin.users (uid) MATCH SIMPLE;
+
+/* drop old columns */
+alter table log.table_changes drop column if exists date_new;
+alter table log.table_changes drop column if exists date_old;
+alter table log.table_changes drop column if exists number_new;
+alter table log.table_changes drop column if exists number_old;
+alter table log.table_changes drop column if exists json_new;
+alter table log.table_changes drop column if exists json_old;
+alter table log.table_changes drop column if exists text_new;
+alter table log.table_changes drop column if exists text_old;
+alter table log.table_changes drop column if exists bool_new;
+alter table log.table_changes drop column if exists bool_old;
+alter table log.table_changes drop column if exists table_change_id;

package/table/controllers/suggest.js

@@ -2,7 +2,7 @@ import getSelectMeta from './utils/getSelectMeta.js';
 import getPG from '../../pg/funcs/getPG.js';
 import config from '../../config.js';
 import getTemplate from './utils/getTemplate.js';
-import getTableSql from '../funcs/getFilterSQL/util/getTableSql.js';
+// import getTableSql from '../funcs/getFilterSQL/util/getTableSql.js';
 
 const limit = 50;
 const headers = { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'GET', 'Cache-Control': 'no-cache' };
@@ -22,7 +22,7 @@ export default async function suggest(req) {
   if (table && !pg1.pk[body?.table || table]) {
     return { headers, status: 400, message: 'param name is invalid: 1' };
   }
-  const columnExists = true;
+  const columnExists = body?.columns?.find((col) => col?.name === column);
   if (table && (!column || !columnExists)) {
     return { headers, status: 400, message: 'param name is invalid: 2' };
   }
@@ -32,7 +32,7 @@ export default async function suggest(req) {
       original: `with c(id,text) as (select row_number() over(), ${column} from ${body?.table || table} group by ${column} ) select * from c`,
       searchQuery: '("text" ilike $1 )',
     }
-    : await getSelectMeta({ name: selectName });
+    : await getSelectMeta({ name: selectName, nocache: query?.nocache });
   const pg = meta?.db ? getPG(meta.db) : pg1;
   if (!meta) return { headers, status: 404, message: 'Not found query select ' };
   if (query.meta) return meta;

package/table/controllers/table.js

@@ -26,7 +26,10 @@ export default async function tableAPI(req) {
   // skip non-existing columns
   const columnList = dbColumns.map((el) => el.name || el).join(',');
 
-  const cols = Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',');
+  const { fields = [] } = !loadTable?.table ? await pg.query(`select * from ${table || opt?.table || params.table} limit 0`) : {};
+  const cols = loadTable?.table
+    ? Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',')
+    : fields.map((el) => (el?.name?.includes('geom') ? `st_asgeojson(${el.name})::json as "${el.name}"` : `"${el?.name}"`)).join(',');
   const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
   const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
   const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table || opt?.table || params.table} t where ${where.join(' and ') || 'true'} limit 1`;

package/table/controllers/utils/getSelectMeta.js

@@ -13,8 +13,8 @@ function getTable(table) {
 
 const selectMeta = {};
 
-export default async function getSelectMeta({ name, pg: pg1 }) {
-  if (selectMeta[name]) return selectMeta[name];
+export default async function getSelectMeta({ name, pg: pg1, nocache }) {
+  if (selectMeta[name] && !nocache) return selectMeta[name];
 
   const cls = await getSelect(name);
 

package/table/controllers/utils/getTemplate.js

@@ -23,6 +23,6 @@ export default async function getTemplateDir(type, name) {
 
   const sql = loadTemplate[type].includes(`${name}.sql`) ? await readFile(path.join(typeDir, `${name}.sql`), 'utf-8') : null;
   const data = loadTemplate[type].includes(`${name}.json`) ? JSON.parse(await readFile(path.join(typeDir, `${name}.json`), 'utf-8')) : await readFile(path.join(typeDir, `${name}.${ext}`), 'utf-8');
-  if (sql) return { ...data || {}, sql };
+  if (sql) return { sql };
   return data;
 }

package/test/api/widget.test.js

@@ -63,9 +63,11 @@ test('widget api', async (t) => {
   });
 
   // before GET log request
-  await t.test('FAKE POST /widget/history/:objectid', async() => {
-    const res = await pg.query(`insert into log.table_changes(uid, entity_id, entity_type)
-    select $1, '1', 'admin.users'`, [config.testUser?.uid || '1']);
+  await t.test('FAKE POST /widget/history/:objectid', async () => {
+    const { changeId } = await pg.query(`insert into log.table_changes(uid, entity_id, entity_type)
+    select $1, '1', 'admin.users' returning change_id as "changeId"`, [config.testUser?.uid || '1']).then((res) => res.rows?.[0] || {});
+    const res1 = await pg.query(`insert into log.table_changes_data(change_id, entity_key, value_new)
+    select $1, 'uid', $2`, [changeId, config.testUser?.uid || '1']);
     // console.log(res.rowCount);
   });
 
@@ -104,11 +106,12 @@ test('widget api', async (t) => {
     assert.ok(resp?.data?.id === fileId, 'file widget delete fail');
   });
 
-  await t.test('clean after test', async() => {
-    const res1 = await pg.query(`delete from crm.communications where entity_id=$1`, ['1']);
-    const res2 = await pg.query(`delete from crm.checklists where entity_id=$1`, ['1']);
-    const res3 = await pg.query(`delete from crm.files where entity_id=$1`, ['1']);
-    const res4 = await pg.query(`delete from log.table_changes where entity_id=$1`, ['1']);
+  await t.test('clean after test', async () => {
+    const res1 = await pg.query('delete from crm.communications where entity_id=$1', ['1']);
+    const res2 = await pg.query('delete from crm.checklists where entity_id=$1', ['1']);
+    const res3 = await pg.query('delete from crm.files where entity_id=$1', ['1']);
+    const res4 = await pg.query('delete from log.table_changes_data where change_id in (select change_id from log.table_changes where entity_id=$1)', ['1']);
+    const res5 = await pg.query('delete from log.table_changes where entity_id=$1', ['1']);
     pg.end();
   });
 });

package/test/funcs/crud.test.js

@@ -7,6 +7,7 @@ import rclient from '../../redis/client.js';
 import dataInsert from '../../crud/funcs/dataInsert.js';
 import dataUpdate from '../../crud/funcs/dataUpdate.js';
 import dataDelete from '../../crud/funcs/dataDelete.js';
+import logChanges from '../../crud/funcs/utils/logChanges.js';
 import isFileExists from '../../crud/funcs/isFileExists.js';
 
 import getOpt from '../../crud/funcs/getOpt.js';
@@ -24,21 +25,66 @@ test('funcs crud', async (t) => {
     assert.equal(data.table, 'gis.dataset');
   });
 
-  const id = (Math.random() * 10000).toFixed();
-  /* await t.test('dataInsert', async () => {
-    const data = await dataInsert({ table: 'gis.dataset', data: { dataset_id: id, dataset_name: '222' } });
-    assert.equal(data.dataset_id, id);
-  });
+  if (config?.local) {
+    const id = (Math.random() * 10000).toFixed();
+    await t.test('dataInsert', async () => {
+      const data = await dataInsert({ table: 'gis.dataset', data: { dataset_id: id, dataset_name: '222' }, uid: '2' });
+      assert.equal(data.rows?.[0]?.dataset_id, id);
+    });
+    await t.test('dataUpdate', async () => {
+      const data = await dataUpdate({
+        table: 'gis.dataset', id, data: { dataset_name: '22211' }, uid: '2',
+      });
+      assert.equal(data.dataset_name, '22211');
+    });
+    await t.test('dataDelete', async () => {
+      const data = await dataDelete({ table: 'gis.dataset', id, uid: '2' });
+      assert.ok(data);
+    });
+    await t.test('clean up after test', async () => {
+      if (pgClients.client.pk?.['log.table_changes_data']) {
+        const { rowCount: testDatasets } = await pgClients.client.query('delete from gis.dataset where uid=$1', ['2']);
+        const { rowCount } = await pgClients.client.query('delete from log.table_changes_data where change_id in (select change_id from log.table_changes where entity_id=$1)', [id]);
+        const { rowCount: rowCount1 } = await pgClients.client.query('delete from log.table_changes where entity_id=$1', [id]);
+        console.log('CRUD test clean up', id, testDatasets, rowCount, rowCount1);
+        assert.ok(rowCount1);
+      }
+    });
+  }
 
-  await t.test('dataUpdate', async () => {
-    const data = await dataUpdate({ table: 'gis.dataset', id, data: { dataset_name: '22211' } });
-    assert.equal(data.dataset_name, '22211');
-  });
+  if (pgClients.client.pk?.['log.table_changes_data']) {
+    const id = (Math.random() * 10000).toFixed();
+    const name = '222';
+    await t.test('logChanges INSERT', async () => {
+      await pgClients.client.query(`insert into gis.dataset(dataset_id,dataset_name, uid) values($1,$2,$3) on conflict(dataset_id) do 
+      update set dataset_name = excluded.dataset_name, uid = excluded.uid`, [id, name, '2']);
 
-  await t.test('dataDelete', async () => {
-    const data = await dataDelete({ table: 'gis.dataset', id });
-    assert.ok(data);
-  }); */
+      const data = await logChanges({
+        pg: pgClients.client, id, table: 'gis.dataset', data: { dataset_id: id, dataset_name: '222' }, uid: '2', type: 'INSERT',
+      });
+      assert.ok(data?.change_type === 'INSERT' && data?.entity_id === id && data?.new?.dataset_name === '222', typeof data === 'object' ? JSON.stringify(data) : data);
+    });
+    await t.test('logChanges UPDATE', async () => {
+      /* await pgClients.client.query('update gis.dataset(dataset_id,dataset_name) set dataset_name=$', [id, name]); */
+      const data = await logChanges({
+        pg: pgClients.client, id, table: 'gis.dataset', data: { dataset_id: id, dataset_name: '2222' }, uid: '2', type: 'UPDATE',
+      });
+      assert.ok(data?.change_type === 'UPDATE' && data?.entity_id === id && data?.new?.dataset_name === '2222' && data?.old?.dataset_name === '222', typeof data === 'object' ? JSON.stringify(data) : data);
+    });
+    await t.test('logChanges DELETE', async () => {
+      const data = await logChanges({
+        pg: pgClients.client, id, table: 'gis.dataset', uid: '2', type: 'DELETE',
+      });
+      assert.ok(data?.change_type === 'DELETE' && data?.old?.dataset_id === id, typeof data === 'object' ? JSON.stringify(data) : data);
+    });
+    await t.test('clean up after test', async () => {
+      const { rowCount: testDatasets } = await pgClients.client.query('delete from gis.dataset where uid=$1', ['2']);
+      const { rowCount } = await pgClients.client.query('delete from log.table_changes_data where change_id in (select change_id from log.table_changes where entity_id=$1)', [id]);
+      const { rowCount: rowCount1 } = await pgClients.client.query('delete from log.table_changes where entity_id=$1', [id]);
+      console.log('logChanges test clean up', id, testDatasets, rowCount, rowCount1);
+      assert.ok(rowCount1);
+    });
+  }
 
   await t.test('isFileExists', async () => {
     const data = await isFileExists({ filepath: '../../crud/funcs/isFileExists.js' });
@@ -46,7 +92,7 @@ test('funcs crud', async (t) => {
   });
 
   let tokens;
-  const session = { passport: { user: { uid: '1' } } };
+  // const session = { passport: { user: { uid: '1' } } };
   const tokenData = JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' });
 
   await t.test('setToken', async () => {

package/util/controllers/properties.add.js

@@ -1,51 +1,57 @@
-import dataInsert from "../../crud/funcs/dataInsert.js";
+import dataInsert from '../../crud/funcs/dataInsert.js';
 
 const table = 'crm.properties';
 
 function checkKeyType({ body, key }) {
-    if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
-        return { [key]: 'int' };
-    } else if (typeof body[key] === 'object') {
-        return { [key]: 'json' };
-    } else if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
-        return { [key]: 'date' };
-    }
-    return { [key]: 'text' };
+  if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
+    return { [key]: 'int' };
+  } if (typeof body[key] === 'object') {
+    return { [key]: 'json' };
+  }
+  if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
+    return { [key]: 'date' };
+  }
+  return { [key]: 'text' };
 }
 
 export default async function addExtraProperties({
-    pg, params = {}, body = {},
+  pg, funcs, params = {}, body = {}, user = {},
 }) {
-    const { id } = params;
-    if (!id) {
-        return { message: 'not enougn params: 1', status: 400 };
-    }
-    const extraProperties = Object.keys(body);
-    if (!extraProperties.length) {
-        return { message: 'not enougn params: 2', status: 400 };
-    }
+  const { id } = params;
+  if (!id) {
+    return { message: 'not enougn params: 1', status: 400 };
+  }
+  const extraProperties = Object.keys(body);
+  if (!extraProperties.length) {
+    return { message: 'not enougn params: 2', status: 400 };
+  }
 
-    if (!pg.pk?.[table]) {
-        return { message: 'table not found: crm.properties', status: 400 };
-    }
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found: crm.properties', status: 400 };
+  }
 
-    try {
-        await pg.query(`delete from crm.properties where object_id=$1`, [id]);
-        const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
-        const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
-            const propertyType = keyTypeMatch[key];
-            const { rows = [] } = await dataInsert({
-                pg, table, data: {
-                    property_type: propertyType,
-                    property_key: key,
-                    object_id: id,
-                    [`property_${propertyType}`]: body[key],
-                }
-            });
-            return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
-        }));
-        return { message: { rows: res }, status: 200 };
-    } catch (err) {
-        return { error: err.toString(), status: 500 };
-    }
-}
+  try {
+    const uid = funcs.config?.auth?.disable ? '1' : user.uid;
+    await pg.query('delete from crm.properties where object_id=$1', [id]); // rewrite?
+    const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
+    const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
+      const propertyType = keyTypeMatch[key];
+      const { rows = [] } = await dataInsert({
+        pg,
+        table,
+        data: {
+          property_type: propertyType,
+          property_key: key,
+          object_id: id,
+          [`property_${propertyType}`]: body[key],
+        },
+        uid,
+      });
+      return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
+    }));
+    return { message: { rows: res }, status: 200 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/widget/controllers/widget.get.js

@@ -29,9 +29,11 @@ export default async function widgetGet({
     from crm.communications c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`
       : 'select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc',
 
-    history: `SELECT table_change_id, entity_id, entity_type, change_key, change_date, json_old, json_new, date_old, 
-    date_new, number_old, number_new, bool_old, bool_new, text_old, 
-    text_new, uid, cdate FROM log.table_changes where entity_id=$1 order by cdate desc, change_key limit 100`,
+    history: `SELECT b.change_data_id, change_id, entity_id, entity_type, change_type, change_date, uid, cdate, b.entity_key, b.value_new, b.value_old FROM log.table_changes a
+    left join lateral(
+      select change_data_id, entity_key, value_new, value_old from log.table_changes_data where change_id=a.change_id
+    )b on 1=1
+    where entity_id=$1 and b.change_data_id is not null order by cdate desc limit 100`,
 
     checklist: pg.pk['admin.users']
       ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 

package/widget/controllers/widget.set.js

@@ -45,7 +45,9 @@ export default async function widgetSet(req) {
         return { message: 'invalid file extension', status: 400 };
       }
 
-      const { rows = [] } = await dataInsert({ table: 'crm.files', data });
+      const { rows = [] } = await dataInsert({
+        table: 'crm.files', data, uid: user?.uid,
+      });
       return {
         rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
       };
@@ -56,8 +58,12 @@ export default async function widgetSet(req) {
     const data = { ...body, uid: user?.uid, entity_id: objectid };
 
     const result = id
-      ? await dataUpdate({ table, data, id })
-      : await dataInsert({ table, data });
+      ? await dataUpdate({
+        table, data, id, uid: user?.uid,
+      })
+      : await dataInsert({
+        table, data, uid: user?.uid,
+      });
 
     return {
       rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],

package/widget/index.js

@@ -10,7 +10,7 @@ const tableSchema = {
   },
   querystring: {
     debug: { type: 'string', pattern: '^(\\d+)$' },
-  }
+  },
 };
 
 async function route(fastify, opt) {