@opengis/fastify-table 1.0.38 → 1.0.39

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`);
-    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`);
+    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/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/table.test.js

@@ -1,57 +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/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);
-  });
-});
+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

@@ -1,114 +1,114 @@
-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;
-
-  // comment
-  let commentId;
-  await t.test('POST /widget/comment/:objectid', async () => {
-    const body = {};
-    const resp = await widgetSet({
-      pg, params: { type: 'comment', objectid: '1' }, session, body,
-    });
-    commentId = resp.id;
-    assert.ok(commentId, 'comment widget insert fail');
-  });
-  await t.test('GET /widget/comment/:objectid', async () => {
-    const resp = await widgetGet({
-      pg, session, params: { type: 'comment', objectid: '1' },
-    });
-    assert.ok(resp.rows?.length, 'comment widget get fail');
-  });
-  await t.test('DELETE /widget/comment/:objectid', async () => {
-    const resp = await widgetDel({
-      pg, session, params: { type: 'comment', objectid: '1', id: commentId },
-    });
-    assert.ok(resp?.data?.id === commentId, 'comment widget delete fail');
-  });
-
-  // checklist
-  let checklistId;
-  await t.test('POST /widget/checklist/:objectid', async () => {
-    const body = {};
-    const resp = await widgetSet({
-      pg, params: { type: 'checklist', objectid: '1' }, session, body,
-    });
-    checklistId = resp.id;
-    assert.ok(checklistId, 'checklist widget insert fail');
-  });
-  await t.test('GET /widget/checklist/:objectid', async () => {
-    const resp = await widgetGet({
-      pg, session, params: { type: 'checklist', objectid: '1' },
-    });
-    assert.ok(resp.rows?.length, 'checklist widget data get fail');
-  });
-  await t.test('DELETE /widget/checklist/:objectid', async () => {
-    const resp = await widgetDel({
-      pg, session, params: { type: 'checklist', objectid: '1', id: checklistId },
-    });
-    assert.ok(resp?.data?.id === checklistId, 'checklist widget delete fail');
-  });
-
-  // before GET log request
-  await t.test('FAKE POST /widget/history/:objectid', async() => {
-    const res = await pg.query(`insert into log.table_changes(uid, entity_id, entity_type)
-    select $1, '1', 'admin.users'`, [config.testUser?.uid || '1']);
-    // console.log(res.rowCount);
-  });
-
-  // history
-  await t.test('GET /widget/history/:objectid', async () => {
-    const resp = await widgetGet({
-      pg, session, params: { type: 'history', objectid: '1' },
-    });
-    assert.ok(resp.rows?.length > 0, 'history widget data get fail');
-  });
-
-  // file
-  let fileId;
-  /* @opengis/fastify-file dependency - funcs */
-  /* await t.test('POST /widget/file/:objectid', async () => {
-    const body = {};
-    const resp = await widgetSet({
-      pg, params: { type: 'file', objectid: '1' }, session, body,
-    });
-    fileId = resp.id;
-    assert.ok(fileId, 'file widget insert fail');
-  }); */
-  await t.test('GET /widget/file/:objectid', async () => {
-    const { rows } = await pg.query(`insert into crm.files(entity_id, entity_type, uid, file_status)
-    select '1', 'admin.users', $1, 1 returning *`, [config.testUser?.uid || '1']);
-    fileId = rows?.[0]?.file_id; // substitude for POST request
-    const resp = await widgetGet({
-      pg, session, params: { type: 'file', objectid: '1' },
-    });
-    assert.ok(resp.rows?.length, 'file widget data get fail');
-  });
-  await t.test('DELETE /widget/file/:objectid', async () => {
-    const resp = await widgetDel({
-      pg, session, params: { type: 'file', objectid: '1', id: fileId },
-    });
-    assert.ok(resp?.data?.id === fileId, 'file widget delete fail');
-  });
-
-  await t.test('clean after test', async() => {
-    const res1 = await pg.query(`delete from crm.communications where entity_id=$1`, ['1']);
-    const res2 = await pg.query(`delete from crm.checklists where entity_id=$1`, ['1']);
-    const res3 = await pg.query(`delete from crm.files where entity_id=$1`, ['1']);
-    const res4 = await pg.query(`delete from log.table_changes where entity_id=$1`, ['1']);
-    pg.end();
-  });
-});
+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;
+
+  // comment
+  let commentId;
+  await t.test('POST /widget/comment/:objectid', async () => {
+    const body = {};
+    const resp = await widgetSet({
+      pg, params: { type: 'comment', objectid: '1' }, session, body,
+    });
+    commentId = resp.id;
+    assert.ok(commentId, 'comment widget insert fail');
+  });
+  await t.test('GET /widget/comment/:objectid', async () => {
+    const resp = await widgetGet({
+      pg, session, params: { type: 'comment', objectid: '1' },
+    });
+    assert.ok(resp.rows?.length, 'comment widget get fail');
+  });
+  await t.test('DELETE /widget/comment/:objectid', async () => {
+    const resp = await widgetDel({
+      pg, session, params: { type: 'comment', objectid: '1', id: commentId },
+    });
+    assert.ok(resp?.data?.id === commentId, 'comment widget delete fail');
+  });
+
+  // checklist
+  let checklistId;
+  await t.test('POST /widget/checklist/:objectid', async () => {
+    const body = {};
+    const resp = await widgetSet({
+      pg, params: { type: 'checklist', objectid: '1' }, session, body,
+    });
+    checklistId = resp.id;
+    assert.ok(checklistId, 'checklist widget insert fail');
+  });
+  await t.test('GET /widget/checklist/:objectid', async () => {
+    const resp = await widgetGet({
+      pg, session, params: { type: 'checklist', objectid: '1' },
+    });
+    assert.ok(resp.rows?.length, 'checklist widget data get fail');
+  });
+  await t.test('DELETE /widget/checklist/:objectid', async () => {
+    const resp = await widgetDel({
+      pg, session, params: { type: 'checklist', objectid: '1', id: checklistId },
+    });
+    assert.ok(resp?.data?.id === checklistId, 'checklist widget delete fail');
+  });
+
+  // before GET log request
+  await t.test('FAKE POST /widget/history/:objectid', async() => {
+    const res = await pg.query(`insert into log.table_changes(uid, entity_id, entity_type)
+    select $1, '1', 'admin.users'`, [config.testUser?.uid || '1']);
+    // console.log(res.rowCount);
+  });
+
+  // history
+  await t.test('GET /widget/history/:objectid', async () => {
+    const resp = await widgetGet({
+      pg, session, params: { type: 'history', objectid: '1' },
+    });
+    assert.ok(resp.rows?.length > 0, 'history widget data get fail');
+  });
+
+  // file
+  let fileId;
+  /* @opengis/fastify-file dependency - funcs */
+  /* await t.test('POST /widget/file/:objectid', async () => {
+    const body = {};
+    const resp = await widgetSet({
+      pg, params: { type: 'file', objectid: '1' }, session, body,
+    });
+    fileId = resp.id;
+    assert.ok(fileId, 'file widget insert fail');
+  }); */
+  await t.test('GET /widget/file/:objectid', async () => {
+    const { rows } = await pg.query(`insert into crm.files(entity_id, entity_type, uid, file_status)
+    select '1', 'admin.users', $1, 1 returning *`, [config.testUser?.uid || '1']);
+    fileId = rows?.[0]?.file_id; // substitude for POST request
+    const resp = await widgetGet({
+      pg, session, params: { type: 'file', objectid: '1' },
+    });
+    assert.ok(resp.rows?.length, 'file widget data get fail');
+  });
+  await t.test('DELETE /widget/file/:objectid', async () => {
+    const resp = await widgetDel({
+      pg, session, params: { type: 'file', objectid: '1', id: fileId },
+    });
+    assert.ok(resp?.data?.id === fileId, 'file widget delete fail');
+  });
+
+  await t.test('clean after test', async() => {
+    const res1 = await pg.query(`delete from crm.communications where entity_id=$1`, ['1']);
+    const res2 = await pg.query(`delete from crm.checklists where entity_id=$1`, ['1']);
+    const res3 = await pg.query(`delete from crm.files where entity_id=$1`, ['1']);
+    const res4 = await pg.query(`delete from log.table_changes where entity_id=$1`, ['1']);
+    pg.end();
+  });
+});

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;