@opengis/bi 1.0.42 → 1.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",

package/server/migrations/bi.sql

@@ -93,6 +93,7 @@ alter table bi.cluster alter column cluster_id set default next_id();
 alter table bi.cluster alter column cluster_id set default next_id();
 ALTER TABLE bi.cluster ADD COLUMN IF NOT EXISTS title text;
 ALTER TABLE bi.cluster ADD COLUMN IF NOT EXISTS type text;
+ALTER TABLE bi.cluster ADD COLUMN IF NOT EXISTS codifier text;
 ALTER TABLE bi.cluster ADD COLUMN IF NOT EXISTS geom geometry(MultiPolygon,4326);
 
 ALTER TABLE bi.cluster ADD COLUMN IF NOT EXISTS uid text;

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

@@ -1,4 +1,4 @@
-import { getFilterSQL, logger, pgClients } from '@opengis/fastify-table/utils.js';
+import { getFilterSQL, logger, pgClients, getMeta } from '@opengis/fastify-table/utils.js';
 
 import { getWidget } from '../../../../utils.js';
 
@@ -6,7 +6,7 @@ import downloadClusterData from './utils/downloadClusterData.js';
 
 const clusterExists = {};
 
-export default async function cluster(req) {
+export default async function cluster(req, reply) {
   const { query = {} } = req;
   const { widget, filter, dashboard, search } = query;
 
@@ -14,7 +14,7 @@ export default async function cluster(req) {
     return { message: 'not enough params: widget', status: 400 };
   }
 
-  const { pg = req.pg || pgClients.client, data } = await getWidget({ pg: req.pg, dashboard, widget });
+  const { pg = req.pg || pgClients.client, data, style, controls } = await getWidget({ pg: req.pg, dashboard, widget });
 
   const pkey = pg.pk?.[data?.table];
 
@@ -82,10 +82,21 @@ export default async function cluster(req) {
         ? await getFilterSQL({ pg, table, filter, search })
         : {};
 
-    const q = `select b.*, ${clusterTable?.operator || 'sum'}("${metrics[0]}")::float as metric 
+    const { columns = [] } = await getMeta({ pg, table });
+    const columnList = columns.map(el => el.name);
+
+    if (query.metric && query.metric !== 'count' && !columnList.includes(query.metric)) {
+      return reply.status(404).send(`metric column not found: ${query.metric}`);
+    }
+
+    const metricFunc = (columnList.includes(query.metric) ? `sum(${query.metric.replace(/'/g, "''")})::float` : null)
+      || ({ count: 'count(*)' }[query.metric])
+      || `${clusterTable?.operator || 'sum'}("${metrics[0]}")::float`;
+
+    const q = `select b.*, ${metricFunc} as metric 
         from ${optimizedSQL ? `(${optimizedSQL})` : table} q 
         left join lateral (select "${pg.pk?.[clusterTable?.name]}" as id, ${clusterTable?.column || cluster} as name, ${clusterTable?.title} as title from ${clusterTable?.name} where ${clusterTable?.codifierColumn || 'codifier'}=q."${clusterTable?.column || cluster}" limit 1)b on 1=1
-        where ${where} group by b.id, b.name, b.title order by ${clusterTable?.operator || 'sum'}("${metrics[0]}")::float desc`;
+        where ${where} group by b.id, b.name, b.title order by ${metricFunc} desc`;
 
     if (query.sql === '1') return q;
 
@@ -102,7 +113,7 @@ export default async function cluster(req) {
       vals[Math.floor(len * 0.75)],
       vals[len - 1],
     ];
-    return { sizes, rows, bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
+    return { sizes, style, controls, rows, bounds, extent, count: rows.length, total: rows?.reduce((acc, curr) => (curr.metric || 0) + acc, 0) };
   } catch (err) {
     logger.file('bi/cluster/error', { error: err.toString(), query });
     return { error: err.toString(), status: 500 };

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

@@ -1,4 +1,4 @@
-import { logger, pgClients } from '@opengis/fastify-table/utils.js';
+import { config, logger, pgClients } from '@opengis/fastify-table/utils.js';
 
 export default async function downloadClusterData({ pg = pgClients.client, cluster }) {
     if (!pg || !cluster) return null;
@@ -24,12 +24,12 @@ export default async function downloadClusterData({ pg = pgClients.client, clust
         }
         const { count = 0 } = await pg.query(`select count(*)::int from bi.cluster where type=$1`, [cluster])
             .then((res1) => res1.rows?.[0] || {});
-        if (count !== features?.length) {
+        if (count !== features?.length || config.debug) {
             // await pg.query(`delete from bi.cluster where type=$1`, [cluster]);
-            const values = features?.map((el) => `('${el.properties.name?.replace(/'/g, "''") || ''}', '${cluster}', ST_GeomFromGeoJSON('${JSON.stringify(el.geometry)}')::geometry)`).join(',');
+            const values = features?.map((el) => `('${el.properties.codifier?.replace(/'/g, "''") || ''}','${el.properties.name?.replace(/'/g, "''") || ''}', '${cluster}', ST_GeomFromGeoJSON('${JSON.stringify(el.geometry)}')::geometry)`).join(',');
 
-            const { rowCount } = await pg.query(`insert into bi.cluster (title,type,geom) 
-            values ${values} on conflict(title,type) do update set geom=excluded.geom`);
+            const { rowCount } = await pg.query(`insert into bi.cluster (codifier,title,type,geom) 
+            values ${values} on conflict(title,type) do update set codifier=excluded.codifier, geom=excluded.geom`);
             logger.file('bi/clusterVtile', { cluster, rowCount });
         }
     } catch (err) {