@opengis/fastify-table 1.0.47 → 1.0.48

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.0.48 - 26.06.2024
+
+- search api no specified table mode support
+
 ## 1.0.47 - 25.06.2024
 
 - add extra properties support

package/package.json

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

package/table/controllers/card.js

@@ -0,0 +1,41 @@
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+export default async function card(req) {
+  const time = Date.now();
+  const {
+    pg, params, query = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { status: 404, message: 'not found' }; }
+
+  const { table, columns, meta, sql, cardSql } = loadTable;
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+  const cardSqlFiltered = params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
+  const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
+
+  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
+  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? `st_asgeojson(geom)::json as geom,` : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
+  where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, [params.id]);
+
+  await metaFormat({ rows, table: params.table });
+
+  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
+  return {
+    time: Date.now() - time, data,
+  };
+}

package/table/controllers/search.js

@@ -1,17 +1,20 @@
 import getTemplate from './utils/getTemplate.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import metaFormat from '../funcs/metaFormat/index.js';
+import getTemplates from './utils/getTemplates.js';
 
-const maxLimit = 100;
+function sequence(tables, data, fn) {
+  return tables.reduce((promise, table) => promise.then(() => fn({
+    ...data, tableName: table.replace('.json', ''),
+  })), Promise.resolve());
+}
 
-export default async function data({
-  pg, query = {},
+async function getData({
+  pg, tableName, query = {}, maxLimit, res,
 }) {
-  const time = Date.now();
+  const loadTable = await getTemplate('table', tableName);
 
-  const loadTable = await getTemplate('table', query.table);
-
-    if (!loadTable) { return { message: 'not found', status: 404 }; }
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
 
   const { table, columns, meta } = loadTable;
   const { pk } = await getMeta(table);
@@ -20,22 +23,46 @@ export default async function data({
   const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
   const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
 
-  const limit = Math.min(maxLimit, +(query.limit || 10));
+  const limit = Math.max(maxLimit - res.rows.length, 0);
+  // 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 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}`;
-
-  if (query.sql === '1') return q;
+  if (query.sql) {
+    res.sql.push(q);
+    return;
+  }
 
   const { rows } = await pg.query(q);
 
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => res.rows.push({ ...row, register: tableName }));
+}
+
+export default async function data({
+  pg, query = {},
+}) {
+  const time = Date.now();
+
+  try {
+    const tables = query.table ? [query.table] : await getTemplates('table');
+    const res = { rows: [], sql: [], total: 0 };
+
+    const maxLimit = Math.min(100, query.limit || '16');
+    await sequence(tables, { pg, query, maxLimit, res }, getData);
+
+    if (query.sql) return res.sql.join(';\n');
 
-  await metaFormat({ rows, table: query.table });
-  return {
-    time: Date.now() - time, total, count: rows.length, rows,
-  };
+    return {
+      time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+    };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
 }

package/table/controllers/utils/getTemplates.js

@@ -0,0 +1,18 @@
+import fs from 'fs';
+import path from 'path';
+import config from '../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+    if (!type) return null;
+    
+    const cwd = process.cwd();
+    const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+    
+    if (!loadTemplate[type]) {
+        const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+        loadTemplate[type] = typeList;
+    }
+    return loadTemplate[type];
+}

package/table/index.js

@@ -1,5 +1,6 @@
 import suggest from './controllers/suggest.js';
 import data from './controllers/data.js';
+import card from './controllers/card.js';
 import search from './controllers/search.js';
 import filter from './controllers/filter.js';
 import form from './controllers/form.js';
@@ -34,6 +35,7 @@ async function plugin(fastify, config = {}) {
 
   fastify.get(`${prefix}/suggest/:data`, {}, suggest);
   fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
   fastify.get(`${prefix}/search`, { schema: searchTableSchema }, search);
   fastify.get(`${prefix}/filter/:table`, {}, filter);
   fastify.get(`${prefix}/form/:form`, {}, form);