@opengis/fastify-table 1.0.2 → 1.0.4

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.3 - 17.04.2024
+
+- fix unit test
+
+## 1.0.2 - 14.04.2024
+
+- fix redis
+
 ## 1.0.1 - 14.04.2024
 
 - fix redis

package/crud/controllers/deleteCrud.js

@@ -1,10 +1,10 @@
+import dataDelete from '../funcs/dataDelete.js';
+
 export default async function deleteCrud(req) {
-  const { funcs } = req;
   const { table, id } = req.params || {};
   if (!table) return { status: 404, message: 'table is required' };
 
-  const { pk } = await funcs.getMeta(table);
-  const data = await funcs.pg.query(`delete from ${table} where ${pk}=$1`, [id]);
+  const data = await dataDelete({ table, id });
 
-  return { rowCount: data.rowCount };
+  return { rowCount: data.rowCount, msg: !data.rowCount ? data : null };
 }

package/crud/funcs/dataDelete.js

@@ -0,0 +1,15 @@
+import getPG from '../../pg/funcs/getPG.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function dataDelete({
+  table, id,
+}) {
+  const pg = getPG({ name: 'client' });
+  const { pk } = await getMeta(table);
+  if (!pg.tlist.includes(table)) return 'table not exist';
+  const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
+  //  console.log(updateDataset);
+  const res = await pg.one(delQuery, [id]) || {};
+  return res;
+}

package/crud/funcs/getOpt.js

@@ -1,7 +1,7 @@
 import getRedis from '../../redis/funcs/getRedis.js';
 
-export default async function getOpt(token) {
-  const rclient = getRedis({ db: 0 });
+export default async function getOpt(token, funcs) {
+  const rclient = getRedis({ db: 0, funcs });
 
   const key = `opt:${token}`;
   const data = await rclient.get(key);

package/crud/funcs/setOpt.js

@@ -10,7 +10,7 @@ export default async function setOpt(params) {
   // const token = md5(params);
   const key = `opt:${token}`;
 
-  const rclient = getRedis({ db: 0 });
+  const rclient = getRedis({ db: 0, funcs: params.funcs });
   await rclient.set(key, JSON.stringify(params), 'EX', 60 * 60);
   return token;
 }

package/package.json

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

package/pg/funcs/getPG.js

@@ -4,8 +4,9 @@ import pgClients from '../pgClients.js';
 import init from './init.js';
 
 function getPG({
-  user, password, host, port, db, database, name: origin,
+  user, password, host, port, db, database, name: origin, funcs,
 }) {
+  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
   const name = origin || db || database;
   if (pgClients[name]) return pgClients[name];
 

package/redis/funcs/getRedis.js

@@ -2,7 +2,8 @@ import Redis from 'ioredis';
 import config from '../../config.js';
 import redisClients from './redisClients.js';
 
-function getRedis({ db }) {
+function getRedis({ db, funcs }) {
+  if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
   if (!config.redis) return null;
   if (redisClients[db]) return redisClients[db];
 

package/redis/index.js

@@ -11,6 +11,7 @@ async function plugin(fastify) {
   const client = getRedis({ db: 0 });
   client.getJSON = client.get;
   fastify.decorate('rclient', client);
+  fastify.decorate('getRedis', getRedis);
   // fastify.decorate('rclient2', client2);
   fastify.addHook('onClose', close);
 }

package/server.js

@@ -0,0 +1,14 @@
+// This file contains code that we reuse
+// between our tests.
+import Fastify from 'fastify';
+import config from './test/config.js';
+import appService from './index.js';
+
+const app = Fastify({ logger: false });
+app.register(appService, config);
+app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
+  if (err) {
+    app.log.error(err);
+    process.exit(1);
+  }
+});

package/table/controllers/data.js

@@ -2,7 +2,7 @@ import getTemplate from './utils/getTemplate.js';
 import getFilterSQL from '../funcs/getFilterSQL/index.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 
-const maxLimit = 10;
+const maxLimit = 100;
 export default async function data(req) {
   const time = Date.now();
   const {
@@ -33,14 +33,17 @@ export default async function data(req) {
 
   const offset = query.page ? ` offset ${(query.page - 1) * limit}` : '';
   // id, query, filter
+  const orderColumn = query.order || loadTable.order;
+
+  const order = cols.includes(orderColumn) ? `order by ${orderColumn} ${query.desc ? 'desc' : ''}` : '';
   const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q].filter((el) => el);
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${offset} limit ${limit}`;
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${offset} ${order} limit ${limit}`;
 
   if (query.sql) { return q; }
 
   const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
 
-  const total = keyQuery || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+  const total = keyQuery || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
 
   return {
     time: Date.now() - time, total, pk, form, rows, meta, columns, filters,

package/table/controllers/suggest.js

@@ -1,10 +1,11 @@
 import getSelectMeta from './utils/getSelectMeta.js';
+import getPG from '../../pg/funcs/getPG.js';
 
 const limit = 50;
 const headers = { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'GET', 'Cache-Control': 'no-cache' };
 
 export default async function suggest(req) {
-  const { params, query, pg } = req;
+  const { params, query, pg: pg1 } = req;
 
   const lang = query.lang || 'ua';
   const time = Date.now();
@@ -13,6 +14,7 @@ export default async function suggest(req) {
   if (!selectName) return { headers, status: 400, message: 'name is required' };
 
   const meta = await getSelectMeta({ name: selectName });
+  const pg = meta.db ? getPG(meta.db) : pg1;
   if (!meta) return { headers, status: 404, message: 'Not found query select ' };
 
   const { arr, searchQuery } = meta;
@@ -48,6 +50,7 @@ export default async function suggest(req) {
     count: data.length,
     total: meta.count - 0,
     mode: 'sql',
+    db: meta.db,
     sql: sqlSuggest,
     data,
   };

package/table/controllers/utils/getSelectMeta.js

@@ -2,6 +2,7 @@
 import getPG from '../../../pg/funcs/getPG.js';
 
 import getSelect from './getSelect.js';
+
 /*
 function getTable(table) {
   // eslint-disable-next-line class-methods-use-this
@@ -14,7 +15,6 @@ const selectMeta = {};
 
 export default async function getSelectMeta({ name, pg: pg1 }) {
   if (selectMeta[name]) return selectMeta[name];
-  const pg = pg1 || getPG({ db: 'client' });
 
   const cls = await getSelect(name);
 
@@ -22,6 +22,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
   if (cls.arr) return cls;
   if (!cls.sql) return null;
 
+  const pg = pg1 || getPG({ db: cls.db || 'client' });
   const { sql: original } = cls;
   const sql = `with c(id,text) as (${original} ) select * from c where id is not null `;
 
@@ -34,7 +35,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
   const dataOrigin1 = await pg.query(`${original} limit 0`);
 
   // const table = getTable(original);
-  const count = cls?.count ?? await pg.one(`select count(*) from (${original})q`).then((el) => el.count);
+  const count = cls?.count ?? await pg.query(`select count(*) from (${original})q`).then((el) => el?.rows?.[0].count);
 
   // column name
   const cols = dataOrigin.fields.map((el) => el.name);
@@ -50,7 +51,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
     type: type.join(','),
     cols: cols.join(','),
     originalCols: dataOrigin1.fields.map((el) => el.name).join(','),
-
+    db: cls.db,
     original,
     sql,
     count,

package/test/templates/select/account_id.json

@@ -0,0 +1,4 @@
+{
+    "db": "mbk_lviv_dma",
+    "searchColumn": "alternative_name"
+}

package/test/templates/select/account_id.sql

@@ -0,0 +1 @@
+SELECT account_id, account_name  FROM crm_acc.crm_account

package/test/templates/table/gis.dataset.table.json

@@ -10,34 +10,12 @@
         }
     ],
     "table": "gis.dataset",
+    "order": "dataset_name",
     "filters": [
         {
-            "ua": "Будівля",
-            "data": "cp_building",
-            "name": "cp_build_id",
-            "type": "Text"
-        },
-        {
-            "ua": "Рік будівництва",
-            "name": "cp_year",
-            "type": "Text"
-        },
-        {
-            "ua": "Замовник ПКД",
-            "data": "customer_name",
-            "name": "cp_pkd",
-            "type": "Text"
-        },
-        {
-            "ua": "Наявність енергоаудиту",
-            "name": "cp_date_en_audit",
-            "type": "Date"
-        },
-        {
-            "ua": "Знак сертифікату",
-            "data": "cp_certificate_mark",
-            "name": "cp_certificate_mark",
-            "type": "Check"
+            "ua": "Назва набору",
+            "name": "dataset_name",
+            "type": "text"
         }
     ]
 }

package/test/templates/table/service.json

@@ -0,0 +1,18 @@
+{
+    "table": "site.page_node",
+    "key": "alias",
+    "query": "t.category_id='3060540645924931148' and t.enabled and t.lang='ua'",
+    "orderby": "value_number",
+    "sql": [
+        {
+            "sql": "select object_id,value_number from site.page_node_data where attr='ord' and t.nid=object_id limit 1",
+            "name": "page_node_data_sql"
+        }
+    ],
+    "columns": [
+        "title",
+        "alias",
+        "teaser",
+        "image"
+    ]
+}