@opengis/fastify-table 1.0.4 → 1.0.6

package/Changelog.md

@@ -1,5 +1,11 @@
 # fastify-table
 
+## 1.0.4 - 20.04.2024
+
+- data api - order
+- suggest api - db support
+- del api fix  
+
 ## 1.0.3 - 17.04.2024
 
 - fix unit test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/table/controllers/suggest.js

@@ -9,12 +9,13 @@ export default async function suggest(req) {
 
   const lang = query.lang || 'ua';
   const time = Date.now();
+  const parent = query.parent || '';
 
   const selectName = query.sel || query.name || params.data;
   if (!selectName) return { headers, status: 400, message: 'name is required' };
 
   const meta = await getSelectMeta({ name: selectName });
-  const pg = meta.db ? getPG(meta.db) : pg1;
+  const pg = meta.db ? getPG({ db: meta.db }) : pg1;
   if (!meta) return { headers, status: 404, message: 'Not found query select ' };
 
   const { arr, searchQuery } = meta;
@@ -36,7 +37,7 @@ export default async function suggest(req) {
   const pk = meta.originalCols.split(',')[0];
   const val = query.val ? ` ${pk}=any('{${query.val.replace(/'/g, "''")}}')` : '';
 
-  const sqlSuggest = `with rows(id,text) as (${meta.original} where ${[search, val].filter((el) => el).join(' and ') || 'true'}) select * from rows limit ${limit}`;
+  const sqlSuggest = `with rows(id,text) as (${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val].filter((el) => el).join(' and ') || 'true'}) select * from rows limit ${limit}`;
   if (query.sql) return sqlSuggest;
 
   // query

package/table/controllers/utils/getSelectMeta.js

@@ -39,7 +39,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
 
   // column name
   const cols = dataOrigin.fields.map((el) => el.name);
-  const type = dataOrigin.fields.map((el) => pg.pgType[el.dataTypeID]);
+  const type = dataOrigin.fields.map((el) => pg.pgType?.[el.dataTypeID] || 'text');
 
   const searchColumn = cls?.searchColumn || (
     dataOrigin.fields.find((el) => el.name === 'search') ? 'search' : dataOrigin1.fields[1].name);
@@ -52,7 +52,7 @@ export default async function getSelectMeta({ name, pg: pg1 }) {
     cols: cols.join(','),
     originalCols: dataOrigin1.fields.map((el) => el.name).join(','),
     db: cls.db,
-    original,
+    original: original?.includes('where') ? `select * from (${original})q` : original,
     sql,
     count,
     searchQuery,

package/test/api/crud.test.js

@@ -11,13 +11,38 @@ test('api crud', async (t) => {
     const res = await app.inject({
       method: 'POST',
       url: '/api/crud/gis.dataset',
-      body: { dataset_name: '111' },
+      body: { dataset_name: '111', dataset_id: '5400000' },
     });
 
     const rep = JSON.parse(res?.body);
     // rep.dataset_id
-    // console.log(rep.total);
-    pgClients.client.query('delete from gis.dataset where dataset_id=$1', [rep.dataset_id]);
+    // console.log(rep);
+    // pgClients.client.query('delete from gis.dataset where dataset_id=$1', [rep.dataset_id]);
     assert.ok(rep.dataset_id);
   });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: '/api/crud/gis.dataset/5400000',
+      body: { editor_id: '11' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    // rep.dataset_id
+    // console.log(rep);
+    assert.equal(rep.editor_id, '11')
+  });
+
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: '/api/crud/gis.dataset/5400000',
+    });
+
+    const rep = JSON.parse(res?.body);
+    // rep.dataset_id
+    // console.log(rep);
+    assert.ok(rep);
+  });
 });

package/test/api/table.test.js

@@ -26,4 +26,24 @@ test('api table', async (t) => {
     // 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);
+  });
 });

package/test/funcs/crud.test.js

@@ -7,17 +7,21 @@ 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';
 
-test('fucns crud', async (t) => {
+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' } });
@@ -29,7 +33,17 @@ test('fucns crud', async (t) => {
     assert.equal(data.dataset_name, '22211');
   });
 
-  pgClients.client.query('delete from gis.dataset where dataset_id=$1', [id]);
+  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);
+  });
+
+  // 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

@@ -7,6 +7,7 @@ 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 () => {
@@ -15,6 +16,11 @@ test('funcs pg', async (t) => {
     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);

package/test/funcs/table.test.js

@@ -4,6 +4,11 @@ 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 () => {
@@ -11,7 +16,31 @@ test('fucns table', async (t) => {
     // 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();

package/test/templates/select/atu.nsdi.ato_level.json

@@ -0,0 +1,4 @@
+{
+    "db": "geo_atu",
+    "searchColumn": "name_ua"
+}

package/test/templates/select/atu.nsdi.ato_level.sql

@@ -0,0 +1,11 @@
+/*db:geo_atu*/
+SELECT a.codifier, a.name_ua ||' '||case when b.ato_type_old in (1,2, 4) then '' else b.prefix_ua end ||' '|| coalesce(a.codifier, '')||
+case when b.ato_type_old in (5,6) then coalesce(' (' || a3.name_ua ||' область'||')' ,'') 
+else coalesce(' (' || a3.name_ua ||' область, ' || a2.name_ua ||' '||b2.prefix_ua ||' )','') end as name,  b.ato_level + 1 as ato_level, st_asgeojson(a.geom::box2d::geometry)::json as geom,
+case when a.object_type in ('O','A','K') then 'regional' when a.object_type in ('B','X','C','T','M','P','H') then 'local' end as resource_level, a.name_ua
+FROM ato_new.ato_new_all a 
+left join ato_new.ato_settings_city_and_terrytory b on b.ato_type=a.object_type 
+left join ato_new.ato_new_all a2 on a2.region_id=a.parent_level2 
+left join ato_new.ato_new_all a3 on a3.region_id=a.parent_level1 
+left join ato_new.ato_settings_city_and_terrytory b2 on b2.ato_type=a2.object_type 
+where a.object_status <> '3' and a.codifier is not null