@opengis/fastify-table 1.0.82 → 1.0.84

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

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

@@ -1,34 +1,34 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import '../config.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-import autoIndex from '../../pg/funcs/autoIndex.js';
-import pgClients from '../../pg/pgClients.js';
-import rclient from '../../redis/client.js';
-// import pgClients from '../../pg/funcs/pgClients.js';
-
-test('funcs pg', async (t) => {
-  await pgClients.client.init();
-  await t.test('getMeta', async () => {
-    const { columns } = await getMeta({ table: 'gis.dataset' });
-    // console.log(columns)
-    assert.ok(columns);
-  });
-
-  /* await t.test('getPG', async (t) => {
-    const data = await getPG({});
-    assert.ok(data);
-  }); */
-
-  await t.test('autoIndex', async () => {
-    await autoIndex({ table: 'gis.dataset', columns: ['service_type'] });
-    assert.ok(1);
-  });
-  t.after(() => {
-    pgClients.client.end();
-
-    rclient.quit();
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import '../config.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+import autoIndex from '../../pg/funcs/autoIndex.js';
+import pgClients from '../../pg/pgClients.js';
+import rclient from '../../redis/client.js';
+// import pgClients from '../../pg/funcs/pgClients.js';
+
+test('funcs pg', async (t) => {
+  await pgClients.client.init();
+  await t.test('getMeta', async () => {
+    const { columns } = await getMeta({ table: 'gis.dataset' });
+    // console.log(columns)
+    assert.ok(columns);
+  });
+
+  /* await t.test('getPG', async (t) => {
+    const data = await getPG({});
+    assert.ok(data);
+  }); */
+
+  await t.test('autoIndex', async () => {
+    await autoIndex({ table: 'gis.dataset', columns: ['service_type'] });
+    assert.ok(1);
+  });
+  t.after(() => {
+    pgClients.client.end();
+
+    rclient.quit();
+  });
+});

package/test/funcs/redis.test.js

@@ -1,19 +1,19 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import '../config.js';
-
-import rclient from '../../redis/client.js';
-
-test('funcs redis', async (t) => {
-  await t.test('get/set', async () => {
-    await rclient.set('test', '1');
-    const d = await rclient.get('test');
-    // console.log(columns)
-    assert.equal(d, '1');
-  });
-
-  t.after(() => {
-    rclient.quit();
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import '../config.js';
+
+import rclient from '../../redis/client.js';
+
+test('funcs redis', async (t) => {
+  await t.test('get/set', async () => {
+    await rclient.set('test', '1');
+    const d = await rclient.get('test');
+    // console.log(columns)
+    assert.equal(d, '1');
+  });
+
+  t.after(() => {
+    rclient.quit();
+  });
+});

package/test/templates/cls/test.json

@@ -1,10 +1,10 @@
-[
-    {
-        "id": 1,
-        "text": "test"
-    },
-    {
-        "id": 2,
-        "text": "test2"
-    }
+[
+    {
+        "id": 1,
+        "text": "test"
+    },
+    {
+        "id": 2,
+        "text": "test2"
+    }
 ]

package/test/templates/form/cp_building.form.json

@@ -1,33 +1,33 @@
-{
-    "schema": {
-        
-        "cp_umuni_id": {
-            "type": "Text",
-            "ua": "ID UMUNI"
-        },
-        "cp_year": {
-            "type": "Text",
-            "ua": "Рік будівництва"
-        },
-        "cp_date_en_audit": {
-            "type": "DatePicker",
-            "ua": "Дата проведення останнього енергоаудиту"
-        },
-        "cp_certificate": {
-            "type": "Text",
-            "ua": "Сертифікат енергоефективності будівлі",
-            "help": "Вкажіть посилання"
-        },
-        "cp_pkd": {
-            "type": "Autocomplete",
-            "data": "customer_name",
-            "add": {
-                "model": "crm_acc.crm_account",
-                "ua": "Додати",
-                "form": "account_light.form"
-            },
-            "ua": "Замовник ПКД"
-        }
-    },
-    "label_style": "vertical"
+{
+    "schema": {
+        
+        "cp_umuni_id": {
+            "type": "Text",
+            "ua": "ID UMUNI"
+        },
+        "cp_year": {
+            "type": "Text",
+            "ua": "Рік будівництва"
+        },
+        "cp_date_en_audit": {
+            "type": "DatePicker",
+            "ua": "Дата проведення останнього енергоаудиту"
+        },
+        "cp_certificate": {
+            "type": "Text",
+            "ua": "Сертифікат енергоефективності будівлі",
+            "help": "Вкажіть посилання"
+        },
+        "cp_pkd": {
+            "type": "Autocomplete",
+            "data": "customer_name",
+            "add": {
+                "model": "crm_acc.crm_account",
+                "ua": "Додати",
+                "form": "account_light.form"
+            },
+            "ua": "Замовник ПКД"
+        }
+    },
+    "label_style": "vertical"
 }

package/test/templates/select/account_id.json

@@ -1,4 +1,4 @@
-{
-    "db": "mbk_lviv_dma",
-    "searchColumn": "alternative_name"
+{
+    "db": "mbk_lviv_dma",
+    "searchColumn": "alternative_name"
 }

package/test/templates/select/storage.data.json

@@ -1,3 +1,3 @@
-{
-    "key": "dataset_id"
+{
+    "key": "dataset_id"
 }

package/test/templates/table/gis.dataset.table.json

@@ -1,21 +1,21 @@
-{
-    "columns": [
-        {
-            "name": "dataset_id",
-            "title": "22"
-        },
-        {
-            "name": "dataset_name",
-            "title": "dataset_name"
-        }
-    ],
-    "table": "gis.dataset",
-    "order": "dataset_name",
-    "filters": [
-        {
-            "ua": "Назва набору",
-            "name": "dataset_name",
-            "type": "text"
-        }
-    ]
+{
+    "columns": [
+        {
+            "name": "dataset_id",
+            "title": "22"
+        },
+        {
+            "name": "dataset_name",
+            "title": "dataset_name"
+        }
+    ],
+    "table": "gis.dataset",
+    "order": "dataset_name",
+    "filters": [
+        {
+            "ua": "Назва набору",
+            "name": "dataset_name",
+            "type": "text"
+        }
+    ]
 }

package/util/controllers/next.id.js

@@ -1,4 +1,4 @@
-export default async function nextId({ pg }) {
-  const { id } = await pg.one('select next_id() as id');
-  return { id: id.toString() };
-};
+export default async function nextId({ pg }) {
+  const { id } = await pg.one('select next_id() as id');
+  return { id: id.toString() };
+};

package/util/controllers/properties.add.js

@@ -1,51 +1,51 @@
-import dataInsert from "../../crud/funcs/dataInsert.js";
-
-const table = 'crm.properties';
-
-function checkKeyType({ body, key }) {
-    if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
-        return { [key]: 'int' };
-    } else if (typeof body[key] === 'object') {
-        return { [key]: 'json' };
-    } else if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
-        return { [key]: 'date' };
-    }
-    return { [key]: 'text' };
-}
-
-export default async function addExtraProperties({
-    pg, params = {}, body = {},
-}) {
-    const { id } = params;
-    if (!id) {
-        return { message: 'not enougn params: 1', status: 400 };
-    }
-    const extraProperties = Object.keys(body);
-    if (!extraProperties.length) {
-        return { message: 'not enougn params: 2', status: 400 };
-    }
-
-    if (!pg.pk?.[table]) {
-        return { message: 'table not found: crm.properties', status: 400 };
-    }
-
-    try {
-        await pg.query(`delete from crm.properties where object_id=$1`, [id]);
-        const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
-        const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
-            const propertyType = keyTypeMatch[key];
-            const { rows = [] } = await dataInsert({
-                pg, table, data: {
-                    property_type: propertyType,
-                    property_key: key,
-                    object_id: id,
-                    [`property_${propertyType}`]: body[key],
-                }
-            });
-            return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
-        }));
-        return { message: { rows: res }, status: 200 };
-    } catch (err) {
-        return { error: err.toString(), status: 500 };
-    }
+import dataInsert from "../../crud/funcs/dataInsert.js";
+
+const table = 'crm.properties';
+
+function checkKeyType({ body, key }) {
+    if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
+        return { [key]: 'int' };
+    } else if (typeof body[key] === 'object') {
+        return { [key]: 'json' };
+    } else if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
+        return { [key]: 'date' };
+    }
+    return { [key]: 'text' };
+}
+
+export default async function addExtraProperties({
+    pg, params = {}, body = {},
+}) {
+    const { id } = params;
+    if (!id) {
+        return { message: 'not enougn params: 1', status: 400 };
+    }
+    const extraProperties = Object.keys(body);
+    if (!extraProperties.length) {
+        return { message: 'not enougn params: 2', status: 400 };
+    }
+
+    if (!pg.pk?.[table]) {
+        return { message: 'table not found: crm.properties', status: 400 };
+    }
+
+    try {
+        await pg.query(`delete from crm.properties where object_id=$1`, [id]);
+        const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
+        const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
+            const propertyType = keyTypeMatch[key];
+            const { rows = [] } = await dataInsert({
+                pg, table, data: {
+                    property_type: propertyType,
+                    property_key: key,
+                    object_id: id,
+                    [`property_${propertyType}`]: body[key],
+                }
+            });
+            return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
+        }));
+        return { message: { rows: res }, status: 200 };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
 }

package/util/controllers/properties.get.js

@@ -1,20 +1,20 @@
-export default async function getExtraProperties({
-    pg, params = {},
-}) {
-    const { id } = params;
-    if (!id) {
-        return { message: 'not enougn params', status: 400 };
-    }
-    try {
-        const { rows = [] } = pg.pk?.['crm.properties']
-            ? await pg.query(`select property_key, property_type, property_text, property_int,
-            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
-            : {};
-        if (!rows.length) return {};
-
-        const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
-        return { message: data, status: 200 };
-    } catch (err) {
-        return { error: err.toString(), status: 500 };
-    }
+export default async function getExtraProperties({
+    pg, params = {},
+}) {
+    const { id } = params;
+    if (!id) {
+        return { message: 'not enougn params', status: 400 };
+    }
+    try {
+        const { rows = [] } = pg.pk?.['crm.properties']
+            ? await pg.query(`select property_key, property_type, property_text, property_int,
+            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
+            : {};
+        if (!rows.length) return {};
+
+        const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
+        return { message: data, status: 200 };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
 }