@opengis/fastify-table 1.0.15 → 1.0.17

package/crud/controllers/deleteCrud.js

@@ -1,7 +1,11 @@
 import dataDelete from '../funcs/dataDelete.js';
+import getTemplate from '../../table/controllers/utils/getTemplate.js';
 
 export default async function deleteCrud(req) {
-  const { table, id } = req.params || {};
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table } = loadTemplate || req.params || {};
+  const { id } = req.params || {};
+
   if (!table) return { status: 404, message: 'table is required' };
 
   const data = await dataDelete({ table, id });

package/crud/controllers/insert.js

@@ -4,7 +4,8 @@ import checkXSS from './utils/checkXSS.js';
 import getTemplate from '../../table/controllers/utils/getTemplate.js';
 
 export default async function insert(req) {
-  const { table } = req.params || {};
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table } = loadTemplate || req.params || {};
   if (!table) return { status: 404, message: 'table is required' };
 
   const { funcs, session, params } = req;
@@ -24,5 +25,5 @@ export default async function insert(req) {
   }
 
   const res = await dataInsert({ table: add || table, data: req.body });
-  return res;
+  return { rows: res.rows };
 }

package/crud/controllers/update.js

@@ -4,7 +4,9 @@ import checkXSS from './utils/checkXSS.js';
 import getTemplate from '../../table/controllers/utils/getTemplate.js';
 
 export default async function update(req) {
-  const { table, id } = req.params || {};
+  const loadTemplate = await getTemplate('table', req.params.table);
+  const { table } = loadTemplate || req.params || {};
+  const { id } = req.params || {};
   if (!req.params?.table) return { message: 'table is required', status: 404 };
   if (!id) return { message: 'id is required', status: 404 };
 

package/crud/controllers/utils/checkXSS.js

@@ -15,7 +15,7 @@ function checkXSS({ body, schema = {} }) {
 
   // escape arrows on non-RTE
   Object.keys(body)
-    .filter((key) => ['<', '>'].find((el) => body[key].includes(el))
+    .filter((key) => ['<', '>'].find((el) => body[key]?.includes?.(el))
   && !['Summernote', 'Tiny', 'Ace'].includes(schema[key]?.type))
     ?.forEach((key) => {
       Object.assign(body, { [key]: body[key].replace(/</g, '&lt;').replace(/>/g, '&gt;') });

package/crud/funcs/dataInsert.js

@@ -18,7 +18,7 @@ export default async function dataInsert({ table, data }) {
     values  (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) 
     
     returning *`;
-  await pg.query('DROP TRIGGER if exists dataset_before_update_insert ON gis.dataset');
-  const res = await pg.one(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' ? JSON.stringify(el[1]) : el[1]))]) || {};
+
+  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' ? JSON.stringify(el[1]) : el[1]))]) || {};
   return res;
 }

package/crud/index.js

@@ -21,9 +21,9 @@ async function plugin(fastify, config = {}) {
   fastify.decorate('isFileExists', isFileExists);
 
   // api
-  fastify.put(`${prefix}/crud/:table/:id`, {}, update);
-  fastify.delete(`${prefix}/crud/:table/:id`, {}, deleteCrud);
-  fastify.post(`${prefix}/crud/:table`, {}, insert);
+  fastify.put(`${prefix}/table/:table/:id`, {}, update);
+  fastify.delete(`${prefix}/table/:table/:id`, {}, deleteCrud);
+  fastify.post(`${prefix}/table/:table`, {}, insert);
 }
 
 export default plugin;

package/package.json

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