@opengis/fastify-table 1.0.29 → 1.0.30

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.0.30 - 17.05.2024
+
+- code optimization
+
 ## 1.0.29 - 17.05.2024
 
 - widget api post (file)

package/package.json

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

package/widget/controllers/widget.set.js

@@ -1,6 +1,5 @@
 import path from 'path';
 
-import obj2db from './utils/obj2db.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 
 const tableList = {
@@ -25,44 +24,35 @@ export default async function widgetSet(req) {
 
   try {
     if (type === 'file') {
-      req.params['*'] = objectid;
-      const { message = {}, error, status } = await funcs.upload(req);
-      if (error) {
-        log.error('widget/file', { step: 'upload', message, error, status });
-        return { error, status };
-      }
-      if (!message.name) return { error: 'upload error', status: 500 };
-
-      const insertQuery = `insert into crm.file (file_id, uploaded_name, file_path, ext, size, file_status, uid, object_id)
-      values ( '${message.result?.file_id}', 
-              '${message.name?.toLocaleLowerCase().replace(/'/g, '\'\'')}', 
-              '${message.result?.file_path?.replace(/\\/g, '/')}', 
-              '${path.extname(message.name).slice(1).toLowerCase()}', 
-              ${message.result?.size}, 1, 
-              '${session.passport?.user?.uid || 1}',
-              nullif('${objectid}','') ) returning file_id as id`;
+      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: req.session?.passport?.user?.uid || 1,
+        object_id: objectid,
+      };
   
-      const { id } = pg.pk['crm.file'] ? await pg.one(insertQuery) : {};
+      const { rows = [] } = await funcs.dataInsert({ table: 'crm.file', data });
       return {
-        rowCount: 1, data: 'ok', command: 'UPLOAD', id, objectid,
+        rowCount: 1, data: 'ok', command: 'UPLOAD', id: rows[0]?.file_id, objectid: rows[0]?.object_id,
       };
     }
-    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 { pk } = await getMeta({ pg, table });
+    if (!pk) return { message: 'table not found', status: 404 };
 
-    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 *;`;
+   const data = { ...body, uid: user?.uid, object_id: objectid };
 
-    // console.log(query, args);
-    const result = await pg.query(query, args);
+    const result = id 
+    ? await funcs.dataUpdate({ table, data, id }) 
+    : await funcs.dataInsert({ table, data });
 
     return {
-      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]],
+      rowCount: result.rowCount, data: 'ok', command: result.command, id: result.rows?.[0]?.[pkList[type]] || result?.[pkList[type]],
     };
   }
   catch (err) {