@opengis/fastify-table 1.0.47 → 1.0.49

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.49 - 26.06.2024
+
+- refactor - npm settings
+
+## 1.0.48 - 26.06.2024
+
+- search api no specified table mode support
+
 ## 1.0.47 - 25.06.2024
 
 - add extra properties support

package/crud/controllers/properties.add.js

@@ -3,7 +3,7 @@ import dataInsert from "../funcs/dataInsert.js";
 const table = 'crm.properties';
 
 function checkKeyType({ body, key }) {
-    if (typeof body[key] === 'number' && !body[key].toString().includes('.')) {
+    if (typeof body[key] === 'number' && (!/\D/.test(body[key].toString()) && body[key].toString().length < 10)) {
         return { [key]: 'int' };
     } else if (typeof body[key] === 'object') {
         return { [key]: 'json' };

package/index.js

@@ -13,7 +13,6 @@ import notificationPlugin from './notification/index.js';
 import widgetPlugin from './widget/index.js';
 import crudPlugin from './crud/index.js';
 import policyPlugin from './policy/index.js';
-import settingsPlugin from './settings/index.js';
 
 import pgClients from './pg/pgClients.js';
 
@@ -75,7 +74,6 @@ async function plugin(fastify, opt) {
   crudPlugin(fastify, opt);
   notificationPlugin(fastify, opt);
   widgetPlugin(fastify, opt);
-  settingsPlugin(fastify, opt);
 }
 export default fp(plugin);
 // export { rclient };

package/package.json

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

package/table/controllers/card.js

@@ -0,0 +1,41 @@
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+export default async function card(req) {
+  const time = Date.now();
+  const {
+    pg, params, query = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { status: 404, message: 'not found' }; }
+
+  const { table, columns, meta, sql, cardSql } = loadTable;
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+  const cardSqlFiltered = params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
+  const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
+
+  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
+  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? `st_asgeojson(geom)::json as geom,` : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
+  where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, [params.id]);
+
+  await metaFormat({ rows, table: params.table });
+
+  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
+  return {
+    time: Date.now() - time, data,
+  };
+}

package/table/controllers/search.js

@@ -1,17 +1,20 @@
 import getTemplate from './utils/getTemplate.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import metaFormat from '../funcs/metaFormat/index.js';
+import getTemplates from './utils/getTemplates.js';
 
-const maxLimit = 100;
+function sequence(tables, data, fn) {
+  return tables.reduce((promise, table) => promise.then(() => fn({
+    ...data, tableName: table.replace('.json', ''),
+  })), Promise.resolve());
+}
 
-export default async function data({
-  pg, query = {},
+async function getData({
+  pg, tableName, query = {}, maxLimit, res,
 }) {
-  const time = Date.now();
+  const loadTable = await getTemplate('table', tableName);
 
-  const loadTable = await getTemplate('table', query.table);
-
-    if (!loadTable) { return { message: 'not found', status: 404 }; }
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
 
   const { table, columns, meta } = loadTable;
   const { pk } = await getMeta(table);
@@ -20,22 +23,46 @@ export default async function data({
   const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
   const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
 
-  const limit = Math.min(maxLimit, +(query.limit || 10));
+  const limit = Math.max(maxLimit - res.rows.length, 0);
+  // Math.max(query.offset - res.rows.length,0)
   const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
 
   const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : null;
 
   const where = [loadTable.query, search].filter((el) => el);
   const q = `select  ${pk ? `"${pk}" as id,` : ''} * from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-
-  if (query.sql === '1') return q;
+  if (query.sql) {
+    res.sql.push(q);
+    return;
+  }
 
   const { rows } = await pg.query(q);
 
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => res.rows.push({ ...row, register: tableName }));
+}
+
+export default async function data({
+  pg, query = {},
+}) {
+  const time = Date.now();
+
+  try {
+    const tables = query.table ? [query.table] : await getTemplates('table');
+    const res = { rows: [], sql: [], total: 0 };
+
+    const maxLimit = Math.min(100, query.limit || '16');
+    await sequence(tables, { pg, query, maxLimit, res }, getData);
+
+    if (query.sql) return res.sql.join(';\n');
 
-  await metaFormat({ rows, table: query.table });
-  return {
-    time: Date.now() - time, total, count: rows.length, rows,
-  };
+    return {
+      time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+    };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
 }

package/table/controllers/utils/getTemplates.js

@@ -0,0 +1,18 @@
+import fs from 'fs';
+import path from 'path';
+import config from '../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+    if (!type) return null;
+    
+    const cwd = process.cwd();
+    const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+    
+    if (!loadTemplate[type]) {
+        const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+        loadTemplate[type] = typeList;
+    }
+    return loadTemplate[type];
+}

package/table/index.js

@@ -1,5 +1,6 @@
 import suggest from './controllers/suggest.js';
 import data from './controllers/data.js';
+import card from './controllers/card.js';
 import search from './controllers/search.js';
 import filter from './controllers/filter.js';
 import form from './controllers/form.js';
@@ -34,6 +35,7 @@ async function plugin(fastify, config = {}) {
 
   fastify.get(`${prefix}/suggest/:data`, {}, suggest);
   fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
   fastify.get(`${prefix}/search`, { schema: searchTableSchema }, search);
   fastify.get(`${prefix}/filter/:table`, {}, filter);
   fastify.get(`${prefix}/form/:form`, {}, form);

package/server/migrations/admin.sql

@@ -1,246 +0,0 @@
-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 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 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 'Вкл. / Відкл';
-COMMENT ON COLUMN admin.users.last_activity_date IS 'Дата останньої активності';
-COMMENT ON COLUMN admin.users.user_type IS 'Тип користувача';
-COMMENT ON COLUMN admin.users.salt IS 'Сіль';
-
--- drop table if exists admin.user_group;
-CREATE TABLE if not exists admin.user_group();
-alter table admin.user_group DROP CONSTRAINT if exists admin_user_group_id_pkey cascade;
-
-ALTER TABLE admin.user_group ADD COLUMN if not exists user_group_id text;
-ALTER TABLE admin.user_group ALTER COLUMN user_group_id SET NOT NULL;
-ALTER TABLE admin.user_group ALTER COLUMN user_group_id SET DEFAULT next_id();
-ALTER TABLE admin.user_group ADD COLUMN if not exists group_name text;
-ALTER TABLE admin.user_group ADD COLUMN if not exists enabled boolean;
-ALTER TABLE admin.user_group ADD COLUMN if not exists cdate timestamp without time zone;
-ALTER TABLE admin.user_group ALTER COLUMN cdate SET DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE admin.user_group ADD COLUMN if not exists uid text;
-ALTER TABLE admin.user_group ADD COLUMN if not exists editor_id text;
-ALTER TABLE admin.user_group ADD COLUMN if not exists editor_date timestamp without time zone;
-
-ALTER TABLE admin.user_group
-ADD CONSTRAINT admin_user_group_id_pkey PRIMARY KEY(user_group_id);
-
-COMMENT ON COLUMN admin.user_group.user_group_id IS 'Вкл./Выкл.';
-COMMENT ON COLUMN admin.user_group.group_name IS 'Назва групи';
-COMMENT ON COLUMN admin.user_group.enabled IS 'Вкл./Відкл.';
-COMMENT ON COLUMN admin.user_group.cdate IS 'Дата створення';
-COMMENT ON COLUMN admin.user_group.uid IS 'Хто створив';
-COMMENT ON COLUMN admin.user_group.editor_id IS 'Останній редагувач';
-COMMENT ON COLUMN admin.user_group.editor_date IS 'Дата останнього редагування';
-
--- drop table if exists admin.user_access;
-CREATE TABLE if not exists admin.user_access();
-alter table admin.user_access DROP CONSTRAINT if exists admin_user_access_id_pkey;
-alter table admin.user_access DROP CONSTRAINT if exists admin_user_access_user_group_id_fkey;
-alter table admin.user_access DROP CONSTRAINT if exists admin_user_access_interface_id_uid_unique;
-alter table admin.user_access DROP CONSTRAINT if exists admin_user_access_interface_id_fkey;
-
-alter table admin.user_access add column if not exists user_access_id text NOT NULL DEFAULT next_id();
-alter table admin.user_access add column if not exists interface_id text NOT NULL;
-alter table admin.user_access add column if not exists user_group_id text;
-alter table admin.user_access add column if not exists user_uid text;
-alter table admin.user_access add column if not exists scope text;
-alter table admin.user_access add column if not exists actions text[];
-ALTER TABLE admin.user_access ADD COLUMN IF NOT EXISTS access_granted text;
-ALTER TABLE admin.user_access ADD COLUMN IF NOT EXISTS access_granted_time timestamp without time zone;
-alter table admin.user_access add column if not exists cdate timestamp without time zone NOT NULL DEFAULT date_trunc('seconds'::text, now());
-alter table admin.user_access add column if not exists uid text;
-alter table admin.user_access add column if not exists editor_id text;
-alter table admin.user_access add column if not exists editor_date timestamp without time zone;
-
-alter table admin.user_access 
-add CONSTRAINT admin_user_access_id_pkey PRIMARY KEY (user_access_id);
-
-alter table admin.user_access 
-add CONSTRAINT admin_user_access_user_group_id_fkey FOREIGN KEY (user_group_id) REFERENCES admin.user_group (user_group_id);
-
-alter table admin.user_access 
-add CONSTRAINT admin_user_access_interface_id_uid_unique UNIQUE (interface_id, user_uid, user_group_id);
-alter table admin.user_access 
-add constraint admin_user_access_interface_id_fkey FOREIGN KEY (interface_id) REFERENCES admin.interface_list(interface_id);
-
-COMMENT ON TABLE admin.user_access IS 'Налаштування прав. Відношення груп / окремих користувачів до шаблонів';
-COMMENT ON COLUMN admin.user_access.interface_id IS 'ID шаблона';
-COMMENT ON COLUMN admin.user_access.user_group_id IS 'ID групи';
-COMMENT ON COLUMN admin.user_access.user_uid IS 'ID користувача';
-COMMENT ON COLUMN admin.user_access.scope IS 'Обмеження виведення (власні, відповідальний, всі)';
-COMMENT ON COLUMN admin.user_access.actions IS 'Доступні дії';
-COMMENT ON COLUMN admin.user_access.access_granted IS 'Ідентифікатор користувача який надав доступ';
-COMMENT ON COLUMN admin.user_access.access_granted_time IS 'Час коли надали доступ';
-
-CREATE INDEX if not exists admin_user_access_interface_id_idx
-ON admin.user_access USING btree (interface_id COLLATE pg_catalog."default");
-
-CREATE INDEX if not exists admin_user_access_user_group_id_idx
-ON admin.user_access USING btree (user_group_id COLLATE pg_catalog."default");
-
--- DROP TABLE if exists admin.user_group_rel;
-CREATE TABLE if not exists admin.user_group_rel();
-ALTER TABLE admin.user_group_rel DROP CONSTRAINT IF EXISTS admin_user_group_rel_pkey;
-ALTER TABLE admin.user_group_rel DROP CONSTRAINT IF EXISTS admin_user_group_rel_user_group_id_fkey;
-ALTER TABLE admin.user_group_rel DROP CONSTRAINT IF EXISTS admin_user_group_rel_user_uid_fkey;
-ALTER TABLE admin.user_group_rel DROP CONSTRAINT IF EXISTS admin_user_group_rel_user_uid_user_group_id_key;
-
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS ugr_id text NOT NULL DEFAULT next_id();
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS user_uid text NOT NULL;
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS user_group_id text NOT NULL;
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS expiration date;
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS access_granted text;
-ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS access_granted_time timestamp without time zone;
-
-ALTER TABLE admin.user_group_rel ADD CONSTRAINT admin_user_group_rel_pkey PRIMARY KEY (ugr_id);
-ALTER TABLE admin.user_group_rel ADD CONSTRAINT admin_user_group_rel_user_group_id_fkey FOREIGN KEY (user_group_id) REFERENCES admin.user_group (user_group_id);
-ALTER TABLE admin.user_group_rel ADD CONSTRAINT admin_user_group_rel_user_uid_fkey FOREIGN KEY (user_uid) REFERENCES admin.users (uid);
-ALTER TABLE admin.user_group_rel ADD CONSTRAINT admin_user_group_rel_user_uid_user_group_id_key UNIQUE (user_uid, user_group_id);
-
-COMMENT ON TABLE admin.user_group_rel IS 'Відношення користувачів до груп';
-COMMENT ON COLUMN admin.user_group_rel.user_uid IS 'ID користувача';
-COMMENT ON COLUMN admin.user_group_rel.user_group_id IS 'ID групи';
-COMMENT ON COLUMN admin.user_group_rel.uid IS 'Користувач, який створив запис в БД';
-COMMENT ON COLUMN admin.user_group_rel.expiration IS 'закінчення терміну дії доступу до групи';
-COMMENT ON COLUMN admin.user_group_rel.access_granted IS 'Ідентифікатор користувача який надав доступ';
-COMMENT ON COLUMN admin.user_group_rel.access_granted_time IS 'Час коли надали доступ';
-
-CREATE INDEX IF NOT EXISTS admin_user_group_access_user_uid_idx ON admin.user_group_rel USING btree (user_uid COLLATE pg_catalog."default");
-
-CREATE INDEX IF NOT EXISTS admin_user_group_rel_cdate_btree_idx ON admin.user_group_rel USING btree (cdate);
-
-CREATE INDEX IF NOT EXISTS admin_user_group_rel_editor_date_btree_idx ON admin.user_group_rel USING btree (editor_date);
-
-CREATE INDEX IF NOT EXISTS admin_user_group_rel_user_uid_gin_idx ON admin.user_group_rel USING gin (user_uid COLLATE pg_catalog."default" gin_trgm_ops);
-
-CREATE INDEX IF NOT EXISTS admin_user_group_user_group_id_idx ON admin.user_group_rel USING btree (user_group_id COLLATE pg_catalog."default");
-
--- 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);
-alter table admin.menu add CONSTRAINT admin_menu_name_unique UNIQUE (name);
-
-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';
-
--- DROP TABLE if exists admin.interface_list;
-CREATE TABLE if not exists admin.interface_list();
-alter table admin.interface_list DROP CONSTRAINT if exists admin_interface_id_pkey cascade;
-
-alter table admin.interface_list add column if not exists interface_id text NOT NULL default next_id();
-alter table admin.interface_list add column if not exists alias text NOT NULL;
-alter table admin.interface_list add column if not exists title text;
-alter table admin.interface_list add column if not exists public boolean;
-alter table admin.interface_list add column if not exists menu_id text;
-alter table admin.interface_list add column if not exists uid text;
-alter table admin.interface_list add column if not exists editor_id text;
-alter table admin.interface_list add column if not exists editor_date timestamp without time zone;
-alter table admin.interface_list add column if not exists cdate timestamp without time zone DEFAULT now();
-alter table admin.interface_list add column if not exists enabled boolean NOT NULL DEFAULT true;
-alter table admin.interface_list add CONSTRAINT admin_interface_id_pkey PRIMARY KEY (interface_id);
-alter table admin.interface_list add constraint admin_interface_menu_id_fkey FOREIGN KEY (menu_id) REFERENCES admin.menu(menu_id);
-
-COMMENT ON TABLE admin.interface_list IS 'Список інтерфейсів';
-COMMENT ON COLUMN admin.interface_list.interface_id IS 'Ідентифікатор інтерфейса';
-COMMENT ON COLUMN admin.interface_list.alias IS 'Назва файлу інтерфейса';
-COMMENT ON COLUMN admin.interface_list.title IS 'Назва інтерфейсу українською';
-COMMENT ON COLUMN admin.interface_list.public IS 'Ознака чи для всіх показується';
-COMMENT ON COLUMN admin.interface_list.enabled IS 'On / Off';
-COMMENT ON COLUMN admin.interface_list.menu_id IS 'Пункт меню (для collapse)';
-
-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/server/migrations/setting.sql

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

package/settings/controllers/settings.get.js

@@ -1,24 +0,0 @@
-export default async function getSettingsAPI({
-  pg, funcs, params = {},
-}) {
-  const { key } = params;
-
-  if (!pg?.pk?.['setting.property']) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  try {
-    const res = await funcs.getSettings({ pg, key });
-    if (key) {
-      if (!res) {
-        return { message: `settings not found: ${key}`, status: 404 };
-      }
-      return { message: res, status: 200 };
-    }
-    const { rows } = res || { };
-    return { message: { total: rows.length || 0, rows }, status: 200 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}

package/settings/controllers/settings.post.js

@@ -1,14 +0,0 @@
-export default async function postSettingsAPI({
-  pg, funcs, body = {},
-}) {
-  const { key, val } = body;
-  if (!key || !val) {
-    return { message: 'not enough params', status: 400 };
-  }
-  const res = await funcs.setSettings({
-    pg, funcs, key, val,
-  });
-  if (res?.error) return res;
-
-  return { message: res, status: 200 };
-}

package/settings/funcs/getSettings.js

@@ -1,12 +0,0 @@
-export default async function getSettings({ pg, key }) {
-  const sql = `select property_id as id, property_entity, property_key, property_text,
-  property_int, property_json, level, object_id, uid, cdate, editor_id, editor_date from setting.property
-  where ${key ? 'property_key=$1' : '1=1'}`;
-
-  if (!key) {
-    const { rows } = await pg.query(sql);
-    return { rows };
-  }
-  const data = await pg.one(sql, [key]);
-  return data;
-}

package/settings/funcs/setSettings.js

@@ -1,29 +0,0 @@
-const table = 'setting.property';
-
-function checkValueType(val) {
-  if (val) {
-    if (typeof val === 'object') {
-      return 'property_json';
-    }
-    if (typeof val === 'number' || (!/\D/.test(val.toString()) && val.length <= 10)) {
-      return 'property_int';
-    }
-  }
-  return 'property_text';
-}
-
-export default async function setSettings({
-  pg, funcs, key, val,
-}) {
-  try {
-    const columnType = checkValueType(val);
-    const data = { property_key: key, [columnType]: val };
-
-    await pg.query('delete from setting.property where property_key=$1', [key]);
-    const { rows } = await funcs.dataInsert({ pg, table, data });
-    return { key, val, data: rows };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}

package/settings/index.js

@@ -1,22 +0,0 @@
-import getSettingsAPI from './controllers/settings.get.js';
-import postSettingsAPI from './controllers/settings.post.js';
-import getSettingsFunc from './funcs/getSettings.js';
-import setSettingsFunc from './funcs/setSettings.js';
-
-async function plugin(fastify, config = { }) {
-  const prefix = config.prefix || '/api';
-  fastify.decorate('getSettings', getSettingsFunc);
-  fastify.decorate('setSettings', setSettingsFunc);
-  fastify.get(`${prefix}/settings/:key?`, {}, getSettingsAPI);
-
-  fastify.route({
-    method: 'POST',
-    path: `${prefix}/settings`,
-    config: {
-      policy: ['superadmin'],
-    },
-    handler: postSettingsAPI,
-  });
-}
-
-export default plugin;