@opengis/fastify-table 1.1.55 → 1.1.56

package/Changelog.md

@@ -1,6 +1,6 @@
 # fastify-table
 
-## 1.1.51 - 24.10.2024
+## 1.1.56 - 29.10.2024
 
 - addHook params refactor
 - add getFolder, handlebars to utils

package/README.md

@@ -1,26 +1,26 @@
-# fastify-table
-
-[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
-
-It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
-
-- pg
-- redis
-- crud
-
-## Install
-
-```bash
-npm i @opengis/fastify-table
-```
-
-## Usage
-
-```js
-fastify.register(import('@opengis/fastify-table'), config);
-```
-
-## Documenation
-
-For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).
+# fastify-table
+
+[![NPM version](https://img.shields.io/npm/v/@opengis/fastify-table)](https://www.npmjs.com/package/@opengis/fastify-table)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](http://standardjs.com/)
+
+It standardizes the entire form building process, while taking care of everything from rendering to validation and processing:
+
+- pg
+- redis
+- crud
+
+## Install
+
+```bash
+npm i @opengis/fastify-table
+```
+
+## Usage
+
+```js
+fastify.register(import('@opengis/fastify-table'), config);
+```
+
+## Documenation
+
+For a detailed understanding fastify-table, its features, and how to use them, refer to our [Documentation](https://apidocs.softpro.ua/gis.storage/).

package/config.js

@@ -1,10 +1,10 @@
-import fs from 'fs';
-
-const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
-const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
-
-Object.assign(config, {
-  allTemplates: config?.allTemplates || {},
-});
-
-export default config;
+import fs from 'fs';
+
+const fileName = ['config.json', '/data/local/config.json'].find(el => (fs.existsSync(el) ? el : null));
+const config = fileName ? JSON.parse(fs.readFileSync(fileName)) : {};
+
+Object.assign(config, {
+  allTemplates: config?.allTemplates || {},
+});
+
+export default config;

package/cron/controllers/cronApi.js

@@ -1,22 +1,22 @@
-import cronList from './utils/cronList.js';
-
-export default async function cronApi(req) {
-  const {
-    params = {}, user = {}, hostname,
-  } = req;
-
-  if ((!user.uid || !user.user_type?.includes('admin')) && !hostname?.includes('localhost')) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (params.name === 'list') {
-    return { data: Object.keys(cronList || {}) };
-  }
-
-  if (!cronList[params.name]) {
-    return { message: `cron not found: ${params.name}`, status: 404 };
-  }
-
-  const result = await cronList[params.name](req);
-  return result;
-}
+import cronList from './utils/cronList.js';
+
+export default async function cronApi(req) {
+  const {
+    params = {}, user = {}, hostname,
+  } = req;
+
+  if ((!user.uid || !user.user_type?.includes('admin')) && !hostname?.includes('localhost')) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (params.name === 'list') {
+    return { data: Object.keys(cronList || {}) };
+  }
+
+  if (!cronList[params.name]) {
+    return { message: `cron not found: ${params.name}`, status: 404 };
+  }
+
+  const result = await cronList[params.name](req);
+  return result;
+}

package/cron/controllers/utils/cronList.js

@@ -1 +1 @@
-export default {};
+export default {};

package/cron/funcs/addCron.js

@@ -4,6 +4,7 @@ import cronList from '../controllers/utils/cronList.js';
 import getRedis from '../../redis/funcs/getRedis.js';
 import getPG from '../../pg/funcs/getPG.js';
 import config from '../../config.js';
+import logger from '../../logger/getLogger.js';
 
 const md5 = (string) => createHash('md5').update(string).digest('hex');
 
@@ -88,12 +89,7 @@ async function runCron({
  * - 10 * 60 - every 10 minutes
  */
 
-export default async function addCron(func, interval, fastify) {
-  if (!fastify) {
-    throw new Error('not enough params: fastify');
-  }
-
-  const { log } = fastify;
+export default async function addCron(func, interval, fastify = {}) {
   const { time = {}, disabled = [] } = config.cron || {};
   const pg = getPG();
   const rclient = getRedis();
@@ -103,7 +99,7 @@ export default async function addCron(func, interval, fastify) {
   // if (!config.isServer) return;
 
   if (disabled.includes(name)) {
-    log.debug('cron', { name, message: 'cron disabled' });
+    logger.debug('cron', { name, message: 'cron disabled' });
     return;
   }
 
@@ -113,19 +109,19 @@ export default async function addCron(func, interval, fastify) {
   const [waitMs, intervalMs] = interval2ms[typeof interval](userInterval);
 
   if (intervalMs < 1000) {
-    log.warn('cron', { name, error: `interval ${interval} to small` });
+    logger.warn('cron', { name, error: `interval ${interval} to small` });
     return;
   }
 
   // setTimeout to w8 for the time to start
   setTimeout(() => {
     runCron({
-      pg, funcs: fastify, func, name, rclient, log,
+      pg, funcs: fastify, func, name, rclient, log: logger,
     });
     // interval
     setInterval(() => {
       runCron({
-        pg, funcs: fastify, func, name, rclient, log,
+        pg, funcs: fastify, func, name, rclient, log: logger,
       });
     }, intervalMs);
   }, waitMs);

package/crud/controllers/utils/xssInjection.js

@@ -1,72 +1,72 @@
-const xssInjection = [
-  'onkeypress=',
-  'onkeyup=',
-  'ondblclick=',
-  'onerror=',
-  'onmouseover=',
-  '<meta',
-  '<script',
-  'vascript:',
-  'onkeydown=',
-  'onmousedown=',
-  'onmouseenter=',
-  'onmouseleave=',
-  'onmousemove=',
-  'onmouseout=',
-  'onmouseup=',
-  'onmousewheel=',
-  'onpaste=',
-  'onscroll=',
-  'onwheel=',
-  'javascript:',
-  '\\x',
-  'eval(',
-  'onmouseover=',
-  'action=',
-  'xlink:',
-  'allowscriptaccess',
-  'href=',
-  'behavior:',
-  'onreadystatechange=',
-  'onstart=',
-  'offline=',
-  'onabort=',
-  'onafterprint=',
-  'onbeforeonload=',
-  'onbeforeprint=',
-  'onblur=',
-  'oncanplay=',
-  'oncanplaythrough=',
-  'onchange=',
-  'onclick=',
-  'oncontextmenu=',
-  'ondblclick=',
-  'ondrag=',
-  'ondragend=',
-  'ondragenter=',
-  'ondragleave=',
-  'ondragover=',
-  'ondragstart=',
-  'ondrop=',
-  'ondurationchange=',
-  'onemptied=',
-  'onended=',
-  'onerror=',
-  'onfocus=',
-  'onformchange=',
-  'onforminput=',
-  'onhaschange=',
-  'oninput=',
-  'oninvalid=',
-  'onkeydown=',
-  'onkeypress=',
-  'onkeyup=',
-  'onload=',
-  'onloadeddata=',
-  'onloadedmetadata=',
-  'onloadstart=',
-  'alert(',
-  'script:',
-];
-
-export default xssInjection;
+const xssInjection = [
+  'onkeypress=',
+  'onkeyup=',
+  'ondblclick=',
+  'onerror=',
+  'onmouseover=',
+  '<meta',
+  '<script',
+  'vascript:',
+  'onkeydown=',
+  'onmousedown=',
+  'onmouseenter=',
+  'onmouseleave=',
+  'onmousemove=',
+  'onmouseout=',
+  'onmouseup=',
+  'onmousewheel=',
+  'onpaste=',
+  'onscroll=',
+  'onwheel=',
+  'javascript:',
+  '\\x',
+  'eval(',
+  'onmouseover=',
+  'action=',
+  'xlink:',
+  'allowscriptaccess',
+  'href=',
+  'behavior:',
+  'onreadystatechange=',
+  'onstart=',
+  'offline=',
+  'onabort=',
+  'onafterprint=',
+  'onbeforeonload=',
+  'onbeforeprint=',
+  'onblur=',
+  'oncanplay=',
+  'oncanplaythrough=',
+  'onchange=',
+  'onclick=',
+  'oncontextmenu=',
+  'ondblclick=',
+  'ondrag=',
+  'ondragend=',
+  'ondragenter=',
+  'ondragleave=',
+  'ondragover=',
+  'ondragstart=',
+  'ondrop=',
+  'ondurationchange=',
+  'onemptied=',
+  'onended=',
+  'onerror=',
+  'onfocus=',
+  'onformchange=',
+  'onforminput=',
+  'onhaschange=',
+  'oninput=',
+  'oninvalid=',
+  'onkeydown=',
+  'onkeypress=',
+  'onkeyup=',
+  'onload=',
+  'onloadeddata=',
+  'onloadedmetadata=',
+  'onloadstart=',
+  'alert(',
+  'script:',
+];
+
+export default xssInjection;

package/crud/funcs/getToken.js

@@ -1,27 +1,27 @@
-import getRedis from '../../redis/funcs/getRedis.js';
-import config from '../../config.js';
-
-function sprintf(str, ...args) {
-  return str.replace(/%s/g, () => args.shift());
-}
-
-const keys = {
-  r: '%s:token:view:%s',
-  a: '%s:token:add:%s',
-  w: '%s:token:edit:%s',
-  e: '%s:token:exec:%s',
-};
-
-async function getToken({
-  uid, token, mode = 'r', json,
-}) {
-  if (mode === 'r') return token;
-
-  const rclient = getRedis({ db: 0 });
-
-  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
-  const id = await rclient.hget(key, token);
-  return json && id?.[0] === '{' ? JSON.parse(id) : id;
-}
-
-export default getToken;
+import getRedis from '../../redis/funcs/getRedis.js';
+import config from '../../config.js';
+
+function sprintf(str, ...args) {
+  return str.replace(/%s/g, () => args.shift());
+}
+
+const keys = {
+  r: '%s:token:view:%s',
+  a: '%s:token:add:%s',
+  w: '%s:token:edit:%s',
+  e: '%s:token:exec:%s',
+};
+
+async function getToken({
+  uid, token, mode = 'r', json,
+}) {
+  if (mode === 'r') return token;
+
+  const rclient = getRedis({ db: 0 });
+
+  const key = sprintf(keys[mode], config?.pg?.database, uid?.toString());
+  const id = await rclient.hget(key, token);
+  return json && id?.[0] === '{' ? JSON.parse(id) : id;
+}
+
+export default getToken;

package/crud/funcs/isFileExists.js

@@ -1,13 +1,13 @@
-import { access } from 'fs/promises';
-
-const isFileExists = async (filepath) => {
-  try {
-    await access(filepath);
-    return true;
-  }
-  catch (err) {
-    return false;
-  }
-};
-
-export default isFileExists;
+import { access } from 'fs/promises';
+
+const isFileExists = async (filepath) => {
+  try {
+    await access(filepath);
+    return true;
+  }
+  catch (err) {
+    return false;
+  }
+};
+
+export default isFileExists;

package/logger/createFileStream.js

@@ -2,7 +2,7 @@ const streams = {};
 
 import build from 'pino-abstract-transport';
 import fs from 'fs';
-// import { createStream } from 'rotating-file-stream';
+
 import labels from './labels.js';
 
 import config from '../config.js';

package/notification/funcs/sendNotification.js

@@ -8,6 +8,7 @@ import pgClients from '../../pg/pgClients.js';
 import sendEmail from './utils/sendEmail.js';
 import getTemplate from '../../table/controllers/utils/getTemplate.js';
 import getRedis from '../../redis/funcs/getRedis.js';
+import logger from '../../logger/getLogger.js';
 
 async function generateNotificationContent({
   pg, table, template, id, message, data: data1,
@@ -26,9 +27,8 @@ async function generateNotificationContent({
 
 // to do: refactor fastify-file to remove funcs completely
 export default async function notification({
-  pg: pg1,
+  pg = pgClients.client,
   funcs,
-  log,
   provider = ['email'],
   from,
   to,
@@ -42,7 +42,6 @@ export default async function notification({
   nocache,
 }) {
   const rclient = getRedis();
-  const pg = pg1 || pgClients.client;
 
   if (!pg) throw new Error('need pg');
 
@@ -52,7 +51,7 @@ export default async function notification({
 
   const keyTo = `${pg.options?.database}:mail:${provider[0]}:${to || ''}${id || ''}${table || ''}${title || ''}`;
   const uniqueTo = await rclient.setnx(keyTo, 1);
-  log.info('notification/sent', { keyTo, send: uniqueTo, nocache });
+  logger.info('notification/sent', { keyTo, send: uniqueTo, nocache });
 
   if (!uniqueTo && !nocache) {
     return `already sent: ${keyTo}`;
@@ -95,7 +94,7 @@ export default async function notification({
         to: toEmail,
       });
 
-      log.info('notification', {
+      logger.info('notification', {
         provider, title, to: toEmail, from, result, len: message?.length, files,
       });
 
@@ -104,7 +103,7 @@ export default async function notification({
     return null;
   }
   catch (err) {
-    log.info('notification/error', {
+    logger.info('notification/error', {
       provider, from, to, err: err.toString(),
     });
     throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.55",
+  "version": "1.1.56",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",
@@ -21,8 +21,7 @@
     "ioredis": "^5.3.2",
     "nodemailer": "^6.5.0",
     "pg": "^8.11.3",
-    "pino-abstract-transport": "^2.0.0",
-    "rotating-file-stream": "^3.2.3"
+    "pino-abstract-transport": "^2.0.0"
   },
   "devDependencies": {
     "@panzoom/panzoom": "^4.5.1",

package/redis/funcs/getRedis.js

@@ -1,23 +1,23 @@
-import Redis from 'ioredis';
-import config from '../../config.js';
-import redisClients from './redisClients.js';
-
-function getRedis({ db } = { db: 0 }) {
-  if (!config.redis) return null;
-  if (redisClients[db]) return redisClients[db];
-
-  const redisConfig = {
-    db,
-    keyPrefix: `${config.db}:`,
-    host: config.redis?.host || '127.0.0.1',
-    port: config.redis?.port || 6379, // Redis port
-    family: 4, // 4 (IPv4) or 6 (IPv6)
-    closeClient: true,
-  };
-
-  redisClients[db] = new Redis(redisConfig);
-
-  return redisClients[db];
-}
-
-export default getRedis;
+import Redis from 'ioredis';
+import config from '../../config.js';
+import redisClients from './redisClients.js';
+
+function getRedis({ db } = { db: 0 }) {
+  if (!config.redis) return null;
+  if (redisClients[db]) return redisClients[db];
+
+  const redisConfig = {
+    db,
+    keyPrefix: `${config.db}:`,
+    host: config.redis?.host || '127.0.0.1',
+    port: config.redis?.port || 6379, // Redis port
+    family: 4, // 4 (IPv4) or 6 (IPv6)
+    closeClient: true,
+  };
+
+  redisClients[db] = new Redis(redisConfig);
+
+  return redisClients[db];
+}
+
+export default getRedis;

package/server/migrations/log.sql

@@ -1,81 +1,81 @@
-create schema if not exists log;
-
--- DROP TABLE IF EXISTS log.table_changes cascade;
-CREATE TABLE IF NOT EXISTS log.table_changes();
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_id text NOT NULL DEFAULT next_id();
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_type text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_date date;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_user_id text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_type text; -- table_name
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-
--- DROP TABLE IF EXISTS log.table_changes_data;
-CREATE TABLE IF NOT EXISTS log.table_changes_data();
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_data_id text NOT NULL DEFAULT next_id();
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_id text not null;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS entity_key text; -- column_name
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_old text;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_new text;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-
--- DROP TABLE IF EXISTS log.user_auth;
-CREATE TABLE IF NOT EXISTS log.user_auth();
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_auth_id text NOT NULL DEFAULT next_id();
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_id text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_date timestamp without time zone;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_type text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-
-COMMENT ON TABLE log.table_changes IS 'Логи подій змін в БД';
-COMMENT ON COLUMN log.table_changes.change_type IS 'Тип події (insert / update / delete)';
-COMMENT ON COLUMN log.table_changes.change_date IS 'Дата внесення змін до БД';
-COMMENT ON COLUMN log.table_changes.entity_type IS 'Таблиця, до якої вносяться зміни';
-COMMENT ON COLUMN log.table_changes.entity_id IS 'ID строки, до якої вносяться зміни';
-COMMENT ON COLUMN log.table_changes.change_user_id IS 'Ініціатор внесення змін';
-
-COMMENT ON TABLE log.table_changes_data IS 'Логи змін в таблицях БД';
-COMMENT ON COLUMN log.table_changes_data.change_id IS 'ID події зміни в БД';
-COMMENT ON COLUMN log.table_changes_data.entity_key IS 'Колонка таблиці, до якої вносяться зміни';
-COMMENT ON COLUMN log.table_changes_data.value_old IS 'Старе значення';
-COMMENT ON COLUMN log.table_changes_data.value_new IS 'Нове значення';
-
-COMMENT ON TABLE log.user_auth IS 'Логи авторизації';
-COMMENT ON COLUMN log.user_auth.user_id IS 'ID користувача';
-COMMENT ON COLUMN log.user_auth.auth_date IS 'Дата авторизації';
-COMMENT ON COLUMN log.user_auth.auth_type IS 'Тип авторизації';
-
-ALTER TABLE log.table_changes DROP CONSTRAINT IF EXISTS log_table_changes_pkey cascade;
-ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_pkey;
-ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_change_id_fkey;
-ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_pkey;
-ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_user_id_fkey;
-
-ALTER TABLE log.table_changes ADD CONSTRAINT log_table_changes_pkey PRIMARY KEY (change_id);
-ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_pkey PRIMARY KEY (change_data_id);
-ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_change_id_fkey FOREIGN KEY (change_id)
-REFERENCES log.table_changes (change_id);
-ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_pkey PRIMARY KEY (user_auth_id);
--- ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_user_id_fkey FOREIGN KEY (user_id) REFERENCES admin.users (uid) MATCH SIMPLE;
-
-/* drop old columns */
-alter table log.table_changes drop column if exists date_new;
-alter table log.table_changes drop column if exists date_old;
-alter table log.table_changes drop column if exists number_new;
-alter table log.table_changes drop column if exists number_old;
-alter table log.table_changes drop column if exists json_new;
-alter table log.table_changes drop column if exists json_old;
-alter table log.table_changes drop column if exists text_new;
-alter table log.table_changes drop column if exists text_old;
-alter table log.table_changes drop column if exists bool_new;
-alter table log.table_changes drop column if exists bool_old;
+create schema if not exists log;
+
+-- DROP TABLE IF EXISTS log.table_changes cascade;
+CREATE TABLE IF NOT EXISTS log.table_changes();
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_id text NOT NULL DEFAULT next_id();
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_type text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_date date;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS change_user_id text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_type text; -- table_name
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE log.table_changes ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+
+-- DROP TABLE IF EXISTS log.table_changes_data;
+CREATE TABLE IF NOT EXISTS log.table_changes_data();
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_data_id text NOT NULL DEFAULT next_id();
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS change_id text not null;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS entity_key text; -- column_name
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_old text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS value_new text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE log.table_changes_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+
+-- DROP TABLE IF EXISTS log.user_auth;
+CREATE TABLE IF NOT EXISTS log.user_auth();
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_auth_id text NOT NULL DEFAULT next_id();
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_id text;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_date timestamp without time zone;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS auth_type text;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+
+COMMENT ON TABLE log.table_changes IS 'Логи подій змін в БД';
+COMMENT ON COLUMN log.table_changes.change_type IS 'Тип події (insert / update / delete)';
+COMMENT ON COLUMN log.table_changes.change_date IS 'Дата внесення змін до БД';
+COMMENT ON COLUMN log.table_changes.entity_type IS 'Таблиця, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes.entity_id IS 'ID строки, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes.change_user_id IS 'Ініціатор внесення змін';
+
+COMMENT ON TABLE log.table_changes_data IS 'Логи змін в таблицях БД';
+COMMENT ON COLUMN log.table_changes_data.change_id IS 'ID події зміни в БД';
+COMMENT ON COLUMN log.table_changes_data.entity_key IS 'Колонка таблиці, до якої вносяться зміни';
+COMMENT ON COLUMN log.table_changes_data.value_old IS 'Старе значення';
+COMMENT ON COLUMN log.table_changes_data.value_new IS 'Нове значення';
+
+COMMENT ON TABLE log.user_auth IS 'Логи авторизації';
+COMMENT ON COLUMN log.user_auth.user_id IS 'ID користувача';
+COMMENT ON COLUMN log.user_auth.auth_date IS 'Дата авторизації';
+COMMENT ON COLUMN log.user_auth.auth_type IS 'Тип авторизації';
+
+ALTER TABLE log.table_changes DROP CONSTRAINT IF EXISTS log_table_changes_pkey cascade;
+ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_pkey;
+ALTER TABLE log.table_changes_data DROP CONSTRAINT IF EXISTS log_table_changes_data_change_id_fkey;
+ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_pkey;
+ALTER TABLE log.user_auth DROP CONSTRAINT IF EXISTS log_user_auth_user_id_fkey;
+
+ALTER TABLE log.table_changes ADD CONSTRAINT log_table_changes_pkey PRIMARY KEY (change_id);
+ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_pkey PRIMARY KEY (change_data_id);
+ALTER TABLE log.table_changes_data ADD CONSTRAINT log_table_changes_data_change_id_fkey FOREIGN KEY (change_id)
+REFERENCES log.table_changes (change_id);
+ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_pkey PRIMARY KEY (user_auth_id);
+-- ALTER TABLE log.user_auth ADD CONSTRAINT log_user_auth_user_id_fkey FOREIGN KEY (user_id) REFERENCES admin.users (uid) MATCH SIMPLE;
+
+/* drop old columns */
+alter table log.table_changes drop column if exists date_new;
+alter table log.table_changes drop column if exists date_old;
+alter table log.table_changes drop column if exists number_new;
+alter table log.table_changes drop column if exists number_old;
+alter table log.table_changes drop column if exists json_new;
+alter table log.table_changes drop column if exists json_old;
+alter table log.table_changes drop column if exists text_new;
+alter table log.table_changes drop column if exists text_old;
+alter table log.table_changes drop column if exists bool_new;
+alter table log.table_changes drop column if exists bool_old;
 alter table log.table_changes drop column if exists table_change_id;

package/table/controllers/suggest.js

@@ -2,13 +2,16 @@ import getSelectMeta from './utils/getSelectMeta.js';
 import getPG from '../../pg/funcs/getPG.js';
 import config from '../../config.js';
 import getTemplate from './utils/getTemplate.js';
+
 // import getTableSql from '../funcs/getFilterSQL/util/getTableSql.js';
 
 const limit = 50;
 const headers = { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'GET', 'Cache-Control': 'no-cache' };
 
 export default async function suggest(req) {
-  const { params, query, pg: pg1 } = req;
+  const {
+    params, query, pg: pg1, user,
+  } = req;
 
   const lang = query.lang || 'ua';
   const time = Date.now();
@@ -54,10 +57,11 @@ export default async function suggest(req) {
 
   // val
   // const pk = meta.originalCols.split(',')[0];
-  const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
 
-  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${[search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true'} limit ${limit}`;
-  if (query.sql) return sqlSuggest;
+  const val = query.val ? ` id=any('{${query.val.replace(/'/g, "''")}}')` : '';
+  const where = [search, val, 'id is not null'].filter((el) => el).join(' and ') || 'true';
+  const sqlSuggest = `${meta.original.replace(/{{parent}}/gi, parent)} where ${where} limit ${limit}`.replace(/{{uid}}/g, user?.uid || '0');
+  if (query.sql && config.local) return sqlSuggest;
 
   // query
   const { rows: dataNew } = meta.searchColumn ? { rows: [] } : await pg.query(sqlSuggest, query.key ? [`${query.key}%`] : []);

package/test/config.example

@@ -1,18 +1,18 @@
-import config from '../config.js';
-
-Object.assign(config, {
-  folder: 'test/templates',
-  pg: {
-    host: '192.168.3.160',
-    port: 5434,
-    database: 'mbk_rivne_dma',
-    user: 'postgres',
-    password: 'postgres',
-  },
-  redis: {
-    host: '192.168.3.160',
-    port: 6379,
-    family: 4,
-  },
-});
-export default config;
+import config from '../config.js';
+
+Object.assign(config, {
+  folder: 'test/templates',
+  pg: {
+    host: '192.168.3.160',
+    port: 5434,
+    database: 'mbk_rivne_dma',
+    user: 'postgres',
+    password: 'postgres',
+  },
+  redis: {
+    host: '192.168.3.160',
+    port: 6379,
+    family: 4,
+  },
+});
+export default config;

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