@opengis/fastify-table 1.0.40 → 1.0.42

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.42 - 12.06.2024
+
+- table cardSql support
+
+## 1.0.41 - 12.06.2024
+
+- cls to db (crm.cls)
+
 ## 1.0.40 - 12.06.2024
 
 - fix widget GET API

package/index.js

@@ -1,4 +1,6 @@
 import path from 'path';
+import { readdir, readFile } from 'fs/promises';
+import { existsSync } from 'fs';
 
 import fp from 'fastify-plugin';
 import config from './config.js';
@@ -12,6 +14,8 @@ import widgetPlugin from './widget/index.js';
 import crudPlugin from './crud/index.js';
 import policyPlugin from './policy/index.js';
 
+import pgClients from './pg/pgClients.js';
+
 async function plugin(fastify, opt) {
   // console.log(opt);
   config.pg = opt.pg;
@@ -31,6 +35,27 @@ async function plugin(fastify, opt) {
     return filepath;
   });
 
+  fastify.addHook('onListen', async () => {
+    const { client } = pgClients;
+    if (client?.pk?.['crm.cls']) {
+      const clsDir = path.join(process.cwd(), 'server/templates/cls');
+      const files = existsSync(clsDir) ? await readdir(clsDir) : [];
+      if (files.length) {
+        const res = await Promise.all(files.map(async (filename) => {
+          const filepath = path.join(clsDir, filename);
+          const data = JSON.parse(await readFile(filepath));
+          return { name: path.parse(filename).name, data };
+        }));
+        await client.query('truncate table crm.cls');
+        const { rows } = await client.query(`insert into crm.cls(name, type) 
+        select value->>'name', 'json' from json_array_elements($1) returning cls_id as id, name`, [JSON.stringify(res).replace(/'/g, "''")]);
+        rows.forEach((row) => Object.assign(row, { data: res.find((cls) => row.name === cls.name)?.data }));
+        const sql = `insert into crm.cls(code, name, parent)
+        select json_array_elements(value->'data')->>'id', json_array_elements(value->'data')->>'text', value->>'name' from json_array_elements($1)`;
+        await client.query(sql, [JSON.stringify(rows).replace(/'/g, "''")]);
+      }
+    }
+  });
   if (!fastify.funcs) {
     fastify.addHook('onRequest', async (req) => {
       req.funcs = fastify;

package/package.json

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

package/server/migrations/crm.sql

@@ -1,8 +1,37 @@
+-- next_id()
+CREATE SEQUENCE crm.cls_clsid_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 128142470
+  CACHE 1;
+CREATE OR REPLACE FUNCTION crm.next_id()
+  RETURNS bigint AS
+$BODY$
+DECLARE
+    our_epoch bigint := 1314220021721;
+    seq_id bigint;
+    now_millis bigint;
+    shard_id int := 1;
+    result bigint;
+BEGIN
+    SELECT nextval('crm.cls_clsid_seq') % 1024 INTO seq_id;
+
+    SELECT FLOOR(EXTRACT(EPOCH FROM clock_timestamp()) * 1000) INTO now_millis;
+    result := (now_millis - our_epoch) << 23;
+    result := result | (shard_id << 10);
+    result := result | (seq_id);
+    return result;
+END;
+$BODY$
+  LANGUAGE plpgsql VOLATILE
+  COST 100;
+
 -- crm.notifications
 -- DROP TABLE IF EXISTS crm.notifications;
 CREATE TABLE IF NOT EXISTS crm.notifications();
 ALTER TABLE crm.notifications DROP CONSTRAINT IF EXISTS crm_notifications_pkey;
-ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS notification_id text NOT NULL DEFAULT admin.next_id();
+ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS notification_id text NOT NULL DEFAULT crm.next_id();
 
 ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS notification_user_id text;
 ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS notification_type text DEFAULT 'notify'::text;
@@ -22,7 +51,7 @@ ALTER TABLE crm.notifications ADD CONSTRAINT crm_notifications_pkey PRIMARY KEY
 -- DROP TABLE IF EXISTS crm.files;
 CREATE TABLE IF NOT EXISTS crm.files();
 ALTER TABLE crm.files DROP CONSTRAINT IF EXISTS crm_files_pkey;
-ALTER TABLE crm.files ADD COLUMN IF NOT EXISTS file_id text NOT NULL DEFAULT admin.next_id();
+ALTER TABLE crm.files ADD COLUMN IF NOT EXISTS file_id text NOT NULL DEFAULT crm.next_id();
 
 ALTER TABLE crm.files ADD COLUMN IF NOT EXISTS uploaded_name text;
 ALTER TABLE crm.files ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
@@ -48,7 +77,7 @@ ALTER TABLE crm.files ADD CONSTRAINT crm_files_pkey PRIMARY KEY (file_id);
 -- DROP TABLE IF EXISTS crm.communications;
 CREATE TABLE IF NOT EXISTS crm.communications();
 ALTER TABLE crm.communications DROP CONSTRAINT IF EXISTS crm_communications_pkey;
-ALTER TABLE crm.communications ADD COLUMN IF NOT EXISTS communication_id text NOT NULL DEFAULT admin.next_id();
+ALTER TABLE crm.communications ADD COLUMN IF NOT EXISTS communication_id text NOT NULL DEFAULT crm.next_id();
 
 ALTER TABLE crm.communications ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
 ALTER TABLE crm.communications ADD COLUMN IF NOT EXISTS entity_type text; -- table_name
@@ -74,8 +103,8 @@ ALTER TABLE crm.communications ADD CONSTRAINT crm_communications_pkey PRIMARY KE
 -- crm.checklists
 -- DROP TABLE IF EXISTS crm.checklists;
 CREATE TABLE IF NOT EXISTS crm.checklists();
-ALTER TABLE crm.checklists DROP CONSTRAINT IF EXISTS checklists_pkey;
-ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS checklist_id text NOT NULL DEFAULT admin.next_id();
+ALTER TABLE crm.checklists DROP CONSTRAINT IF EXISTS crm_checklists_pkey;
+ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS checklist_id text NOT NULL DEFAULT crm.next_id();
 
 ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS entity_id text; -- object_id
 ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS entity_type text; -- table_name
@@ -93,3 +122,24 @@ ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS cdate timestamp without time
 ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE crm.checklists ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
 ALTER TABLE crm.checklists ADD CONSTRAINT crm_checklists_pkey PRIMARY KEY (checklist_id);
+
+-- crm.cls
+-- DROP TABLE IF EXISTS crm.cls;
+CREATE TABLE IF NOT EXISTS crm.cls();
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS cls_id text NOT NULL DEFAULT crm.next_id();
+
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS name text;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS data text;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS type text;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS parent text;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS code text;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS color text;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS icon text;
+
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS files json;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_pkey PRIMARY KEY (cls_id);
+ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_unique UNIQUE (code, parent);

package/table/controllers/data.js

@@ -1,57 +1,60 @@
-import getTemplate from './utils/getTemplate.js';
-import getFilterSQL from '../funcs/getFilterSQL/index.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import metaFormat from '../funcs/metaFormat/index.js';
-
-const maxLimit = 100;
-export default async function data(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, sql, filters, form, meta,
-  } = loadTable;
-  const { pk } = await getMeta(table);
-
-  const cols = columns.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 fData = query.filter ? await getFilterSQL({
-    filter: query.filter,
-    table: params.table,
-    json: 1,
-  }) : {};
-
-  const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
-
-  const limit = Math.min(maxLimit, +(query.limit || 10));
-
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-  // id, query, filter
-  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
-
-  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
-  const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
-  const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
-  const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
-
-  const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} from ${table} t ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
-
-  if (query.sql === '1') { return q; }
-
-  const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
-
-  const total = keyQuery || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
-
-  await metaFormat({ rows, table: params.table });
-  return {
-    time: Date.now() - time, total, count: rows.length, pk, form, rows, meta, columns, filters,
-  };
-}
+import getTemplate from './utils/getTemplate.js';
+import getFilterSQL from '../funcs/getFilterSQL/index.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+const maxLimit = 100;
+export default async function data(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, sql, cardSql, filters, form, meta,
+  } = loadTable;
+  const { pk } = await getMeta(table);
+
+  const cols = columns.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 fData = query.filter ? await getFilterSQL({
+    filter: query.filter,
+    table: params.table,
+    json: 1,
+  }) : {};
+
+  const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
+
+  const limit = Math.min(maxLimit, +(query.limit || 10));
+
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+  // id, query, filter
+  const [orderColumn, orderDir] = (query.order || loadTable.order || '').split(/[- ]/);
+
+  const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
+  const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
+  const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
+  const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
+
+  const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
+  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
+
+  const total = keyQuery || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+
+  await metaFormat({ rows, table: params.table });
+  return {
+    time: Date.now() - time, total, count: rows.length, pk, form, rows, meta, columns, filters,
+  };
+}