@opengis/fastify-table 1.0.90 → 1.0.91

package/test/api/table.test.js

@@ -1,89 +1,89 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-import pgClients from '../../pg/pgClients.js';
-import init from '../../pg/funcs/init.js';
-
-import build from '../../helper.js';
-import config from '../config.js';
-
-test('api table', async (t) => {
-  const app = await build(t);
-  await init(pgClients.client);
-
-  const bbox = '20.276526313524393 40.6651677831094,35.27752631352439 50.66616778310941';
-  const { count = 0 } = await pgClients.client.query(`select count(*) from gis.dataset 
-  where geom && 'box(${bbox})'::box2d`)
-    .then((res) => res.rows[0] || {});
-
-  await t.test('GET /data (meta bbox / cls)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${config.prefix || '/api'}/data/test.dataset.table?bbox=${bbox}`,
-    });
-    const json = res.json();
-    assert.ok(json?.rows?.length === +count, 'meta bbox - not ok');
-    assert.ok(json?.rows?.length ? json?.rows?.[0]?.dataset_id_text : true, 'meta cls - not ok');
-  });
-
-  const polyline = 'wfvkH_jsvCoKvj@oKfiB?fw@?nd@?nK?nK~WgEfE?wQfw@gEfE?vQwQvj@wQvcAoKvQoKnKgEnd@_cBgw@wj@fEwj@nKg^vQg^oK?vQgEnKgpAvj@?vcAfEf^fEf^?vj@vQvj@vQgE~Wvj@?~p@gE~iAfEnK?~iA_XnvA?nd@fEf^~p@~bBvQ?nd@wQ?vQfEf^fEnK?vQ?vj@oKfEoKfEvQnd@nKvj@?vQfEvQgEf^gEf^?vQfEvQfEvQfE~W?fE?fE?~W?f^?nd@?nK?nKfEfEg^oKwj@nK_X~W~p@~WvQnKoKn}@wQvj@oK~Wg^vcAgEnK?~Wfw@vgD~p@oKfpAvQnd@nKoKvQoKvQ?fE?fEnKvj@wQvQ?fEod@fw@~Wn}@fEn}@_Xv|A_jA~fEwQwQ_XoKwQoKoKoKoKoKg^gE_XgEoKg^gEgEgE?gEfEgEfEgEf^_XoKwQ?gEgEoK?wQ?gE~WoKoKoKwQfEgEnK_X?gEgE?oKfEoKoKgE_XgEgEwQfEoKod@_Xgw@gEoKgE_Xg^wQoKg^_XnvAgE?gEvQgE?od@fpA?vQ?f^oKvcAwj@oKg^?wQn}@gEf^oK?w|AnKgE??nKwj@gEgEg^oKwQoKoK?gEwQoaD?oKod@oKod@gEod@wQo}@oKfEf^gEfEgpAnd@_XfEgE?wQnKo}@_q@?gEgEwj@?oK?oK?_X?oKfEoK?oKfEoK?oK?oK?gEfEoKwQfEoK?gEwQwj@nKo}@nKwQ~Wod@nKoKfEgw@ovAgEwQgE??oKoKgEoKgEgEwQ?oKfEoKnKwQfEwQoK?g^fE?wQfEg^fEod@gE??fEoKvQ?nKoKnKgEfEgEgE?g^nK_q@nKod@?oKoKoK~Wgw@fEoKnd@fE?_XfEoKfEwQfEoKfEwQfEoKvQ?fEfE?vj@gE~W~WvQvQwj@vQvQf^o}@nKvQ?_XgEg^gEg^nKod@?wQgEgEgE?oK_XgEoK?oKgEoKgE_XoKg^oKg^oKod@?gEfEoKvQgEnK?nKfE?_Xnd@gw@fEwQf^wj@fEwQnd@w|A?gEgEgEgEwQfEoKfEgEnKoKnKwQfEgE?oKfEoKnKgEnKwQ_XwQnKwcAod@wQvQod@~Wgw@nKgw@oKg^f^ovAgEwQ?_X?od@gEwj@gEwQvQg^fEoKnKoKvQnK~WfEnKvQ~Wod@f^wj@~WoKnKg^~W?vQgE~WoKnKoK~WoKfEwQvQwQfEgEnKwQnKwQvQwQnKoKnKgEnKgEnKgEvQnKnK?fE?fE?~WwQnKgEnKgEfE?fE?nK?fE?fE?vQgEfE?nKfEfE?fE?vQ?~W?~WgEfEgEnKgEnKwQfEnKnKfE?wj@?o}@g^o}@_Xod@?gEf^_X?o}@?wQ~W?~WgE~WgEfE?f^gEf^oK~Wg^nKgE?oK~WwQ?od@nK_XfEwQnKoKfEgEfE~W?f^f^fEfEfEnKfEnK?gEf^vQfEnK?~WnKvQnK?vQf^nKfEfEgE~WnKfEnK?fEgEfE?nK?fEfEfEgEnK?nKgEnK?nKfEf^?vQgEvQ?nd@gEnKo}@vQgE~WgEf^gE'; // UA26040270000047749
-
-  const { count1 } = await pgClients.client.query('select count(*) as count1 from gis.dataset where ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline($1)),geom)', [polyline])
-    .then((res) => res.rows[0] || {});
-  await t.test('GET /data (meta polyline)', async () => {
-    const res = await app.inject({
-      method: 'GET',
-      url: `${config.prefix || '/api'}/data/test.dataset.table?polyline=${polyline}`,
-    });
-    const json = res.json();
-    assert.ok(json?.rows?.length === +count1, 'meta bbox (polyline) - not ok');
-  });
-
-  /* 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 pgClients from '../../pg/pgClients.js';
+import init from '../../pg/funcs/init.js';
+
+import build from '../../helper.js';
+import config from '../config.js';
+
+test('api table', async (t) => {
+  const app = await build(t);
+  await init(pgClients.client);
+
+  const bbox = '20.276526313524393 40.6651677831094,35.27752631352439 50.66616778310941';
+  const { count = 0 } = await pgClients.client.query(`select count(*) from gis.dataset 
+  where geom && 'box(${bbox})'::box2d`)
+    .then((res) => res.rows[0] || {});
+
+  await t.test('GET /data (meta bbox / cls)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${config.prefix || '/api'}/data/test.dataset.table?bbox=${bbox}`,
+    });
+    const json = res.json();
+    assert.ok(json?.rows?.length === +count, 'meta bbox - not ok');
+    assert.ok(json?.rows?.length ? json?.rows?.[0]?.dataset_id_text : true, 'meta cls - not ok');
+  });
+
+  const polyline = 'wfvkH_jsvCoKvj@oKfiB?fw@?nd@?nK?nK~WgEfE?wQfw@gEfE?vQwQvj@wQvcAoKvQoKnKgEnd@_cBgw@wj@fEwj@nKg^vQg^oK?vQgEnKgpAvj@?vcAfEf^fEf^?vj@vQvj@vQgE~Wvj@?~p@gE~iAfEnK?~iA_XnvA?nd@fEf^~p@~bBvQ?nd@wQ?vQfEf^fEnK?vQ?vj@oKfEoKfEvQnd@nKvj@?vQfEvQgEf^gEf^?vQfEvQfEvQfE~W?fE?fE?~W?f^?nd@?nK?nKfEfEg^oKwj@nK_X~W~p@~WvQnKoKn}@wQvj@oK~Wg^vcAgEnK?~Wfw@vgD~p@oKfpAvQnd@nKoKvQoKvQ?fE?fEnKvj@wQvQ?fEod@fw@~Wn}@fEn}@_Xv|A_jA~fEwQwQ_XoKwQoKoKoKoKoKg^gE_XgEoKg^gEgEgE?gEfEgEfEgEf^_XoKwQ?gEgEoK?wQ?gE~WoKoKoKwQfEgEnK_X?gEgE?oKfEoKoKgE_XgEgEwQfEoKod@_Xgw@gEoKgE_Xg^wQoKg^_XnvAgE?gEvQgE?od@fpA?vQ?f^oKvcAwj@oKg^?wQn}@gEf^oK?w|AnKgE??nKwj@gEgEg^oKwQoKoK?gEwQoaD?oKod@oKod@gEod@wQo}@oKfEf^gEfEgpAnd@_XfEgE?wQnKo}@_q@?gEgEwj@?oK?oK?_X?oKfEoK?oKfEoK?oK?oK?gEfEoKwQfEoK?gEwQwj@nKo}@nKwQ~Wod@nKoKfEgw@ovAgEwQgE??oKoKgEoKgEgEwQ?oKfEoKnKwQfEwQoK?g^fE?wQfEg^fEod@gE??fEoKvQ?nKoKnKgEfEgEgE?g^nK_q@nKod@?oKoKoK~Wgw@fEoKnd@fE?_XfEoKfEwQfEoKfEwQfEoKvQ?fEfE?vj@gE~W~WvQvQwj@vQvQf^o}@nKvQ?_XgEg^gEg^nKod@?wQgEgEgE?oK_XgEoK?oKgEoKgE_XoKg^oKg^oKod@?gEfEoKvQgEnK?nKfE?_Xnd@gw@fEwQf^wj@fEwQnd@w|A?gEgEgEgEwQfEoKfEgEnKoKnKwQfEgE?oKfEoKnKgEnKwQ_XwQnKwcAod@wQvQod@~Wgw@nKgw@oKg^f^ovAgEwQ?_X?od@gEwj@gEwQvQg^fEoKnKoKvQnK~WfEnKvQ~Wod@f^wj@~WoKnKg^~W?vQgE~WoKnKoK~WoKfEwQvQwQfEgEnKwQnKwQvQwQnKoKnKgEnKgEnKgEvQnKnK?fE?fE?~WwQnKgEnKgEfE?fE?nK?fE?fE?vQgEfE?nKfEfE?fE?vQ?~W?~WgEfEgEnKgEnKwQfEnKnKfE?wj@?o}@g^o}@_Xod@?gEf^_X?o}@?wQ~W?~WgE~WgEfE?f^gEf^oK~Wg^nKgE?oK~WwQ?od@nK_XfEwQnKoKfEgEfE~W?f^f^fEfEfEnKfEnK?gEf^vQfEnK?~WnKvQnK?vQf^nKfEfEgE~WnKfEnK?fEgEfE?nK?fEfEfEgEnK?nKgEnK?nKfEf^?vQgEvQ?nd@gEnKo}@vQgE~WgEf^gE'; // UA26040270000047749
+
+  const { count1 } = await pgClients.client.query('select count(*) as count1 from gis.dataset where ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline($1)),geom)', [polyline])
+    .then((res) => res.rows[0] || {});
+  await t.test('GET /data (meta polyline)', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${config.prefix || '/api'}/data/test.dataset.table?polyline=${polyline}`,
+    });
+    const json = res.json();
+    assert.ok(json?.rows?.length === +count1, 'meta bbox (polyline) - not ok');
+  });
+
+  /* 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,117 @@
-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 { changeId } = await pg.query(`insert into log.table_changes(uid, entity_id, entity_type)
+    select $1, '1', 'admin.users' returning change_id as "changeId"`, [config.testUser?.uid || '1']).then((res) => res.rows?.[0] || {});
+    const res1 = await pg.query(`insert into log.table_changes_data(change_id, entity_key, value_new)
+    select $1, 'uid', $2`, [changeId, 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_data where change_id in (select change_id from log.table_changes where entity_id=$1)', ['1']);
+    const res5 = await pg.query('delete from log.table_changes where entity_id=$1', ['1']);
+    pg.end();
+  });
+});

package/test/funcs/crud.test.js

@@ -1,76 +1,122 @@
-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 logChanges from '../../crud/funcs/utils/logChanges.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');
+  });
+
+  if (config?.local) {
+    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' }, uid: '2' });
+      assert.equal(data.rows?.[0]?.dataset_id, id);
+    });
+    await t.test('dataUpdate', async () => {
+      const data = await dataUpdate({
+        table: 'gis.dataset', id, data: { dataset_name: '22211' }, uid: '2',
+      });
+      assert.equal(data.dataset_name, '22211');
+    });
+    await t.test('dataDelete', async () => {
+      const data = await dataDelete({ table: 'gis.dataset', id, uid: '2' });
+      assert.ok(data);
+    });
+    await t.test('clean up after test', async () => {
+      if (pgClients.client.pk?.['log.table_changes_data']) {
+        const { rowCount: testDatasets } = await pgClients.client.query('delete from gis.dataset where uid=$1', ['2']);
+        const { rowCount } = await pgClients.client.query('delete from log.table_changes_data where change_id in (select change_id from log.table_changes where entity_id=$1)', [id]);
+        const { rowCount: rowCount1 } = await pgClients.client.query('delete from log.table_changes where entity_id=$1', [id]);
+        console.log('CRUD test clean up', id, testDatasets, rowCount, rowCount1);
+        assert.ok(rowCount1);
+      }
+    });
+  }
+
+  if (pgClients.client.pk?.['log.table_changes_data']) {
+    const id = (Math.random() * 10000).toFixed();
+    const name = '222';
+    await t.test('logChanges INSERT', async () => {
+      await pgClients.client.query(`insert into gis.dataset(dataset_id,dataset_name, uid) values($1,$2,$3) on conflict(dataset_id) do 
+      update set dataset_name = excluded.dataset_name, uid = excluded.uid`, [id, name, '2']);
+
+      const data = await logChanges({
+        pg: pgClients.client, id, table: 'gis.dataset', data: { dataset_id: id, dataset_name: '222' }, uid: '2', type: 'INSERT',
+      });
+      assert.ok(data?.change_type === 'INSERT' && data?.entity_id === id && data?.new?.dataset_name === '222', typeof data === 'object' ? JSON.stringify(data) : data);
+    });
+    await t.test('logChanges UPDATE', async () => {
+      /* await pgClients.client.query('update gis.dataset(dataset_id,dataset_name) set dataset_name=$', [id, name]); */
+      const data = await logChanges({
+        pg: pgClients.client, id, table: 'gis.dataset', data: { dataset_id: id, dataset_name: '2222' }, uid: '2', type: 'UPDATE',
+      });
+      assert.ok(data?.change_type === 'UPDATE' && data?.entity_id === id && data?.new?.dataset_name === '2222' && data?.old?.dataset_name === '222', typeof data === 'object' ? JSON.stringify(data) : data);
+    });
+    await t.test('logChanges DELETE', async () => {
+      const data = await logChanges({
+        pg: pgClients.client, id, table: 'gis.dataset', uid: '2', type: 'DELETE',
+      });
+      assert.ok(data?.change_type === 'DELETE' && data?.old?.dataset_id === id, typeof data === 'object' ? JSON.stringify(data) : data);
+    });
+    await t.test('clean up after test', async () => {
+      const { rowCount: testDatasets } = await pgClients.client.query('delete from gis.dataset where uid=$1', ['2']);
+      const { rowCount } = await pgClients.client.query('delete from log.table_changes_data where change_id in (select change_id from log.table_changes where entity_id=$1)', [id]);
+      const { rowCount: rowCount1 } = await pgClients.client.query('delete from log.table_changes where entity_id=$1', [id]);
+      console.log('logChanges test clean up', id, testDatasets, rowCount, rowCount1);
+      assert.ok(rowCount1);
+    });
+  }
+
+  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();
+  });
+});