@opengis/fastify-table 1.0.77 → 1.0.78

package/widget/controllers/widget.get.js

@@ -1,96 +1,96 @@
-import getToken from '../../crud/funcs/getToken.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import historyFormat from './utils/historyFormat.js';
-
-const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-
-/**
- * Дістає CRM для widget
- *
- */
-
-export default async function widgetGet({
-  pg, session = {}, params = {}, query = {},
-}) {
-  const { user = {} } = session.passport || {};
-
-  const param = user?.uid ? await getToken({
-    token: params.objectid, mode: 'w', uid: user.uid,
-  }) : null;
-
-  const objectid = param ? JSON.parse(param)?.id : params.objectid;
-
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const sqls = {
-    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`
-      : '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: 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: 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`
-      : `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`
-      : `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];
-  if (!sql) {
-    return { error: 'param type not valid', status: 400 };
-  }
-
-  try {
-    /* data */
-    const time = [Date.now()];
-    const { rows } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
-    time.push(Date.now());
-
-    /* Object info  */
-    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 = 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 {
-        sql, type: params.type, q, id: objectid, data,
-      };
-    }
-
-    time.push(Date.now());
-    return {
-      time: { data: time[1] - time[0], format: time[2] - time[1] },
-      rows: params.type === 'history' ? await historyFormat(rows, tableName, pg) : rows,
-      user: { uid: user?.uid, name: user?.user_name },
-      data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
-      objectid: params.objectid,
-    };
-  }
-  catch (err) {
-    // 'history', 'file',  'checklist'
-    /* 'document', 'image' - Макс на клиенте */
-    return { message: err.toString(), status: 500 };
-  }
-}
+import getToken from '../../crud/funcs/getToken.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import historyFormat from './utils/historyFormat.js';
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+/**
+ * Дістає CRM для widget
+ *
+ */
+
+export default async function widgetGet({
+  pg, session = {}, params = {}, query = {},
+}) {
+  const { user = {} } = session.passport || {};
+
+  const param = user?.uid ? await getToken({
+    token: params.objectid, mode: 'w', uid: user.uid,
+  }) : null;
+
+  const objectid = param ? JSON.parse(param)?.id : params.objectid;
+
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const sqls = {
+    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`
+      : '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: 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: 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`
+      : `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`
+      : `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];
+  if (!sql) {
+    return { error: 'param type not valid', status: 400 };
+  }
+
+  try {
+    /* data */
+    const time = [Date.now()];
+    const { rows } = await pg.query(sql, [objectid, params.type === 'gallery' ? galleryExtList : null].filter((el) => el));
+    time.push(Date.now());
+
+    /* Object info  */
+    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 = 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 {
+        sql, type: params.type, q, id: objectid, data,
+      };
+    }
+
+    time.push(Date.now());
+    return {
+      time: { data: time[1] - time[0], format: time[2] - time[1] },
+      rows: params.type === 'history' ? await historyFormat(rows, tableName, pg) : rows,
+      user: { uid: user?.uid, name: user?.user_name },
+      data: { author: data?.author, cdate: data?.cdate, edate: data?.editor_date },
+      objectid: params.objectid,
+    };
+  }
+  catch (err) {
+    // 'history', 'file',  'checklist'
+    /* 'document', 'image' - Макс на клиенте */
+    return { message: err.toString(), status: 500 };
+  }
+}

package/widget/controllers/widget.set.js

@@ -1,70 +1,70 @@
-import path from 'path';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-import dataInsert from '../../crud/funcs/dataInsert.js';
-import dataUpdate from '../../crud/funcs/dataUpdate.js';
-
-const tableList = {
-  comment: 'crm.communications',
-  checklist: 'crm.checklists',
-};
-const pkList = {
-  comment: 'communication_id',
-  checklist: 'checklist_id',
-};
-
-const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
-
-export default async function widgetSet(req) {
-  const {
-    pg, params = {}, session = {}, body = {}, funcs, log,
-  } = req;
-  const { user = {} } = session.passport || {};
-  const { type, id, objectid } = params;
-  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) return { error: 'param type not valid', status: 400 };
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const table = tableList[type];
-
-  try {
-    if (['gallery', 'file'].includes(type)) {
-      const file = await funcs.uploadMultiPart(req);
-      const extName = path.extname(file.filepath).slice(1).toLowerCase();
-
-      const data = {
-        uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
-        file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
-        ext: extName,
-        size: file?.size,
-        file_status: 1,
-        uid: user?.uid || 1,
-        entity_id: objectid,
-      };
-
-      if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
-        return { message: 'invalid file extension', status: 400 };
-      }
-
-      const { rows = [] } = await dataInsert({ table: 'crm.files', data });
-      return {
-        rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
-      };
-    }
-    const { pk } = await getMeta({ pg, table });
-    if (!pk) return { message: 'table not found', status: 404 };
-
-    const data = { ...body, uid: user?.uid, entity_id: objectid };
-
-    const result = id
-      ? await dataUpdate({ table, data, id })
-      : await dataInsert({ table, data });
-
-    return {
-      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
-    };
-  }
-  catch (err) {
-    log.error('widget/upload', { error: err.toString(), params });
-    return { error: err.toString(), status: 500 };
-  }
-}
+import path from 'path';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+import dataInsert from '../../crud/funcs/dataInsert.js';
+import dataUpdate from '../../crud/funcs/dataUpdate.js';
+
+const tableList = {
+  comment: 'crm.communications',
+  checklist: 'crm.checklists',
+};
+const pkList = {
+  comment: 'communication_id',
+  checklist: 'checklist_id',
+};
+
+const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
+
+export default async function widgetSet(req) {
+  const {
+    pg, params = {}, session = {}, body = {}, funcs, log,
+  } = req;
+  const { user = {} } = session.passport || {};
+  const { type, id, objectid } = params;
+  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) return { error: 'param type not valid', status: 400 };
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const table = tableList[type];
+
+  try {
+    if (['gallery', 'file'].includes(type)) {
+      const file = await funcs.uploadMultiPart(req);
+      const extName = path.extname(file.filepath).slice(1).toLowerCase();
+
+      const data = {
+        uploaded_name: file?.originalFilename?.toLocaleLowerCase()?.replace(/'/g, '\'\''),
+        file_path: file?.relativeFilepath?.replace(/\\/g, '/'),
+        ext: extName,
+        size: file?.size,
+        file_status: 1,
+        uid: user?.uid || 1,
+        entity_id: objectid,
+      };
+
+      if (type === 'gallery' && !galleryExtList.includes(extName.toLowerCase())) {
+        return { message: 'invalid file extension', status: 400 };
+      }
+
+      const { rows = [] } = await dataInsert({ table: 'crm.files', data });
+      return {
+        rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, entity_id: rows[0]?.entity_id,
+      };
+    }
+    const { pk } = await getMeta({ pg, table });
+    if (!pk) return { message: 'table not found', status: 404 };
+
+    const data = { ...body, uid: user?.uid, entity_id: objectid };
+
+    const result = id
+      ? await dataUpdate({ table, data, id })
+      : await dataInsert({ table, data });
+
+    return {
+      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
+    };
+  }
+  catch (err) {
+    log.error('widget/upload', { error: err.toString(), params });
+    return { error: err.toString(), status: 500 };
+  }
+}