@opengis/admin 0.1.86 → 0.1.87

package/server/routes/notifications/controllers/testEmail.js

@@ -1,35 +1,35 @@
-import config from '../../../../config.js';
-
-import sendNotification from '../funcs/sendNotification.js';
-
-export default async function testNotification({
-  pg, query = {}, session = {},
-}) {
-  const { local } = config || {};
-
-  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
-    return { message: 'Forbidden', status: 403 };
-  }
-
-  const date = new Date().toISOString().split('T')[0];
-  if (!query.to) {
-    return { message: 'param to is required', status: 400 };
-  }
-
-  const {
-    to, template, table, id, nocache,
-  } = query;
-
-  const data = await sendNotification({
-    pg,
-    to,
-    template,
-    title: `Test Softpro ${date}`,
-    table,
-    nocache,
-    id,
-    message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
-  });
-
-  return { message: data || 'ok' };
-}
+import config from '../../../../config.js';
+
+import sendNotification from '../funcs/sendNotification.js';
+
+export default async function testNotification({
+  pg, query = {}, session = {},
+}) {
+  const { local } = config || {};
+
+  if (!session?.passport?.user?.user_type?.includes('admin') && !local) {
+    return { message: 'Forbidden', status: 403 };
+  }
+
+  const date = new Date().toISOString().split('T')[0];
+  if (!query.to) {
+    return { message: 'param to is required', status: 400 };
+  }
+
+  const {
+    to, template, table, id, nocache,
+  } = query;
+
+  const data = await sendNotification({
+    pg,
+    to,
+    template,
+    title: `Test Softpro ${date}`,
+    table,
+    nocache,
+    id,
+    message: `Test mail Softpro ${date} Lorem Ipsum Lorem Ipsum`,
+  });
+
+  return { message: data || 'ok' };
+}

package/server/routes/notifications/controllers/userNotifications.js

@@ -1,53 +1,53 @@
-// for example only
-/*
-    const res = await dataInsert({
-      pg,
-      table: 'crm.notifications',
-      data: {
-        subject: 'notif title',
-        body: 'notif body',
-        link: 'http://localhost:3000/api/notification',
-        addressee_id: userId,
-        author_id: userId,
-      },
-    });
-*/
-
-import { getSelectVal } from '@opengis/fastify-table/utils.js';
-
-const maxLimit = 100;
-
-export default async function userNotifications({
-  pg, query = {}, session = {},
-}) {
-  const time = Date.now();
-
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const limit = Math.min(maxLimit, +(query.limit || 5));
-  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-  const q = `select notification_id as id, subject, body, cdate,
-  author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar from crm.notifications a where addressee_id=$1 order by cdate desc limit $2 offset $3`;
-
-  if (query.sql) return q;
-
-  const { rows = [] } = await pg.query(q, [uid, limit, offset]);
-
-  const values = rows.map((el) => el.author_id)
-    ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);
-
-  if (values?.length) {
-    const vals = await getSelectVal({ name: 'core.user_mentioned', values });
-    rows.forEach((row) => {
-      Object.assign(row, { author: vals?.[row.author_id] });
-    });
-  }
-
-  return { time: Date.now() - time, total: rows?.length, rows };
-
-}
+// for example only
+/*
+    const res = await dataInsert({
+      pg,
+      table: 'crm.notifications',
+      data: {
+        subject: 'notif title',
+        body: 'notif body',
+        link: 'http://localhost:3000/api/notification',
+        addressee_id: userId,
+        author_id: userId,
+      },
+    });
+*/
+
+import { getSelectVal } from '@opengis/fastify-table/utils.js';
+
+const maxLimit = 100;
+
+export default async function userNotifications({
+  pg, query = {}, session = {},
+}) {
+  const time = Date.now();
+
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const limit = Math.min(maxLimit, +(query.limit || 5));
+  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+  const q = `select notification_id as id, subject, body, cdate,
+  author_id, read, link, entity_id, (select avatar from admin.users where uid=a.author_id limit 1) as avatar from crm.notifications a where addressee_id=$1 order by cdate desc limit $2 offset $3`;
+
+  if (query.sql) return q;
+
+  const { rows = [] } = await pg.query(q, [uid, limit, offset]);
+
+  const values = rows.map((el) => el.author_id)
+    ?.filter((el, idx, arr) => el && arr.indexOf(el) === idx);
+
+  if (values?.length) {
+    const vals = await getSelectVal({ name: 'core.user_mentioned', values });
+    rows.forEach((row) => {
+      Object.assign(row, { author: vals?.[row.author_id] });
+    });
+  }
+
+  return { time: Date.now() - time, total: rows?.length, rows };
+
+}

package/server/routes/notifications/funcs/addNotification.js

@@ -1,21 +1,21 @@
-import { dataInsert } from '@opengis/fastify-table/utils.js';
-
-export default async function addNotification({
-  pg, session = {}, subject, body, link, uid, entity,
-}) {
-  const { uid: author } = session.passport?.user || {};
-  const res = await dataInsert({
-    pg,
-    table: 'crm.notifications',
-    data: {
-      subject,
-      body,
-      link,
-      addressee_id: uid,
-      author_id: author,
-      entity_id: entity,
-      uid: author,
-    },
-  });
-  return res?.rows?.[0] || {};
-}
+import { dataInsert } from '@opengis/fastify-table/utils.js';
+
+export default async function addNotification({
+  pg, session = {}, subject, body, link, uid, entity,
+}) {
+  const { uid: author } = session.passport?.user || {};
+  const res = await dataInsert({
+    pg,
+    table: 'crm.notifications',
+    data: {
+      subject,
+      body,
+      link,
+      addressee_id: uid,
+      author_id: author,
+      entity_id: entity,
+      uid: author,
+    },
+  });
+  return res?.rows?.[0] || {};
+}

package/server/routes/notifications/funcs/sendNotification.js

@@ -1,105 +1,105 @@
-// eslint-disable-next-line max-len, no-control-regex
-const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
-
-import sendEmail from './utils/sendEmail.js';
-
-import { handlebars, pgClients, getTemplate, getRedis, logger } from '@opengis/fastify-table/utils.js';
-
-async function generateNotificationContent({
-  pg, table, template, id, message, data: data1,
-}) {
-  if (template) {
-    const data = table && id ? await pg.one(`select * from ${table} where ${pg.pk[table]}=$1`, [id]) : data1;
-    // console.log(data);
-    const body = await getTemplate('pt', template);
-    // console.log(body);
-    const html = handlebars.compile(body || template || 'template not found')(data || {});
-    // console.log(html);
-    return html;
-  }
-  return message;
-}
-
-// to do: refactor fastify-file to remove funcs completely
-export default async function notification({
-  pg = pgClients.client,
-  provider = ['email'],
-  from,
-  to,
-  template,
-  table,
-  message,
-  title,
-  file,
-  data,
-  id,
-  nocache,
-}) {
-  const rclient = getRedis();
-
-  if (!pg) throw new Error('need pg');
-
-  if (pg?.readonly) {
-    return null;
-  }
-
-  const keyTo = `${pg.options?.database}:mail:${provider[0]}:${to || ''}${id || ''}${table || ''}${title || ''}`;
-  const uniqueTo = await rclient.setnx(keyTo, 1);
-  logger.info('notification/sent', { keyTo, send: uniqueTo, nocache });
-
-  if (!uniqueTo && !nocache) {
-    return `already sent: ${keyTo}`;
-  }
-  await rclient.expire(keyTo, 1000 * 600);
-
-  if (!to.length) {
-    return null;
-  }
-
-  if (!(Array.isArray(provider) && provider.length)) {
-    return 'notification provider - must be array and not empty';
-  }
-
-  try {
-    const html = await generateNotificationContent({
-      pg, table, template, id, message, data,
-    });
-
-    // return html;
-
-    if (provider.includes('email')) {
-      const files = Array.isArray(file) ? file : [file];
-      const attachments = files?.length && false ? await Promise.all(files?.filter((el) => el).map(async (el) => {
-        /* const content = await downloadFile(el, { buffer: true }); // ?
-        return {
-          filename: el.split('/').pop(),
-          encoding: 'base64',
-          content,
-        }; */
-      })) : [];
-
-      const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
-
-      const result = await sendEmail({
-        attachments,
-        html,
-        subject: title,
-        from,
-        to: toEmail,
-      });
-
-      logger.info('notification', {
-        provider, title, to: toEmail, from, result, len: message?.length, files,
-      });
-
-      return result;
-    }
-    return null;
-  }
-  catch (err) {
-    logger.info('notification/error', {
-      provider, from, to, err: err.toString(),
-    });
-    throw err;
-  }
-}
+// eslint-disable-next-line max-len, no-control-regex
+const emailReg = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/g;
+
+import sendEmail from './utils/sendEmail.js';
+
+import { handlebars, pgClients, getTemplate, getRedis, logger } from '@opengis/fastify-table/utils.js';
+
+async function generateNotificationContent({
+  pg, table, template, id, message, data: data1,
+}) {
+  if (template) {
+    const data = table && id ? await pg.one(`select * from ${table} where ${pg.pk[table]}=$1`, [id]) : data1;
+    // console.log(data);
+    const body = await getTemplate('pt', template);
+    // console.log(body);
+    const html = handlebars.compile(body || template || 'template not found')(data || {});
+    // console.log(html);
+    return html;
+  }
+  return message;
+}
+
+// to do: refactor fastify-file to remove funcs completely
+export default async function notification({
+  pg = pgClients.client,
+  provider = ['email'],
+  from,
+  to,
+  template,
+  table,
+  message,
+  title,
+  file,
+  data,
+  id,
+  nocache,
+}) {
+  const rclient = getRedis();
+
+  if (!pg) throw new Error('need pg');
+
+  if (pg?.readonly) {
+    return null;
+  }
+
+  const keyTo = `${pg.options?.database}:mail:${provider[0]}:${to || ''}${id || ''}${table || ''}${title || ''}`;
+  const uniqueTo = await rclient.setnx(keyTo, 1);
+  logger.info('notification/sent', { keyTo, send: uniqueTo, nocache });
+
+  if (!uniqueTo && !nocache) {
+    return `already sent: ${keyTo}`;
+  }
+  await rclient.expire(keyTo, 1000 * 600);
+
+  if (!to.length) {
+    return null;
+  }
+
+  if (!(Array.isArray(provider) && provider.length)) {
+    return 'notification provider - must be array and not empty';
+  }
+
+  try {
+    const html = await generateNotificationContent({
+      pg, table, template, id, message, data,
+    });
+
+    // return html;
+
+    if (provider.includes('email')) {
+      const files = Array.isArray(file) ? file : [file];
+      const attachments = files?.length && false ? await Promise.all(files?.filter((el) => el).map(async (el) => {
+        /* const content = await downloadFile(el, { buffer: true }); // ?
+        return {
+          filename: el.split('/').pop(),
+          encoding: 'base64',
+          content,
+        }; */
+      })) : [];
+
+      const toEmail = Array.isArray(to) ? to.map((emails) => emails.match(emailReg)?.join(',')) : to;
+
+      const result = await sendEmail({
+        attachments,
+        html,
+        subject: title,
+        from,
+        to: toEmail,
+      });
+
+      logger.info('notification', {
+        provider, title, to: toEmail, from, result, len: message?.length, files,
+      });
+
+      return result;
+    }
+    return null;
+  }
+  catch (err) {
+    logger.info('notification/error', {
+      provider, from, to, err: err.toString(),
+    });
+    throw err;
+  }
+}

package/server/routes/notifications/hook/onWidgetSet.js

@@ -1,57 +1,57 @@
-/* eslint-disable camelcase */
-import { config, pgClients, getSelect } from '@opengis/fastify-table/utils.js';
-
-import { addNotification, sendNotification } from '../../../../utils.js';
-
-function sequence(arr, data, fn) {
-  return arr.reduce((promise, row) => promise.then(() => fn({
-    ...data, ...row,
-  })), Promise.resolve());
-}
-
-export default async function onWidgetSet({ pg = pgClients?.client, link, session, log, type, payload: data = {} }) {
-  const values = data.body?.match(/\B@[a-zA-z0-9а-яА-яіїІЇєЄ]+ [a-zA-z0-9а-яА-яіїІЇєЄ]+/g)
-    ?.filter((el, idx, arr) => el?.replace && arr.indexOf(el) === idx)
-    ?.map((el) => el.replace(/@/g, ''));
-
-  if (type !== 'comment' || !values?.length) {
-    return null;
-  }
-
-  const { sql } = await getSelect('core.user_mentioned');
-
-  const { rows = [] } = await pg.query(`with data (id,name,email) as (${sql})
-  select id, name, email from data where name = any($1)`, [values]);
-
-  if (!rows?.length) {
-    return null;
-  }
-
-  const message = `${data.body?.substring(0, 50)}...`;
-  const subject = 'You were mentioned';
-
-  await sequence(rows, {}, async ({ id, name, email }) => {
-    const res = await addNotification({
-      pg, session, subject, entity: data.entity_id, body: message, link, uid: id,
-    });
-    try {
-      const res1 = await sendNotification({
-        pg,
-        log,
-        to: email,
-        // template,
-        message,
-        title: subject,
-        data,
-        nocache: 1,
-      });
-      if (config.local) console.info('comment notification', name, id, email, res1);
-      await pg.query('update crm.notifications set sent=true where notification_id=$1', [res?.notification_id]);
-    }
-    catch (err) {
-      console.error('comment notification send error', err.toString());
-    }
-  });
-  console.log('comment notification add', rows);
-  return null;
-}
+/* eslint-disable camelcase */
+import { config, pgClients, getSelect } from '@opengis/fastify-table/utils.js';
+
+import { addNotification, sendNotification } from '../../../../utils.js';
+
+function sequence(arr, data, fn) {
+  return arr.reduce((promise, row) => promise.then(() => fn({
+    ...data, ...row,
+  })), Promise.resolve());
+}
+
+export default async function onWidgetSet({ pg = pgClients?.client, link, session, log, type, payload: data = {} }) {
+  const values = data.body?.match(/\B@[a-zA-z0-9а-яА-яіїІЇєЄ]+ [a-zA-z0-9а-яА-яіїІЇєЄ]+/g)
+    ?.filter((el, idx, arr) => el?.replace && arr.indexOf(el) === idx)
+    ?.map((el) => el.replace(/@/g, ''));
+
+  if (type !== 'comment' || !values?.length) {
+    return null;
+  }
+
+  const { sql } = await getSelect('core.user_mentioned');
+
+  const { rows = [] } = await pg.query(`with data (id,name,email) as (${sql})
+  select id, name, email from data where name = any($1)`, [values]);
+
+  if (!rows?.length) {
+    return null;
+  }
+
+  const message = `${data.body?.substring(0, 50)}...`;
+  const subject = 'You were mentioned';
+
+  await sequence(rows, {}, async ({ id, name, email }) => {
+    const res = await addNotification({
+      pg, session, subject, entity: data.entity_id, body: message, link, uid: id,
+    });
+    try {
+      const res1 = await sendNotification({
+        pg,
+        log,
+        to: email,
+        // template,
+        message,
+        title: subject,
+        data,
+        nocache: 1,
+      });
+      if (config.local) console.info('comment notification', name, id, email, res1);
+      await pg.query('update crm.notifications set sent=true where notification_id=$1', [res?.notification_id]);
+    }
+    catch (err) {
+      console.error('comment notification send error', err.toString());
+    }
+  });
+  console.log('comment notification add', rows);
+  return null;
+}

package/server/routes/notifications/index.mjs

@@ -1,27 +1,27 @@
-import { config, addHook } from '@opengis/fastify-table/utils.js';
-
-// api
-import testEmail from './controllers/testEmail.js';
-import readNotifications from './controllers/readNotifications.js'; // mark as read
-import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
-
-// hook
-import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
-
-// funcs
-// import addNotification from '../notifications/funcs/addNotification.js'; // add to db
-// import notification from '../notifications/funcs/sendNotification.js'; // send notification
-
-import { notificationSchema, emailSchema } from './schema.js';
-
-export default async function route(fastify) {
-  const prefix = config.prefix || '/api';
-
-  // fastify.decorate('addNotification', addNotification);
-  // fastify.decorate('notification', notification);
-
-  fastify.get(`${prefix}/test-email`, { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
-  fastify.get(`/notification`, { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
-  fastify.get(`/notification-read/:id?`, { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
-  addHook('onWidgetSet', onWidgetSet);
-}
+import { config, addHook } from '@opengis/fastify-table/utils.js';
+
+// api
+import testEmail from './controllers/testEmail.js';
+import readNotifications from './controllers/readNotifications.js'; // mark as read
+import userNotifications from './controllers/userNotifications.js'; // check all, backend pagination
+
+// hook
+import onWidgetSet from './hook/onWidgetSet.js'; // send notification on comment
+
+// funcs
+// import addNotification from '../notifications/funcs/addNotification.js'; // add to db
+// import notification from '../notifications/funcs/sendNotification.js'; // send notification
+
+import { notificationSchema, emailSchema } from './schema.js';
+
+export default async function route(fastify) {
+  const prefix = config.prefix || '/api';
+
+  // fastify.decorate('addNotification', addNotification);
+  // fastify.decorate('notification', notification);
+
+  fastify.get(`${prefix}/test-email`, { config: { policy: ['user'] }, schema: emailSchema }, testEmail);
+  fastify.get(`/notification`, { config: { policy: ['user'] }, schema: notificationSchema }, userNotifications);
+  fastify.get(`/notification-read/:id?`, { config: { policy: ['user'] }, schema: notificationSchema }, readNotifications);
+  addHook('onWidgetSet', onWidgetSet);
+}

package/server/routes/notifications/schema.js

@@ -1,17 +1,17 @@
-const notificationSchema = {
-    params: {
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-    querystring: {
-      nocache: { type: 'string', pattern: '^(\\d+)$' },
-    },
-};
-
-const emailSchema = {
-  quertstring: {
-    to: { type: 'string', pattern: '^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$' },
-  },
-};
-
-export default null;
+const notificationSchema = {
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+    querystring: {
+      nocache: { type: 'string', pattern: '^(\\d+)$' },
+    },
+};
+
+const emailSchema = {
+  quertstring: {
+    to: { type: 'string', pattern: '^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$' },
+  },
+};
+
+export default null;
 export { notificationSchema, emailSchema }