@opengis/fastify-table 1.0.17 → 1.0.19

package/crud/funcs/dataUpdate.js

@@ -1,20 +1,20 @@
-import getPG from '../../pg/funcs/getPG.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function dataUpdate({
-  table, id, data,
-}) {
-  const pg = getPG({ name: 'client' });
-  const { columns, pk } = await getMeta(table);
-
-  const names = columns?.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => data[el] && names?.includes(el)).map((el) => [el, data[el]]);
-
-  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => `"${key[0]}"=$${i + 2}`).join(',')} 
-      WHERE ${pk} = $1 returning *`;
-  //  console.log(updateDataset);
-  const res = await pg.query(updateQuery, [id, ...filterData.map((el) => (typeof el[1] === 'object' ? JSON.stringify(el[1]) : el[1]))]).then(el => el?.rows?.[0]) || {};
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function dataUpdate({
+  table, id, data,
+}) {
+  const pg = getPG({ name: 'client' });
+  const { columns, pk } = await getMeta(table);
+
+  const names = columns?.map((el) => el.name);
+  const filterData = Object.keys(data)
+    .filter((el) => data[el] && names?.includes(el)).map((el) => [el, data[el]]);
+
+  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => `"${key[0]}"=$${i + 2}`).join(',')} 
+      WHERE ${pk} = $1 returning *`;
+  //  console.log(updateDataset);
+  const res = await pg.query(updateQuery, [id, ...filterData.map((el) => (typeof el[1] === 'object' ? JSON.stringify(el[1]) : el[1]))]).then(el => el?.rows?.[0]) || {};
+  return res;
+}

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 getIdByToken({
-  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 getIdByToken;
+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 getIdByToken({
+  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 getIdByToken;

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/crud/funcs/setToken.js

@@ -1,53 +1,53 @@
-import { createHash, randomUUID } from 'crypto';
-
-import config from '../../config.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-const generateCodes = (ids, userToken) => {
-  const token = userToken || randomUUID();
-  const notNullIds = ids.filter((el) => el);
-  const obj = {};
-  const codes = notNullIds.reduce((acc, id) => {
-    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
-    acc[newToken] = id; obj[id] = newToken;
-    return acc;
-  }, {});
-  return { codes, obj };
-};
-
-function setToken({
-  ids: idsOrigin, mode = 'r', uid, referer, array,
-}) {
-  const rclient2 = getRedis({ db: 0 });
-  //  const rclient5 = getRedis({ db: 0, funcs });
-
-  if (!uid) return { user: 'empty' };
-  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
-
-  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
-  // update/delete
-
-  if (mode === 'r') return null;
-
-  // TODO generate salt
-  const { codes, obj } = generateCodes(ids, uid);
-
-  if (!Object.keys(codes).length) return { ids: 'empty' };
-
-  rclient2.hmset(`${config.pg.database}:token:${{
-    e: 'exec', r: 'view', w: 'edit', a: 'add',
-  }[mode]}:${uid}`, codes);
-
-  // log token for debug. add extra data - uid, mode, date
-  /* const dt = new Date().toISOString();
-   const codesLog = Object.keys(codes).reduce((acc, key) => {
-    acc[key] = `{"referer": "${referer}" ,"uid":"${uid}","mode":"${mode}","date":"${dt}",${codes[key].substr(1)}`;
-    return acc;
-  }, {});
-   rclient5.hmset(`${config.pg.database}:token:edit`, codesLog); // 'EX', 64800 */
-
-  // TODO дополнительно писать в hset token -> uid
-  return array ? Object.values(obj) : obj;
-}
-
-export default setToken;
+import { createHash, randomUUID } from 'crypto';
+
+import config from '../../config.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+const generateCodes = (ids, userToken) => {
+  const token = userToken || randomUUID();
+  const notNullIds = ids.filter((el) => el);
+  const obj = {};
+  const codes = notNullIds.reduce((acc, id) => {
+    const newToken = createHash('sha1').update(token + id).digest('base64url').replace(/-/g, '');
+    acc[newToken] = id; obj[id] = newToken;
+    return acc;
+  }, {});
+  return { codes, obj };
+};
+
+function setToken({
+  ids: idsOrigin, mode = 'r', uid, referer, array,
+}) {
+  const rclient2 = getRedis({ db: 0 });
+  //  const rclient5 = getRedis({ db: 0, funcs });
+
+  if (!uid) return { user: 'empty' };
+  if (!Object.keys(idsOrigin).length) return { ids: 'empty' };
+
+  const ids = idsOrigin.map((el) => (typeof el === 'object' ? JSON.stringify(el) : el));
+  // update/delete
+
+  if (mode === 'r') return null;
+
+  // TODO generate salt
+  const { codes, obj } = generateCodes(ids, uid);
+
+  if (!Object.keys(codes).length) return { ids: 'empty' };
+
+  rclient2.hmset(`${config.pg.database}:token:${{
+    e: 'exec', r: 'view', w: 'edit', a: 'add',
+  }[mode]}:${uid}`, codes);
+
+  // log token for debug. add extra data - uid, mode, date
+  /* const dt = new Date().toISOString();
+   const codesLog = Object.keys(codes).reduce((acc, key) => {
+    acc[key] = `{"referer": "${referer}" ,"uid":"${uid}","mode":"${mode}","date":"${dt}",${codes[key].substr(1)}`;
+    return acc;
+  }, {});
+   rclient5.hmset(`${config.pg.database}:token:edit`, codesLog); // 'EX', 64800 */
+
+  // TODO дополнительно писать в hset token -> uid
+  return array ? Object.values(obj) : obj;
+}
+
+export default setToken;

package/crud/index.js

@@ -1,29 +1,29 @@
-import getOPt from './funcs/getOpt.js';
-import setOpt from './funcs/setOpt.js';
-import isFileExists from './funcs/isFileExists.js';
-import dataUpdate from './funcs/dataUpdate.js';
-import dataInsert from './funcs/dataInsert.js';
-
-import update from './controllers/update.js';
-import insert from './controllers/insert.js';
-import deleteCrud from './controllers/deleteCrud.js';
-
-// import config from '../config.js';
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  // funcs
-  fastify.decorate('setOpt', setOpt);
-  fastify.decorate('getOpt', getOPt);
-  fastify.decorate('dataUpdate', dataUpdate);
-  fastify.decorate('dataInsert', dataInsert);
-
-  fastify.decorate('isFileExists', isFileExists);
-
-  // api
-  fastify.put(`${prefix}/table/:table/:id`, {}, update);
-  fastify.delete(`${prefix}/table/:table/:id`, {}, deleteCrud);
-  fastify.post(`${prefix}/table/:table`, {}, insert);
-}
-
-export default plugin;
+import getOPt from './funcs/getOpt.js';
+import setOpt from './funcs/setOpt.js';
+import isFileExists from './funcs/isFileExists.js';
+import dataUpdate from './funcs/dataUpdate.js';
+import dataInsert from './funcs/dataInsert.js';
+
+import update from './controllers/update.js';
+import insert from './controllers/insert.js';
+import deleteCrud from './controllers/deleteCrud.js';
+
+// import config from '../config.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  // funcs
+  fastify.decorate('setOpt', setOpt);
+  fastify.decorate('getOpt', getOPt);
+  fastify.decorate('dataUpdate', dataUpdate);
+  fastify.decorate('dataInsert', dataInsert);
+
+  fastify.decorate('isFileExists', isFileExists);
+
+  // api
+  fastify.put(`${prefix}/table/:table/:id`, {}, update);
+  fastify.delete(`${prefix}/table/:table/:id`, {}, deleteCrud);
+  fastify.post(`${prefix}/table/:table`, {}, insert);
+}
+
+export default plugin;

package/helper.js

@@ -1,28 +1,28 @@
-// 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 rclient from './redis/client.js';
-import pgClients from './pg/pgClients.js';
-
-// automatically build and tear down our instance
-async function build(t) {
-  // you can set all the options supported by the fastify CLI command
-  // const argv = [AppPath]
-  process.env.NODE_ENV = 'production';
-  const app = Fastify({ logger: false });
-  app.register(appService, config);
-  // close the app after we are done
-  t.after(() => {
-    // console.log('close app');
-    pgClients.client.end();
-    rclient.quit();
-    app.close();
-  });
-
-  return app;
-}
-
-export default build;
+// 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 rclient from './redis/client.js';
+import pgClients from './pg/pgClients.js';
+
+// automatically build and tear down our instance
+async function build(t) {
+  // you can set all the options supported by the fastify CLI command
+  // const argv = [AppPath]
+  process.env.NODE_ENV = 'production';
+  const app = Fastify({ logger: false });
+  app.register(appService, config);
+  // close the app after we are done
+  t.after(() => {
+    // console.log('close app');
+    pgClients.client.end();
+    rclient.quit();
+    app.close();
+  });
+
+  return app;
+}
+
+export default build;

package/index.js

@@ -6,6 +6,8 @@ import config from './config.js';
 import redisPlugin from './redis/index.js';
 import pgPlugin from './pg/index.js';
 import tablePlugin from './table/index.js';
+import notificationPlugin from './notification/index.js';
+import widgetPlugin from './widget/index.js';
 import crudPlugin from './crud/index.js';
 import policyPlugin from './policy/index.js';
 
@@ -27,6 +29,8 @@ async function plugin(fastify, opt) {
   await pgPlugin(fastify, opt);
   tablePlugin(fastify, opt);
   crudPlugin(fastify, opt);
+  notificationPlugin(fastify, opt);
+  widgetPlugin(fastify, opt);
 }
 export default fp(plugin);
 // export { rclient };

package/notification/controllers/userNotifications.js

@@ -0,0 +1,19 @@
+export default async function userNotifications({
+  pg, session = {}, query = {},
+}) {
+  const time = Date.now();
+  try {
+    const { uid } = session.passport?.user || {};
+    if (!uid) return { error: 'access restricted', status: 403 };
+
+    const queryFunc = query.nocache ? pg.query : pg.queryCache;
+
+    // queryCache not supports $1 params
+    const { rows } = await queryFunc(`select notification_id as id, notification_type as type, 
+      notification_status as status, title, body, link, uid from crm.notification where uid='${uid}'`);
+    return { time: Date.now() - time, total: rows?.length, rows };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/notification/funcs/addNotification.js

@@ -0,0 +1,8 @@
+export default async function addNotification({
+  pg, session = {}, title, body, link, notificationType, uid: uid1,
+}) {
+  const uid = uid1 || session.passport?.user?.uid || {};
+  const { id, status } = await pg.one(`insert into crm.notification(title, body, link, notification_type, uid) 
+  values($1,$2,$3,$4,$5) returning notification_id as id, notification_status as status`, [title, body, link, notificationType, uid]);
+  return { id, status };
+}

package/notification/index.js

@@ -0,0 +1,19 @@
+// api
+import userNotifications from './controllers/userNotifications.js';
+// funcs
+import addNotification from './funcs/addNotification.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/notification`,
+    config: {
+      policy: ['user'], // implement user auth check policy??
+    },
+    handler: userNotifications,
+  });
+  fastify.decorate('addNotification', addNotification);
+}
+
+export default plugin;

package/package.json

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

package/pg/index.js

@@ -1,35 +1,35 @@
-// import fp from 'fastify-plugin';
-//import pg from 'pg';
-import pgClients from './funcs/pgClients.js';
-import init from './funcs/init.js';
-import autoIndex from './funcs/autoIndex.js';
-import getMeta from './funcs/getMeta.js';
-import getPG from './funcs/getPG.js';
-
-function close() {
-  // console.log('pg close');
-  Object.keys(pgClients).forEach((el) => {
-    // console.log(el);
-    pgClients[el].end();
-  });
-
-  // return pgClients.client.end();
-}
-
-async function plugin(fastify, config) {
-  const client = getPG({ ...config.pg || {}, name: 'client' })
-  await init(client);
-  fastify.addHook('onRequest', async (req) => {
-    // req.funcs = fastify;
-    req.pg = client;
-  });
-  //pgClients.client = client;
-
-  // fastify.decorate('pg', client);
-  fastify.decorate('autoIndex', autoIndex);
-  fastify.decorate('getMeta', getMeta);
-  fastify.decorate('getPG', getPG);
-  fastify.addHook('onClose', close);
-}
-
-export default plugin;
+// import fp from 'fastify-plugin';
+//import pg from 'pg';
+import pgClients from './funcs/pgClients.js';
+import init from './funcs/init.js';
+import autoIndex from './funcs/autoIndex.js';
+import getMeta from './funcs/getMeta.js';
+import getPG from './funcs/getPG.js';
+
+function close() {
+  // console.log('pg close');
+  Object.keys(pgClients).forEach((el) => {
+    // console.log(el);
+    pgClients[el].end();
+  });
+
+  // return pgClients.client.end();
+}
+
+async function plugin(fastify, config) {
+  const client = getPG({ ...config.pg || {}, name: 'client' })
+  await init(client);
+  fastify.addHook('onRequest', async (req) => {
+    // req.funcs = fastify;
+    req.pg = client;
+  });
+  //pgClients.client = client;
+
+  // fastify.decorate('pg', client);
+  fastify.decorate('autoIndex', autoIndex);
+  fastify.decorate('getMeta', getMeta);
+  fastify.decorate('getPG', getPG);
+  fastify.addHook('onClose', close);
+}
+
+export default plugin;

package/server/migrations/crm.sql

@@ -0,0 +1,55 @@
+-- crm.notification
+CREATE TABLE IF NOT EXISTS crm.notification();
+ALTER TABLE crm.notification DROP CONSTRAINT IF EXISTS notification_key;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS notification_id text NOT NULL DEFAULT admin.next_id();
+
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS notification_user_id text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS notification_type text DEFAULT 'notify'::text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS notification_status text DEFAULT 'not sent'::text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS title text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS body text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS link text;
+
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE crm.notification ADD CONSTRAINT notification_key PRIMARY KEY (notification_id);
+
+-- crm.file
+CREATE TABLE IF NOT EXISTS crm.file();
+ALTER TABLE crm.file DROP CONSTRAINT IF EXISTS crm_file_pkey;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS file_id text NOT NULL DEFAULT admin.next_id();
+
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS upload_name text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS object_id text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS file_type text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS doc_type text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS title text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS size numeric;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS ext text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS file_path text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS ismain boolean default false;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS isverified boolean default false;
+
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE crm.file ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE crm.file ADD CONSTRAINT crm_file_pkey PRIMARY KEY (file_id);
+
+-- crm.comment
+CREATE TABLE IF NOT EXISTS crm.comment();
+ALTER TABLE crm.comment DROP CONSTRAINT IF EXISTS comment_key;
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS comment_id text NOT NULL DEFAULT admin.next_id();
+
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS object_id text;
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS title text;
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS body text;
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS mark numeric;
+
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE crm.comment ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE crm.comment ADD CONSTRAINT comment_key PRIMARY KEY (comment_id);

package/server/migrations/log.sql

@@ -0,0 +1,40 @@
+CREATE TABLE IF NOT EXISTS log.table_change();
+ALTER TABLE log.table_change DROP CONSTRAINT IF EXISTS log_table_change_pkey;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS table_change_id text NOT NULL DEFAULT admin.next_id();
+
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS table_name text;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS change_key text;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS change_date date;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS json_old json;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS json_new json;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS date_old timestamp without time zone;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS date_new timestamp without time zone;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS number_old numeric;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS number_new numeric;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS bool_old boolean;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS bool_new boolean;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS text_old text;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS text_new text;
+
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE log.table_change ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE log.table_change ADD CONSTRAINT log_table_change_pkey PRIMARY KEY (table_change_id);
+
+CREATE TABLE IF NOT EXISTS log.user_auth();
+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.user_auth ADD COLUMN IF NOT EXISTS user_auth_id text NOT NULL DEFAULT admin.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 user_auth_date timestamp without time zone;
+ALTER TABLE log.user_auth ADD COLUMN IF NOT EXISTS user_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;
+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;

package/server/migrations/notifications.sql

@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS crm.notification();
+ALTER TABLE crm.notification DROP CONSTRAINT IF EXISTS notification_key;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS notification_id text NOT NULL DEFAULT admin.next_id();
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS notification_user_id text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS notification_type text DEFAULT 'notify'::text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS notification_status text DEFAULT 'not sent'::text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS title text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS body text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS link text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE crm.notification ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE crm.notification ADD CONSTRAINT notification_key PRIMARY KEY (notification_id);

package/server/templates/select/test.storage.data.json

@@ -0,0 +1,3 @@
+{
+    "key": "dataset_id"
+}

package/server/templates/select/test.storage.data.sql

@@ -0,0 +1 @@
+select dataset_id,dataset_name from  gis.dataset

package/server/templates/table/test.dataset.table.json

@@ -0,0 +1,25 @@
+{
+    "columns": [
+        {
+            "name": "dataset_id",
+            "title": "22"
+        },
+        {
+            "name": "dataset_name",
+            "title": "dataset_name"
+        }
+    ],
+    "table": "gis.dataset",
+    "order": "dataset_name",
+    "meta": {
+        "title": "dataset_name",
+        "search": "dataset_name,dataset_id"
+    },
+    "filters": [
+        {
+            "ua": "Назва набору",
+            "name": "dataset_name",
+            "type": "text"
+        }
+    ]
+}