@opengis/fastify-table 1.0.26 → 1.0.28

package/widget/controllers/widget.get.js

@@ -1,74 +1,74 @@
-import getToken from '../../crud/funcs/getToken.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import historyFormat from './utils/historyFormat.js';
-
-/**
- * Дістає 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 (!['comment', 'history', 'file', 'checklist'].includes(params.type)) return { error: 'param type not valid', status: 400 };
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const sql = {
-    comment: `select body,c.cdate, comment_id,object_id,c.uid, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username,avatar 
-    from crm.comment c left join admin.users u on u.uid=c.uid where object_id=$1 order by cdate desc`,
-
-    history: `SELECT object_id, table_name, 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_change where object_id=$1 order by cdate desc, change_key limit 100`,
-
-    checklist: `SELECT checklist_id, title, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
-    avatar  FROM crm.checklist c left join admin.users u on u.uid=c.uid where object_id=$1 order by cdate desc`,
-
-    file: `SELECT file_id, 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.file c left join admin.users u on u.uid=c.uid
-    where object_id=$1 and file_status<>3 order by cdate desc`,
-
-  };
-  try {
-    /* data */
-    const time = [Date.now()];
-    const { rows } = await pg.query(sql[params.type], [objectid]);
-    time.push(Date.now());
-
-    /* Object info  */
-    const { tableName } = await pg.one('select table_name as "tableName" from log.table_change where object_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]) : {};
-
-    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';
+
+/**
+ * Дістає 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 (!['comment', 'history', 'file', 'checklist'].includes(params.type)) return { error: 'param type not valid', status: 400 };
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const sql = {
+    comment: `select body,c.cdate, comment_id,object_id,c.uid, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username,avatar 
+    from crm.comment c left join admin.users u on u.uid=c.uid where object_id=$1 order by cdate desc`,
+
+    history: `SELECT object_id, table_name, 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_change where object_id=$1 order by cdate desc, change_key limit 100`,
+
+    checklist: `SELECT checklist_id, title, is_done, done_date, c.uid, c.cdate, coalesce(user_name,' ')||' '||coalesce(sur_name,'') as username, 
+    avatar  FROM crm.checklist c left join admin.users u on u.uid=c.uid where object_id=$1 order by cdate desc`,
+
+    file: `SELECT file_id, 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.file c left join admin.users u on u.uid=c.uid
+    where object_id=$1 and file_status<>3 order by cdate desc`,
+
+  };
+  try {
+    /* data */
+    const time = [Date.now()];
+    const { rows } = await pg.query(sql[params.type], [objectid]);
+    time.push(Date.now());
+
+    /* Object info  */
+    const { tableName } = await pg.one('select table_name as "tableName" from log.table_change where object_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]) : {};
+
+    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,45 +1,45 @@
-import obj2db from './utils/obj2db.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-const tableList = {
-  comment: 'crm.comment',
-  checklist: 'crm.checklist',
-};
-const pkList = {
-  comment: 'comment_id',
-  checklist: 'checklist_id',
-};
-
-export default async function widgetSet({
-  pg, params = {}, session = {}, body = {},
-}) {
-  const { user = {} } = session.passport || {};
-  const { type, id, objectid } = params;
-  if (!['comment', 'checklist'].includes(type)) return { error: 'param type not valid', status: 400 };
-  if (!objectid) return { error: 'id required', status: 400 };
-
-  const table = tableList[type];
-
-  try {
-    const { pk, columns: metaColumns } = await getMeta({ pg, table });
-    if (!pk) return { error: 'table not found', status: 404 };
-
-    const columnList = metaColumns.map((col) => col.name);
-    const nonexistCol = Object.keys(body).filter((key) => !columnList.includes(key));
-    const { columns, args } = obj2db({ ...body, uid: user?.uid, object_id: objectid }, nonexistCol);
-
-    const query = id
-      ? `UPDATE ${table} SET ${columns?.map((key, index) => `"${key}"=$${++index}`).join(',')} WHERE ${pkList[type]} = '${id}' `
-      : `INSERT INTO ${table} (${columns?.join(',')}) VALUES (${columns?.map((el, index) => `$${++index}`).join(',')}) returning *;`;
-
-    // console.log(query, args);
-    const result = await pg.query(query, args);
-
-    return {
-      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]],
-    };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import obj2db from './utils/obj2db.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+const tableList = {
+  comment: 'crm.comment',
+  checklist: 'crm.checklist',
+};
+const pkList = {
+  comment: 'comment_id',
+  checklist: 'checklist_id',
+};
+
+export default async function widgetSet({
+  pg, params = {}, session = {}, body = {},
+}) {
+  const { user = {} } = session.passport || {};
+  const { type, id, objectid } = params;
+  if (!['comment', 'checklist'].includes(type)) return { error: 'param type not valid', status: 400 };
+  if (!objectid) return { error: 'id required', status: 400 };
+
+  const table = tableList[type];
+
+  try {
+    const { pk, columns: metaColumns } = await getMeta({ pg, table });
+    if (!pk) return { error: 'table not found', status: 404 };
+
+    const columnList = metaColumns.map((col) => col.name);
+    const nonexistCol = Object.keys(body).filter((key) => !columnList.includes(key));
+    const { columns, args } = obj2db({ ...body, uid: user?.uid, object_id: objectid }, nonexistCol);
+
+    const query = id
+      ? `UPDATE ${table} SET ${columns?.map((key, index) => `"${key}"=$${++index}`).join(',')} WHERE ${pkList[type]} = '${id}' `
+      : `INSERT INTO ${table} (${columns?.join(',')}) VALUES (${columns?.map((el, index) => `$${++index}`).join(',')}) returning *;`;
+
+    // console.log(query, args);
+    const result = await pg.query(query, args);
+
+    return {
+      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]],
+    };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/widget/index.js

@@ -1,29 +1,29 @@
-import widgetDel from './controllers/widget.del.js';
-import widgetSet from './controllers/widget.set.js';
-import widgetGet from './controllers/widget.get.js';
-
-async function route(fastify, opt) {
-  const prefix = opt.prefix || '/api';
-  fastify.route({
-    method: 'DELETE',
-    url: `${prefix}/widget/:type/:objectid/:id`,
-    schema: {},
-    handler: widgetDel,
-  });
-  fastify.route({
-    method: 'POST',
-    path: `${prefix}/widget/:type/:objectid/:id?`,
-    schema: {},
-    handler: widgetSet,
-  });
-  fastify.route({
-    method: 'GET',
-    path: `${prefix}/widget/:type/:objectid`,
-    config: {
-      policy: ['public'],
-    },
-    schema: {},
-    handler: widgetGet,
-  });
-}
-export default route;
+import widgetDel from './controllers/widget.del.js';
+import widgetSet from './controllers/widget.set.js';
+import widgetGet from './controllers/widget.get.js';
+
+async function route(fastify, opt) {
+  const prefix = opt.prefix || '/api';
+  fastify.route({
+    method: 'DELETE',
+    url: `${prefix}/widget/:type/:objectid/:id`,
+    schema: {},
+    handler: widgetDel,
+  });
+  fastify.route({
+    method: 'POST',
+    path: `${prefix}/widget/:type/:objectid/:id?`,
+    schema: {},
+    handler: widgetSet,
+  });
+  fastify.route({
+    method: 'GET',
+    path: `${prefix}/widget/:type/:objectid`,
+    config: {
+      policy: ['public'],
+    },
+    schema: {},
+    handler: widgetGet,
+  });
+}
+export default route;