@opengis/bi 1.2.32 → 1.2.34

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

@@ -1,58 +1,58 @@
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-const q = `select nspname||'.'||relname as table, json_agg(json_build_object('name',attname, 'type', a.atttypid::regtype, 'description', coalesce(col_description(attrelid, attnum),attname))) as columns
-from pg_attribute a
-left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-JOIN pg_class AS i
-  ON i.oid = a.attrelid 
-JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
-where a.attnum > 0 and nspname||'.'||relname = $1
-and not a.attisdropped
-group by nspname||'.'||relname limit 1`;
-
-export default async function dbTablePreview({ pg = pgClients.client, params = {}, query = {} }) {
-  if (!params?.name) {
-    return { message: 'not enough params: name', status: 400 };
-  }
-
-  if (query.sql) return q;
-  try {
-    const { table, columns } = await pg
-      .query(q, [params.name.replace(/"/g, '')])
-      .then(el => el.rows?.[0] || {});
-    if (!table) {
-      return { message: 'table not found', status: 404 };
-    }
-
-    const { count = 0 } = await pg.query('select reltuples as count from pg_class where oid  = to_regclass($1)', [params.name])
-      .then(el => el.rows?.[0] || {});
-    const geom = columns.find((el) => el.type === 'geometry')?.name;
-    const { bounds, extentStr } = geom
-      ? await pg.query(`select 
-        count(*),
-        st_asgeojson(st_extent(${geom}))::json as bounds,
-        replace(regexp_replace(st_extent(${geom})::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
-      from ${params.name}`).then(el => el.rows?.[0] || {})
-      : {};
-    const extent = extentStr ? extentStr.split(',') : undefined;
-
-    const systemColumns = [
-      'uid',
-      'files',
-      'editor_date',
-      'cdate',
-      'editor_id',
-      geom,
-    ];
-
-    const columnList = columns.map((el) => el?.name).filter((el) => !systemColumns.includes(el));
-    const { rows = [] } = await pg.query(`select ${columnList.map(el => `"${el.replace(/'/g, "''")}"`).join(',')} ${geom ? ', st_asgeojson(geom)::json as geom' : ''} from ${params.name.replace(/'/g, '')} limit 10`);
-
-    return {
-      count, geom: !!geom, bounds, extent, columns, rows,
-    };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+const q = `select nspname||'.'||relname as table, json_agg(json_build_object('name',attname, 'type', a.atttypid::regtype, 'description', coalesce(col_description(attrelid, attnum),attname))) as columns
+from pg_attribute a
+left join pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+JOIN pg_class AS i
+  ON i.oid = a.attrelid 
+JOIN pg_namespace AS NS ON i.relnamespace = NS.OID
+where a.attnum > 0 and nspname||'.'||relname = $1
+and not a.attisdropped
+group by nspname||'.'||relname limit 1`;
+
+export default async function dbTablePreview({ pg = pgClients.client, params = {}, query = {} }) {
+  if (!params?.name) {
+    return { message: 'not enough params: name', status: 400 };
+  }
+
+  if (query.sql) return q;
+  try {
+    const { table, columns } = await pg
+      .query(q, [params.name.replace(/"/g, '')])
+      .then(el => el.rows?.[0] || {});
+    if (!table) {
+      return { message: 'table not found', status: 404 };
+    }
+
+    const { count = 0 } = await pg.query('select reltuples as count from pg_class where oid  = to_regclass($1)', [params.name])
+      .then(el => el.rows?.[0] || {});
+    const geom = columns.find((el) => el.type === 'geometry')?.name;
+    const { bounds, extentStr } = geom
+      ? await pg.query(`select 
+        count(*),
+        st_asgeojson(st_extent(${geom}))::json as bounds,
+        replace(regexp_replace(st_extent(${geom})::box2d::text,'BOX\\(|\\)','','g'),' ',',') as "extentStr"
+      from ${params.name}`).then(el => el.rows?.[0] || {})
+      : {};
+    const extent = extentStr ? extentStr.split(',') : undefined;
+
+    const systemColumns = [
+      'uid',
+      'files',
+      'editor_date',
+      'cdate',
+      'editor_id',
+      geom,
+    ];
+
+    const columnList = columns.map((el) => el?.name).filter((el) => !systemColumns.includes(el));
+    const { rows = [] } = await pg.query(`select ${columnList.map(el => `"${el.replace(/'/g, "''")}"`).join(',')} ${geom ? ', st_asgeojson(geom)::json as geom' : ''} from ${params.name.replace(/'/g, '')} limit 10`);
+
+    return {
+      count, geom: !!geom, bounds, extent, columns, rows,
+    };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

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

@@ -1,34 +1,34 @@
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function dbTables({ pg = pgClients.client, query = {} }) {
-  const q = `select 
-  t.table_schema ||'."'|| t.table_name ||'"' as table, 
-  obj_description(to_regclass(t.table_schema ||'."'|| t.table_name||'"')) as description,
-  t.table_schema as schema,
-  (select reltuples from pg_class where oid  = to_regclass(t.table_schema ||'."'|| t.table_name||'"') ) as total,
-  coalesce(isgeom,false) as isgeom
-  
-  from information_schema.tables t
-  left join lateral(
-    select true as isgeom from information_schema.columns c 
-    where c.table_name = t.table_name 
-    and c.table_schema = t.table_schema and 'geometry'=c.udt_name limit 1
-  )c on 1=1
-  
-  where t.table_type = 'BASE TABLE'
-  and t.table_schema not in ('public','log','admin','feature_ir','gis', 'setting')
-  and t.table_name not like '%.%'
-  and regexp_replace(t.table_name, '^[[:digit:]]', '', 'g') = t.table_name
-  and 1=(SELECT count(*) FROM pg_catalog.pg_constraint con 
-    INNER JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid
-    INNER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = connamespace 
-    WHERE nsp.nspname = t.table_schema AND rel.relname = t.table_name and contype='p'
-  )
-  and isgeom
-  order by total desc`;
-
-  if (query.sql) return q;
-
-  const { rows = [] } = await pg.queryCache(q, { time: 0 });
-  return { rows };
-}
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function dbTables({ pg = pgClients.client, query = {} }) {
+  const q = `select 
+  t.table_schema ||'."'|| t.table_name ||'"' as table, 
+  obj_description(to_regclass(t.table_schema ||'."'|| t.table_name||'"')) as description,
+  t.table_schema as schema,
+  (select reltuples from pg_class where oid  = to_regclass(t.table_schema ||'."'|| t.table_name||'"') ) as total,
+  coalesce(isgeom,false) as isgeom
+  
+  from information_schema.tables t
+  left join lateral(
+    select true as isgeom from information_schema.columns c 
+    where c.table_name = t.table_name 
+    and c.table_schema = t.table_schema and 'geometry'=c.udt_name limit 1
+  )c on 1=1
+  
+  where t.table_type = 'BASE TABLE'
+  and t.table_schema not in ('public','log','admin','feature_ir','gis', 'setting')
+  and t.table_name not like '%.%'
+  and regexp_replace(t.table_name, '^[[:digit:]]', '', 'g') = t.table_name
+  and 1=(SELECT count(*) FROM pg_catalog.pg_constraint con 
+    INNER JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid
+    INNER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = connamespace 
+    WHERE nsp.nspname = t.table_schema AND rel.relname = t.table_name and contype='p'
+  )
+  and isgeom
+  order by total desc`;
+
+  if (query.sql) return q;
+
+  const { rows = [] } = await pg.queryCache(q, { time: 0 });
+  return { rows };
+}

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

@@ -1,40 +1,40 @@
-import {
-  config, getToken, dataDelete, pgClients,
-} from '@opengis/fastify-table/utils.js';
-
-export default async function datasetDataDelete({
-  pg = pgClients.client, params = {}, user = {},
-}) {
-  if (!user?.uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const tokenData = await getToken({
-    uid: user?.uid,
-    token: params.id,
-    mode: 'a',
-    json: 1,
-  });
-
-  if (!tokenData && !config.local && !config.debug) {
-    return { message: 'token not allow', status: 403 };
-  }
-
-  const dataset = await pg.query('select dataset_id as id, table_name as table from bi.dataset where dataset_id=$1', [tokenData?.dataset || params.id])
-    .then(el => el.rows[0] || {});
-
-  const table = tokenData?.table || dataset.table;
-
-  if (!dataset.id) {
-    return { message: 'dataset not found', status: 404 };
-  }
-
-  const res = await dataDelete({
-    pg,
-    id: tokenData?.id || params?.object_id,
-    table,
-    uid: user?.uid,
-  });
-
-  return { rowCount: res.rowCount, msg: !res.rowCount ? res : null };
-}
+import {
+  config, getToken, dataDelete, pgClients,
+} from '@opengis/fastify-table/utils.js';
+
+export default async function datasetDataDelete({
+  pg = pgClients.client, params = {}, user = {},
+}) {
+  if (!user?.uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const tokenData = await getToken({
+    uid: user?.uid,
+    token: params.id,
+    mode: 'a',
+    json: 1,
+  });
+
+  if (!tokenData && !config.local && !config.debug) {
+    return { message: 'token not allow', status: 403 };
+  }
+
+  const dataset = await pg.query('select dataset_id as id, table_name as table from bi.dataset where dataset_id=$1', [tokenData?.dataset || params.id])
+    .then(el => el.rows[0] || {});
+
+  const table = tokenData?.table || dataset.table;
+
+  if (!dataset.id) {
+    return { message: 'dataset not found', status: 404 };
+  }
+
+  const res = await dataDelete({
+    pg,
+    id: tokenData?.id || params?.object_id,
+    table,
+    uid: user?.uid,
+  });
+
+  return { rowCount: res.rowCount, msg: !res.rowCount ? res : null };
+}

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

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

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

@@ -1,90 +1,90 @@
-import { dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
-
-const columnTypeMatch = {
-  text: 'text',
-  select: 'text',
-  date: 'date',
-  'yes/no': 'boolean',
-  badge: 'text',
-  number: 'numeric',
-  tags: 'text[]',
-  geom: 'geom',
-};
-
-/**
- * Редагування структури набору даних
- *
- * @method PUT
- * @summary Редагування структури набору даних
- * @priority 4
- * @alias editDataset
- * @type api
- * @tag bi
- * @param {Object} query.id Видалення ID
- * @errors 400,500
- * @returns {Number} status Номер помилки
- * @returns {String} error Опис помилки
- * @returns {Object} rows Масив з колонками таблиці
- */
-
-export default async function editDataset(req) {
-  const {
-    pg = pgClients.client, query = {}, body = {}, user = {},
-  } = req;
-  if (!user?.uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (!query?.id) {
-    return { message: 'not enough params: id', status: 404 };
-  }
-
-  if (!body.column_list?.length) {
-    return { message: 'not enough params: columns', status: 400 };
-  }
-
-  const dataset = await pg.query('select dataset_id as id, table_name as table, column_list as columns from bi.dataset where dataset_id=$1', [query.id])
-    .then(el => el.rows[0] || {});
-
-  if (!dataset?.id) {
-    return { message: 'dataset not found', status: 404 };
-  }
-
-  if (!dataset.table || !pg.pk?.[dataset.table]) {
-    return { message: `table not found: ${dataset.table}`, status: 404 };
-  }
-
-  if (!dataset.table.startsWith('data_user.')) {
-    return { message: 'access restricted: source', status: 403 };
-  }
-
-  const { fields = [] } = await pg.query(`select * from ${dataset.table} limit 0`);
-  const columnList = fields.map((col) => col.name);
-
-  const columns = (dataset.columns || [])
-    .concat(body.column_list.filter((col) => !col.name || !columnList.includes(col.name)))
-    .map((col, idx) => ({
-      ...col,
-      name: col.name && columnList.includes(col.name) ? col.name : `col_${idx}`,
-      disabled: col.name && !body.column_list.find((item) => item.name === col.name),
-    }));
-
-  await dataUpdate({
-    pg,
-    table: 'bi.dataset',
-    data: { column_list: columns },
-    id: dataset.id,
-    uid: user.uid,
-  });
-
-  const sqlList = columns
-    .filter((col) => col.name.startsWith('col_') || (col.title && dataset.columns?.find?.((item) => item.name === col.name)?.title !== col.title))
-    .map((col) => `alter table ${dataset.table} add column if not exists ${col.name} ${columnTypeMatch[col.type] || 'text'};
-    comment on column ${dataset.table}."${col.name}" is '${(col.title || col.name).replace(/'/g, "''")}'`);
-
-  if (sqlList.length) {
-    await pg.query(sqlList.join(';'));
-  }
-
-  return { message: { id: dataset?.id, table: dataset.table, columns }, status: 200 };
-}
+import { dataUpdate, pgClients } from '@opengis/fastify-table/utils.js';
+
+const columnTypeMatch = {
+  text: 'text',
+  select: 'text',
+  date: 'date',
+  'yes/no': 'boolean',
+  badge: 'text',
+  number: 'numeric',
+  tags: 'text[]',
+  geom: 'geom',
+};
+
+/**
+ * Редагування структури набору даних
+ *
+ * @method PUT
+ * @summary Редагування структури набору даних
+ * @priority 4
+ * @alias editDataset
+ * @type api
+ * @tag bi
+ * @param {Object} query.id Видалення ID
+ * @errors 400,500
+ * @returns {Number} status Номер помилки
+ * @returns {String} error Опис помилки
+ * @returns {Object} rows Масив з колонками таблиці
+ */
+
+export default async function editDataset(req) {
+  const {
+    pg = pgClients.client, query = {}, body = {}, user = {},
+  } = req;
+  if (!user?.uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (!query?.id) {
+    return { message: 'not enough params: id', status: 404 };
+  }
+
+  if (!body.column_list?.length) {
+    return { message: 'not enough params: columns', status: 400 };
+  }
+
+  const dataset = await pg.query('select dataset_id as id, table_name as table, column_list as columns from bi.dataset where dataset_id=$1', [query.id])
+    .then(el => el.rows[0] || {});
+
+  if (!dataset?.id) {
+    return { message: 'dataset not found', status: 404 };
+  }
+
+  if (!dataset.table || !pg.pk?.[dataset.table]) {
+    return { message: `table not found: ${dataset.table}`, status: 404 };
+  }
+
+  if (!dataset.table.startsWith('data_user.')) {
+    return { message: 'access restricted: source', status: 403 };
+  }
+
+  const { fields = [] } = await pg.query(`select * from ${dataset.table} limit 0`);
+  const columnList = fields.map((col) => col.name);
+
+  const columns = (dataset.columns || [])
+    .concat(body.column_list.filter((col) => !col.name || !columnList.includes(col.name)))
+    .map((col, idx) => ({
+      ...col,
+      name: col.name && columnList.includes(col.name) ? col.name : `col_${idx}`,
+      disabled: col.name && !body.column_list.find((item) => item.name === col.name),
+    }));
+
+  await dataUpdate({
+    pg,
+    table: 'bi.dataset',
+    data: { column_list: columns },
+    id: dataset.id,
+    uid: user.uid,
+  });
+
+  const sqlList = columns
+    .filter((col) => col.name.startsWith('col_') || (col.title && dataset.columns?.find?.((item) => item.name === col.name)?.title !== col.title))
+    .map((col) => `alter table ${dataset.table} add column if not exists ${col.name} ${columnTypeMatch[col.type] || 'text'};
+    comment on column ${dataset.table}."${col.name}" is '${(col.title || col.name).replace(/'/g, "''")}'`);
+
+  if (sqlList.length) {
+    await pg.query(sqlList.join(';'));
+  }
+
+  return { message: { id: dataset?.id, table: dataset.table, columns }, status: 200 };
+}