@opengis/fastify-table 1.0.18 → 1.0.19

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

@@ -1,20 +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.color ? el : el.text }), {}) };
-  if (!cls.arr && data.length) {
-    redis.hmset(key, clsAr);
-  }
-  return clsAr;
-}
+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.color ? el : el.text }), {}) };
+  if (!cls.arr && data.length) {
+    redis.hmset(key, clsAr);
+  }
+  return clsAr;
+}

package/table/funcs/metaFormat/index.js

@@ -1,26 +1,26 @@
-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 values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => el);
-    if (!values.length) return null;
-
-    const cls = await getSelectVal({ name: attr.data, values });
-    if (!cls) return null;
-    rows.forEach(el => {
-      const val = el[attr.name]?.map?.(c => cls[c] || c) || cls[el[attr.name]] || el[attr.name];
-      if (!val) return;
-      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
-    });
-
-    return null;
-  }));
-
-  return rows;
-}
+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 values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => el);
+    if (!values.length) return null;
+
+    const cls = await getSelectVal({ name: attr.data, values });
+    if (!cls) return null;
+    rows.forEach(el => {
+      const val = el[attr.name]?.map?.(c => cls[c] || c) || cls[el[attr.name]] || el[attr.name];
+      if (!val) return;
+      Object.assign(el, { [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: (val.color ? val : val.text || val) });
+    });
+
+    return null;
+  }));
+
+  return rows;
+}

package/table/index.js

@@ -1,25 +1,38 @@
-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;
+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';
+
+const tableSchema = {
+  querystring: {
+    page: { type: 'number' },
+    order: { type: 'string' },
+    filter: { type: 'string' },
+  },
+};
+
+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);
+}
+
+export default plugin;

package/test/api/notification.test.js

@@ -7,7 +7,6 @@ import config from '../config.js';
 const session = { passport: { user: { uid: config.testUser?.uid || '1' } } };
 
 import userNotifications from '../../notification/controllers/userNotifications.js';
-import addNotification from '../../notification/funcs/addNotification.js';
 
 import pgClients from '../../pg/pgClients.js';
 
@@ -35,22 +34,4 @@ test('api && funcs notification', async (t) => {
     const rep = await userNotifications({ pg, session });
     assert.ok(rep.time);
   });
-
-  let resp;
-  await t.test('GET /notification', async () => {
-    resp = await addNotification({
-      pg,
-      session,
-      title: 'test title',
-      body: 'test body',
-      link: 'http://link',
-      notificationType: 'mention',
-      uid: session.passport.user.uid,
-    });
-    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');
-  });
 });

package/test/api/table.test.js

@@ -1,49 +1,57 @@
-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/test.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/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/test.dataset.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/test.dataset.table',
+    });
+    // console.log(res);
+    const rep = JSON.parse(res?.body);
+    // console.log(rep.total);
+    assert.ok(rep);
+  });
+});

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/funcs/notification.test.js

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

package/widget/controllers/widget.del.js

@@ -21,8 +21,9 @@ export default async function widgetDel({
   pg, params = {}, session = {},
 }) {
   const { user = {} } = session.passport || {};
+  if (!user.uid) return { error: 'access restricted', status: 403 };
   const { type, objectid, id } = params;
-  if (!['comment', 'checklist', 'link', 'time'].includes(type)) return { status: 401, error: 'type not valid required' };
+  if (!['comment', 'checklist', 'link', 'time'].includes(type)) return { error: 'type not valid required', status: 401 };
   if (!objectid) return { error: 'id required', status: 400 };
 
   const sql = {
@@ -33,7 +34,7 @@ export default async function widgetDel({
   };
   try {
     const { rows, rowCount } = await pg.query(sql[type], [objectid, user.uid, id]);
-    return { data: { rows, rowCount }, user: { uid: user?.uid, name: user?.user_name } };
+    return { data: { rows, rowCount }, user: { uid: user.uid, name: user.user_name } };
   }
   catch (err) {
     return { message: err.toString(), status: 500 };

package/widget/controllers/widget.set.js

@@ -36,7 +36,7 @@ export default async function widgetSet({
       ? `UPDATE ${table} SET ${columns?.map((key, index) => `"${key}"=$${++index}`).join(',')} WHERE ${pkList[type]} = '${id}' `
       : `INSERT INTO ${table} (${columns?.join(',')}) VALUES (${columns?.map((el, index) => `$${++index}`).join(',')}) returning *;`;
 
-    console.log(query, args);
+    // console.log(query, args);
     const result = await pg.query(query, args);
 
     return {

package/widget/index.js

@@ -1,37 +1,28 @@
-const schema = {
-  params: {
-    type: { type: 'string' },
-    objectid: { type: 'string' },
-    id: { type: 'string' },
-  },
-  querystring: {
-    table: { type: 'string' },
-  },
-};
-
 import widgetDel from './controllers/widget.del.js';
 import widgetSet from './controllers/widget.set.js';
 import widgetGet from './controllers/widget.get.js';
 
-async function route(fastify) {
+async function route(fastify, opt) {
+  const prefix = opt.prefix || '/api';
   fastify.route({
     method: 'DELETE',
-    url: '/api-user/widget/:type/:objectid/:id',
-    schema,
+    url: `${prefix}/widget/:type/:objectid/:id`,
+    schema: {},
     handler: widgetDel,
   });
   fastify.route({
     method: 'POST',
-    path: '/api-user/widget/:type/:objectid/:id?',
-    schema,
+    path: `${prefix}/widget/:type/:objectid/:id?`,
+    schema: {},
     handler: widgetSet,
   });
   fastify.route({
     method: 'GET',
-    path: '/api-user/widget/:type/:objectid',
+    path: `${prefix}/widget/:type/:objectid`,
     config: {
       policy: ['public'],
     },
+    schema: {},
     handler: widgetGet,
   });
 }