@opengis/fastify-table 1.1.31 → 1.1.33

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/server/migrations/properties.sql

@@ -1,5 +1,5 @@
 create schema if not exists admin;
-create schema if not exists setting;
+create schema if not exists crm;
 
 -- drop old
 DROP TABLE IF EXISTS setting.extra_data;
@@ -72,7 +72,10 @@ drop table if exists admin.custom_column cascade;
 CREATE TABLE IF NOT EXISTS admin.custom_column();
 ALTER TABLE admin.custom_column DROP CONSTRAINT IF EXISTS admin_custom_column_column_id_pkey cascade;
 alter table admin.custom_column drop constraint if exists admin_custom_column_key_entity_uid_unique;
-ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS column_id text NOT NULL DEFAULT next_id();
+
+ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS column_id text;
+ALTER TABLE admin.custom_column ALTER COLUMN column_id SET NOT NULL;
+ALTER TABLE admin.custom_column ALTER COLUMN column_id SET DEFAULT next_id();
 
 ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS name text;
 ALTER TABLE admin.custom_column ADD COLUMN IF NOT EXISTS entity text;
@@ -104,6 +107,7 @@ CREATE TABLE if not exists crm.extra_data();
 ALTER TABLE crm.extra_data DROP CONSTRAINT IF EXISTS crm_extra_data_pkey;
 ALTER TABLE crm.extra_data DROP CONSTRAINT IF EXISTS crm_extra_data_property_id_fkey;
 ALTER TABLE crm.extra_data DROP CONSTRAINT IF EXISTS crm_extra_data_property_key_object_id_entity_unique;
+
 ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS extra_data_id text;
 ALTER TABLE crm.extra_data ALTER COLUMN extra_data_id SET NOT NULL;
 ALTER TABLE crm.extra_data ALTER COLUMN extra_data_id SET DEFAULT next_id();
@@ -121,7 +125,9 @@ ALTER TABLE crm.extra_data ALTER COLUMN cdate SET DEFAULT date_trunc('seconds'::
 ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
 ALTER TABLE crm.extra_data ADD COLUMN IF NOT EXISTS files json;
+
 ALTER TABLE crm.extra_data ADD CONSTRAINT crm_extra_data_pkey PRIMARY KEY (extra_data_id);
+-- delete from crm.extra_data where property_id not in (select column_id from admin.custom_column);
 ALTER TABLE crm.extra_data ADD CONSTRAINT crm_extra_data_property_id_fkey FOREIGN KEY (property_id) REFERENCES admin.custom_column (column_id) MATCH SIMPLE;
 ALTER TABLE crm.extra_data ADD CONSTRAINT crm_extra_data_property_key_object_id_entity_unique UNIQUE (property_key, object_id, property_entity);
 

package/server.js

@@ -1,14 +1,26 @@
-// This file contains code that we reuse
-// between our tests.
-import Fastify from 'fastify';
-import config from './test/config.js';
-import appService from './index.js';
-
-const app = Fastify({ logger: false });
-app.register(appService, config);
-app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
-  if (err) {
-    app.log.error(err);
-    process.exit(1);
-  }
-});
+// This file contains code that we reuse
+// between our tests.
+import Fastify from 'fastify';
+import config from './test/config.js';
+import appService from './index.js';
+import logger from './logger/getLogger.js';
+import loggerTest from './logger/logger.test.api.js';
+
+const app = Fastify({ logger });
+app.register(appService, config);
+
+app.get('/logger-test', {
+  schema: {
+    querystring: {
+      name: { type: 'string' },
+      excitement: { type: 'integer' },
+    },
+  },
+}, loggerTest);
+
+app.listen({ host: '0.0.0.0', port: process.env.PORT || 3000 }, (err) => {
+  if (err) {
+    app.log.error(err);
+    process.exit(1);
+  }
+});

package/table/controllers/card.js

@@ -1,44 +1,44 @@
-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 = {}, opt = {},
-  } = req;
-
-  const loadTable = await getTemplate('table', params.table);
-
-  if (!loadTable) { return { message: 'template not found', status: 404 }; }
-
-  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 = opt.id || 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, [opt.id || 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,
-  };
-}
+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 = {}, opt = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { message: 'template not found', status: 404 }; }
+
+  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 = opt.id || 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, [opt.id || 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/form.js

@@ -1,28 +1,28 @@
-import getTemplate from './utils/getTemplate.js';
-
-const sql = `select property_key as key, property_json as json, property_int as int,
-property_text as text from admin.properties where 1=1`;
-
-async function getSettings({ pg }) {
-  const { rows = [] } = await pg.query(sql);
-  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  return data;
-}
-
-export default async function formFunction(req) {
-  const time = Date.now();
-  const { pg, params } = req;
-  const form = await getTemplate('form', params.form);
-  if (!form) { return { status: 404, message: 'not found' }; }
-
-  // replace settings
-  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
-  if (arr?.length) {
-    const string = JSON.stringify(form);
-    const settings = await getSettings({ pg });
-    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
-    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
-    return { time: Date.now() - time, form: JSON.parse(res) };
-  }
-  return { time: Date.now() - time, form };
-}
+import getTemplate from './utils/getTemplate.js';
+
+const sql = `select property_key as key, property_json as json, property_int as int,
+property_text as text from admin.properties where 1=1`;
+
+async function getSettings({ pg }) {
+  const { rows = [] } = await pg.query(sql);
+  const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  return data;
+}
+
+export default async function formFunction(req) {
+  const time = Date.now();
+  const { pg, params } = req;
+  const form = await getTemplate('form', params.form);
+  if (!form) { return { status: 404, message: 'not found' }; }
+
+  // replace settings
+  const arr = JSON.stringify(form).match(/{{settings.([^}]*)}}/g);
+  if (arr?.length) {
+    const string = JSON.stringify(form);
+    const settings = await getSettings({ pg });
+    const match = arr.reduce((acc, curr) => Object.assign(acc, { [curr]: settings[curr.replace(/^{{settings./g, '').replace(/}}$/, '')] }), {});
+    const res = Object.keys(match).reduce((s, m) => s.replace(m, match[m]), string);
+    return { time: Date.now() - time, form: JSON.parse(res) };
+  }
+  return { time: Date.now() - time, form };
+}

package/test/api/crud.xss.test.js

@@ -1,72 +1,72 @@
-import { test } from 'node:test';
-import assert from 'node:assert';
-
-import build from '../../helper.js';
-
-import setToken from '../../crud/funcs/setToken.js';
-import config from '../config.js';
-
-test('api crud xss', async (t) => {
-  const app = await build(t);
-  const session = { passport: { user: { uid: '1' } } };
-  app.addHook('onRequest', async (req) => {
-    req.session = session;
-  });
-  // app.decorateRequest('session', session);
-
-  const prefix = config.prefix || '/api';
-
-  let addTokens;
-  let editTokens;
-
-  // before
-  t.test('setToken', async () => {
-    addTokens = setToken({
-      ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
-      mode: 'a',
-      uid: 1,
-      array: 1,
-    });
-    editTokens = setToken({
-      ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
-      mode: 'w',
-      uid: 1,
-      array: 1,
-    });
-    assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');
-  });
-
-  await t.test('POST /insert', async () => {
-    const res = await app.inject({
-      method: 'POST',
-      url: `${prefix}/table/${addTokens[0]}`,
-      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.ok(rep.status, 409);
-  });
-
-  await t.test('PUT /update', async () => {
-    const res = await app.inject({
-      method: 'PUT',
-      url: `${prefix}/table/${editTokens[0]}/${editTokens[0]}`,
-      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.equal(rep.status, 409);
-  });
-  await t.test('DELETE /delete', async () => {
-    const res = await app.inject({
-      method: 'DELETE',
-      url: `${prefix}/table/gis.dataset/5400000`,
-    });
-
-    const rep = JSON.parse(res?.body);
-    console.log(rep)
-    assert.ok(rep);
-  });
-});
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import build from '../../helper.js';
+
+import setToken from '../../crud/funcs/setToken.js';
+import config from '../config.js';
+
+test('api crud xss', async (t) => {
+  const app = await build(t);
+  const session = { passport: { user: { uid: '1' } } };
+  app.addHook('onRequest', async (req) => {
+    req.session = session;
+  });
+  // app.decorateRequest('session', session);
+
+  const prefix = config.prefix || '/api';
+
+  let addTokens;
+  let editTokens;
+
+  // before
+  t.test('setToken', async () => {
+    addTokens = setToken({
+      ids: [JSON.stringify({ add: 'gis.dataset', form: 'test.dataset.form' })],
+      mode: 'a',
+      uid: 1,
+      array: 1,
+    });
+    editTokens = setToken({
+      ids: [JSON.stringify({ id: '5400000', table: 'gis.dataset', form: 'test.dataset.form' })],
+      mode: 'w',
+      uid: 1,
+      array: 1,
+    });
+    assert.ok(addTokens.length === 1 && editTokens.length === 1, 'invalid token');
+  });
+
+  await t.test('POST /insert', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/table/${addTokens[0]}`,
+      body: { dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>', dataset_id: '5400000' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.ok(rep.status, 409);
+  });
+
+  await t.test('PUT /update', async () => {
+    const res = await app.inject({
+      method: 'PUT',
+      url: `${prefix}/table/${editTokens[0]}/${editTokens[0]}`,
+      body: { editor_id: '11', dataset_name: '<a onClick="alert("XSS Injection")">xss injection</a>' },
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.equal(rep.status, 409);
+  });
+  await t.test('DELETE /delete', async () => {
+    const res = await app.inject({
+      method: 'DELETE',
+      url: `${prefix}/table/gis.dataset/5400000`,
+    });
+
+    const rep = JSON.parse(res?.body);
+    console.log(rep)
+    assert.ok(rep);
+  });
+});

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;