@opengis/fastify-table 1.0.95 → 1.0.97

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.97 - 13.09.2024
+
+- add migrations
+
+## 1.0.96 - 12.09.2024
+
+- minor refactor of email notifications
+
 ## 1.0.95 - 12.09.2024
 
 - add dbname to getFolder func

package/migration/exec.migrations.js

@@ -1,76 +1,79 @@
-import fs from 'fs';
-import path from 'path';
-
-const time = Date.now();
-
-import getPG from '../pg/funcs/getPG.js';
-
-export default async function execMigrations(opt) {
-    try {
-        const pg = opt?.pg || getPG({ name: 'client' });
-        const rootDir = getCallerDir();
-        const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), rootDir.endsWith('plugins') ? '../..' : '', 'server/migrations');
-
-        console.log('migrations start', dir, Date.now() - time);
-        const exists = fs.existsSync(dir);
-        if (exists) {
-            // get directory sql file list
-            const content = fs.readdirSync(dir, { withFileTypes: true })
-                ?.filter((el) => el.isFile() && path.extname(el.name) === '.sql')
-                ?.map((el) => el.name) || [];
-
-            // execute sql files
-            if (content?.length) {
-                await sequence(content, { pg, dir }, execSql);
-            }
-        }
-        console.log('migrations finish', dir, exists, Date.now() - time);
-    } catch(err) {
-        console.error('migrations error', err.toString(), Date.now() - time);
-    }
-}
-
-function getCallerDir() {
-    const originalFunc = Error.prepareStackTrace;
-
-    let callerfile;
-    try {
-        const err = new Error();
-        let currentfile;
-
-        Error.prepareStackTrace = function (err, stack) { return stack; };
-
-        currentfile = err.stack.shift().getFileName();
-
-        while (err.stack.length) {
-            callerfile = err.stack.shift().getFileName();
-
-            if(currentfile !== callerfile) break;
-        }
-    } catch (err) { }
-
-    Error.prepareStackTrace = originalFunc; 
-
-    return path.dirname(callerfile);
-}
-
-function sequence(files, data, fn) {
-    return files.reduce((promise, filename) => promise.then(() => fn({
-      ...data, filename,
-    })), Promise.resolve());
-}
-
-async function execSql({
-    pg, dir, filename,
-}) {
-    const start = Date.now();
-    const filepath = path.join(dir, filename);
-    const sql = fs.readFileSync(filepath, 'utf-8');
-    try {
-        console.log(filename, 'start', Date.now() - start);
-        await pg.query(sql);
-        console.log(filename, 'finish', Date.now() - start);
-    } catch (err) {
-        console.log(filepath, 'error', err.toString(), Date.now() - start);
-    }
-}
+import fs from 'fs';
+import path from 'path';
+
+const time = Date.now();
+
+import getPG from '../pg/funcs/getPG.js';
+
+function getCallerDir() {
+  const originalFunc = Error.prepareStackTrace;
+
+  let callerfile;
+  try {
+    const err = new Error();
+    // let currentfile;
+
+    Error.prepareStackTrace = function (err, stack) { return stack; };
+
+    const currentfile = err.stack.shift().getFileName();
+
+    while (err.stack.length) {
+      callerfile = err.stack.shift().getFileName();
+
+      if (currentfile !== callerfile) break;
+    }
+  }
+  catch (err) { }
+
+  Error.prepareStackTrace = originalFunc;
+
+  return path.dirname(callerfile);
+}
+
+function sequence(files, data, fn) {
+  return files.reduce((promise, filename) => promise.then(() => fn({
+    ...data, filename,
+  })), Promise.resolve());
+}
+
+async function execSql({
+  pg, dir, filename,
+}) {
+  const start = Date.now();
+  const filepath = path.join(dir, filename);
+  const sql = fs.readFileSync(filepath, 'utf-8');
+  try {
+    console.log(filename, 'start', Date.now() - start);
+    await pg.query(sql);
+    console.log(filename, 'finish', Date.now() - start);
+  }
+  catch (err) {
+    console.log(filepath, 'error', err.toString(), Date.now() - start);
+  }
+}
+
+export default async function execMigrations(opt) {
+  try {
+    const pg = opt?.pg || getPG({ name: 'client' });
+    const rootDir = getCallerDir();
+    const dir = path.join(rootDir.replace(/\\/g, '/').replace(/^file:\/\/\//, ''), rootDir.endsWith('plugins') ? '../..' : '', 'server/migrations');
+
+    console.log('migrations start', dir, Date.now() - time);
+    const exists = fs.existsSync(dir);
+    if (exists) {
+      // get directory sql file list
+      const content = fs.readdirSync(dir, { withFileTypes: true })
+        ?.filter((el) => el.isFile() && path.extname(el.name) === '.sql')
+        ?.map((el) => el.name) || [];
+
+      // execute sql files
+      if (content?.length) {
+        await sequence(content, { pg, dir }, execSql);
+      }
+    }
+    console.log('migrations finish', dir, exists, Date.now() - time);
+  }
+  catch (err) {
+    console.error('migrations error', err.toString(), Date.now() - time);
+  }
+}

package/notification/funcs/sendNotification.js

@@ -1,111 +1,111 @@
-// eslint-disable-next-line max-len, no-control-regex
-const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
-
-// eslint-disable-next-line import/no-relative-packages
-// import downloadFile from '../../../fastify-file/file/funcs/downloadFile.js'; // test only
-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';
-
-async function generateNotificationContent({
-  pg, funcs, table, template, id, message, data: data1,
-}) {
-  if (template) {
-    const data = table && id ? await pg.one(`select * from ${table} where ${pg.pk[table]}=$1`, [id]) : data1;
-    // console.log(data);
-    const body = await getTemplate('pt', template);
-    // console.log(body);
-    const html = funcs.handlebars.compile(body || 'template not found')(data || {});
-    // console.log(html);
-    return html;
-  }
-  return message;
-}
-
-export default async function notification({
-  pg: pg1,
-  funcs,
-  log,
-  provider = ['email'],
-  from,
-  to,
-  template,
-  table,
-  message,
-  title,
-  file,
-  data,
-  id,
-  nocache,
-}) {
-  const rclient = getRedis();
-  const pg = pg1 || pgClients.client;
-
-  if (!pg) throw new Error('need pg');
-
-  if (pg?.readonly) {
-    return null;
-  }
-
-  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 });
-
-  if (!uniqueTo && !nocache) {
-    return `already sent: ${keyTo}`;
-  }
-  await rclient.expire(keyTo, 1000 * 600);
-
-  if (!to.length) {
-    return null;
-  }
-
-  if (!(Array.isArray(provider) && provider.length)) {
-    return 'notification provider - must be array and not empty';
-  }
-
-  try {
-    const html = await generateNotificationContent({
-      pg, funcs, table, template, id, message, data,
-    });
-
-    // return html;
-
-    if (provider.includes('email')) {
-      const files = Array.isArray(file) ? file : [file];
-      const attachments = files?.length ? await Promise.all(files?.filter((el) => el).map(async (el) => {
-        const content = await funcs.downloadFile(el, { funcs, buffer: true }); // ?
-        return {
-          filename: el.split('/').pop(),
-          encoding: 'base64',
-          content,
-        };
-      })) : [];
-
-      const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
-
-      const result = await sendEmail({
-        funcs,
-        attachments,
-        html,
-        subject: title,
-        from,
-        to: toEmail,
-      });
-
-      log.info('notification', {
-        provider, title, to: toEmail, from, result, len: message?.length, files,
-      });
-
-      return result;
-    }
-    return null;
-  }
-  catch (err) {
-    log.info('notification/error', {
-      provider, from, to, err: err.toString(),
-    });
-    throw err;
-  }
-}
+// eslint-disable-next-line max-len, no-control-regex
+const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
+
+// eslint-disable-next-line import/no-relative-packages
+// import downloadFile from '../../../fastify-file/file/funcs/downloadFile.js'; // test only
+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';
+
+async function generateNotificationContent({
+  pg, funcs, table, template, id, message, data: data1,
+}) {
+  if (template) {
+    const data = table && id ? await pg.one(`select * from ${table} where ${pg.pk[table]}=$1`, [id]) : data1;
+    // console.log(data);
+    const body = await getTemplate('pt', template);
+    // console.log(body);
+    const html = funcs.handlebars.compile(body || template || 'template not found')(data || {});
+    // console.log(html);
+    return html;
+  }
+  return message;
+}
+
+export default async function notification({
+  pg: pg1,
+  funcs,
+  log,
+  provider = ['email'],
+  from,
+  to,
+  template,
+  table,
+  message,
+  title,
+  file,
+  data,
+  id,
+  nocache,
+}) {
+  const rclient = getRedis();
+  const pg = pg1 || pgClients.client;
+
+  if (!pg) throw new Error('need pg');
+
+  if (pg?.readonly) {
+    return null;
+  }
+
+  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 });
+
+  if (!uniqueTo && !nocache) {
+    return `already sent: ${keyTo}`;
+  }
+  await rclient.expire(keyTo, 1000 * 600);
+
+  if (!to.length) {
+    return null;
+  }
+
+  if (!(Array.isArray(provider) && provider.length)) {
+    return 'notification provider - must be array and not empty';
+  }
+
+  try {
+    const html = await generateNotificationContent({
+      pg, funcs, table, template, id, message, data,
+    });
+
+    // return html;
+
+    if (provider.includes('email')) {
+      const files = Array.isArray(file) ? file : [file];
+      const attachments = files?.length ? await Promise.all(files?.filter((el) => el).map(async (el) => {
+        const content = await funcs.downloadFile(el, { funcs, buffer: true }); // ?
+        return {
+          filename: el.split('/').pop(),
+          encoding: 'base64',
+          content,
+        };
+      })) : [];
+
+      const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
+
+      const result = await sendEmail({
+        funcs,
+        attachments,
+        html,
+        subject: title,
+        from,
+        to: toEmail,
+      });
+
+      log.info('notification', {
+        provider, title, to: toEmail, from, result, len: message?.length, files,
+      });
+
+      return result;
+    }
+    return null;
+  }
+  catch (err) {
+    log.info('notification/error', {
+      provider, from, to, err: err.toString(),
+    });
+    throw err;
+  }
+}

package/package.json

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

package/server/migrations/properties.sql

@@ -0,0 +1,31 @@
+create schema if not exists admin;
+
+-- DROP TABLE admin.properties;
+CREATE TABLE IF NOT EXISTS admin.properties();
+ALTER TABLE admin.properties DROP CONSTRAINT IF EXISTS admin_properties_property_id_pkey;
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
+
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_entity text;
+COMMENT ON COLUMN admin.properties.property_entity IS 'Сутність';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_key text;
+COMMENT ON COLUMN admin.properties.property_key IS 'Ключ';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_text text;
+COMMENT ON COLUMN admin.properties.property_text IS 'Текстове значення налаштування';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_int integer;
+COMMENT ON COLUMN admin.properties.property_int IS 'Цілочислове значения';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_json json;
+COMMENT ON COLUMN admin.properties.property_json IS 'Значення налаштування';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS level text;
+COMMENT ON COLUMN admin.properties.level IS 'Рівень (user/system)';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS object_id text;
+COMMENT ON COLUMN admin.properties.object_id IS 'ID Об''єкту';
+
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS files json;
+
+ALTER TABLE admin.properties ADD CONSTRAINT admin_properties_property_id_pkey PRIMARY KEY(property_id);
+
+COMMENT ON TABLE admin.properties IS 'Налаштування';

package/server/migrations/roles.sql

@@ -0,0 +1,164 @@
+create schema if not exists admin;
+
+-- Role (Group)
+-- drop table if exists admin.roles;
+CREATE TABLE if not exists admin.roles();
+alter table admin.roles DROP CONSTRAINT if exists admin_roles_id_pkey cascade;
+
+ALTER TABLE admin.roles ADD COLUMN if not exists role_id text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.roles ADD COLUMN if not exists name text;
+ALTER TABLE admin.roles ADD COLUMN if not exists enabled boolean;
+ALTER TABLE admin.roles ADD COLUMN if not exists info text;
+ALTER TABLE admin.roles ADD COLUMN if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.roles ADD COLUMN if not exists uid text;
+ALTER TABLE admin.roles ADD COLUMN if not exists editor_id text;
+ALTER TABLE admin.roles ADD COLUMN if not exists editor_date timestamp without time zone;
+
+ALTER TABLE admin.roles ADD CONSTRAINT admin_roles_id_pkey PRIMARY KEY(role_id);
+
+COMMENT ON TABLE admin.roles IS 'Групи';
+COMMENT ON COLUMN admin.roles.role_id IS 'ID';
+COMMENT ON COLUMN admin.roles.name IS 'Назва групи';
+COMMENT ON COLUMN admin.roles.enabled IS 'On / Off';
+COMMENT ON COLUMN admin.roles.info IS 'Опис групи';
+COMMENT ON COLUMN admin.roles.cdate IS 'Дата створення';
+COMMENT ON COLUMN admin.roles.uid IS 'Хто створив';
+COMMENT ON COLUMN admin.roles.editor_id IS 'Останній редагувач';
+COMMENT ON COLUMN admin.roles.editor_date IS 'Дата останнього редагування';
+
+-- Routes (Interfaces)
+-- DROP TABLE if exists admin.routes;
+CREATE TABLE if not exists admin.routes();
+alter table admin.routes DROP CONSTRAINT if exists admin_route_id_pkey cascade;
+alter table admin.routes DROP constraint if exists admin_route_menu_id_fkey cascade;
+
+alter table admin.routes add column if not exists route_id text NOT NULL default next_id();
+alter table admin.routes add column if not exists alias text NOT NULL;
+alter table admin.routes add column if not exists table_name text NOT NULL;
+alter table admin.routes add column if not exists title text;
+alter table admin.routes add column if not exists public boolean;
+alter table admin.routes add column if not exists menu_id text;
+alter table admin.routes add column if not exists uid text;
+alter table admin.routes add column if not exists editor_id text;
+alter table admin.routes add column if not exists editor_date timestamp without time zone;
+alter table admin.routes add column if not exists cdate timestamp without time zone DEFAULT now();
+alter table admin.routes add column if not exists enabled boolean NOT NULL DEFAULT true;
+alter table admin.routes add CONSTRAINT admin_route_id_pkey PRIMARY KEY (route_id);
+
+COMMENT ON TABLE admin.routes IS 'Список інтерфейсів';
+COMMENT ON COLUMN admin.routes.route_id IS 'Ідентифікатор інтерфейса';
+COMMENT ON COLUMN admin.routes.alias IS 'Назва файлу інтерфейса';
+COMMENT ON COLUMN admin.routes.table_name IS 'Таблиця в БД';
+COMMENT ON COLUMN admin.routes.title IS 'Назва інтерфейсу українською';
+COMMENT ON COLUMN admin.routes.public IS 'Ознака чи для всіх показується';
+COMMENT ON COLUMN admin.routes.enabled IS 'On / Off';
+COMMENT ON COLUMN admin.routes.menu_id IS 'Пункт меню (для collapse)';
+
+-- User <> Role (Group)
+-- DROP TABLE if exists admin.user_roles;
+CREATE TABLE if not exists admin.user_roles();
+ALTER TABLE admin.user_roles DROP CONSTRAINT IF EXISTS admin_user_roles_role_id_pkey;
+ALTER TABLE admin.user_roles DROP CONSTRAINT IF EXISTS admin_user_roles_role_id_fkey;
+ALTER TABLE admin.user_roles DROP CONSTRAINT IF EXISTS admin_user_roles_user_uid_fkey;
+ALTER TABLE admin.user_roles DROP CONSTRAINT IF EXISTS admin_user_roles_user_uid_role_id_key;
+
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS ugr_id text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS user_uid text NOT NULL;
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS role_id text NOT NULL;
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS expiration date;
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS access_granted text;
+ALTER TABLE admin.user_roles ADD COLUMN IF NOT EXISTS access_granted_time timestamp without time zone;
+
+ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_role_id_pkey PRIMARY KEY (ugr_id);
+
+
+COMMENT ON TABLE admin.user_roles IS 'Відношення користувачів до груп';
+COMMENT ON COLUMN admin.user_roles.user_uid IS 'ID користувача';
+COMMENT ON COLUMN admin.user_roles.role_id IS 'ID групи';
+COMMENT ON COLUMN admin.user_roles.uid IS 'Користувач, який створив запис в БД';
+COMMENT ON COLUMN admin.user_roles.expiration IS 'закінчення терміну дії доступу до групи';
+COMMENT ON COLUMN admin.user_roles.access_granted IS 'Ідентифікатор користувача який надав доступ';
+COMMENT ON COLUMN admin.user_roles.access_granted_time IS 'Час коли надали доступ';
+
+CREATE INDEX IF NOT EXISTS admin_user_roles_access_user_uid_idx ON admin.user_roles USING btree (user_uid COLLATE pg_catalog."default");
+CREATE INDEX IF NOT EXISTS admin_user_roles_cdate_btree_idx ON admin.user_roles USING btree (cdate);
+CREATE INDEX IF NOT EXISTS admin_user_roles_editor_date_btree_idx ON admin.user_roles USING btree (editor_date);
+CREATE INDEX IF NOT EXISTS admin_user_roles_user_uid_gin_idx ON admin.user_roles USING gin (user_uid COLLATE pg_catalog."default" gin_trgm_ops);
+CREATE INDEX IF NOT EXISTS admin_user_roles_role_id_idx ON admin.user_roles USING btree (role_id COLLATE pg_catalog."default");
+
+
+-- Route (Interface) <> User / Role (Group)
+-- drop table if exists admin.access;
+CREATE TABLE if not exists admin.access();
+alter table admin.access DROP CONSTRAINT if exists admin_access_id_pkey;
+alter table admin.access DROP CONSTRAINT if exists admin_access_role_id_fkey;
+alter table admin.access DROP CONSTRAINT if exists admin_access_route_id_uid_unique;
+alter table admin.access DROP CONSTRAINT if exists admin_access_route_id_fkey;
+
+alter table admin.access add column if not exists access_id text NOT NULL DEFAULT next_id();
+alter table admin.access add column if not exists route_id text NOT NULL;
+alter table admin.access add column if not exists role_id text;
+alter table admin.access add column if not exists user_uid text;
+alter table admin.access add column if not exists scope text;
+alter table admin.access add column if not exists actions text[];
+ALTER TABLE admin.access ADD COLUMN IF NOT EXISTS access_granted text;
+ALTER TABLE admin.access ADD COLUMN IF NOT EXISTS access_granted_time timestamp without time zone;
+alter table admin.access add column if not exists cdate timestamp without time zone NOT NULL DEFAULT date_trunc('seconds'::text, now());
+alter table admin.access add column if not exists uid text;
+alter table admin.access add column if not exists editor_id text;
+alter table admin.access add column if not exists editor_date timestamp without time zone;
+
+alter table admin.access 
+add CONSTRAINT admin_access_id_pkey PRIMARY KEY (access_id);
+
+COMMENT ON TABLE admin.access IS 'Налаштування прав. Відношення груп / окремих користувачів до шаблонів';
+COMMENT ON COLUMN admin.access.route_id IS 'ID шаблона';
+COMMENT ON COLUMN admin.access.role_id IS 'ID групи';
+COMMENT ON COLUMN admin.access.user_uid IS 'ID користувача';
+COMMENT ON COLUMN admin.access.scope IS 'Обмеження виведення (власні, відповідальний, всі)';
+COMMENT ON COLUMN admin.access.actions IS 'Доступні дії';
+COMMENT ON COLUMN admin.access.access_granted IS 'Ідентифікатор користувача який надав доступ';
+COMMENT ON COLUMN admin.access.access_granted_time IS 'Час коли надали доступ';
+
+CREATE INDEX if not exists admin_access_route_id_idx ON admin.access USING btree (route_id COLLATE pg_catalog."default");
+CREATE INDEX if not exists admin_access_role_id_idx ON admin.access USING btree (role_id COLLATE pg_catalog."default");
+
+-- Admin Menu
+-- DROP TABLE if exists admin.menu;
+CREATE TABLE if not exists admin.menu();
+alter table admin.menu DROP CONSTRAINT if exists admin_menu_id_pkey cascade;
+alter table admin.menu DROP CONSTRAINT if exists admin_menu_name_unique;
+
+alter table admin.menu add column if not exists menu_id text NOT NULL default next_id();
+alter table admin.menu add column if not exists name text;
+alter table admin.menu add column if not exists ord numeric;
+alter table admin.menu add column if not exists enabled boolean NOT NULL DEFAULT true;
+alter table admin.menu add column if not exists uid text;
+alter table admin.menu add column if not exists editor_id text;
+alter table admin.menu add column if not exists editor_date timestamp without time zone;
+alter table admin.menu add column if not exists cdate timestamp without time zone DEFAULT now();
+alter table admin.menu add CONSTRAINT admin_menu_id_pkey PRIMARY KEY (menu_id);
+
+
+COMMENT ON TABLE admin.menu IS 'Пункти меню';
+COMMENT ON COLUMN admin.menu.menu_id IS 'Ідентифікатор пункту меню';
+COMMENT ON COLUMN admin.menu.name IS 'Назва пункту меню';
+COMMENT ON COLUMN admin.menu.ord IS 'Порядковий номер';
+COMMENT ON COLUMN admin.menu.enabled IS 'On / Off';
+
+alter table admin.access 
+add CONSTRAINT admin_access_role_id_fkey FOREIGN KEY (role_id) REFERENCES admin.roles (role_id);
+alter table admin.routes add constraint admin_route_menu_id_fkey FOREIGN KEY (menu_id) REFERENCES admin.menu(menu_id);
+
+alter table admin.access 
+add CONSTRAINT admin_access_route_id_uid_unique UNIQUE (route_id, user_uid, role_id);
+alter table admin.access 
+add constraint admin_access_route_id_fkey FOREIGN KEY (route_id) REFERENCES admin.routes(route_id);
+alter table admin.menu add CONSTRAINT admin_menu_name_unique UNIQUE (name);
+ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_role_id_fkey FOREIGN KEY (role_id) REFERENCES admin.roles (role_id);
+ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_uid_fkey FOREIGN KEY (user_uid) REFERENCES admin.users (uid);
+ALTER TABLE admin.user_roles ADD CONSTRAINT admin_user_roles_user_uid_role_id_key UNIQUE (user_uid, role_id);

package/server/migrations/users.sql

@@ -0,0 +1,89 @@
+create schema if not exists admin;
+
+-- DROP TABLE is exists admin.users;
+CREATE TABLE if not exists admin.users();
+ALTER TABLE admin.users add column if not exists uid text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_uid_pkey cascade;
+ALTER TABLE admin.users DROP CONSTRAINT if exists user_pk cascade;
+
+ALTER TABLE admin.users add column if not exists login text;
+ALTER TABLE admin.users add column if not exists password text NOT NULL DEFAULT ''::text;
+ALTER TABLE admin.users add column if not exists user_name text;
+ALTER TABLE admin.users add column if not exists sur_name text;
+ALTER TABLE admin.users add column if not exists father_name text;
+ALTER TABLE admin.users add column if not exists email text;
+ALTER TABLE admin.users add column if not exists phone text;
+ALTER TABLE admin.users add column if not exists avatar text;
+ALTER TABLE admin.users add column if not exists enabled boolean;
+ALTER TABLE admin.users add column if not exists user_personal_code text;
+ALTER TABLE admin.users add column if not exists last_activity_date timestamp without time zone;
+ALTER TABLE admin.users add column if not exists user_type text DEFAULT 'regular'::text;
+ALTER TABLE admin.users add column if not exists salt text;
+ALTER TABLE admin.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.users add column if not exists editor_id text;
+ALTER TABLE admin.users add column if not exists editor_date timestamp without time zone;
+
+ALTER TABLE admin.users add CONSTRAINT admin_user_uid_pkey PRIMARY KEY (uid);
+
+COMMENT ON TABLE admin.users IS 'Користувачі';
+
+COMMENT ON COLUMN admin.users.uid IS 'ID користувача';
+COMMENT ON COLUMN admin.users.login IS 'Логін користувача';
+COMMENT ON COLUMN admin.users.password IS 'Пароль користувача';
+COMMENT ON COLUMN admin.users.user_name IS 'Ім''я користувача';
+COMMENT ON COLUMN admin.users.sur_name IS 'Прізвище користувача';
+COMMENT ON COLUMN admin.users.father_name IS 'По-батькові користувача';
+COMMENT ON COLUMN admin.users.email IS 'Ел. пошта користувача';
+COMMENT ON COLUMN admin.users.phone IS 'Номер телефону користувача';
+COMMENT ON COLUMN admin.users.avatar IS 'Аватар';
+COMMENT ON COLUMN admin.users.enabled IS 'On / Off';
+COMMENT ON COLUMN admin.users.last_activity_date IS 'Дата останньої активності';
+COMMENT ON COLUMN admin.users.user_type IS 'Тип користувача';
+COMMENT ON COLUMN admin.users.salt IS 'Сіль';
+
+CREATE EXTENSION if not exists pgcrypto SCHEMA public VERSION "1.3";
+CREATE OR REPLACE FUNCTION admin.crypt(text, text) RETURNS text AS '$libdir/pgcrypto', 'pg_crypt' LANGUAGE c IMMUTABLE STRICT COST 1;
+
+-- DROP FUNCTION admin.insert_update_user_before();
+CREATE OR REPLACE FUNCTION admin.insert_update_user_before()
+RETURNS trigger AS
+
+$BODY$
+DECLARE 
+
+iterations  int;
+hash character varying;
+
+BEGIN
+
+ if(TG_OP='INSERT' or (TG_OP='UPDATE' and new.password<>old.password)) then
+	if(char_length(new.password) <> 0 and char_length(new.password) < 8) then
+		--raise exception 'password must be longer than 8 characters';
+	end if;
+	new.salt=md5(now()::text);
+	--raise exception '%','change pass';
+	if(new.salt ='') then
+		new.salt=gen_salt('md5');	
+	end if;	
+	iterations = 10;
+	hash=''; 
+	
+	loop   		
+		if iterations=0 then
+			exit;
+		end if;
+		hash = md5(new.password||hash||new.salt);
+		iterations=iterations-1;
+	end loop;
+	new.password=admin.crypt(hash,new.salt);
+	
+ end if;
+ RETURN new;
+END
+$BODY$
+
+LANGUAGE plpgsql VOLATILE COST 100;
+  
+DROP TRIGGER if exists insert_update_user_before on admin.users;
+CREATE TRIGGER insert_update_user_before BEFORE INSERT OR UPDATE ON admin.users FOR EACH ROW 
+EXECUTE PROCEDURE admin.insert_update_user_before();

package/table/funcs/getFilterSQL/util/getCustomQuery.js

@@ -4,7 +4,7 @@ async function getCustomQuery({
   if (!customFilter) return null;
   const customFilterList = customFilter?.split(',')?.map((el) => el?.split('_').pop());
   const { property_json: customFilterSQL } = await pg.one(`select json_agg(json_build_object('id',property_id,'name',property_key,'query',property_text)
-  ) as property_json from setting.property where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
+  ) as property_json from admin.properties where property_key is not null and property_entity='customQuery' and object_id=$1`, [table]);
   const data = customFilterSQL?.length ? customFilterSQL.filter((el) => customFilterList.includes(el.id)) || [] : [];
   const customQuery = data?.map((el) => el.query).join(' and ');
   return `${customQuery}`;