@opengis/bi 1.2.32 → 1.2.34

package/server/routes/data/controllers/util/normalizeData.js

@@ -1,65 +1,65 @@
-function normalizeData(data, query = {}, columnTypes = []) {
-  const skip = [];
-  ['x', 'groupby', 'granularity'].forEach((el) => {
-    // console.log(el, query[el], columnTypes.find(col => col.name == query[el]))
-    if (!columnTypes.find((col) => col.name == query[el])) {
-      if (query[el] && query[el] !== 'null') {
-        if (el === 'granularity' && !['week', 'month', 'quarter', 'year'].includes(query[el])) {
-          skip.push(`invalid granularity option: ${query[el]}`);
-        } else if (el !== 'granularity') { skip.push(`column not found: ${query[el]}`); }
-      }
-      if (!(el === 'granularity' || (el === 'groupby' && query[el] === 'null'))) delete query[el];
-    }
-  });
-
-  if (
-    !columnTypes.find(
-      (col) => col.type === 'numeric' && col.name == query.metric
-    )
-  ) {
-    delete query.metric;
-  }
-
-  const xName = query.x || (Array.isArray(data.x) ? data.x[0] : data.x);
-  const xType = columnTypes.find((el) => el.name == xName)?.type;
-
-  const granularity =
-    xType === 'date' || xType?.includes('timestamp')
-      ? query.granularity || data.granularity || 'year'
-      : null;
-
-  const x =
-    (granularity
-      ? `date_trunc('${granularity}',${xName})::date::text`
-      : null) || xName;
-
-  const metrics = Array.isArray(data.metrics || data.metric) ? (data.metrics || data.metric) : [data.metrics || data.metric];
-  const metric =
-    (query.metric ? `sum(${query.metric})` : null) ||
-    (metrics.length
-      ? (metrics
-        ?.filter((el) => el && columnTypes.find((col) => col.name == (el?.name || el)))
-        ?.map((el) => el.fx || `${el.operator || 'sum'}(${el.name || el})`)?.join(',') || 'count(*)')
-      : 'count(*)');
-
-  const yName = metrics?.[0]?.name || metrics?.[0];
-  const yType = columnTypes.find((el) => el.name == yName)?.type;
-
-  const { cls, groupbyCls, table, filterCustom } = data;
-  const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
-  // const orderby = query.orderby || data.orderby || 'count(*)';
-
-  const custom = query?.filterCustom
-    ?.split(',')
-    ?.map((el) => filterCustom?.find((item) => item?.name === el)?.sql)
-    ?.filter((el) => el)
-    ?.join(' and ');
-  const where = `${data.query || '1=1'} and ${custom || 'true'}`;
-
-  const tableSQL = data.tableSQL?.length
-    ? `(select * from ${data?.table} t ${data.tableSQL || ''} where ${where})q`
-    : undefined;
-
-  return { x, cls, groupbyCls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
-}
-export default normalizeData;
+function normalizeData(data, query = {}, columnTypes = []) {
+  const skip = [];
+  ['x', 'groupby', 'granularity'].forEach((el) => {
+    // console.log(el, query[el], columnTypes.find(col => col.name == query[el]))
+    if (!columnTypes.find((col) => col.name == query[el])) {
+      if (query[el] && query[el] !== 'null') {
+        if (el === 'granularity' && !['week', 'month', 'quarter', 'year'].includes(query[el])) {
+          skip.push(`invalid granularity option: ${query[el]}`);
+        } else if (el !== 'granularity') { skip.push(`column not found: ${query[el]}`); }
+      }
+      if (!(el === 'granularity' || (el === 'groupby' && query[el] === 'null'))) delete query[el];
+    }
+  });
+
+  if (
+    !columnTypes.find(
+      (col) => col.type === 'numeric' && col.name == query.metric
+    )
+  ) {
+    delete query.metric;
+  }
+
+  const xName = query.x || (Array.isArray(data.x) ? data.x[0] : data.x);
+  const xType = columnTypes.find((el) => el.name == xName)?.type;
+
+  const granularity =
+    xType === 'date' || xType?.includes('timestamp')
+      ? query.granularity || data.granularity || 'year'
+      : null;
+
+  const x =
+    (granularity
+      ? `date_trunc('${granularity}',${xName})::date::text`
+      : null) || xName;
+
+  const metrics = Array.isArray(data.metrics || data.metric) ? (data.metrics || data.metric) : [data.metrics || data.metric];
+  const metric =
+    (query.metric ? `sum(${query.metric})` : null) ||
+    (metrics.length
+      ? (metrics
+        ?.filter((el) => el && columnTypes.find((col) => col.name == (el?.name || el)))
+        ?.map((el) => el.fx || `${el.operator || 'sum'}(${el.name || el})`)?.join(',') || 'count(*)')
+      : 'count(*)');
+
+  const yName = metrics?.[0]?.name || metrics?.[0];
+  const yType = columnTypes.find((el) => el.name == yName)?.type;
+
+  const { cls, groupbyCls, table, filterCustom } = data;
+  const groupby = (query.groupby || data.groupby) === 'null' ? null : (query.groupby || data.groupby);
+  // const orderby = query.orderby || data.orderby || 'count(*)';
+
+  const custom = query?.filterCustom
+    ?.split(',')
+    ?.map((el) => filterCustom?.find((item) => item?.name === el)?.sql)
+    ?.filter((el) => el)
+    ?.join(' and ');
+  const where = `${data.query || '1=1'} and ${custom || 'true'}`;
+
+  const tableSQL = data.tableSQL?.length
+    ? `(select * from ${data?.table} t ${data.tableSQL || ''} where ${where})q`
+    : undefined;
+
+  return { x, cls, groupbyCls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };
+}
+export default normalizeData;

package/server/routes/data/index.mjs

@@ -1,38 +1,38 @@
-import data from './controllers/data.js';
-
-const biSchema = {
-  type: 'object',
-  properties: {
-    querystring: {
-      widget: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-      dashboard: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-      sql: { type: 'string', pattern: '^([\\d])$' },
-      // metric: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-      x: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-      granularity: { type: 'string', pattern: '^(week|month|quarter|year)$' },
-      groupby: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-      filterCustom: { type: 'string', pattern: '^([\\d\\w_,]+)$' },
-    },
-    params: {
-      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    },
-  },
-};
-
-const policy = ['public'];
-
-export default async function route(fastify, opts) {
-  fastify.route({
-    method: 'GET',
-    url: '/bi-data',
-    schema: biSchema,
-    config: {
-      policy,
-      rateLimit: {
-        max: 3000,
-        timeWindow: '1 minute',
-      }
-    },
-    handler: data,
-  });
-}
+import data from './controllers/data.js';
+
+const biSchema = {
+  type: 'object',
+  properties: {
+    querystring: {
+      widget: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      dashboard: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      sql: { type: 'string', pattern: '^([\\d])$' },
+      // metric: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      x: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      granularity: { type: 'string', pattern: '^(week|month|quarter|year)$' },
+      groupby: { type: 'string', pattern: '^([\\d\\w_]+)$' },
+      filterCustom: { type: 'string', pattern: '^([\\d\\w_,]+)$' },
+    },
+    params: {
+      id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    },
+  },
+};
+
+const policy = ['public'];
+
+export default async function route(fastify, opts) {
+  fastify.route({
+    method: 'GET',
+    url: '/bi-data',
+    schema: biSchema,
+    config: {
+      policy,
+      rateLimit: {
+        max: 3000,
+        timeWindow: '1 minute',
+      }
+    },
+    handler: data,
+  });
+}

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

@@ -1,29 +1,29 @@
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-const maxLimit = 100;
-
-/**
- * Отримання списку наборів даних BI
- *
- * @method GET
- * @summary Отримання списку наборів даних BI
- * @priority 4
- * @alias biDatasetList
- * @type api
- * @tag bi
- * @errors 400,500
- * @returns {Number} status Номер помилки
- * @returns {String} error Опис помилки
- * @returns {Object} rows Масив з колонками таблиці
- */
-
-export default async function biDatasetList({ pg = pgClients.client, query = {} }) {
-
-  const limit = Math.min(maxLimit, +(query.limit || 20));
-  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
-
-  const { rows = [] } = await pg.query(`select dataset_id as id, name, source_type as source, table_name as table, dashboard_list 
-  from bi.dataset order by name limit ${limit} offset ${offset}`);
-
-  return { rows };
-};
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+const maxLimit = 100;
+
+/**
+ * Отримання списку наборів даних BI
+ *
+ * @method GET
+ * @summary Отримання списку наборів даних BI
+ * @priority 4
+ * @alias biDatasetList
+ * @type api
+ * @tag bi
+ * @errors 400,500
+ * @returns {Number} status Номер помилки
+ * @returns {String} error Опис помилки
+ * @returns {Object} rows Масив з колонками таблиці
+ */
+
+export default async function biDatasetList({ pg = pgClients.client, query = {} }) {
+
+  const limit = Math.min(maxLimit, +(query.limit || 20));
+  const offset = query.page && query.page > 0 ? (query.page - 1) * limit : 0;
+
+  const { rows = [] } = await pg.query(`select dataset_id as id, name, source_type as source, table_name as table, dashboard_list 
+  from bi.dataset order by name limit ${limit} offset ${offset}`);
+
+  return { rows };
+};

package/server/routes/dataset/controllers/bi.db.list.js

@@ -1,19 +1,19 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-/**
- * Список БД
- *
- * @method POST
- * @priority 4
- * @alias biDbList
- * @type api
- * @tag bi
- * @errors 400,500
- * @returns {Number} status Номер помилки
- * @returns {String} error Опис помилки
- * @returns {Object} rows Масив з колонками таблиці
- */
-
-export default async function biDbList(req) {
-    return { db_list: config.db_list?.map((el) => ({ id: el.key, text: el.title })) || [] };
-};
+import { config } from '@opengis/fastify-table/utils.js';
+
+/**
+ * Список БД
+ *
+ * @method POST
+ * @priority 4
+ * @alias biDbList
+ * @type api
+ * @tag bi
+ * @errors 400,500
+ * @returns {Number} status Номер помилки
+ * @returns {String} error Опис помилки
+ * @returns {Object} rows Масив з колонками таблиці
+ */
+
+export default async function biDbList(req) {
+    return { db_list: config.db_list?.map((el) => ({ id: el.key, text: el.title })) || [] };
+};

package/server/routes/dataset/controllers/comment.js

@@ -1,55 +1,55 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-export default async function datasetEditComment({
-  pg = pgClients.client,
-  body = {},
-  params = {},
-}) {
-  if (!params?.id) {
-    return { message: 'not enough params: id', status: 400 };
-  }
-
-  if (!Array.isArray(body.data) || !body.data?.length) {
-    return { message: 'invalid param: body.data not an array / empty', status: 400 };
-  }
-
-  const dataset = await pg.query('select dataset_id as id, table_name as table from bi.dataset where dataset_id=$1', [params.id])
-    .then(el => el.rows?.[0] || {});
-
-  if (!dataset?.table) {
-    return { message: dataset?.id ? 'dataset table not set' : 'dataset not found', status: 404 };
-  }
-
-  const { fields = [] } = pg.pk?.[dataset.table] ? await pg.query(`select * from ${dataset.table} limit 0`) : {};
-
-  if (!fields.length) {
-    return { message: `table not found: ${dataset.table}`, status: 404 };
-  }
-
-  const columnList = fields.map(el => el.name);
-  const validData = body.data?.filter?.(el => el?.name && el?.comment && columnList.includes(el.name));
-
-  const q1 = validData.map(el => `COMMENT ON COLUMN ${dataset.table}."${el.name.replace(/'/g, "''")}" IS '${el.comment.replace(/'/g, "''")}'`).join(';');
-  if (q1) await pg.query(q1);
-
-  const q2 = `select
-    attrelid::regclass,
-    attname,
-    pg_catalog.col_description(attrelid,attnum) as title
-  from pg_catalog.pg_attribute a 
-  where attnum > 0 
-  and attname not in ('editor_id','editor_date','cdate','geom','id','uid','cdate')
-  and atttypid::regtype not in ('json','geometry')
-  and pg_catalog.col_description(attrelid,attnum) is not null`;
-
-  const { rows = [] } = await pg.query(q2);
-
-  const title = rows
-    .filter(el => el.attrelid === dataset.table)
-    .reduce((p, el) => ({ ...p, [el.attname]: el.title }), {});
-
-  const res = await pg.query(`update bi.dataset set setting=coalesce(setting::jsonb, '{}'::jsonb)||$1::jsonb 
-  where dataset_id=$2 returning dataset_id as id, setting`, [{ title }, dataset.id]);
-
-  return res.rows?.[0];
-}
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+export default async function datasetEditComment({
+  pg = pgClients.client,
+  body = {},
+  params = {},
+}) {
+  if (!params?.id) {
+    return { message: 'not enough params: id', status: 400 };
+  }
+
+  if (!Array.isArray(body.data) || !body.data?.length) {
+    return { message: 'invalid param: body.data not an array / empty', status: 400 };
+  }
+
+  const dataset = await pg.query('select dataset_id as id, table_name as table from bi.dataset where dataset_id=$1', [params.id])
+    .then(el => el.rows?.[0] || {});
+
+  if (!dataset?.table) {
+    return { message: dataset?.id ? 'dataset table not set' : 'dataset not found', status: 404 };
+  }
+
+  const { fields = [] } = pg.pk?.[dataset.table] ? await pg.query(`select * from ${dataset.table} limit 0`) : {};
+
+  if (!fields.length) {
+    return { message: `table not found: ${dataset.table}`, status: 404 };
+  }
+
+  const columnList = fields.map(el => el.name);
+  const validData = body.data?.filter?.(el => el?.name && el?.comment && columnList.includes(el.name));
+
+  const q1 = validData.map(el => `COMMENT ON COLUMN ${dataset.table}."${el.name.replace(/'/g, "''")}" IS '${el.comment.replace(/'/g, "''")}'`).join(';');
+  if (q1) await pg.query(q1);
+
+  const q2 = `select
+    attrelid::regclass,
+    attname,
+    pg_catalog.col_description(attrelid,attnum) as title
+  from pg_catalog.pg_attribute a 
+  where attnum > 0 
+  and attname not in ('editor_id','editor_date','cdate','geom','id','uid','cdate')
+  and atttypid::regtype not in ('json','geometry')
+  and pg_catalog.col_description(attrelid,attnum) is not null`;
+
+  const { rows = [] } = await pg.query(q2);
+
+  const title = rows
+    .filter(el => el.attrelid === dataset.table)
+    .reduce((p, el) => ({ ...p, [el.attname]: el.title }), {});
+
+  const res = await pg.query(`update bi.dataset set setting=coalesce(setting::jsonb, '{}'::jsonb)||$1::jsonb 
+  where dataset_id=$2 returning dataset_id as id, setting`, [{ title }, dataset.id]);
+
+  return res.rows?.[0];
+}