@opengis/fastify-table 1.1.102 → 1.1.104

package/package.json

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

package/server/plugins/cron/funcs/addCron.js

@@ -8,7 +8,8 @@ import cronList from '../cronList.js';
 
 const md5 = (string) => createHash('md5').update(string).digest('hex');
 
-async function verifyUnique(name, rclient) {
+const rclient = getRedis();
+async function verifyUnique(name) {
   const cronId = config.port || 3000 + md5(name);
   // one per node check
   const key = `cron:unique:${cronId}`;
@@ -59,23 +60,27 @@ const interval2ms = {
 };
 
 async function runCron({
-  pg, func, name, rclient,
+  func, name,
 }) {
-  const unique = await verifyUnique(name, rclient);
+  const pg = getPG();
+
+  const unique = await verifyUnique(name);
 
   if (!unique) return;
   const db = pg.options.database;
 
   try {
+    // console.log(`cron:${name}`);
     const data = await func({ pg });
     logger.file('cron', {
-      level: 'INFO', db, name, result: data,
+      db, name, result: data,
     });
   }
   catch (err) {
     logger.file('cron', {
-      level: 'ERROR', db, name, error: err.toString(),
+      db, name, error: err.toString(),
     });
+    logger.error(err);
   }
 }
 
@@ -93,15 +98,13 @@ async function runCron({
 
 export default async function addCron(func, interval) {
   const { time = {}, disabled = [] } = config.cron || {};
-  const pg = getPG();
-  const rclient = getRedis();
 
   const name = func.name || func.toString().split('/').at(-1).split('\'')[0];
 
   // if (!config.isServer) return;
 
   if (disabled.includes(name)) {
-    logger.debug('cron', { name, message: 'cron disabled' });
+    logger.file('cron', { name, message: 'cron disabled' });
     return;
   }
 
@@ -111,20 +114,16 @@ export default async function addCron(func, interval) {
   const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
 
   if (intervalMs < 1000) {
-    logger.warn('cron', { name, error: `interval ${interval} to small` });
+    logger.file('cron', { name, error: `interval ${interval} to small` });
     return;
   }
 
   // setTimeout to w8 for the time to start
   setTimeout(() => {
-    runCron({
-      pg, func, name, rclient, logger,
-    });
+    runCron({ func, name });
     // interval
     setInterval(() => {
-      runCron({
-        pg, func, name, rclient, logger,
-      });
+      runCron({ func, name });
     }, intervalMs);
   }, waitMs);
 }

package/server/plugins/table/funcs/getFilterSQL/index.js

@@ -22,13 +22,13 @@ async function getFilterSQL({
         return ` left join lateral (${el.filter ? el.sql.replace(/limit 1/ig, '') : el.sql}) as ${el.name} on 1=1 `;
       }).join(' ')
     : '';
-  const fieldQuery = `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} where 1=1 limit 0`;
+  const fieldQuery = `select * from ${body?.table || table} ${sqlList ? ` t ${sqlList}` : ''} limit 0`;
   const { fields = [] } = await pg.query(fieldQuery);
 
   const { fields: fieldsModel } = body?.table && pg.pk[body?.table] ? await pg.query(`select * from ${body.table} limit 0`) : {};
 
   const autoSearchColumn = fields?.filter((el) => pg.pgType?.[el.dataTypeID] === 'text')?.map((el) => el.name).join(',');
-  const searchColumn = body?.search_column || autoSearchColumn;
+  const searchColumn = body?.search_column || body?.meta?.search || autoSearchColumn;
   const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
   try {
     const tableSQL = await getTableSql({
@@ -38,7 +38,7 @@ async function getFilterSQL({
     const searchQuery = search && searchColumn
       ? ` (${searchColumn.split(',')?.map((name) => {
         const { pk } = tableSQL.find((el) => el.name === name) || {};
-        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
+        return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery.replace(/limit 0/g, '')} where ${name} ${sval} )q where 1=1)` : `${name} ${sval}`;
       }).join(' or ')} )` : '';
 
     const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || [])