@opengis/fastify-table 1.1.6 → 1.1.7

package/table/controllers/card.js

@@ -1,44 +1,44 @@
-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 = {}, opt = {},
-  } = req;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  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 = opt.id || 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, [opt.id || 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,
-  };
-}
+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 = {}, opt = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+
+  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 = opt.id || 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, [opt.id || 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/form.js

@@ -1,28 +1,28 @@
-import getTemplate from './utils/getTemplate.js';
-
-const sql = `select property_key as key, property_json as json, property_int as int,
-property_text as text from admin.properties where 1=1`;
-
-async function getSettings({ pg }) {
-  const { rows = [] } = await pg.query(sql);
-  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  return data;
-}
-
-export default async function formFunction(req) {
-  const time = Date.now();
-  const { pg, params } = req;
-  const form = await getTemplate('form', params.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  // replace settings
-  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
-  if (arr?.length) {
-    const string = JSON.stringify(form);
-    const settings = await getSettings({ pg });
-    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
-    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
-    return { time: Date.now() - time, form: JSON.parse(res) };
-  }
-  return { time: Date.now() - time, form };
-}
+import getTemplate from './utils/getTemplate.js';
+
+const sql = `select property_key as key, property_json as json, property_int as int,
+property_text as text from admin.properties where 1=1`;
+
+async function getSettings({ pg }) {
+  const { rows = [] } = await pg.query(sql);
+  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  return data;
+}
+
+export default async function formFunction(req) {
+  const time = Date.now();
+  const { pg, params } = req;
+  const form = await getTemplate('form', params.form);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  // replace settings
+  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
+  if (arr?.length) {
+    const string = JSON.stringify(form);
+    const settings = await getSettings({ pg });
+    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+    return { time: Date.now() - time, form: JSON.parse(res) };
+  }
+  return { time: Date.now() - time, form };
+}

package/table/controllers/utils/getSelect.js

@@ -5,16 +5,15 @@ const loadCls = {};
 export default async function getSelect(name) {
   if (loadCls[name]) return loadCls[name];
 
-  const clsData = await getTemplate('cls', name);
-  // console.log(clsData);
-  if (clsData) {
+  const clsData = await getTemplate(['cls', 'select'], name);
+  if (!clsData) { return null; }
+
+  //  console.log(clsData);
+  if (clsData && Array.isArray(clsData)) {
     loadCls[name] = { arr: clsData };
     return loadCls[name];
   }
 
-  const selectData = await getTemplate('select', name);
-  if (!selectData) { return null; }
-
-  loadCls[name] = selectData;
+  loadCls[name] = clsData.sql ? clsData : { sql: clsData };
   return loadCls[name];
 }

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

@@ -1,72 +1,72 @@
-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.addHook('onRequest', async (req) => {
-    req.session = session;
-  });
-  // 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}/table/${addTokens[0]}`,
-      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.ok(rep.status, 409);
-  });
-
-  await t.test('PUT /update', async () => {
-    const res = await app.inject({
-      method: 'PUT',
-      url: `${prefix}/table/${editTokens[0]}/${editTokens[0]}`,
-      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.equal(rep.status, 409);
-  });
-  await t.test('DELETE /delete', async () => {
-    const res = await app.inject({
-      method: 'DELETE',
-      url: `${prefix}/table/gis.dataset/5400000`,
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    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.addHook('onRequest', async (req) => {
+    req.session = session;
+  });
+  // 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}/table/${addTokens[0]}`,
+      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.ok(rep.status, 409);
+  });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: `${prefix}/table/${editTokens[0]}/${editTokens[0]}`,
+      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.equal(rep.status, 409);
+  });
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: `${prefix}/table/gis.dataset/5400000`,
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.ok(rep);
+  });
+});

package/test/api/notification.test.js

@@ -1,37 +1,37 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-import config from '../config.js';
-
-const session = { passport: { user: { uid: config.testUser?.uid || '1' } } };
-
-import userNotifications from '../../notification/controllers/userNotifications.js';
-
-import pgClients from '../../pg/pgClients.js';
-
-test('api && funcs notification', async (t) => {
-  const app = await build(t);
-  const pg = pgClients.client;
-  /*
-  // require dependency
-  await t.test('GET /auth', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `/api/login?username=${config.testUser?.username}&password=${config.testUser?.password}`,
-    });
-    assert.ok(res.statusCode);
-  });
-  await t.test('GET /notification', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: '/api/notification',
-    });
-    const rep = JSON.parse(res?.body);
-    assert.ok(rep.time);
-  }); */
-  /* await t.test('GET /notification', async () => {
-    const rep = await userNotifications({ pg, session });
-    assert.ok(rep.time);
-  }); */
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+import config from '../config.js';
+
+const session = { passport: { user: { uid: config.testUser?.uid || '1' } } };
+
+import userNotifications from '../../notification/controllers/userNotifications.js';
+
+import pgClients from '../../pg/pgClients.js';
+
+test('api && funcs notification', async (t) => {
+  const app = await build(t);
+  const pg = pgClients.client;
+  /*
+  // require dependency
+  await t.test('GET /auth', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `/api/login?username=${config.testUser?.username}&password=${config.testUser?.password}`,
+    });
+    assert.ok(res.statusCode);
+  });
+  await t.test('GET /notification', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/notification',
+    });
+    const rep = JSON.parse(res?.body);
+    assert.ok(rep.time);
+  }); */
+  /* await t.test('GET /notification', async () => {
+    const rep = await userNotifications({ pg, session });
+    assert.ok(rep.time);
+  }); */
+});

package/test/api/suggest.test.js

@@ -1,66 +1,66 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-
-test('api suggest', async (t) => {
-  const app = await build(t);
-  
-  await t.test('GET /suggest', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `/api/suggest/test.storage.data`,
-    });
-    const rep = JSON.parse(res?.body);
-    // console.log(rep);
-    assert.equal(res?.statusCode, 200);
-    assert.ok(rep?.count);
-  });
-
-  await t.test('GET /suggest key query', async () => {
-    const key = 'Новокиївка';
-    const res = await app.inject({
-      method: 'GET',
-      url: `/api/suggest/test.suggest.ato_new?key=${key}`,
-    });
-    const rep = JSON.parse(res?.body);
-    // console.log(rep);
-    assert.equal(res?.statusCode, 200);
-    assert.ok(rep?.count);
-  });
-
-  await t.test('GET /suggest key searchColumn', async () => {
-    const key = 'data_address.addr_city';
-    const res = await app.inject({
-      method: 'GET',
-      url: `/api/suggest/test.storage.data?key=${key}`,
-    });
-    const rep = JSON.parse(res?.body);
-    // console.log(rep);
-    assert.equal(res?.statusCode, 200);
-    assert.ok(rep?.count);
-  });
-
-  await t.test('GET /suggest інша db', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `/api/suggest/test.suggest.data`,
-    });
-    const rep = JSON.parse(res?.body);
-    // console.log(rep);
-    assert.equal(res?.statusCode, 200);
-    assert.ok(rep?.count);
-  });
-
-  await t.test('GET /suggest parent', async () => {
-    const parent = '3206158274160231699';
-    const res = await app.inject({
-      method: 'GET',
-      url: `/api/suggest/test.suggest.parent?parent=${parent}`,
-    });
-    const rep = JSON.parse(res?.body);
-    // console.log(rep);
-    assert.equal(res?.statusCode, 200);
-    assert.ok(rep?.count);
-  });
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+
+test('api suggest', async (t) => {
+  const app = await build(t);
+  
+  await t.test('GET /suggest', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `/api/suggest/test.storage.data`,
+    });
+    const rep = JSON.parse(res?.body);
+    // console.log(rep);
+    assert.equal(res?.statusCode, 200);
+    assert.ok(rep?.count);
+  });
+
+  await t.test('GET /suggest key query', async () => {
+    const key = 'Новокиївка';
+    const res = await app.inject({
+      method: 'GET',
+      url: `/api/suggest/test.suggest.ato_new?key=${key}`,
+    });
+    const rep = JSON.parse(res?.body);
+    // console.log(rep);
+    assert.equal(res?.statusCode, 200);
+    assert.ok(rep?.count);
+  });
+
+  await t.test('GET /suggest key searchColumn', async () => {
+    const key = 'data_address.addr_city';
+    const res = await app.inject({
+      method: 'GET',
+      url: `/api/suggest/test.storage.data?key=${key}`,
+    });
+    const rep = JSON.parse(res?.body);
+    // console.log(rep);
+    assert.equal(res?.statusCode, 200);
+    assert.ok(rep?.count);
+  });
+
+  await t.test('GET /suggest інша db', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `/api/suggest/test.suggest.data`,
+    });
+    const rep = JSON.parse(res?.body);
+    // console.log(rep);
+    assert.equal(res?.statusCode, 200);
+    assert.ok(rep?.count);
+  });
+
+  await t.test('GET /suggest parent', async () => {
+    const parent = '3206158274160231699';
+    const res = await app.inject({
+      method: 'GET',
+      url: `/api/suggest/test.suggest.parent?parent=${parent}`,
+    });
+    const rep = JSON.parse(res?.body);
+    // console.log(rep);
+    assert.equal(res?.statusCode, 200);
+    assert.ok(rep?.count);
+  });
 })

package/test/config.example

@@ -1,18 +1,18 @@
-import config from '../config.js';
-
-Object.assign(config, {
-  folder: '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, {
+  folder: '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;

package/test/funcs/notification.test.js

@@ -1,31 +1,31 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-// import build from '../../helper.js';
-// import config from '../config.js';
-
-// import addNotification from '../../notification/funcs/addNotification.js';
-
-// import pgClients from '../../pg/pgClients.js';
-
-test('notification funcs', async (t) => {
-  // await build(t);
-  // const pg = pgClients.client;
-  // let resp;
-  /* await t.test('addNotification', async () => {
-    resp = await addNotification({
-      pg,
-
-      title: 'test title',
-      body: 'test body',
-      link: 'http://link',
-      notificationType: 'mention',
-      uid: config.testUser?.uid || '1',
-    });
-    assert.ok(resp.id);
-  });
-  await t.test('clean up after test, before pool is closed', async () => {
-    await pg.query('delete from crm.notification where notification_id=$1', [resp.id]);
-    console.log(resp.id, 'deleted');
-  }); */
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+// import build from '../../helper.js';
+// import config from '../config.js';
+
+// import addNotification from '../../notification/funcs/addNotification.js';
+
+// import pgClients from '../../pg/pgClients.js';
+
+test('notification funcs', async (t) => {
+  // await build(t);
+  // const pg = pgClients.client;
+  // let resp;
+  /* await t.test('addNotification', async () => {
+    resp = await addNotification({
+      pg,
+
+      title: 'test title',
+      body: 'test body',
+      link: 'http://link',
+      notificationType: 'mention',
+      uid: config.testUser?.uid || '1',
+    });
+    assert.ok(resp.id);
+  });
+  await t.test('clean up after test, before pool is closed', async () => {
+    await pg.query('delete from crm.notification where notification_id=$1', [resp.id]);
+    console.log(resp.id, 'deleted');
+  }); */
+});