@opengis/fastify-table 1.0.26 → 1.0.28

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

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

package/test/widget.test.js

@@ -1,39 +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('api && funcs notification', async (t) => {
-  const app = 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');
-  });
-});
+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('api && funcs notification', async (t) => {
+  const app = 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/widget/controllers/utils/historyFormat.js

@@ -1,76 +1,76 @@
-import { readdir } from 'fs/promises';
-import { existsSync, readFileSync } from 'fs';
-
-// import getTemplate from '../../../table/controllers/utils/getTemplate.js';
-import getSelect from '../../../table/controllers/utils/getSelect.js';
-
-const dbData = {};
-
-// from config??
-const allTemplates = { table: {} };
-
-const historyQ = `select nspname||'.'||relname as table_name, json_agg(json_build_object('name',attname, 'title',coalesce(col_description(attrelid, attnum),attname))) as columns
-from pg_attribute a
-left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-JOIN pg_class AS i
-  ON i.oid = a.attrelid 
-JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
-where a.attnum > 0 
-and not a.attisdropped
-group by nspname||'.'||relname`;
-
-export default async function historyFormat(rows, table, pg) {
-  if (!rows?.[0]?.changes) return rows; // old structure
-  // on startup
-  if (!allTemplates.table.length) {
-    const templateDir = './server/templates/table';
-    const templates = existsSync(templateDir) ? await readdir(templateDir) : [];
-    templates.forEach((template) => {
-      const body = JSON.parse(readFileSync(`${templateDir}/${template}`) || '{}');
-      Object.assign(allTemplates.table, { [template]: body });
-    });
-  }
-
-  const progrid = Object.keys(allTemplates.table).find((key) => key.replace('.json', '') === table);
-  if (!progrid) return rows;
-  // const body = await getTemplate('table', progrid);
-  const body = allTemplates.table[progrid];
-  const tableName = body?.table || table;
-  if (!tableName) return rows;
-
-  // get DB column description
-  if (!dbData?.[body.table]?.length) {
-    const { rows: rows1 } = await pg.query(historyQ);
-    rows1.forEach((row) => {
-      dbData[row.table_name] = row.columns;
-    });
-  }
-
-  // rewrite!!!
-  await Promise.all(rows?.map(async (op) => {
-    op.changes?.map(async (el) => {
-      const col = body.colModel.filter((col1) => col1.name === el.attr)[0] || dbData[body?.table]?.find((col1) => col1.name === el.attr);
-      if (el.attr === 'geom') {
-        el.title = 'Геометрія';
-      }
-      el.title = col?.ua || col?.title || el.attr;
-      if (!col) return;
-      el.type = col.type;
-      el.format = col.format;
-      const select = col.data || col.option || col.select;
-
-      // getSelect not equals to node
-      if (select && false) {
-        el.select = select;
-        const cls = await getSelect(select, {
-          val: [el.old, el.new],
-        });
-
-        el.oldf = cls[0] || el.old;
-        el.newf = cls[1] || el.new;
-      }
-    });
-  }));
-
-  return rows;
-}
+import { readdir } from 'fs/promises';
+import { existsSync, readFileSync } from 'fs';
+
+// import getTemplate from '../../../table/controllers/utils/getTemplate.js';
+import getSelect from '../../../table/controllers/utils/getSelect.js';
+
+const dbData = {};
+
+// from config??
+const allTemplates = { table: {} };
+
+const historyQ = `select nspname||'.'||relname as table_name, json_agg(json_build_object('name',attname, 'title',coalesce(col_description(attrelid, attnum),attname))) as columns
+from pg_attribute a
+left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+JOIN pg_class AS i
+  ON i.oid = a.attrelid 
+JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
+where a.attnum > 0 
+and not a.attisdropped
+group by nspname||'.'||relname`;
+
+export default async function historyFormat(rows, table, pg) {
+  if (!rows?.[0]?.changes) return rows; // old structure
+  // on startup
+  if (!allTemplates.table.length) {
+    const templateDir = './server/templates/table';
+    const templates = existsSync(templateDir) ? await readdir(templateDir) : [];
+    templates.forEach((template) => {
+      const body = JSON.parse(readFileSync(`${templateDir}/${template}`) || '{}');
+      Object.assign(allTemplates.table, { [template]: body });
+    });
+  }
+
+  const progrid = Object.keys(allTemplates.table).find((key) => key.replace('.json', '') === table);
+  if (!progrid) return rows;
+  // const body = await getTemplate('table', progrid);
+  const body = allTemplates.table[progrid];
+  const tableName = body?.table || table;
+  if (!tableName) return rows;
+
+  // get DB column description
+  if (!dbData?.[body.table]?.length) {
+    const { rows: rows1 } = await pg.query(historyQ);
+    rows1.forEach((row) => {
+      dbData[row.table_name] = row.columns;
+    });
+  }
+
+  // rewrite!!!
+  await Promise.all(rows?.map(async (op) => {
+    op.changes?.map(async (el) => {
+      const col = body.colModel.filter((col1) => col1.name === el.attr)[0] || dbData[body?.table]?.find((col1) => col1.name === el.attr);
+      if (el.attr === 'geom') {
+        el.title = 'Геометрія';
+      }
+      el.title = col?.ua || col?.title || el.attr;
+      if (!col) return;
+      el.type = col.type;
+      el.format = col.format;
+      const select = col.data || col.option || col.select;
+
+      // getSelect not equals to node
+      if (select && false) {
+        el.select = select;
+        const cls = await getSelect(select, {
+          val: [el.old, el.new],
+        });
+
+        el.oldf = cls[0] || el.old;
+        el.newf = cls[1] || el.new;
+      }
+    });
+  }));
+
+  return rows;
+}

package/widget/controllers/utils/obj2db.js

@@ -1,13 +1,13 @@
-export default function obj2db(data, nonexistCol) {
-  if (
-    typeof data !== 'object'
-        || Array.isArray(data)
-        || !Object.keys(data || {}).length
-  ) return { error: 'invalid data type' };
-
-  const existColumns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
-  const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
-  const args = columns?.map((col) => data[col]);
-
-  return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };
-}
+export default function obj2db(data, nonexistCol) {
+  if (
+    typeof data !== 'object'
+        || Array.isArray(data)
+        || !Object.keys(data || {}).length
+  ) return { error: 'invalid data type' };
+
+  const existColumns = Object.keys(data)?.filter((key) => !nonexistCol.includes(key));
+  const columns = existColumns?.filter((col) => data[col] || data?.[col] === 0);
+  const args = columns?.map((col) => data[col]);
+
+  return { columns, args, error: !columns?.length ? 'nothing to process' : undefined };
+}

package/widget/controllers/widget.del.js

@@ -1,40 +1,40 @@
-/**
- * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
- *
- * @method DELETE
- * @summary CRM дані для обраного віджета.
- * @priority 2
- * @tag table
- * @type api
- * @requires setTokenById
- * @requires getSelect
- * @param {String} id Ідентифікатор для хешування
- * @param {Any} sql Використовується для повернення sql запиту
- * @param {String} type Тип для хешування даних
- * @errors 400, 500
- * @returns {Number} status Номер помилки
- * @returns {String|Object} error Опис помилки
- * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
- */
-
-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 { error: 'type not valid required', status: 401 };
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const sql = {
-    comment: 'delete from crm.comment where object_id=$1 and uid=$2 and comment_id=$3',
-    checklist: 'delete from crm.checklist where object_id=$1 and uid=$2 and checklist_id=$3 ',
-  };
-  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 } };
-  }
-  catch (err) {
-    return { message: err.toString(), status: 500 };
-  }
-}
+/**
+ * Дістає CRM дані для vue хешує ідентифікатори, підтягує селекти
+ *
+ * @method DELETE
+ * @summary CRM дані для обраного віджета.
+ * @priority 2
+ * @tag table
+ * @type api
+ * @requires setTokenById
+ * @requires getSelect
+ * @param {String} id Ідентифікатор для хешування
+ * @param {Any} sql Використовується для повернення sql запиту
+ * @param {String} type Тип для хешування даних
+ * @errors 400, 500
+ * @returns {Number} status Номер помилки
+ * @returns {String|Object} error Опис помилки
+ * @returns {String|Object} message Повідомлення про успішне виконання або об'єкт з параметрами
+ */
+
+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 { error: 'type not valid required', status: 401 };
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const sql = {
+    comment: 'delete from crm.comment where object_id=$1 and uid=$2 and comment_id=$3',
+    checklist: 'delete from crm.checklist where object_id=$1 and uid=$2 and checklist_id=$3 ',
+  };
+  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 } };
+  }
+  catch (err) {
+    return { message: err.toString(), status: 500 };
+  }
+}