@opengis/fastify-table 1.4.84 → 1.4.86

package/index.js

@@ -130,10 +130,22 @@ async function plugin(fastify, opt) {
           },
           body: ['PUT', 'POST'].includes(req.method) ? req.raw : undefined,
         });
-        const resp = res.headers.get('content-type')?.includes('/json') ? await res.json() : await res.text();
         reply.headers(Object.fromEntries(res.headers));
         reply.status(res.status);
-        reply.send(resp);
+        if (res.headers.get('content-type')?.startsWith?.('text/')) {
+          const resp = await res.text();
+          // reply.send(resp);
+          return resp;
+        }
+        if (res.headers.get('content-type')?.includes?.('/json')) {
+          const resp = await res.json();
+          // reply.send(resp);
+          return resp;
+        }
+        const blob = await res.blob();
+        const arrayBuffer = await blob.arrayBuffer();
+        const fileBuffer = Buffer.from(arrayBuffer);
+        return fileBuffer;
       });
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.84",
+  "version": "1.4.86",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/migrations/crm.sql

@@ -124,7 +124,7 @@ COMMENT ON COLUMN crm.properties.table_name IS 'Таблиця';
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS object_id text;
 COMMENT ON COLUMN crm.properties.object_id IS 'ID Об''єкту';
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_key text;
-COMMENT ON COLUMN crm.properties.object_id IS 'Назва атрибуту';
+COMMENT ON COLUMN crm.properties.property_key IS 'Назва атрибуту';
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_text text;
 COMMENT ON COLUMN crm.properties.property_text IS 'Текст';
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_int integer;
@@ -143,3 +143,13 @@ ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS cdate timestamp without time
 ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS files json;
 
 ALTER TABLE crm.properties ADD CONSTRAINT crm_properties_pkey PRIMARY KEY(property_id);
+
+-- drop table if exists crm.reactions;
+CREATE TABLE if not exists crm.reactions (
+    reaction_id text default next_id() PRIMARY KEY,
+    created_by text NOT NULL,
+    entity_id text NOT NULL,
+    reaction_type text NOT NULL check (reaction_type in ('like', 'love', 'hate', 'wow', 'sad', 'angry')),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (user_id) REFERENCES admin.users(uid)
+);

package/server/routes/table/controllers/getFormByTable.js

@@ -37,7 +37,7 @@ export default async function getForm({
 
     const form = tokenData?.form
         || hookData?.form
-        || await getTemplate('table', table).then(el => el.form) || {};
+        || await getTemplate('table', table).then(el => el?.form) || {};
 
     if (!form) {
         return reply.status(404).send('form not found');

package/server/routes/widget/controllers/widget.del.js

@@ -45,6 +45,10 @@ export default async function widgetDel(req, reply) {
   const { type, objectid, id } = params;
 
   if (!objectid) {
+    return reply.status(400).send('not enough params: object id');
+  }
+
+  if (!id && type !== 'reaction') {
     return reply.status(400).send('not enough params: id');
   }
 
@@ -60,6 +64,7 @@ export default async function widgetDel(req, reply) {
     checklist: `delete from crm.checklists where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'uid=$2'} and checklist_id=$3`,
     file: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
     gallery: `update crm.files set file_status=3 where entity_id=$1 and ${!exists || isAdmin(req) ? '$2=$2' : 'uid=$2'} and file_id=$3 returning uploaded_name`,
+    reaction: `delete from crm.reactions where entity_id=$1 and ${isAdmin(req) ? '$2=$2' : 'created_by=$2'} and $3=$3 returning reaction_type`,
   };
 
   const sql = sqls[type];
@@ -68,18 +73,23 @@ export default async function widgetDel(req, reply) {
     checklist: 'crm.checklists',
     file: 'crm.files',
     gallery: 'crm.files',
+    reaction: 'crm.reactions',
   }[type];
 
   if (!sql) {
     return reply.status(400).send('invalid widget type');
   }
 
-  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id]);
+  const { rows = [] } = await pg.query(sql, [objectid, user.uid, id || '']);
+
+  if (type === 'reaction') {
+    console.log('231131');
+  }
 
   await logChanges({
     pg,
     table,
-    id,
+    id: type === 'reaction' ? objectid : id,
     data: rows[0],
     uid: user?.uid,
     type: 'DELETE',

package/server/routes/widget/controllers/widget.get.js

@@ -87,7 +87,7 @@ export default async function widgetGet({
     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`,
-
+    reaction: 'SELECT count(*), reaction_type FROM crm.reactions c where entity_id=$1 group by reaction_type',
   };
 
   const q = sqls[params.type];

package/server/routes/widget/controllers/widget.set.js

@@ -11,23 +11,25 @@ const tableList = {
   gallery: 'crm.files',
   file: 'crm.files',
   checklist: 'crm.checklists',
+  reaction: 'crm.reactions',
 };
 const pkList = {
   comment: 'communication_id',
   checklist: 'checklist_id',
   file: 'file_id',
   gallery: 'file_id',
+  reaction: 'reaction_id',
 };
 
 const galleryExtList = ['png', 'svg', 'jpg', 'jpeg', 'gif', 'mp4', 'mov', 'avi'];
 
 export default async function widgetSet(req, reply) {
   const {
-    pg, params = {}, session = {}, headers = {}, body = {}, user = {},
+    pg, params = {}, headers = {}, body = {}, user = {},
   } = req;
   const { type, id, objectid } = params;
 
-  if (!['comment', 'checklist', 'file', 'gallery'].includes(type)) {
+  if (!['comment', 'checklist', 'file', 'gallery', 'reaction'].includes(type)) {
     return reply.status(400).send('param type not valid');
   }
 

package/server/routes/widget/index.mjs

@@ -11,7 +11,7 @@ const tableSchema = {
   params: {
     type: 'object',
     properties: {
-      // type: { type: 'string', pattern: '^([\\d\\w]+)$' },
+      type: { type: 'string', enum: ['gallery', 'file', 'checklist', 'history', 'comment', 'reaction'] },
       objectid: { type: 'string', pattern: '^([\\d\\w]+)$' },
       id: { type: 'string', pattern: '^([\\d\\w]+)$' },
     },