@opengis/fastify-table 1.1.78 → 1.1.79

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

@@ -1,21 +1,21 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-// import { getPG, getMeta } from '../../../../utils.js';
-
-import logChanges from './utils/logChanges.js';
-
-export default async function dataDelete({
-  table, id, pg: pg1, uid,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  const { pk } = await getMeta(table);
-  if (!pg.tlist?.includes(table)) return 'table not exist';
-  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;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
+import logChanges from './utils/logChanges.js';
+
+export default async function dataDelete({
+  table, id, pg: pg1, uid,
+}) {
+  const pg = pg1 || getPG({ name: 'client' });
+  const { pk } = await getMeta(table);
+  if (!pg.tlist?.includes(table)) return 'table not exist';
+  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/server/plugins/crud/funcs/dataInsert.js

@@ -1,38 +1,38 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-// import { getPG, getMeta } from '../../../../utils.js';
-
-import logChanges from './utils/logChanges.js';
-
-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);
-  if (!columns) return null;
-
-  const names = columns.map((el) => el.name);
-
-  Object.assign(data, { uid, editor_id: uid });
-  const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
-
-  const filterData = Object.keys(data)
-    .filter((el) => !['cdate', 'editor_date'].includes(el) && 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(',')}) 
-
-    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' && (!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;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
+import logChanges from './utils/logChanges.js';
+
+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);
+  if (!columns) return null;
+
+  const names = columns.map((el) => el.name);
+
+  Object.assign(data, { uid, editor_id: uid });
+  const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
+
+  const filterData = Object.keys(data)
+    .filter((el) => !['cdate', 'editor_date'].includes(el) && 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(',')}) 
+
+    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' && (!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/server/plugins/crud/funcs/dataUpdate.js

@@ -1,50 +1,50 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-// import { getPG, getMeta } from '../../../../utils.js';
-
-import logChanges from './utils/logChanges.js';
-
-const srids = {};
-
-export default async function dataUpdate({
-  table, id, data, pg: pg1, uid,
-}) {
-  if (!data || !table || !id) return null;
-
-  const pg = pg1 || getPG({ name: 'client' });
-  const { columns, pk } = await getMeta(table);
-
-  const names = columns?.map((el) => el.name);
-
-  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()'], ['editor_id', `'${uid.replace(/'/g, "''")}'`]].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
-
-  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]));
-
-  // update geometry with srid
-  if (!srids[table]) {
-    const { srids1 } = await pg.query(`select json_object_agg(_table,rel) as srids1 from (
-      select  f_table_schema||'.'||f_table_name as _table, 
-        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
-      from public.geometry_columns group by f_table_schema||'.'||f_table_name
-      )q`).then((res1) => res1.rows?.[0] || {});
-    Object.assign(srids, srids1);
-  }
-
-  const updateQuery = `UPDATE ${table} SET ${systemColumns}, ${filterData
-    ?.map((key, i) => (key?.includes('geom') && key !== 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),${srids[table]?.[key] || 4326})` : undefined)
-      || (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;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+// import { getPG, getMeta } from '../../../../utils.js';
+
+import logChanges from './utils/logChanges.js';
+
+const srids = {};
+
+export default async function dataUpdate({
+  table, id, data, pg: pg1, uid,
+}) {
+  if (!data || !table || !id) return null;
+
+  const pg = pg1 || getPG({ name: 'client' });
+  const { columns, pk } = await getMeta(table);
+
+  const names = columns?.map((el) => el.name);
+
+  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 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]));
+
+  // update geometry with srid
+  if (!srids[table]) {
+    const { srids1 } = await pg.query(`select json_object_agg(_table,rel) as srids1 from (
+      select  f_table_schema||'.'||f_table_name as _table, 
+        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
+      from public.geometry_columns group by f_table_schema||'.'||f_table_name
+      )q`).then((res1) => res1.rows?.[0] || {});
+    Object.assign(srids, srids1);
+  }
+
+  const updateQuery = `UPDATE ${table} SET ${systemColumns}, ${filterData
+    ?.map((key, i) => (key?.includes('geom') && key !== 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),${srids[table]?.[key] || 4326})` : undefined)
+      || (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/server/plugins/crud/funcs/getAccess.js

@@ -1,48 +1,48 @@
-import config from '../../../../config.js';
-import pgClients from '../../pg/pgClients.js';
-
-import getTemplate from '../../table/funcs/getTemplate.js';
-import applyHook from '../../hook/funcs/applyHook.js';
-
-// import { config, pgClients, getTemplate, applyHook } from '../../../../utils.js';
-
-const q = `select a.route_id as id, coalesce(b.actions,array['get']) as actions, b.scope 
-from admin.routes a 
-left join admin.role_access b on 
-  a.route_id=b.route_id
-left join admin.roles c on 
-  b.role_id=c.role_id 
-  and c.enabled
-left join admin.user_roles d on 
-  c.role_id=d.role_id 
-  and ( case when 
-            d.expiration is not null 
-            then d.expiration > CURRENT_DATE 
-            else 1=1 
-        end )
-where $1 in (a.route_id, a.alias) and $2 in (b.user_uid, d.user_uid)`;
-
-export default async function getAccess({ table, user = {} }) {
-  if (!table) return null;
-
-  const hookData = await applyHook('getAccess', { table, user });
-  if (hookData) return hookData;
-
-  const { uid } = user;
-  const body = await getTemplate('table', table) || {};
-
-  // console.log(user?.type);
-  if (body.access === 'admin' && user?.type !== 'admin') return null;
-
-  if (config.auth?.disable || user?.type === 'admin' || body?.public || body.access === 'public' || (body.access === 'user' && user.uid)) {
-    return { actions: ['get'].concat(user.uid ? body.actions || body.action_default || [] : []), query: '1=1' };
-  }
-
-  if (!uid || !body?.table) return null;
-
-  const { scope, actions = [] } = await pgClients.client.query(q, [table, uid]).then((res) => res.rows?.[0] || {});
-
-  return {
-    scope, actions, query: scope === 'my' ? `uid='${uid}` : null,
-  };
-}
+import config from '../../../../config.js';
+import pgClients from '../../pg/pgClients.js';
+
+import getTemplate from '../../table/funcs/getTemplate.js';
+import applyHook from '../../hook/funcs/applyHook.js';
+
+// import { config, pgClients, getTemplate, applyHook } from '../../../../utils.js';
+
+const q = `select a.route_id as id, coalesce(b.actions,array['get']) as actions, b.scope 
+from admin.routes a 
+left join admin.role_access b on 
+  a.route_id=b.route_id
+left join admin.roles c on 
+  b.role_id=c.role_id 
+  and c.enabled
+left join admin.user_roles d on 
+  c.role_id=d.role_id 
+  and ( case when 
+            d.expiration is not null 
+            then d.expiration > CURRENT_DATE 
+            else 1=1 
+        end )
+where $1 in (a.route_id, a.alias) and $2 in (b.user_uid, d.user_uid)`;
+
+export default async function getAccess({ table, user = {} }) {
+  if (!table) return null;
+
+  const hookData = await applyHook('getAccess', { table, user });
+  if (hookData) return hookData;
+
+  const { uid } = user;
+  const body = await getTemplate('table', table) || {};
+
+  // console.log(user?.type);
+  if (body.access === 'admin' && user?.type !== 'admin') return null;
+
+  if (config.auth?.disable || user?.type === 'admin' || body?.public || body.access === 'public' || (body.access === 'user' && user.uid)) {
+    return { actions: ['get'].concat(user.uid ? body.actions || body.action_default || [] : []), query: '1=1' };
+  }
+
+  if (!uid || !body?.table) return null;
+
+  const { scope, actions = [] } = await pgClients.client.query(q, [table, uid]).then((res) => res.rows?.[0] || {});
+
+  return {
+    scope, actions, query: scope === 'my' ? `uid='${uid}` : null,
+  };
+}

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

@@ -1,13 +1,13 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-
-// import { getRedis } from '../../../../utils.js';
-
-export default async function getOpt(token, uid = 0) {
-  const rclient = getRedis({ db: 0 });
-
-  const key = `opt:${uid}:${token}`;
-  // console.log(key);
-  const data = await rclient.get(key);
-  if (!data) return null;
-  return JSON.parse(data);
-}
+import getRedis from '../../redis/funcs/getRedis.js';
+
+// import { getRedis } from '../../../../utils.js';
+
+export default async function getOpt(token, uid = 0) {
+  const rclient = getRedis({ db: 0 });
+
+  const key = `opt:${uid}:${token}`;
+  // console.log(key);
+  const data = await rclient.get(key);
+  if (!data) return null;
+  return JSON.parse(data);
+}

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

@@ -1,21 +1,21 @@
-import { createHash, randomUUID } from 'crypto';
-
-const random = randomUUID();
-
-import getRedis from '../../redis/funcs/getRedis.js';
-
-// import { getRedis } from '../../../../utils.js';
-
-function md5(string) {
-  return createHash('md5').update(string).digest('hex');
-}
-
-export default function setOpt(params, uid = 0) {
-  const token = Buffer.from(md5(typeof params === 'object' ? JSON.stringify(params) : params) + random, 'hex').toString('base64').replace(/[+-=]+/g, '');
-  // const token = md5(params);
-  const key = `opt:${uid}:${token}`;
-
-  const rclient = getRedis({ db: 0 });
-  rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
-  return token;
-}
+import { createHash, randomUUID } from 'crypto';
+
+const random = randomUUID();
+
+import getRedis from '../../redis/funcs/getRedis.js';
+
+// import { getRedis } from '../../../../utils.js';
+
+function md5(string) {
+  return createHash('md5').update(string).digest('hex');
+}
+
+export default function setOpt(params, uid = 0) {
+  const token = Buffer.from(md5(typeof params === 'object' ? JSON.stringify(params) : params) + random, 'hex').toString('base64').replace(/[+-=]+/g, '');
+  // const token = md5(params);
+  const key = `opt:${uid}:${token}`;
+
+  const rclient = getRedis({ db: 0 });
+  rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
+  return token;
+}

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

@@ -1,44 +1,44 @@
-import { createHash, randomUUID } from 'crypto';
-
-import config from '../../../../config.js';
-
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const rclient = getRedis({ db: 0 });
-
-// import { config, getRedis } from '../../../../utils.js';
-
-const generateCodes = (ids, userToken) => {
-  const token = userToken || randomUUID();
-  const notNullIds = ids.filter((el) => el);
-  const obj = {};
-  const codes = notNullIds.reduce((acc, id) => {
-    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
-    acc[newToken] = id; obj[id] = newToken;
-    return acc;
-  }, {});
-  return { codes, obj };
-};
-
-function setToken({
-  ids: idsOrigin, uid, array,
-}) {
-  //  const rclient5 = getRedis({ db: 0, funcs });
-
-  if (!uid) return { user: 'empty' };
-  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
-
-  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
-
-  // TODO generate salt
-  const { codes, obj } = generateCodes(ids, uid);
-
-  if (!Object.keys(codes).length) return { ids: 'empty' };
-
-  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
-  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
-  // TODO дополнительно писать в hset token -> uid
-  return array ? Object.values(obj) : obj;
-}
-
-export default setToken;
+import { createHash, randomUUID } from 'crypto';
+
+import config from '../../../../config.js';
+
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const rclient = getRedis({ db: 0 });
+
+// import { config, getRedis } from '../../../../utils.js';
+
+const generateCodes = (ids, userToken) => {
+  const token = userToken || randomUUID();
+  const notNullIds = ids.filter((el) => el);
+  const obj = {};
+  const codes = notNullIds.reduce((acc, id) => {
+    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
+    acc[newToken] = id; obj[id] = newToken;
+    return acc;
+  }, {});
+  return { codes, obj };
+};
+
+function setToken({
+  ids: idsOrigin, uid, array,
+}) {
+  //  const rclient5 = getRedis({ db: 0, funcs });
+
+  if (!uid) return { user: 'empty' };
+  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
+
+  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
+
+  // TODO generate salt
+  const { codes, obj } = generateCodes(ids, uid);
+
+  if (!Object.keys(codes).length) return { ids: 'empty' };
+
+  rclient.hmset(`${config.pg.database}:token:edit:${uid}`, codes);
+  // console.log(`${config.pg.database}:token:edit:${uid}`, idsOrigin, Object.values(obj));
+  // TODO дополнительно писать в hset token -> uid
+  return array ? Object.values(obj) : obj;
+}
+
+export default setToken;

package/server/plugins/crud/funcs/utils/getFolder.js

@@ -1,10 +1,10 @@
-import path from 'node:path';
-
-import config from '../../../../../config.js';
-
-export default function getFolder(req, type = 'server') {
-  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
-  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
-  const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
-  return filepath;
-}
+import path from 'node:path';
+
+import config from '../../../../../config.js';
+
+export default function getFolder(req, type = 'server') {
+  if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
+  const types = { local: req.root || config.root, server: req.mapServerRoot || config.mapServerRoot };
+  const filepath = path.posix.join(types[type] || `/data/local/${req.pg?.options?.database || ''}`, req.folder || config.folder || '');
+  return filepath;
+}

package/server/plugins/crud/funcs/utils/logChanges.js

@@ -1,62 +1,62 @@
-import getMeta from '../../../pg/funcs/getMeta.js';
-
-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 { fields = [] } = await pg.query(`select * from ${table} limit 0`);
-    const columnList = fields.map((el) => el?.name);
-    const q = `select ${Object.keys(data || {}).filter((el) => columnList.includes(el)).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
-    // console.log(q, type, id);
-
-    const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};
-
-    const { columns = [] } = await getMeta({ table: 'log.table_changes_data' });
-    const names = columns.map((el) => el.name);
-
-    const res = await Promise.all(Object.keys(data || {}).map(async (el) => {
-      const filterData = Object.entries({
-        change_id: changeId, entity_key: el, value_old: old[el], value_new: data[el], uid,
-      })
-        .filter((el1) => el1[1] && names.includes(el1[0]));
-
-      const insertQuery = `insert into log.table_changes_data (${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
-      values (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
-
-      const { rows = [] } = await pg.query(insertQuery, [...filterData.map((el1) => (el1[1] && typeof el1[1] === 'object' && (!Array.isArray(el1[1]) || typeof el1[1]?.[0] === 'object') ? JSON.stringify(el1[1]) : el1[1]))]) || {};
-      return rows[0];
-    }));
-
-    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.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,
-    };
-  }
-}
+import getMeta from '../../../pg/funcs/getMeta.js';
+
+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 { fields = [] } = await pg.query(`select * from ${table} limit 0`);
+    const columnList = fields.map((el) => el?.name);
+    const q = `select ${Object.keys(data || {}).filter((el) => columnList.includes(el)).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
+    // console.log(q, type, id);
+
+    const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};
+
+    const { columns = [] } = await getMeta({ table: 'log.table_changes_data' });
+    const names = columns.map((el) => el.name);
+
+    const res = await Promise.all(Object.keys(data || {}).map(async (el) => {
+      const filterData = Object.entries({
+        change_id: changeId, entity_key: el, value_old: old[el], value_new: data[el], uid,
+      })
+        .filter((el1) => el1[1] && names.includes(el1[0]));
+
+      const insertQuery = `insert into log.table_changes_data (${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
+      values (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;
+
+      const { rows = [] } = await pg.query(insertQuery, [...filterData.map((el1) => (el1[1] && typeof el1[1] === 'object' && (!Array.isArray(el1[1]) || typeof el1[1]?.[0] === 'object') ? JSON.stringify(el1[1]) : el1[1]))]) || {};
+      return rows[0];
+    }));
+
+    const newData = type === 'DELETE' ? {} : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.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,
+    };
+  }
+}