@opengis/fastify-table 1.0.49 → 1.0.50

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.0.50 - 27.06.2024
+
+- refactor search api
+
 ## 1.0.49 - 26.06.2024
 
 - refactor - npm settings

package/index.js

@@ -28,6 +28,7 @@ async function plugin(fastify, opt) {
     fastify.decorate('config', config);
   }
 
+  fastify.register(import('@opengis/fastify-hb'));
   fastify.decorate('getFolder', (req, type = 'server') => {
     if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
     const types = { local: req.root, server: req.mapServerRoot };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.49",
+  "version": "1.0.50",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
@@ -9,9 +9,10 @@
     "test": "node --test"
   },
   "dependencies": {
-    "ioredis": "^5.3.2",
+    "@opengis/fastify-hb": "^1.0.0",
     "fastify": "^4.26.1",
     "fastify-plugin": "^4.0.0",
+    "ioredis": "^5.3.2",
     "pg": "^8.11.3"
   },
   "devDependencies": {
@@ -20,4 +21,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}

package/table/controllers/search.js

@@ -10,13 +10,14 @@ function sequence(tables, data, fn) {
 }
 
 async function getData({
-  pg, tableName, query = {}, maxLimit, res,
+  pg, funcs, tableName, query = {}, maxLimit, res,
 }) {
   const loadTable = await getTemplate('table', tableName);
 
   if (!loadTable) { return { message: 'not found', status: 404 }; }
 
-  const { table, columns, meta } = loadTable;
+  const { table, columns, meta, ua } = loadTable;
+
   const { pk } = await getMeta(table);
 
   const cols = columns.map((el) => el.name || el).join(',');
@@ -27,10 +28,10 @@ async function getData({
   // Math.max(query.offset - res.rows.length,0)
   const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
 
-  const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : null;
+  const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : 'false';
 
-  const where = [loadTable.query, search].filter((el) => el);
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} * from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
+  const where = [!pk ? 'false' : 'true', loadTable.query, search].filter((el) => el);
+  const q = `select ${[`"${pk}" as id`, meta?.title ? `${meta.title} as title` : ''].filter((el) => el).join(',')} from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
   if (query.sql) {
     res.sql.push(q);
     return;
@@ -42,11 +43,14 @@ async function getData({
 
   await metaFormat({ rows, table: tableName });
   res.total += +total;
-  rows.forEach((row) => res.rows.push({ ...row, register: tableName }));
+  rows.forEach((row) => {
+    const href = meta?.href ? funcs.handlebars.compile(meta.href)({ ...row, [pk]: row.id }) : undefined;
+    res.rows.push({ ...row, register: tableName, register_title: loadTable.ua, href });
+  });
 }
 
-export default async function data({
-  pg, query = {},
+export default async function search({
+  pg, funcs, query = {},
 }) {
   const time = Date.now();
 
@@ -55,7 +59,7 @@ export default async function data({
     const res = { rows: [], sql: [], total: 0 };
 
     const maxLimit = Math.min(100, query.limit || '16');
-    await sequence(tables, { pg, query, maxLimit, res }, getData);
+    await sequence(tables, { pg, funcs, query, maxLimit, res }, getData);
 
     if (query.sql) return res.sql.join(';\n');