@opengis/bi 1.0.21 → 1.0.23

package/server/routes/map/controllers/cluster.js

@@ -1,4 +1,4 @@
-import { getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { getFilterSQL, logger, pgClients } from '@opengis/fastify-table/utils.js';
 
 import { getWidget } from '../../../../utils.js';
 
@@ -6,58 +6,58 @@ import downloadClusterData from './utils/downloadClusterData.js';
 
 const clusterExists = {};
 
-export default async function cluster({ pg, query = {}, log }) {
+export default async function cluster({ query = {} }) {
   const { widget, filter, dashboard, search } = query;
 
   if (!widget) {
     return { message: 'not enough params: widget', status: 400 };
   }
 
-  const { data } = await getWidget({ dashboard, widget });
+  const { pg = pgClients.client, data } = await getWidget({ dashboard, widget });
 
-  try {
-    const pkey = pg.pk?.[data?.table];
-
-    if (!pkey) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
-        status: 400,
-      };
-    }
+  const pkey = pg.pk?.[data?.table];
 
-    // data param
-    const {
-      table,
-      query: where = '1=1',
-      metrics = [],
-      cluster,
-      clusterTable = {},
-    } = data;
+  if (!pkey) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: table pk not found (${data?.table})`,
+      status: 400,
+    };
+  }
 
-    if (!cluster) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
-        status: 400,
-      };
-    }
+  // data param
+  const {
+    table,
+    query: where = '1=1',
+    metrics = [],
+    cluster,
+    clusterTable = {},
+  } = data;
+
+  if (!cluster) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: cluster column not specified`,
+      status: 400,
+    };
+  }
 
-    if (!metrics.length) {
-      return {
-        message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
-        status: 400,
-      };
-    }
+  if (!metrics.length) {
+    return {
+      message: `invalid ${widget ? 'widget' : 'dashboard'}: metric columns not found`,
+      status: 400,
+    };
+  }
 
-    if (!clusterTable?.name) {
-      Object.assign(clusterTable, {
-        name: 'bi.cluster',
-        title: 'title',
-        query: `type='${cluster}'`,
-      });
-    }
+  if (!clusterTable?.name) {
+    Object.assign(clusterTable, {
+      name: 'bi.cluster',
+      title: 'title',
+      query: `type='${cluster}'`,
+    });
+  }
 
+  try {
     if (cluster && !clusterExists[cluster]) {
-      const res = await downloadClusterData({ pg, log, cluster });
+      const res = await downloadClusterData({ pg, cluster });
       if (res) return res;
       clusterExists[cluster] = 1;
     }
@@ -103,7 +103,7 @@ export default async function cluster({ pg, query = {}, log }) {
     ];
     return { sizes, rows, bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
   } catch (err) {
-    log.error('bi/cluster', { error: err.toString(), query });
+    logger.file('bi/cluster/error', { error: err.toString(), query });
     return { error: err.toString(), status: 500 };
   }
 }

package/server/routes/map/controllers/clusterVtile.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { createHash } from 'crypto';
 import { writeFile, mkdir } from 'fs/promises';
 
-import { getFolder, getFilterSQL, autoIndex } from '@opengis/fastify-table/utils.js';
+import { getFolder, getFilterSQL, autoIndex, pgClients } from '@opengis/fastify-table/utils.js';
 
 import { getWidget } from '../../../../utils.js';
 
@@ -15,7 +15,7 @@ const mercator = new Sphericalmercator({ size: 256 });
 const clusterExists = {};
 
 export default async function clusterVtile(req, reply) {
-  const { pg, params = {}, query = {}, log } = req;
+  const { params = {}, query = {} } = req;
   const { z, y } = params;
   const x = params.x?.split('.')[0] - 0;
 
@@ -30,7 +30,7 @@ export default async function clusterVtile(req, reply) {
     return { message: 'not enough params: widget', status: 400 };
   }
 
-  const { data } = await getWidget({ dashboard, widget });
+  const { pg = pgClients.client, data } = await getWidget({ dashboard, widget });
 
   const headers = {
     'Content-Type': 'application/x-protobuf',
@@ -80,7 +80,7 @@ export default async function clusterVtile(req, reply) {
     }
 
     if (cluster && !clusterExists[data.cluster]) {
-      const res = await downloadClusterData({ pg, log, cluster });
+      const res = await downloadClusterData({ pg, cluster });
       if (res) return res;
       clusterExists[cluster] = 1;
     }
@@ -160,7 +160,7 @@ export default async function clusterVtile(req, reply) {
 
     return reply.headers(headers).send(buffer);
   } catch (err) {
-    log.error('bi/clusterVtile', { error: err.toString(), query, params });
+    logger.file('bi/clusterVtile/error', { error: err.toString(), query, params });
     return { error: err.toString(), status: 500 };
   }
 }

package/server/routes/map/controllers/geojson.js

@@ -4,7 +4,7 @@ import { writeFile, mkdir, readFile, stat } from 'fs/promises';
 import { existsSync, /* readdirSync, */ readFileSync } from 'fs';
 
 
-import { getFolder, getFilterSQL, autoIndex, logger } from '@opengis/fastify-table/utils.js';
+import { getFolder, getFilterSQL, autoIndex, logger, pgClients } from '@opengis/fastify-table/utils.js';
 
 import normalizeData from '../../data/controllers/util/normalizeData.js';
 
@@ -17,7 +17,7 @@ const types = {
 const hourMs = 3.6e6;
 
 export default async function geojson(req, reply) {
-  const { pg, query = {} } = req;
+  const { query = {} } = req;
 
   const {
     filter,
@@ -38,6 +38,7 @@ export default async function geojson(req, reply) {
   const data = await getWidget({ dashboard, widget });
   if (data.status) return data;
 
+  const pg = data.pg || pgClients.client;
   const hash = [pointZoom, filter].filter((el) => el).join();
 
   const root = getFolder(req);
@@ -92,10 +93,9 @@ export default async function geojson(req, reply) {
 
     const q1 = `SELECT 'FeatureCollection' As type, json_agg(f) As features FROM ( 
       SELECT 'Feature' As type, row_number() over() as id,
-      st_asgeojson(st_force2d(${
-        query.srid
-          ? `st_transform(${type === 'centroid' ? `st_centroid(${geom})` : geom},${query.srid})`
-          : `${type === 'centroid' || query.point || query.centroid ? `st_centroid(${geom})` : geom}`
+      st_asgeojson(st_force2d(${query.srid
+        ? `st_transform(${type === 'centroid' ? `st_centroid(${geom})` : geom},${query.srid})`
+        : `${type === 'centroid' || query.point || query.centroid ? `st_centroid(${geom})` : geom}`
       }), 6, 0)::json as geometry,    
       (select row_to_json(tc) from (select ${'' ? `${''} as status, ` : ''} 
       ${xName ? `${xName},` : ''} 

package/server/routes/map/controllers/heatmap.js

@@ -0,0 +1,118 @@
+import path from 'node:path';
+import { createHash } from 'node:crypto';
+import { existsSync } from 'node:fs';
+import { readFile, writeFile, mkdir, stat } from 'node:fs/promises';
+
+import { pgClients, getFilterSQL, getMeta, getFolder } from '@opengis/fastify-table/utils.js';
+
+import { getWidget } from '../../../../utils.js';
+
+const hourMs = 3.6e6;
+const maxLimit = 2500;
+
+export default async function heatmap(req, reply) {
+    const { query = {}, user = {} } = req;
+
+    const { widget, dashboard, filter, search, size = 0.1 } = query;
+
+    if (query.size && (+query.size || 0) <= 0) {
+        return { message: 'param size is invalid', status: 400 };
+    }
+
+    if (!dashboard || !widget) {
+        return { message: 'not enough params: dashboard / widget', status: 400 };
+    }
+
+    const { data } = await getWidget({ widget, dashboard });
+
+    if (!data?.table) {
+        return { message: 'widget not found: ' + widget, status: 400 };
+    }
+
+    const limit = Math.min(+query.limit || maxLimit, maxLimit);
+    const hash = [search, filter, limit].filter((el) => el).join();
+
+    const root = getFolder(req, 'local');
+    const file = path.join(
+        root,
+        `/map/geojson/heatmap/${data.table}/${hash ? `${createHash('sha1').update(hash).digest('base64')}/` : ''}.geojson`
+    );
+
+    if (existsSync(file) && !query.nocache && !query.sql) {
+        const timeNow = Date.now();
+        const stats = await stat(file);
+        const birthTime = new Date(stats.birthtime).getTime();
+        if (!(birthTime - timeNow > hourMs * 24)) {
+            const geojson = JSON.parse((await readFile(file, 'utf-8')) || {});
+            return geojson;
+        }
+    }
+
+    const pg = data.pg || pgClients.client;
+
+    if (!pg.pk?.[data.table]) {
+        return { message: `table not found: ${data.table}`, status: 404 };
+    }
+
+    const metric = query.metric || data.metrics?.[0]?.name || (Array.isArray(data.metrics) ? data.metrics?.[0] : data.metrics);
+
+    const operator = metric
+        ? (['sum', 'min', 'max', 'avg'].find(el => el === query.operator) || 'sum')
+        : undefined;
+
+    const aggregator = metric
+        ? `${operator}(${metric})`
+        : 'count(*)';
+
+    const { geom, columns } = await getMeta({ pg, table: data.table });
+
+    const { dataTypeID } = columns.find(col => col.name === metric) || {};
+
+    if (metric && !dataTypeID) {
+        return { message: `metric column not found: ${metric}`, status: 404 };
+    }
+
+    if (!['integer', 'numeric', 'double precision'].includes(pg.pgType[dataTypeID])) {
+        return { message: `metric column invalid type: ${metric} (${pg.pgType[dataTypeID]})`, status: 404 };
+    }
+
+    if (!geom) {
+        return { message: `geometry column not found: ${data.table}`, status: 404 };
+    }
+
+    const { optimizedSQL = `select * from ${data.table} where 1=1` } = hash ? await getFilterSQL({ pg, table: data.table, filter, search }) : {};
+
+    const subQuery = `SELECT ${aggregator} AS metric, hex.geom FROM (
+        SELECT ST_SetSRID( (ST_HexagonGrid(${size}, ST_Extent(q.${geom})) ).geom, 4326 ) as geom FROM ( ${optimizedSQL})q
+    )hex
+    LEFT JOIN ( ${optimizedSQL} )pts
+    ON ST_Within(pts.${geom}, hex.geom)
+
+    JOIN ( SELECT ST_ConvexHull(ST_Collect(${geom})) AS mask FROM ( ${optimizedSQL} )q )point_mask
+    ON ST_Intersects(hex.geom, point_mask.mask)
+
+    WHERE 1=1 /*and pts.${geom} is not null AND st_srid(pts.${geom}) > 0*/
+    GROUP BY hex.geom
+    limit ${limit}`;
+
+    if (query.sql === '1' && user?.user_type?.includes('admin')) return subQuery;
+
+    const q = `SELECT 'FeatureCollection' As type, json_agg(f) As features FROM ( 
+      SELECT
+        'Feature' As type,
+        row_number() over() as id,
+        st_asgeojson(geom, 6, 0)::json as geometry,
+        json_build_object( 'metric', metric ) as properties
+      from (${subQuery})sq
+    )f`;
+
+    if (query.sql === '2' && user?.user_type?.includes('admin')) return q;
+
+    const geojson = await pg.query(q)
+        .then(el => el.rows?.[0] || {});
+
+    await mkdir(path.dirname(file), { recursive: true });
+    await writeFile(file, JSON.stringify(geojson));
+
+    return geojson;
+}

package/server/routes/map/controllers/map.js

@@ -1,11 +1,11 @@
-import { getFilterSQL } from '@opengis/fastify-table/utils.js';
+import { pgClients, getFilterSQL } from '@opengis/fastify-table/utils.js';
 
 import { getWidget } from '../../../../utils.js';
 
-export default async function map({ pg, query = {} }) {
+export default async function map({ query = {} }) {
   const { dashboard, widget } = query;
 
-  const { data, type, layers } = await getWidget({ dashboard, widget });
+  const { pg = pgClients.client, data, type, layers } = await getWidget({ dashboard, widget });
 
   if (!['map'].includes(type)) {
     return { message: 'access restricted: invalid widget type', status: 403 };

package/server/routes/map/controllers/utils/downloadClusterData.js

@@ -1,5 +1,7 @@
-export default async function downloadClusterData({ pg, log, cluster }) {
-    if (!pg || !log || !cluster) return null;
+import { logger, pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function downloadClusterData({ pg = pgClients.client, cluster }) {
+    if (!pg || !cluster) return null;
     const res = await fetch(`https://cdn.softpro.ua/data/bi/${cluster}-ua.geojson`);
     if (res?.status !== 200) {
         return {
@@ -28,10 +30,10 @@ export default async function downloadClusterData({ pg, log, cluster }) {
 
             const { rowCount } = await pg.query(`insert into bi.cluster (title,type,geom) 
             values ${values} on conflict(title,type) do update set geom=excluded.geom`);
-            log.info('bi/clusterVtile', { cluster, rowCount });
+            logger.file('bi/clusterVtile', { cluster, rowCount });
         }
     } catch (err) {
-        log.error('bi/clusterVtile', {
+        logger.file('bi/clusterVtile/error', {
             error: err.toString(),
             filename: `${cluster}-ua.json`,
         });

package/server/routes/map/controllers/vtile.js

@@ -6,7 +6,7 @@ import { writeFile, mkdir } from 'fs/promises';
 import { existsSync, /* readdirSync, */ readFileSync } from 'fs';
 import { getWidget } from '../../../../utils.js';
 
-import { getFolder, getFilterSQL, logger } from '@opengis/fastify-table/utils.js';
+import { getFolder, getFilterSQL, logger, pgClients } from '@opengis/fastify-table/utils.js';
 
 import normalizeData from '../../data/controllers/util/normalizeData.js';
 
@@ -34,7 +34,7 @@ const area = {
 };
 
 export default async function vtile(req, reply) {
-  const { pg, params = {}, query = {} } = req;
+  const { params = {}, query = {} } = req;
 
   const {
     filter,
@@ -59,7 +59,7 @@ export default async function vtile(req, reply) {
     return { message: 'not enough params: xyz', status: 400 };
   }
 
-  const { data } = await getWidget({ widget, dashboard });
+  const { pg = pgClients.client, data } = await getWidget({ widget, dashboard });
 
   const headers = {
     'Content-Type': 'application/x-protobuf',

package/server/routes/map/index.mjs

@@ -4,6 +4,7 @@ import vtile from './controllers/vtile.js';
 
 import cluster from './controllers/cluster.js';
 import clusterVtile from './controllers/clusterVtile.js';
+import heatmap from './controllers/heatmap.js';
 
 const biSchema = {
   querystring: {
@@ -22,4 +23,5 @@ export default async function route(fastify, opts) {
   fastify.get('/bi-vtile/:z/:y/:x', { schema: biSchema }, vtile);
   fastify.get('/bi-cluster', { schema: biSchema }, cluster);
   fastify.get('/bi-cluster-vtile/:z/:y/:x', { schema: biSchema }, clusterVtile);
+  fastify.get('/bi-heatmap', {}, heatmap);
 }

package/server/utils/getWidget.js

@@ -1,6 +1,6 @@
-import { getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
+import { getTemplate, getPGAsync, pgClients } from '@opengis/fastify-table/utils.js';
 
-const pg = pgClients.client;
+import mdToHTML from '../helpers/mdToHTML.js';
 
 async function getWidget({ dashboard, widget }) {
   if (!dashboard && !widget) {
@@ -10,6 +10,9 @@ async function getWidget({ dashboard, widget }) {
     ? await getTemplate('dashboard', dashboard)
     : null;
 
+  const dashboardIndex = dashboardData?.find((el) => el[0] == 'index.yml')?.[1]; // dashboardData?.find((el) => el[2] == 'index')?.[1]
+  const pg = dashboardIndex?.db ? await getPGAsync(dashboardIndex?.db) : pgClients.client;
+
   const { id, tableName } =
     !dashboardData && pg.pk['bi.dashboard'] && dashboard
       ? await pg
@@ -27,13 +30,13 @@ async function getWidget({ dashboard, widget }) {
   dashboardData?.forEach((el) => {
     el[2] = el[0].split('.')[0];
   });
-  const dashboardIndex = dashboardData?.find((el) => el[2] == 'index')?.[1];
 
   const widgetData = dashboard
     ? dashboardData?.find((el) => el[2] === (widget || 'index'))?.[1]
     : await getTemplate('widget', widget);
   if (typeof widgetData === 'string') {
-    return { source: widgetData, status: 200 };
+    const html = mdToHTML(widgetData);
+    return { source: html, status: 200 };
   }
   if (!id && !dashboardData && !widgetData) {
     return { message: `not found ${widget} ${dashboard}`, status: 404 };
@@ -65,9 +68,10 @@ async function getWidget({ dashboard, widget }) {
       widgetData?.table_name ||
       dashboardIndex?.table ||
       dashboardIndex?.table_name,
-    db: dashboardIndex?.db || pgClients.client?.options?.database,
+    db: dashboardIndex?.db || widgetData?.db || pgClients.client?.options?.database,
   });
   const main = { ...(dashboardIndex || {}), ...widgetData, ...data, ...data?.data || {} };
+  const pg1 = widgetData?.db ? await getPGAsync(widgetData?.db) : pg;
 
   if (!main?.table) {
     return {
@@ -80,6 +84,6 @@ async function getWidget({ dashboard, widget }) {
     (el, i) => `left join lateral(${el})t${i + 1} on 1=1`
   );
 
-  return { ...main, tableSQL, data, type, text, controls, style, options, yml };
+  return { ...main, pg: pg1, tableSQL, data, type, text, controls, style, options, yml };
 }
 export default getWidget;

package/server/routes/dataset/controllers/bi.dataset.add.js

@@ -1,86 +0,0 @@
-import { randomBytes } from 'node:crypto';
-
-import { dataInsert, getPG, pgClients, initPG } from '@opengis/fastify-table/utils.js';
-
-import createTableFunc from './util/create.table.js';
-import prepareData from './util/prepare.data.js';
-
-async function updatePGMeta(pg, table) {
-  if (!pg.tlist) await initPG(pg);
-  if (!pg.tlist.includes(table)) {
-    const { pks } = await pg.query(`SELECT json_object_agg(c.conrelid::regclass, a.attname) as pks FROM pg_constraint c 
-      left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] WHERE c.contype='p'::"char"`).then(el => el.rows[0]) || {};
-      pg.pk[table] = pks[table];
-      pg.tlist.push(table);
-  }
-}
-
-/**
- * Додавання нового набору даних BI
- *
- * @method POST
- * @summary Додавання нового набору даних BI
- * @priority 4
- * @alias biDatasetAdd
- * @type api
- * @tag bi
- * @param {Object} params.id Dashboard ID
- * @errors 400,500
- * @returns {Number} status Номер помилки
- * @returns {String} error Опис помилки
- * @returns {Object} rows Масив з колонками таблиці
- */
-
-export default async function biDatasetAdd(req) {
-  const { body = {}, session = {} } = req;
-  const { uid } = session?.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (body.table_name) {
-    const result = await dataInsert({
-      table: 'bi.dataset',
-      data: { ...body, source_type: 'db' },
-      uid,
-    }).then(el => el.rows?.[0]);
-
-    const pg = body.db ? getPG({ db: body.db }) : pgClients.client;
-    await updatePGMeta(pg,body.table_name);
-
-    return { message: { id: result?.dataset_id, action: 'assign', table: body.table_name }, status: 200 };
-  }
-
-  if (!Array.isArray(body.data) && body.data?.features?.[0]?.type !== 'Feature' && !body.file_path) {
-    return { message: 'body data param is invalid', status: 400 };
-  }
-
-  const tableName = randomBytes(64).toString('hex').substring(0, 24).replace(/^\d+/, '');
-  const pkey = tableName.concat('_id');
-  const table = `bi_data.${tableName}`;
-  const { columns, insertData } = await prepareData({ table, file_path: body.file_path, data: body?.data });
-  const createTable = createTableFunc({ table, pkey, columns, name: body.name });
-
-  const q = ['create extension if not exists postgis;create schema if not exists bi_data', createTable, insertData].join(';');
-  
-  const pg = body.db ? getPG({ db: body.db }) : pgClients.client;
-  if (!pg.pk) await initPG(pg);
-  
-  const results = await pg.query(q);
-
-  const result = await dataInsert({
-    table: 'bi.dataset',
-    data: { ...body, table_name: table, source_type: body.data ? 'user' : 'file' },
-    uid,
-  }).then(el => el.rows?.[0]);
-
-  await updatePGMeta(pg,table);
-
-  return {
-    message: {
-      id: result?.dataset_id, action: 'import', total: results?.find((el) => el.command === 'INSERT')?.rowCount, table,
-    },
-    status: 200,
-  };
-};

package/server/routes/dataset/controllers/bi.dataset.data.add.js

@@ -1,49 +0,0 @@
-import { dataInsert, getPG, initPG, pgClients } from "@opengis/fastify-table/utils.js";
-
-/**
- * Внесення даних до набору BI
- *
- * @method POST
- * @summary Внесення даних до набору BI
- * @priority 4
- * @alias biDatasetDataAdd
- * @type api
- * @tag bi
- * @param {Object} params.id Dataset ID
- * @errors 400,500
- * @returns {Number} status Номер помилки
- * @returns {String} error Опис помилки
- * @returns {Object} rows Масив з колонками таблиці
- */
-
-export default async function biDatasetDataAdd(req) {
-    const { params = {}, session = {}, body = {} } = req;
-    const { uid } = session?.passport?.user || {};
-
-    if (!uid) {
-        return { message: 'access restricted', status: 403 };
-    }
-
-    if (!params?.id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    const { id, table, db } = await pgClients.client.query('select db, dataset_id as id, table_name as table from bi.dataset where dataset_id=$1', [params.id])
-        .then(el => el.rows[0]);
-
-    if (!id) {
-        return { message: 'dataset not found', status: 404 };
-    }
-    
-    const pg = db ? getPG({ db }) : pgClients.client;
-    if (!pg.pk) await initPG(pg);
-
-    const result = await dataInsert({
-        pg,
-        table,
-        data: body,
-        uid,
-    }).then(el => el.rows[0]);
-
-    return { id, action: 'insert', result };
-};

package/server/routes/dataset/controllers/bi.dataset.data.del.js

@@ -1,54 +0,0 @@
-import { dataDelete, getPG, initPG, pgClients } from "@opengis/fastify-table/utils.js";
-
-/**
- * Видалення змін до даних набору BI
- *
- * @method DELETE
- * @summary Внесення змін до даних набору BI
- * @priority 4
- * @alias biDatasetDataDel
- * @type api
- * @tag bi
- * @param {Object} params.id Dataset ID
- * @param {Object} params.objectId Dataset object ID
- * @errors 400,500
- * @returns {Number} status Номер помилки
- * @returns {String} error Опис помилки
- * @returns {Object} rows Масив з колонками таблиці
- */
-
-export default async function biDatasetDataDel(req) {
-    const { params = {}, session = {} } = req;
-    const { uid } = session?.passport?.user || {};
-
-    if (!uid) {
-        return { message: 'access restricted', status: 403 };
-    }
-
-    if (!params?.id) {
-        return { message: 'not enough params: id', status: 400 };
-    }
-
-    if (!params?.objectId) {
-        return { message: 'not enough params: objectId', status: 400 };
-    }
-
-    const { id, table, db } = await pgClients.client.query('select db, dataset_id as id, table_name as table from bi.dataset where dataset_id=$1', [params.id])
-        .then(el => el.rows[0]);
-
-    if (!id) {
-        return { message: 'dataset not found', status: 404 };
-    }
-    
-    const pg = db ? getPG({ db }) : pgClients.client;
-    if (!pg.pk) await initPG(pg);
-
-    const result = await dataDelete({
-        pg,
-        table,
-        id: params.objectId,
-        uid,
-    });
-
-    return { id, action: 'delete', result };
-};