@opengis/fastify-table 1.0.17 → 1.0.19

package/server.js

@@ -1,14 +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);
-  }
-});
+// 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/search.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';
+
+const maxLimit = 100;
+
+export default async function data({
+  pg, query = {},
+}) {
+  const time = Date.now();
+
+  const loadTable = await getTemplate('table', query.table);
+
+    if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const { table, columns, meta } = loadTable;
+  const { pk } = await getMeta(table);
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  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 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;
+
+  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);
+
+  await metaFormat({ rows, table: query.table });
+  return {
+    time: Date.now() - time, total, count: rows.length, rows,
+  };
+}

package/table/index.js

@@ -1,5 +1,6 @@
 import suggest from './controllers/suggest.js';
 import data from './controllers/data.js';
+import search from './controllers/search.js';
 import filter from './controllers/filter.js';
 import form from './controllers/form.js';
 import metaFormat from './funcs/metaFormat/index.js';
@@ -12,12 +13,24 @@ const tableSchema = {
   },
 };
 
+const searchTableSchema = {
+  querystring: {
+    page: { type: 'number' },
+    order: { type: 'string' },
+    desc: { type: 'string' },
+    filter: { type: 'string' },
+    key: { type: 'string' },
+    table: { 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}/search`, { schema: searchTableSchema }, search);
   fastify.get(`${prefix}/filter/:table`, {}, filter);
   fastify.get(`${prefix}/form/:form`, {}, form);
 }

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,68 +1,68 @@
-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);
-  });
-});
+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/notification.test.js

@@ -0,0 +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);
+  });
+});

package/test/api/table.test.js

@@ -9,7 +9,7 @@ test('api table', async (t) => {
   await t.test('GET /suggest', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: '/api/suggest/storage.data',
+      url: '/api/suggest/test.storage.data',
     });
     // console.log(res?.body);
     const rep = JSON.parse(res?.body);
@@ -19,17 +19,25 @@ test('api table', async (t) => {
   await t.test('GET /data', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: '/api/data/gis.dataset.table',
+      url: '/api/data/test.dataset.table',
     });
     // console.log(res);
     const rep = JSON.parse(res?.body);
     // console.log(rep.total);
     assert.ok(rep.total);
   });
+  await t.test('GET /search', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/search?table=test.dataset.table&key=0',
+    });
+    const rep = JSON.parse(res?.body);
+    assert.ok(rep.total);
+  });
   await t.test('GET /form', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: '/api/form/cp_building.form',
+      url: '/api/form/test.dataset.form',
     });
     // console.log(res);
     const rep = JSON.parse(res?.body);
@@ -39,7 +47,7 @@ test('api table', async (t) => {
   await t.test('GET /filter', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: '/api/filter/gis.dataset.table',
+      url: '/api/filter/test.dataset.table',
     });
     // console.log(res);
     const rep = JSON.parse(res?.body);

package/test/api/widget.test.js

@@ -0,0 +1,39 @@
+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 widgetGet from '../../widget/controllers/widget.get.js';
+import widgetSet from '../../widget/controllers/widget.set.js';
+import widgetDel from '../../widget/controllers/widget.del.js';
+
+import pgClients from '../../pg/pgClients.js';
+
+test('widget api', async (t) => {
+  await build(t);
+  const pg = pgClients.client;
+  await t.test('POST /widget/:type/:objectid', async () => {
+    const body = {};
+    const rep = await widgetSet({
+      pg, params: { type: 'comment', objectid: '1' }, session, body,
+    });
+    assert.ok(rep.data);
+  });
+
+  let resp;
+  await t.test('GET /widget/:type/:objectid', async () => {
+    resp = await widgetGet({
+      pg, session, params: { type: 'comment', objectid: '1' },
+    });
+    assert.ok(resp.rows.length > 0, 'widget data get fail');
+  });
+  await t.test('DELETE /widget/:type/:objectid', async () => {
+    resp = await widgetDel({
+      pg, session, params: { type: 'comment', objectid: '1', id: resp.rows?.find((row) => row)?.comment_id },
+    });
+    assert.ok(resp.data.rowCount === 1, 'widget data delete fail');
+  });
+});

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;

package/test/funcs/crud.test.js

@@ -1,76 +1,76 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-import config from '../config.js';
-import pgClients from '../../pg/pgClients.js';
-import rclient from '../../redis/client.js';
-
-import dataInsert from '../../crud/funcs/dataInsert.js';
-import dataUpdate from '../../crud/funcs/dataUpdate.js';
-import dataDelete from '../../crud/funcs/dataDelete.js';
-import isFileExists from '../../crud/funcs/isFileExists.js';
-
-import getOpt from '../../crud/funcs/getOpt.js';
-import setOpt from '../../crud/funcs/setOpt.js';
-
-import getToken from '../../crud/funcs/getToken.js';
-import setToken from '../../crud/funcs/setToken.js';
-
-test('funcs crud', async (t) => {
-  await pgClients.client.init();
-  await t.test('getOpt/setOpt', async () => {
-    const opt = await setOpt({ table: 'gis.dataset' });
-    const data = await getOpt(opt);
-    // console.log(data);
-    assert.equal(data.table, 'gis.dataset');
-  });
-
-  const id = (Math.random() * 10000).toFixed();
-  await t.test('dataInsert', async () => {
-    const data = await dataInsert({ table: 'gis.dataset', data: { dataset_id: id, dataset_name: '222' } });
-    assert.equal(data.dataset_id, id);
-  });
-
-  await t.test('dataUpdate', async () => {
-    const data = await dataUpdate({ table: 'gis.dataset', id, data: { dataset_name: '22211' } });
-    assert.equal(data.dataset_name, '22211');
-  });
-
-  await t.test('dataDelete', async () => {
-    const data = await dataDelete({ table: 'gis.dataset', id });
-    assert.ok(data);
-  });
-
-  await t.test('isFileExists', async () => {
-    const data = await isFileExists({ filepath: '../../crud/funcs/isFileExists.js' });
-    assert.equal(data, false);
-  });
-
-  let tokens;
-  const session = { passport: { user: { uid: '1' } } };
-  const tokenData = JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' });
-
-  await t.test('setToken', async () => {
-    tokens = setToken({
-      funcs: { config },
-      ids: [tokenData],
-      mode: 'a',
-      uid: 1,
-      array: 1,
-    });
-    assert.equal(tokens.length, 1);
-  });
-  await t.test('getToken', async () => {
-    const data = await getToken({
-      uid: 1,
-      token: tokens[0],
-      mode: 'a',
-    });
-    assert.equal(data, tokenData);
-  });
-
-  // pgClients.client.query('delete from gis.dataset where dataset_id=$1', [id]);
-  t.after(() => {
-    pgClients.client?.end();
-    rclient.quit();
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+import config from '../config.js';
+import pgClients from '../../pg/pgClients.js';
+import rclient from '../../redis/client.js';
+
+import dataInsert from '../../crud/funcs/dataInsert.js';
+import dataUpdate from '../../crud/funcs/dataUpdate.js';
+import dataDelete from '../../crud/funcs/dataDelete.js';
+import isFileExists from '../../crud/funcs/isFileExists.js';
+
+import getOpt from '../../crud/funcs/getOpt.js';
+import setOpt from '../../crud/funcs/setOpt.js';
+
+import getToken from '../../crud/funcs/getToken.js';
+import setToken from '../../crud/funcs/setToken.js';
+
+test('funcs crud', async (t) => {
+  await pgClients.client.init();
+  await t.test('getOpt/setOpt', async () => {
+    const opt = await setOpt({ table: 'gis.dataset' });
+    const data = await getOpt(opt);
+    // console.log(data);
+    assert.equal(data.table, 'gis.dataset');
+  });
+
+  const id = (Math.random() * 10000).toFixed();
+  await t.test('dataInsert', async () => {
+    const data = await dataInsert({ table: 'gis.dataset', data: { dataset_id: id, dataset_name: '222' } });
+    assert.equal(data.dataset_id, id);
+  });
+
+  await t.test('dataUpdate', async () => {
+    const data = await dataUpdate({ table: 'gis.dataset', id, data: { dataset_name: '22211' } });
+    assert.equal(data.dataset_name, '22211');
+  });
+
+  await t.test('dataDelete', async () => {
+    const data = await dataDelete({ table: 'gis.dataset', id });
+    assert.ok(data);
+  });
+
+  await t.test('isFileExists', async () => {
+    const data = await isFileExists({ filepath: '../../crud/funcs/isFileExists.js' });
+    assert.equal(data, false);
+  });
+
+  let tokens;
+  const session = { passport: { user: { uid: '1' } } };
+  const tokenData = JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' });
+
+  await t.test('setToken', async () => {
+    tokens = setToken({
+      funcs: { config },
+      ids: [tokenData],
+      mode: 'a',
+      uid: 1,
+      array: 1,
+    });
+    assert.equal(tokens.length, 1);
+  });
+  await t.test('getToken', async () => {
+    const data = await getToken({
+      uid: 1,
+      token: tokens[0],
+      mode: 'a',
+    });
+    assert.equal(data, tokenData);
+  });
+
+  // pgClients.client.query('delete from gis.dataset where dataset_id=$1', [id]);
+  t.after(() => {
+    pgClients.client?.end();
+    rclient.quit();
+  });
+});