@opengis/fastify-table 1.1.137 → 1.1.138

package/package.json

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

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

@@ -7,7 +7,7 @@ import logChanges from './utils/logChanges.js';
 const rclient = getRedis();
 
 export default async function dataDelete({
-  table, id, pg: pg1, uid,
+  table, template, id, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
   const { pk } = await getMeta({ pg, table });
@@ -16,7 +16,7 @@ export default async function dataDelete({
   //  console.log(updateDataset);
   const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
   await logChanges({
-    pg, table, id, uid, type: 'DELETE',
+    pg, table, template, id, uid, type: 'DELETE',
   });
   rclient.incr(`pg:${table}:crud`);
   return res;

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

@@ -7,7 +7,7 @@ import logChanges from './utils/logChanges.js';
 const rclient = getRedis();
 
 export default async function dataInsert({
-  id, table, data, pg: pg1, uid,
+  id, table, template, data, pg: pg1, uid,
 }) {
   const pg = pg1 || getPG({ name: 'client' });
   if (!data) return null;
@@ -37,7 +37,7 @@ export default async function dataInsert({
   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',
+    pg, table, template, data, id: res.rows?.[0]?.[pg.pk[table]], uid, type: 'INSERT',
   });
 
   rclient.incr(`pg:${table}:crud`);

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

@@ -18,7 +18,7 @@ function assignValue(key, i, srid = 4326, columnType = 'text') {
 }
 
 export default async function dataUpdate({
-  table, id, data, pg: pg1, uid,
+  table, template, id, data, pg: pg1, uid,
 }) {
   if (!data || !table || !id) return null;
 
@@ -57,7 +57,7 @@ export default async function dataUpdate({
   const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
 
   await logChanges({
-    pg, table, data, id, uid, type: 'UPDATE',
+    pg, table, template, data, id, uid, type: 'UPDATE',
   });
 
   rclient.incr(`pg:${table}:crud`);

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

@@ -1,7 +1,16 @@
 import getMeta from '../../../pg/funcs/getMeta.js';
+import getTemplate from '../../..//table/funcs/getTemplate.js';
+import { metaFormat } from '@opengis/fastify-table/utils.js';
+
+const getValue = function (val) {
+  if (!val) return null;
+  return typeof val === 'object'
+    ? JSON.stringify(val)?.substring?.(0, 30)
+    : val?.toString?.()?.substring?.(0, 30);
+}
 
 export default async function logChanges({
-  pg, table, id, data, uid = 1, type,
+  pg, table, template, id, data, uid = 1, type,
 }) {
   if (!id) {
     console.error('param id is required');
@@ -24,21 +33,46 @@ export default async function logChanges({
     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)).map(el => `"${el.replace(/'/g, "''")}"`).join(',') || '*'} from ${table} where ${pg.pk?.[table]}=$1`;
+    const q = `select json_object_agg(entity_key, value_new) from (
+      select
+        entity_key,
+        value_new,
+        ( rank() over (partition by entity_key order by cdate desc) = 1 ) as is_latest
+      from log.table_changes_data
+
+      where change_id in (
+        select
+          change_id
+        from log.table_changes
+        where entity_id=$1
+        and entity_type=$2
+      )
+
+    )q where is_latest`;
     // console.log(q, type, id);
 
-    const old = type !== 'INSERT' ? await pg.query(q, [id]).then((res) => res.rows?.[0] || {}) : {};
+    const old = type !== 'INSERT' ? await pg.query(q, [id, table]).then(el => el.rows?.[0]?.json_object_agg || {}) : {};
 
     const { columns = [] } = await getMeta({ table: 'log.table_changes_data' });
-    const names = columns.map((el) => el.name);
+    // const names = columns.map((el) => el.name);
+
+    const body = template ? await getTemplate('table', template) : null;
+    const cls = body?.columns?.filter(el => el.data)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {});
+    Object.keys(data || {}).filter(key => typeof data[key] === 'boolean').forEach(key => Object.assign(cls, { [key]: 'yes_no' }));
+    const titles = (body?.columns || columns)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {});
+
+    await metaFormat({ rows: [data], cls, sufix: false });
+    const newObj = Object.fromEntries(Object.entries(data || {}).map(el => ([[titles[el[0]] || el[0]], el[1]])));
+    const changesData = Object.keys(newObj || {}).map(el => ({
+      change_id: changeId,
+      entity_key: titles[el] || el,
+      value_old: getValue(old?.[el]),
+      value_new: getValue(newObj?.[el]),
+      uid,
+    })).filter(el => el?.value_new !== el?.value_old);
 
-    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 res = await Promise.all(changesData.map(async (el) => {
+      const filterData = Object.entries(el);
 
       const insertQuery = `insert into log.table_changes_data (${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
       values (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) returning *`;

package/server/routes/crud/controllers/deleteCrud.js

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

package/server/routes/crud/controllers/insert.js

@@ -53,7 +53,11 @@ export default async function insert(req) {
   }
 
   const res = await dataInsert({
-    id: params?.id, table: loadTemplate?.table || table, data: body, uid: user?.uid,
+    id: params?.id,
+    table: loadTemplate?.table || table,
+    data: body,
+    uid: user?.uid,
+    template: tokenData?.template,
   });
   if (!res) return { message: 'nothing added ' };
 
@@ -71,7 +75,7 @@ export default async function insert(req) {
       const objId = body[schema[key].parent_id] || req.body?.id || res?.rows?.[0]?.[schema[key].parent_id] || pkey;
       const extraRows = await Promise.all(body[key].map(async (row) => {
         const extraRes = await dataInsert({
-          table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid: user?.uid,
+          table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid: user?.uid, template: tokenData?.template,
         });
         return extraRes?.rows?.[0];
       }));

package/server/routes/crud/controllers/table.js

@@ -79,7 +79,7 @@ export default async function tableAPI(req) {
   }
   if (user?.uid && actions?.includes?.('edit')) {
     data.token = tokenData?.table ? params.table : setToken({
-      ids: [JSON.stringify({ id, table: tableName, form: loadTable.form })],
+      ids: [JSON.stringify({ id, table: tableName, form: loadTable.form, template: params?.table })],
       uid: user.uid,
       array: 1,
     })[0];

package/server/routes/crud/controllers/update.js

@@ -60,7 +60,11 @@ export default async function update(req) {
   }
 
   const res = await dataUpdate({
-    table: loadTemplate?.table || table, id, data: body, uid,
+    table: loadTemplate?.table || table,
+    id,
+    data: body,
+    uid,
+    template: tokenData?.template,
   });
 
   // admin.custom_column
@@ -79,7 +83,7 @@ export default async function update(req) {
       // insert new extra data
       if (Array.isArray(body[key]) && body[key]?.length) {
         const extraRows = await Promise.all(body[key]?.map?.(async (row) => {
-          const extraRes = await dataInsert({ table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid });
+          const extraRes = await dataInsert({ table: schema[key].table, data: { ...row, [schema[key].parent_id]: objId }, uid, template: tokenData?.template });
           return extraRes?.rows?.[0];
         }));
         Object.assign(res.extra, { [key]: extraRows.filter((el) => el) });

package/utils.js

@@ -62,6 +62,8 @@ import eventStream from './server/plugins/util/funcs/eventStream.js';
 import isFileExists from './server/plugins/crud/funcs/isFileExists.js';
 import getFolder from './server/plugins/crud/funcs/utils/getFolder.js';
 
+import logChanges from './server/plugins/crud/funcs/utils/logChanges.js';
+
 export default null;
 export {
   config,
@@ -119,4 +121,5 @@ export {
   getSelectMeta,
   getSelect,
 
+  logChanges,
 };