@opengis/fastify-table 1.0.9 → 1.0.11

package/test/funcs/crud.test.js

@@ -1,77 +1,76 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-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 getIdByToken from '../../crud/funcs/getIdByToken.js';
-import setTokenById from '../../crud/funcs/setTokenById.js';
-import config from '../config.js';
-
-test('funcs crud', async (t) => {
-  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('setTokenById', async () => {
-    tokens = setTokenById({
-      funcs: { config },
-      ids: [tokenData],
-      mode: 'a',
-      session,
-      array: 1,
-    });
-    assert.equal(tokens.length, 1);
-  });
-  await t.test('getIdByToken', async () => {
-    const data = await getIdByToken({
-      funcs: { config },
-      session,
-      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/pg.test.js

@@ -1,32 +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 getPG from '../../pg/funcs/getPG.js'
-
-test('funcs pg', async (t) => {
-  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/itree.recommend.json

@@ -0,0 +1,26 @@
+[
+  {
+    "id": "3",
+    "text": "Заміна",
+    "en": "Replacement",
+    "color": "#B8860B"
+  },
+  {
+    "id": "2",
+    "text": "Видалення",
+    "en": "Removal",
+    "color": "#8B0000"
+  },
+  {
+    "id": "1",
+    "text": "Обрізка",
+    "en": "Cutting",
+    "color": "#DEB887"
+  },
+  {
+    "id": "4",
+    "text": "Відсутні",
+    "en": "None",
+    "color": "#2E8B57"
+  }
+]

package/test/templates/cls/itree.type_plant.json

@@ -0,0 +1,65 @@
+[
+  {
+    "id": "4",
+    "text": "Газони",
+    "en": "Lawns",
+    "icon": "/assets/image/icon/60936458728884429/3f714a00-6dec-11ea-b853-074b5683525e.svg",
+    "color": "#87a96b",
+    "data": "lawns"
+  },
+  {
+    "id": "8",
+    "text": "Пам’ятка природи",
+    "en": "Landmark",
+    "color": "blue",
+    "data": "landmark"
+  },
+  {
+    "id": "7",
+    "text": "Пеньок",
+    "en": "Stump",
+    "icon": "/assets/image/icon/2322523888191276250/52ec1310-0d2b-11eb-ab6a-23ffd484ced7.svg",
+    "color": "#63594C",
+    "data": "stump"
+  },
+  {
+    "id": "2",
+    "text": "Дерева",
+    "en": "Tree",
+    "icon": "/assets/image/icon/2202400955901674510/ba471bb0-5b13-11ea-9003-07912ed5d347.svg",
+    "color": "#66cd00",
+    "data": "tree"
+  },
+  {
+    "id": "6",
+    "text": "Лунка",
+    "en": "Digger",
+    "icon": "/assets/image/icon/2322523536775709909/50634550-0d2b-11eb-ab6a-23ffd484ced7.svg",
+    "color": "#cdb79e",
+    "data": "digger"
+  },
+  {
+    "id": "1",
+    "text": "Кущі",
+    "en": "Bush",
+    "icon": "/assets/image/icon/2202401113020302354/c62b1580-5b13-11ea-9003-07912ed5d347.svg",
+    "color": "#556b2f",
+    "data": "bush"
+  },
+  {
+    "id": "3",
+    "text": "Живопліт",
+    "en": "Hedge",
+    "icon": "/assets/image/icon/59524404264212563/dd365ec0-6e6d-11ea-bc2a-d3dca36653f0.svg",
+    "color": "#9fa91f",
+    "data": "hedge"
+  },
+  {
+    "id": "5",
+    "text": "Квітники",
+    "en": "Flowers",
+    "icon": "/assets/image/icon/2254649206885057992/e961fa00-5b13-11ea-9003-07912ed5d347.svg",
+    "color": "#ff7f24",
+    "data": "flowers"
+  }
+]

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/contact_id.sql

@@ -0,0 +1 @@
+select contact_id, coalesce(last_name,'')||' '||coalesce(first_name,'') from crm_acc.crm_contact order by last_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/test/templates/table/green_space.table.json

@@ -274,9 +274,9 @@
   ],
   "filterInline": [
     {
-      "label": "Дата",
-      "id": "cdate",
-      "type": "Date"
+      "label": "Інвентарний номер",
+      "id": "invent_number",
+      "type": "Text"
     }
   ],
   "filterCustom": [

package/test/funcs/table.test.js

@@ -1,48 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-import '../config.js';
-import pgClients from '../../pg/pgClients.js';
-import rclient from '../../redis/client.js';
-import getFilterSQL from '../../table/funcs/getFilterSQL/index.js';
-import getTableSql from '../../table/funcs/getFilterSQL/index.js';
-import getCustomQuery from '../../table/funcs/getFilterSQL/index.js';
-import getFilterQuery from '../../table/funcs/getFilterSQL/index.js';
-import formatValue from '../../table/funcs/getFilterSQL/index.js';
-import getOptimizedQuery from '../../table/funcs/getFilterSQL/index.js';
-
-test('fucns table', async (t) => {
-  await t.test('getMeta', async () => {
-    const data = await getFilterSQL({ table: 'gis.dataset', filter: 'service_type=1' });
-    // console.log(data);
-    assert.ok(data.q);
-  });
-  
-  await t.test('formatValue', async (t) => {
-    const data = await formatValue( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  
-  await t.test('getCustomQuery', async (t) => {
-    const data = await getCustomQuery( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  
-  await t.test('getFilterQuery', async (t) => {
-    const data = await getFilterQuery( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  
-  await t.test('getOptimizedQuery', async (t) => {
-    const data = await getOptimizedQuery( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  
-  await t.test('getTableSql', async (t) => {
-    const data = await getTableSql( {table: 'gis.dataset'} );
-    assert.ok(data);
-  });
-  t.after(() => {
-    pgClients.client.end();
-    rclient.quit();
-  });
-});