@opengis/fastify-table 1.0.39 → 1.0.41

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.41 - 12.06.2024
+
+- cls to db (crm.cls)
+
+## 1.0.40 - 12.06.2024
+
+- fix widget GET API
+
 ## 1.0.39 - 29.05.2024
 
 - add getFolder func

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;
@@ -27,10 +31,31 @@ async function plugin(fastify, opt) {
   fastify.decorate('getFolder', (req, type = 'server') => {
     if (!['server', 'local'].includes(type)) throw new Error('params type is invalid');
     const types = { local: req.root, server: req.mapServerRoot };
-    const filepath = path.posix.join(types[type] || '/data/local', req.folder || '');
+    const filepath = path.posix.join(types[type] || '/data/local', req.folder || config.folder || '');
     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.39",
+  "version": "1.0.41",
   "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/widget/controllers/widget.get.js

@@ -23,25 +23,35 @@ export default async function widgetGet({
   if (!objectid) return { error: 'id required', status: 400 };
 
   const sqls = {
-    comment: `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
+    comment: pg.pk['admin.users']
+      ? `select communication_id, entity_id, body, subject, c.cdate, c.uid, 
     coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, avatar 
-    from crm.communications c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`,
+    from crm.communications c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`
+      : 'select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc',
 
     history: `SELECT table_change_id, entity_id, entity_type, change_key, change_date, json_old, json_new, date_old, 
     date_new, number_old, number_new, bool_old, bool_new, text_old, 
     text_new, uid, cdate FROM log.table_changes where entity_id=$1 order by cdate desc, change_key limit 100`,
 
-    checklist: `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
-    avatar FROM crm.checklists c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`,
+    checklist: pg.pk['admin.users']
+      ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
+    avatar FROM crm.checklists c left join admin.users u on u.uid=c.uid where entity_id=$1 order by cdate desc`
+      : 'SELECT checklist_id, entity_id, subject, is_done, done_date, uid, cdate FROM crm.checklists where entity_id=$1 order by cdate desc',
 
-    file: `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    file: pg.pk['admin.users']
+      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
     coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
     avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 order by cdate desc`,
-    gallery: `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
+    where entity_id=$1 and file_status<>3 order by cdate desc`
+      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, uid, cdate, file_type, ismain,
+      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 order by cdate desc`,
+    gallery: pg.pk['admin.users']
+      ? `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, c.ismain,
     coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, isverified,
     avatar, c.uid as author, file_status FROM crm.files c left join admin.users u on u.uid=c.uid
-    where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
+    where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`
+      : `SELECT file_id, entity_id, entity_type, file_path, uploaded_name, ext, size, c.uid, c.cdate, file_type, ismain,
+      isverified, uid as author, file_status FROM crm.files c where entity_id=$1 and file_status<>3 and ext = any($2) order by cdate desc`,
 
   };
   const sql = sqls[params.type];
@@ -56,12 +66,12 @@ export default async function widgetGet({
     time.push(Date.now());
 
     /* Object info  */
-    const { tableName } = await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]);
+    const { tableName } = pg.pk['log.table_changes'] ? await pg.one('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid]) : {};
     const { pk } = await getMeta({ table: tableName });
 
-    const q = `select coalesce(b.user_name,'')||coalesce(' '||b.sur_name,'') as author, a.cdate, a.editor_date from ${tableName} a 
-    left join admin.users b on a.uid=b.uid where a.${pk}=$1 limit 1`;
-    const data = pk ? await pg.one(q, [objectid]) : {};
+    const q = tableName && pg.pk['admin.users'] ? `select coalesce(b.user_name,'')||coalesce(' '||b.sur_name,'') as author, a.cdate, a.editor_date from ${tableName} a 
+    left join admin.users b on a.uid=b.uid where a.${pk}=$1 limit 1` : undefined;
+    const data = pk && q ? await pg.one(q, [objectid]) : {};
 
     if (query.debug && user?.user_type === 'admin') {
       return {