@opengis/fastify-table 1.1.44 → 1.1.45

package/Changelog.md

@@ -1,6 +1,6 @@
 # fastify-table
 
-## 1.1.44 - 21.10.2024
+## 1.1.45 - 22.10.2024
 
 - addHook params refactor
 - add handlebars to utils

package/crud/funcs/getAccess.js

@@ -20,10 +20,6 @@ left join admin.user_roles d on
 where $1 in (a.route_id, a.alias) and $2 in (b.user_uid, d.user_uid)`;
 
 export default async function getAccess({ table, id, user }) {
-  if (config.auth?.disable || user?.user_type?.includes('admin')) {
-    return { actions: ['get', 'edit', 'del'], my: true, query: '1=1' };
-  }
-
   const { client: pg } = pgClients || {};
   const { uid, user_type: userType } = user || {};
 
@@ -34,6 +30,10 @@ export default async function getAccess({ table, id, user }) {
   const body = await getTemplate('table', table) || {};
   if (!body?.table) return null;
 
+  if (config.auth?.disable || user?.user_type?.includes('admin') || body?.public) {
+    return { actions: ['get', 'edit', 'del'], my: true, query: '1=1' };
+  }
+
   const { scope = 'my', actions = [] } = await pg.query(q, [table, uid]).then((res) => res.rows?.[0] || {});
 
   const { columns = [] } = await getMeta({ table: body?.table });

package/crud/funcs/utils/logChanges.js

@@ -1,28 +1,4 @@
-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 (typeof value === 'object' || fieldType.includes('json')) {
-    if (Array.isArray(value)) {
-      return `'${JSON.stringify(value)}'`;
-    }
-    return `'${JSON.stringify(value)}'`;
-  }
-  if (Array.isArray(value)) {
-    return `'{ ${value.join(',')} }'::${fieldType}`;
-  }
-  return `'${value || null}'`;
-}
+import getMeta from '../../../pg/funcs/getMeta.js';
 
 export default async function logChanges({
   pg, table, id, data, uid = 1, type,
@@ -55,13 +31,23 @@ export default async function logChanges({
 
     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 { 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((el) => el[1] && names.includes(el[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((el) => (el[1] && typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+      return rows[0];
+    }));
 
-    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 }), {});
+    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,

package/hook/funcs/applyHook.js

@@ -2,7 +2,7 @@ import config from '../../config.js';
 import hookList from './hookList.js';
 
 export default async function applyHook(name, data) {
-  const debug = config.local || config.debug;
+  const { debug } = config;
   if (debug) console.log('applyHook', name);
   if (!hookList[name]?.length) return null;
   const result = {};

package/module/test/table/test.rest_zone.table.json

@@ -1,4 +1,5 @@
 {
+  "public": true,
   "key": "rz_id",
   "table": "itree.rest_zones",
   "query": "verif",

package/package.json

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

package/table/controllers/card.js

@@ -24,7 +24,8 @@ export default async function card(req) {
     table: hookData?.table || params.table,
     id: hookData?.id || params?.id,
     user,
-  });
+  }) || {};
+
   if (!actions.includes('get') || (scope === 'my' && !my)) {
     return { message: 'access restricted', status: 403 };
   }

package/table/controllers/data.js

@@ -30,7 +30,8 @@ export default async function dataAPI(req) {
     table: hookData?.table || params.table,
     id: hookData?.id || params?.id,
     user,
-  });
+  }) || {};
+
   if (!actions.includes('get') || (scope === 'my' && !my)) {
     return { message: 'access restricted', status: 403 };
   }

package/table/controllers/table.js

@@ -30,7 +30,8 @@ export default async function tableAPI(req) {
     table: hookData?.table || params.table,
     id: hookData?.id || params?.id,
     user,
-  });
+  }) || {};
+
   if (!actions.includes('get') || (scope === 'my' && !my)) {
     return { message: 'access restricted', status: 403 };
   }

package/test/api/table.test.js

@@ -11,6 +11,13 @@ const table = 'test.rest_zone.table';
 
 test('api table', async (t) => {
   const app = await build(t);
+
+  const session = { passport: { user: { uid: '1', user_type: 'admin' } } };
+  app.addHook('onRequest', async (req) => {
+    req.session = session;
+    req.user = session.passport.user;
+  });
+
   await init(pgClients.client);
 
   const body = await getTemplate('table', table);