@opengis/fastify-table 1.1.21 → 1.1.23

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.1.23 - 03.10.2024
+
+- add user API and unit tests
+
 ## 1.1.21 - 03.10.2024
 
 - add mention in comment notification hook

package/index.js

@@ -15,7 +15,7 @@ import crudPlugin from './crud/index.js';
 import policyPlugin from './policy/index.js';
 import utilPlugin from './util/index.js';
 import cronPlugin from './cron/index.js';
-import hookPlugin from './hook/index.js';
+import userPlugin from './user/index.js';
 
 import pgClients from './pg/pgClients.js';
 
@@ -92,7 +92,7 @@ async function plugin(fastify, opt) {
   widgetPlugin(fastify, opt);
   utilPlugin(fastify, opt);
   cronPlugin(fastify, opt);
-  hookPlugin(fastify, opt);
+  userPlugin(fastify, opt);
 
   // core templates && cls
   const filename = fileURLToPath(import.meta.url);

package/package.json

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

package/server/migrations/properties.sql

@@ -41,10 +41,10 @@ COMMENT ON COLUMN admin.user_properties.property_key IS 'Ключ';
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_json json;
 COMMENT ON COLUMN admin.user_properties.property_json IS 'Значення налаштування';
 
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_entity text;
-COMMENT ON COLUMN admin.properties.property_entity IS 'Сутність';
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_title text;
-COMMENT ON COLUMN admin.properties.property_title IS 'Назва';
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_entity text;
+COMMENT ON COLUMN admin.user_properties.property_entity IS 'Сутність';
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_title text;
+COMMENT ON COLUMN admin.user_properties.property_title IS 'Назва';
 
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS editor_id text;
@@ -53,6 +53,6 @@ ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS cdate timestamp witho
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS files json;
 
 ALTER TABLE admin.user_properties ADD CONSTRAINT admin_user_properties_property_id_pkey PRIMARY KEY(property_id);
-alter table admin.user_properties add constraint user_properties_key_uid_unique UNIQUE (property_key,uid);
+ALTER TABLE admin.user_properties ADD CONSTRAINT user_properties_key_uid_unique UNIQUE (property_key,property_entity,uid);
 
 COMMENT ON TABLE admin.user_properties IS 'Налаштування користувача';

package/server/migrations/users.sql

@@ -131,4 +131,38 @@ COMMENT ON COLUMN admin.users_social_auth.social_auth_obj IS 'обьект со
 COMMENT ON COLUMN admin.users_social_auth.social_auth_date IS 'время получение последнего обьекта соцсети';
 COMMENT ON COLUMN admin.users_social_auth.social_auth_softpro_code IS 'код обьекта соцсети, создаваемый и используемый сервером авторизации';
 COMMENT ON COLUMN admin.users_social_auth.enabled IS 'Выключатель';
-COMMENT ON COLUMN admin.users_social_auth.social_auth_url IS 'URL для QR code';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_url IS 'URL для QR code';
+
+CREATE TABLE IF NOT EXISTS admin.user_cls();
+ALTER TABLE admin.user_cls DROP CONSTRAINT IF EXISTS admin_user_cls_pkey;
+ALTER TABLE admin.user_cls DROP CONSTRAINT IF EXISTS admin_user_unique;
+
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS user_clsid text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS code text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS parent text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS name text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS icon text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS data text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS type text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS files json;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS color text;
+
+ALTER TABLE admin.user_cls ALTER COLUMN user_clsid SET NOT NULL;
+ALTER TABLE admin.user_cls ALTER COLUMN user_clsid SET DEFAULT next_id();
+ALTER TABLE admin.user_cls ALTER COLUMN cdate SET DEFAULT (now())::timestamp without time zone;
+ALTER TABLE admin.user_cls ALTER COLUMN uid SET NOT NULL;
+ALTER TABLE admin.user_cls ALTER COLUMN uid SET DEFAULT '1'::text;
+
+ALTER TABLE admin.user_cls ADD CONSTRAINT admin_user_cls_pkey PRIMARY KEY(user_clsid);
+ALTER TABLE admin.user_cls ADD CONSTRAINT admin_user_unique UNIQUE(code, parent);
+
+COMMENT ON TABLE admin.user_cls IS 'Користувацькі класифікатори';
+COMMENT ON COLUMN admin.user_cls.user_clsid IS 'ID';
+COMMENT ON COLUMN admin.user_cls.code IS 'Код';
+COMMENT ON COLUMN admin.user_cls.name IS 'Назва';
+COMMENT ON COLUMN admin.user_cls.icon IS 'Іконка';
+COMMENT ON COLUMN admin.user_cls.color IS 'Колір';

package/table/funcs/metaFormat/getSelectVal.js

@@ -1,15 +1,16 @@
 import getSelect from '../../controllers/utils/getSelect.js';
-import pg from '../../../pg/pgClients.js';
+import pgClients from '../../../pg/pgClients.js';
 import redis from '../../../redis/client.js';
 
-export default async function metaFormat({ name, values }) {
+export default async function getSelectVal({ pg: pg1, name, values }) {
+  const pg = pg1 || pgClients.client;
   const cls = await getSelect(name);
   if (!cls?.arr && !cls?.sql) return null;
   const key = `select:${name}`;
   const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
 
   const data = cls.arr || (values.filter(el => !cache[el]).length
-    ? await pg.client.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
+    ? await pg.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
     : []);
 
   const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };

package/test/api/notification.test.js

@@ -4,34 +4,71 @@ import assert from 'node:assert';
 import build from '../../helper.js';
 import config from '../config.js';
 
-const session = { passport: { user: { uid: config.testUser?.uid || '1' } } };
-
-import userNotifications from '../../notification/controllers/userNotifications.js';
+import { getSelect, initPG, pgClients } from '../../utils.js';
 
-import pgClients from '../../pg/pgClients.js';
+const session = { passport: { user: { uid: config.testUser?.uid || '1' } } };
+const { uid } = session.passport.user;
 
 test('api && funcs notification', async (t) => {
   const app = await build(t);
-  const pg = pgClients.client;
-  /*
-  // require dependency
-  await t.test('GET /auth', async () => {
+  const { client: pg } = pgClients;
+  await initPG(pg);
+
+  app.addHook('onRequest', async (req) => {
+    req.session = session;
+  });
+
+  const notificationIds = await pgClients.client.query(`insert into crm.notifications(addressee_id,entity_id,author_id,subject,body,link) 
+  values($1,$1,$1,$1,$1,$1), ($1,$1,$1,$1,$1,$1) returning notification_id as "notificationId"`, [uid])
+    .then((res) => res.rows?.map((el) => el.notificationId) || {});
+
+  if (!notificationIds?.length) {
+    assert.ok(0, 'insert notification error');
+  }
+  await t.test('GET /notification', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: `/api/login?username=${config.testUser?.username}&password=${config.testUser?.password}`,
+      url: '/api/notification',
     });
-    assert.ok(res.statusCode);
+    const rep = res.json();
+    assert.ok(rep.total > 0);
   });
-  await t.test('GET /notification', async () => {
+  await t.test('GET /notification-read/:id', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: '/api/notification',
+      url: `/api/notification-read/${notificationIds[0]}`,
+    });
+    const rep = res.json();
+    assert.ok(!rep.message?.startsWith(0), res.body);
+    assert.ok(rep.message?.includes('unread notifications marked'), res.body);
+  });
+  await t.test('GET /notification-read', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: '/api/notification-read',
     });
-    const rep = JSON.parse(res?.body);
-    assert.ok(rep.time);
-  }); */
-  /* await t.test('GET /notification', async () => {
-    const rep = await userNotifications({ pg, session });
-    assert.ok(rep.time);
-  }); */
+    const rep = res.json();
+    assert.ok(!rep.message?.startsWith(0), res.body);
+    assert.ok(rep.message?.includes('unread notifications marked'), res.body);
+  });
+
+  const { sql } = await getSelect('core.user_mentioned');
+  const { name } = await pg.query(`with data (id,name,email) as (${sql})
+  select name from data where id = $1`, [uid]).then((res) => res.rows?.[0] || {});
+  if (name) {
+    await t.test('GET Email Notification via HOOK at POST /widget/comment/:id', async () => {
+      const res = await app.inject({
+        method: 'POST',
+        url: `/api/widget/comment/${notificationIds[0]}`,
+        body: { body: `@${name}`, entity_id: uid },
+      });
+      assert.equal(res.statusCode, 200);
+      assert.equal(res.json().rowCount, 1);
+    });
+  }
+
+  await t.test('clean up', async () => {
+    const { rowCount = 0 } = await pg.query('delete from crm.notifications where entity_id=$1', [uid]);
+    console.log('clean up', rowCount);
+  });
 });

package/test/api/user.test.js

@@ -0,0 +1,84 @@
+import { test } from 'node:test';
+import assert from 'node:assert';
+
+import pgClients from '../../pg/pgClients.js';
+import init from '../../pg/funcs/init.js';
+
+import build from '../../helper.js';
+import config from '../config.js';
+
+const prefix = config.prefix || '/api';
+
+const body = {
+  name: 'test.user.cls',
+  type: 'json',
+  children: [
+    {
+      id: 'get',
+      text: 'Отримання',
+    },
+  ],
+};
+
+test('applyHook to API data/table', async (t) => {
+  const app = await build(t);
+  await init(pgClients.client);
+
+  app.addHook('onRequest', async (req) => {
+    req.session = { passport: { user: { uid: '1' } } };
+  });
+
+  await t.test('GET /user-info', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/user-info`,
+    });
+    assert.equal(res.statusCode, 200);
+    assert.equal(res.json().uid, '1');
+    assert.ok(res.json().user_name, 'not enough info: user_name');
+    assert.ok(res.json().notifications || res.json().notifications === 0, 'not enough info: notifications');
+  });
+
+  await t.test('GET /user-cls', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/user-cls`,
+    });
+    const { message = {} } = res.json() || {};
+    assert.ok(message.rows?.length, 'empty cls list');
+  });
+
+  await t.test('POST /user-cls', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/user-cls`,
+      body,
+    });
+    assert.equal(res.statusCode, 200);
+    assert.ok(res.json().children?.length, 'insert user cls error');
+  });
+
+  await t.test('GET /user-cls/:name', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/user-cls/${body.name}`,
+      body,
+    });
+    assert.equal(res.statusCode, 200);
+    assert.equal(res.json().status || 200, 200);
+    assert.equal(res.json().message?.children?.length, 1);
+  });
+
+  await t.test('clean up', async () => {
+    const { rowCount = 0 } = await pgClients.client.query(`with recursive rows as (
+            select user_clsid, name, code, icon, color, parent
+            from admin.user_cls a
+            where name=$1
+            union all
+            select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
+            from admin.user_cls a
+            join rows b on a.parent=b.name
+          ) delete from admin.user_cls where user_clsid in (select user_clsid from rows )`, [body.name]);
+    console.log('clean up', rowCount);
+  });
+});

package/user/controllers/user.cls.id.js

@@ -0,0 +1,14 @@
+import userCls from './user.cls.js';
+
+export default async function userClsId(req) {
+  const { id } = req.params || {};
+  const res = await userCls(req);
+  if (req.query?.sql || res?.error) {
+    return res;
+  }
+  const { rows = [] } = res?.message || {};
+  if (!rows?.length) {
+    return { message: `cls not found: ${id}`, status: 404 };
+  }
+  return { message: rows?.[0], status: 200 };
+}

package/user/controllers/user.cls.js

@@ -0,0 +1,71 @@
+import { readFile } from 'fs/promises';
+import { getSelect, getTemplatePath } from '../../utils.js';
+
+export default async function userCls(req) {
+  const {
+    pg, params = {}, query = {}, session = {},
+  } = req;
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const q = `select user_clsid as id, name, type, 
+  case when type='json' then (
+      ${params?.id
+    ? `(with recursive rows as (
+        select user_clsid, name, code, icon, color, parent
+        from admin.user_cls a
+        where name=u.name
+        union all
+        select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
+        from admin.user_cls a
+        join rows b on a.parent=b.name
+      ) select json_agg(row_to_json(q)) from rows q where name<>u.name
+     )`
+    : 'select count(*)::int from admin.user_cls where parent=u.name'} ) else null end as children, 
+      case when type='sql' then data else null end as sql from admin.user_cls u
+    where (case when type='json' then parent is null else true end)
+    and uid=(select uid from admin.users where $1 in (login,uid) limit 1)
+    and ${params?.id ? 'u.name=$2' : '1=1'}`;
+
+  if (query?.sql) return q;
+
+  try {
+    const { rows = [] } = await pg.query(q, [uid, params.id].filter((el) => el));
+
+    rows.forEach((row) => {
+      if (row.type === 'sql') delete row.children;
+      if (row.type === 'json') { delete row.sql; Object.assign(row, { children: row.children || (params?.id ? [] : 0) }); }
+    });
+
+    const clsList = getTemplatePath('cls');
+    const selectList = getTemplatePath('select');
+
+    const userClsNames = rows.map((el) => el.name);
+    const selectNames = selectList.map((el) => el[0]);
+
+    const arr = (clsList || []).concat(selectList || []).map((el) => ({ name: el[0], path: el[1], type: el[2] }))
+      ?.filter((el) => (params?.id ? el.name === params?.id : true))
+      ?.filter((el) => ['sql', 'json'].includes(el?.type) && !userClsNames.includes(el.name))
+      ?.filter((el) => (el?.type === 'json' ? !selectNames?.includes(el?.name) : true));
+
+    const res = await Promise.all(arr?.map(async (el) => {
+      const type = { json: 'cls', sql: 'select' }[el.type] || el.type;
+      // const clsData = await getSelect(type, el.name);
+      const str = await readFile(el.path, 'utf-8');
+      const clsData = type === 'cls' ? JSON.parse(str) : str;
+      if (type === 'cls') {
+        const children = params?.id ? clsData : clsData?.length || 0;
+        return { name: el.name, type: el.type, children };
+      }
+      return { name: el.name, type: el.type, sql: clsData?.sql || clsData };
+    }));
+
+    return { message: { rows: rows.concat(res) }, status: 200 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 200 };
+  }
+}

package/user/controllers/user.cls.post.js

@@ -0,0 +1,55 @@
+export default async function userClsPost({
+  pg, body = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+  const {
+    name, type = 'json', children = [], sql,
+  } = body;
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (!name) {
+    return { message: 'not enough params: name', status: 400 };
+  }
+
+  if (type === 'json' && (!Array.isArray(children) || !children.length || !children?.[0]?.id)) {
+    return { message: 'invalid params: children (array of objects)', status: 400 };
+  }
+
+  if (type === 'sql' && (!sql || typeof sql !== 'string')) {
+    return { message: 'invalid params: sql (string)', status: 400 };
+  }
+
+  try {
+    const { rowCount = 0 } = await pg.query(`with recursive rows as (
+      select user_clsid, name, code, icon, color, parent
+      from admin.user_cls a
+      where name=$1
+      union all
+      select a.user_clsid, a.name, a.code, a.icon, a.color, a.parent
+      from admin.user_cls a
+      join rows b on a.parent=b.name
+    ) delete from admin.user_cls where user_clsid in (select user_clsid from rows )`, [name]);
+    console.log('delete old user cls', name, rowCount);
+
+    const { id, data } = await pg.query('insert into admin.user_cls(name,type,data,uid) values($1,$2,$3,$4) returning user_clsid as id, data', [name, type, sql, uid])
+      .then((res) => res.rows?.[0] || {});
+    if (type === 'json') {
+      if (!id) { return { error: 'insert user cls error', status: 500 }; }
+      const q1 = `insert into admin.user_cls(code,name,color,icon,parent,uid)
+      
+      select value->>'id',value->>'text',value->>'color',value->>'icon', '${name.replace(/'/g, "''")}', '${uid}'
+      from json_array_elements('${JSON.stringify(children).replace(/'/g, "''")}'::json)
+      
+      returning user_clsid as id, code, name, parent`;
+      const { rows = [] } = await pg.query(q1);
+      return { id, children: rows };
+    }
+    return { id, data };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/user/controllers/user.info.js

@@ -0,0 +1,21 @@
+export default async function userInfo({
+  pg, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const data = await pg.query(`select user_name, sur_name, father_name, user_rnokpp, user_type, email, login from admin.users 
+  where uid=$1`, [uid]).then((res) => res.rows?.[0] || {});
+
+  try {
+    const { notifications = 0 } = await pg.query(`select count(*)::int as notifications from crm.notifications 
+    where addressee_id=$1 and read is not true`, [uid]).then((res) => res.rows?.[0] || {});
+    return { uid, ...data, notifications };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/user/index.js

@@ -0,0 +1,46 @@
+import userCls from './controllers/user.cls.js';
+import userClsId from './controllers/user.cls.id.js';
+import userInfo from './controllers/user.info.js';
+import userClsPost from './controllers/user.cls.post.js';
+
+async function plugin(fastify, opts) {
+  const { prefix = '/api' } = opts || {};
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/user-cls`,
+    config: {
+      policy: ['user'],
+    },
+    schema: {},
+    handler: userCls,
+  });
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/user-cls/:id`,
+    config: {
+      policy: ['user'],
+    },
+    schema: {},
+    handler: userClsId,
+  });
+  fastify.route({
+    method: 'POST',
+    url: `${prefix}/user-cls`,
+    config: {
+      policy: ['user'],
+    },
+    schema: {},
+    handler: userClsPost,
+  });
+  fastify.route({
+    method: 'GET',
+    url: `${prefix}/user-info`,
+    config: {
+      policy: ['user'],
+    },
+    schema: {},
+    handler: userInfo,
+  });
+}
+
+export default plugin;

package/hook/index.js

@@ -1,6 +0,0 @@
-import addHook from './funcs/addHook.js';
-import applyHook from './funcs/applyHook.js';
-
-export default async function plugin(fastify, opts) {
-  fastify.decorate('hook', { add: addHook, apply: applyHook });
-}