@opengis/fastify-table 1.0.89 → 1.0.91

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.91 - 30.08.2024
+
+- add CRUD and Auth logs
+
+## 1.0.90 - 27.08.2024
+
+- logger file API to core
+
 ## 1.0.89 - 26.08.2024
 
 - data API meta bbox polyline support

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,15 +1,19 @@
-import getPG from '../../pg/funcs/getPG.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function dataDelete({
-  table, id, pg: pg1,
-}) {
-  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]) || {};
-  return res;
-}
+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, 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/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,7 +15,11 @@ 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]));
+
+  await logChanges({
+    pg, table, data, id, uid, type: 'UPDATE',
+  });
 
   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 *`;

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/crud/index.js

@@ -1,36 +1,36 @@
-import getOpt from './funcs/getOpt.js';
-import setOpt from './funcs/setOpt.js';
-import isFileExists from './funcs/isFileExists.js';
-import dataUpdate from './funcs/dataUpdate.js';
-import dataInsert from './funcs/dataInsert.js';
-
-import update from './controllers/update.js';
-import insert from './controllers/insert.js';
-import deleteCrud from './controllers/deleteCrud.js';
-import getAccessFunc from './funcs/getAccess.js';
-
-const tableSchema = {
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  // funcs
-  fastify.decorate('setOpt', setOpt);
-  fastify.decorate('getOpt', getOpt);
-  fastify.decorate('dataUpdate', dataUpdate);
-  fastify.decorate('dataInsert', dataInsert);
-  fastify.decorate('getAccess', getAccessFunc);
-
-  fastify.decorate('isFileExists', isFileExists);
-
-  // api
-  fastify.put(`${prefix}/table/:table/:id`, { schema: tableSchema }, update);
-  fastify.delete(`${prefix}/table/:table/:id`, { schema: tableSchema }, deleteCrud);
-  fastify.post(`${prefix}/table/:table`, { schema: tableSchema }, insert);
-}
-
-export default plugin;
+import getOpt from './funcs/getOpt.js';
+import setOpt from './funcs/setOpt.js';
+import isFileExists from './funcs/isFileExists.js';
+import dataUpdate from './funcs/dataUpdate.js';
+import dataInsert from './funcs/dataInsert.js';
+
+import update from './controllers/update.js';
+import insert from './controllers/insert.js';
+import deleteCrud from './controllers/deleteCrud.js';
+import getAccessFunc from './funcs/getAccess.js';
+
+const tableSchema = {
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  // funcs
+  fastify.decorate('setOpt', setOpt);
+  fastify.decorate('getOpt', getOpt);
+  fastify.decorate('dataUpdate', dataUpdate);
+  fastify.decorate('dataInsert', dataInsert);
+  fastify.decorate('getAccess', getAccessFunc);
+
+  fastify.decorate('isFileExists', isFileExists);
+
+  // api
+  fastify.put(`${prefix}/table/:table/:id`, { schema: tableSchema }, update);
+  fastify.delete(`${prefix}/table/:table/:id`, { schema: tableSchema }, deleteCrud);
+  fastify.post(`${prefix}/table/:table`, { schema: tableSchema }, insert);
+}
+
+export default plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.89",
+  "version": "1.0.91",
   "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/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`;