@opengis/fastify-table 1.0.9 → 1.0.11

package/table/funcs/getFilterSQL/util/getTableSql.js

@@ -1,34 +1,34 @@
-function getTable(table) {
-  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
-    ?.map((el) => el.split(/[ )]/)[0]);
-  return result;
-}
-
-/**
-* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
-* @param {String} opt.query - запит до таблиці
-* @param {String} opt.hash - інформація з хешу по запиту
-*/
-const tableSql = {};
-async function getTableSql({
-  pg, body, table, fields,
-}) {
-  if (tableSql[table]) return tableSql[table];
-
-  const fieldList = fields.map((el) => el.name);
-
-  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
-
-  if (!tableList) { tableSql[table] = []; return []; }
-
-  const data = await Promise.all(tableList?.map(async (tableEl) => {
-    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`, { cache: 1 });
-    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
-  }));
-
-  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
-
-  return tableSql[table];
-}
-
-export default getTableSql;
+function getTable(table) {
+  const result = table?.toLowerCase()?.replace(/[\n\r]+/g, ' ')?.split(' from ')?.filter((el) => /^[a-z0-9_]+\.[a-z0-9_]+/.test(el))
+    ?.map((el) => el.split(/[ )]/)[0]);
+  return result;
+}
+
+/**
+* @param {Number} opt.json - (1|0) 1 - Результат - Object, 0 - String
+* @param {String} opt.query - запит до таблиці
+* @param {String} opt.hash - інформація з хешу по запиту
+*/
+const tableSql = {};
+async function getTableSql({
+  pg, body, table, fields,
+}) {
+  if (tableSql[table]) return tableSql[table];
+
+  const fieldList = fields.map((el) => el.name);
+
+  const tableList = body?.sql?.map((el) => getTable(el.sql)).reduce((acc, el) => acc.concat(el), []).filter((el) => fieldList.includes(pg.pk[el]));
+
+  if (!tableList) { tableSql[table] = []; return []; }
+
+  const data = await Promise.all(tableList?.map(async (tableEl) => {
+    const { fields: fieldsEl } = await pg.query(`select * from ${tableEl} limit 0`, { cache: 1 });
+    return fieldsEl.map((el) => ({ name: el.name, table: tableEl, pk: pg.pk[tableEl] }));
+  }));
+
+  tableSql[table] = data.reduce((acc, el) => acc.concat(el), []);
+
+  return tableSql[table];
+}
+
+export default getTableSql;

package/table/funcs/metaFormat/getSelectVal.js

@@ -0,0 +1,20 @@
+import getSelect from '../../controllers/utils/getSelect.js';
+import pg from '../../../pg/pgClients.js';
+import redis from '../../../redis/client.js';
+
+export default async function metaFormat({ name, values }) {
+  const cls = await getSelect(name);
+  if (!cls?.arr && !cls?.sql) return null;
+  const key = `select:${name}`;
+  const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
+
+  const data = cls.arr || (values.filter(el => !cache[el]).length
+    ? await pg.client.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
+    : []);
+
+  const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.text }), {}) };
+  if (!cls.arr && data.length) {
+    redis.hmset(key, clsAr);
+  }
+  return clsAr;
+}

package/table/funcs/metaFormat/index.js

@@ -0,0 +1,24 @@
+import getTemplate from '../../controllers/utils/getTemplate.js';
+import getSelectVal from './getSelectVal.js';
+
+export default async function metaFormat({ rows, table }) {
+  const loadTable = await getTemplate('table', table);
+  const selectCols = loadTable.columns?.filter((e) => e.data);
+
+  // cls & select format
+
+  await Promise.all(selectCols?.map(async (attr) => {
+    const val = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => el);
+    if (!val.length) return null;
+
+    const clsAr = await getSelectVal({ name: attr.data, values: val });
+    if (!clsAr) return null;
+    rows.forEach(el => {
+      Object.assign(el, { [`${attr.name}_text`]: clsAr[el[attr.name]] || el[attr.name] });
+    });
+
+    return null;
+  }));
+
+  return rows;
+}

package/table/index.js

@@ -1,14 +1,25 @@
-import suggest from './controllers/suggest.js';
-import data from './controllers/data.js';
-import filter from './controllers/filter.js';
-import form from './controllers/form.js';
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.get(`${prefix}/suggest/:data`, {}, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, {}, data); // vs.crm.data.api с node
-  fastify.get(`${prefix}/filter/:table`, {}, filter);
-  fastify.get(`${prefix}/form/:form`, {}, form);
-}
-
-export default plugin;
+import suggest from './controllers/suggest.js';
+import data from './controllers/data.js';
+import filter from './controllers/filter.js';
+import form from './controllers/form.js';
+import metaFormat from './funcs/metaFormat/index.js';
+
+const tableSchema = {
+  querystring: {
+    page: { type: 'number' },
+    order: { type: 'string' },
+    filter: { type: 'string' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.decorate('metaFormat', metaFormat);
+
+  fastify.get(`${prefix}/suggest/:data`, {}, suggest);
+  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/filter/:table`, {}, filter);
+  fastify.get(`${prefix}/form/:form`, {}, form);
+}
+
+export default plugin;

package/test/api/crud.test.js

@@ -1,50 +1,50 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-
-import config from '../config.js';
-
-test('api crud', async (t) => {
-  const app = await build(t);
-  const prefix = config.prefix || '/api';
-
-  await t.test('POST /insert', async () => {
-    const res = await app.inject({
-      method: 'POST',
-      url: `${prefix}/crud/gis.dataset`,
-      body: { dataset_name: '111', dataset_id: '5400000' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    // rep.dataset_id
-    // console.log(rep);
-    // pgClients.client.query('delete from gis.dataset where dataset_id=$1', [rep.dataset_id]);
-    assert.ok(rep.dataset_id);
-  });
-
-  await t.test('PUT /update', async () => {
-    const res = await app.inject({
-      method: 'PUT',
-      url: `${prefix}/crud/gis.dataset/5400000`,
-      body: { editor_id: '11' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    // rep.dataset_id
-    // console.log(rep);
-    assert.equal(rep.editor_id, '11');
-  });
-
-  await t.test('DELETE /delete', async () => {
-    const res = await app.inject({
-      method: 'DELETE',
-      url: `${prefix}/crud/gis.dataset/5400000`,
-    });
-
-    const rep = JSON.parse(res?.body);
-    // rep.dataset_id
-    // console.log(rep);
-    assert.ok(rep);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+
+import config from '../config.js';
+
+test('api crud', async (t) => {
+  const app = await build(t);
+  const prefix = config.prefix || '/api';
+
+  await t.test('POST /insert', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/crud/gis.dataset`,
+      body: { dataset_name: '111', dataset_id: '5400000' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    // rep.dataset_id
+    // console.log(rep);
+    // pgClients.client.query('delete from gis.dataset where dataset_id=$1', [rep.dataset_id]);
+    assert.ok(rep.dataset_id);
+  });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: `${prefix}/crud/gis.dataset/5400000`,
+      body: { editor_id: '11' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    // rep.dataset_id
+    // console.log(rep);
+    assert.equal(rep.editor_id, '11');
+  });
+
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: `${prefix}/crud/gis.dataset/5400000`,
+    });
+
+    const rep = JSON.parse(res?.body);
+    // rep.dataset_id
+    // console.log(rep);
+    assert.ok(rep);
+  });
+});

package/test/api/crud.xss.test.js

@@ -1,70 +1,68 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-
-import setTokenById from '../../crud/funcs/setTokenById.js';
-import config from '../config.js';
-
-test('api crud xss', async (t) => {
-  const app = await build(t);
-  const session = { passport: { user: { uid: '1' } } };
-  app.decorateRequest('session', session);
-
-  const prefix = config.prefix || '/api';
-
-  let addTokens;
-  let editTokens;
-
-  // before
-  t.test('setTokenById', async () => {
-    addTokens = setTokenById({
-      funcs: { config },
-      ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
-      mode: 'a',
-      session,
-      array: 1,
-    });
-    editTokens = setTokenById({
-      funcs: { config },
-      ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
-      mode: 'w',
-      session,
-      array: 1,
-    });
-    assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');
-  });
-
-  await t.test('POST /insert', async () => {
-    const res = await app.inject({
-      method: 'POST',
-      url: `${prefix}/crud/${addTokens[0]}`,
-      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
-    });
-
-    const rep = JSON.parse(res?.body);
-
-    assert.ok(rep.status, 409);
-  });
-
-  await t.test('PUT /update', async () => {
-    const res = await app.inject({
-      method: 'PUT',
-      url: `${prefix}/crud/${editTokens[0]}/${editTokens[0]}`,
-      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
-    });
-
-    const rep = JSON.parse(res?.body);
-
-    assert.equal(rep.status, 409);
-  });
-  await t.test('DELETE /delete', async () => {
-    const res = await app.inject({
-      method: 'DELETE',
-      url: `${prefix}/crud/gis.dataset/5400000`,
-    });
-
-    const rep = JSON.parse(res?.body);
-    assert.ok(rep);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+
+import setToken from '../../crud/funcs/setToken.js';
+import config from '../config.js';
+
+test('api crud xss', async (t) => {
+  const app = await build(t);
+  const session = { passport: { user: { uid: '1' } } };
+  app.decorateRequest('session', session);
+
+  const prefix = config.prefix || '/api';
+
+  let addTokens;
+  let editTokens;
+
+  // before
+  t.test('setToken', async () => {
+    addTokens = setToken({
+      ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
+      mode: 'a',
+      uid: 1,
+      array: 1,
+    });
+    editTokens = setToken({
+      ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
+      mode: 'w',
+      uid: 1,
+      array: 1,
+    });
+    assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');
+  });
+
+  await t.test('POST /insert', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/crud/${addTokens[0]}`,
+      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
+    });
+
+    const rep = JSON.parse(res?.body);
+
+    assert.ok(rep.status, 409);
+  });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: `${prefix}/crud/${editTokens[0]}/${editTokens[0]}`,
+      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
+    });
+
+    const rep = JSON.parse(res?.body);
+
+    assert.equal(rep.status, 409);
+  });
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: `${prefix}/crud/gis.dataset/5400000`,
+    });
+
+    const rep = JSON.parse(res?.body);
+    assert.ok(rep);
+  });
+});

package/test/api/table.test.js

@@ -1,49 +1,49 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-
-test('api table', async (t) => {
-  const app = await build(t);
-  // assert.ok(1);
-  await t.test('GET /suggest', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/suggest/storage.data',
-    });
-    // console.log(res?.body);
-    const rep = JSON.parse(res?.body);
-    // console.log(rep.total);
-    assert.ok(rep.total);
-  });
-  await t.test('GET /data', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/data/gis.dataset.table',
-    });
-    // console.log(res);
-    const rep = JSON.parse(res?.body);
-    // console.log(rep.total);
-    assert.ok(rep.total);
-  });
-  await t.test('GET /form', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/form/cp_building.form',
-    });
-    // console.log(res);
-    const rep = JSON.parse(res?.body);
-    // console.log(rep.total);
-    assert.ok(rep);
-  });
-  await t.test('GET /filter', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/filter/gis.dataset.table',
-    });
-    // console.log(res);
-    const rep = JSON.parse(res?.body);
-    // console.log(rep.total);
-    assert.ok(rep);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+
+test('api table', async (t) => {
+  const app = await build(t);
+  // assert.ok(1);
+  await t.test('GET /suggest', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/suggest/storage.data',
+    });
+    // console.log(res?.body);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep.total);
+  });
+  await t.test('GET /data', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/data/gis.dataset.table',
+    });
+    // console.log(res);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep.total);
+  });
+  await t.test('GET /form', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/form/cp_building.form',
+    });
+    // console.log(res);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep);
+  });
+  await t.test('GET /filter', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/filter/gis.dataset.table',
+    });
+    // console.log(res);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep);
+  });
+});

package/test/config.example

@@ -1,18 +1,18 @@
-import config from '../config.js';
-
-Object.assign(config, {
-  templateDir: 'test/templates',
-  pg: {
-    host: '192.168.3.160',
-    port: 5434,
-    database: 'mbk_rivne_dma',
-    user: 'postgres',
-    password: 'postgres',
-  },
-  redis: {
-    host: '192.168.3.160',
-    port: 6379,
-    family: 4,
-  },
-});
-export default config;
+import config from '../config.js';
+
+Object.assign(config, {
+  templateDir: 'test/templates',
+  pg: {
+    host: '192.168.3.160',
+    port: 5434,
+    database: 'mbk_rivne_dma',
+    user: 'postgres',
+    password: 'postgres',
+  },
+  redis: {
+    host: '192.168.3.160',
+    port: 6379,
+    family: 4,
+  },
+});
+export default config;