@opengis/bi 1.2.32 → 1.2.34

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

@@ -1,46 +1,46 @@
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-import getTableData from "../utils/getTableData.js";
-import getLayersData from "../utils/getLayersData.js";
-
-export default async function gisFormat({ query = {}, pg = pgClients.client }) {
-  const time = [Date.now()];
-  const { layer, table, id, lat, lng } = query;
-
-  if (!table && !layer) {
-    return { message: 'not enough params', status: 400 };
-  }
-
-  if (layer && !(lat && lng)) {
-    return { message: 'not enough params: lat/lng', status: 400 };
-  }
-
-  if (table && !(id || layer)) {
-    return { message: 'not enough params: id', status: 400 };
-  }
-
-  const { message, template, rows, layers, html, body } = layer
-    ? await getLayersData({ pg, layer, table, id, lat, lng, time })
-    : await getTableData({ pg, table, id, time });
-
-  if (message) return { message, status: 400 };
-
-  return {
-    time: {
-      layer: time[1] - time[0],
-      data: time[2] - time[1],
-      html: time[3] - time[2],
-      total: time[3] - time[0],
-    },
-
-    id: rows[0]?.id,
-    table,
-    layers,
-
-    data: { geom: rows[0]?.geom },
-    rows,
-    html,
-    template,
-    body,
-  };
-}
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+import getTableData from "../utils/getTableData.js";
+import getLayersData from "../utils/getLayersData.js";
+
+export default async function gisFormat({ query = {}, pg = pgClients.client }) {
+  const time = [Date.now()];
+  const { layer, table, id, lat, lng } = query;
+
+  if (!table && !layer) {
+    return { message: 'not enough params', status: 400 };
+  }
+
+  if (layer && !(lat && lng)) {
+    return { message: 'not enough params: lat/lng', status: 400 };
+  }
+
+  if (table && !(id || layer)) {
+    return { message: 'not enough params: id', status: 400 };
+  }
+
+  const { message, template, rows, layers, html, body } = layer
+    ? await getLayersData({ pg, layer, table, id, lat, lng, time })
+    : await getTableData({ pg, table, id, time });
+
+  if (message) return { message, status: 400 };
+
+  return {
+    time: {
+      layer: time[1] - time[0],
+      data: time[2] - time[1],
+      html: time[3] - time[2],
+      total: time[3] - time[0],
+    },
+
+    id: rows[0]?.id,
+    table,
+    layers,
+
+    data: { geom: rows[0]?.geom },
+    rows,
+    html,
+    template,
+    body,
+  };
+}

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

@@ -1,47 +1,47 @@
-import {
-  config, getToken, dataInsert, pgClients,
-} from '@opengis/fastify-table/utils.js';
-
-import datasetForms from '../utils/datasetForms.js';
-
-export default async function datasetDataInsert({
-  pg = pgClients.client, params = {}, body = {}, 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 { form, table: add } = tokenData
-    || { form: `${dataset.id}.form`, table: dataset.table };
-
-  if (!form || !dataset.id || !datasetForms[dataset.id]) {
-    return { message: 'dataset not found', status: 404 };
-  }
-
-  const res = await dataInsert({
-    pg,
-    table: add,
-    data: body,
-    uid: user?.uid,
-  });
-
-  if (!res) {
-    return { message: 'nothing added' };
-  }
-
-  return { rows: res.rows };
-}
+import {
+  config, getToken, dataInsert, pgClients,
+} from '@opengis/fastify-table/utils.js';
+
+import datasetForms from '../utils/datasetForms.js';
+
+export default async function datasetDataInsert({
+  pg = pgClients.client, params = {}, body = {}, 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 { form, table: add } = tokenData
+    || { form: `${dataset.id}.form`, table: dataset.table };
+
+  if (!form || !dataset.id || !datasetForms[dataset.id]) {
+    return { message: 'dataset not found', status: 404 };
+  }
+
+  const res = await dataInsert({
+    pg,
+    table: add,
+    data: body,
+    uid: user?.uid,
+  });
+
+  if (!res) {
+    return { message: 'nothing added' };
+  }
+
+  return { rows: res.rows };
+}

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

@@ -1,68 +1,68 @@
-import {
-  config, pgClients, getMeta, setToken, getToken,
-} from '@opengis/fastify-table/utils.js';
-
-export default async function datasetFormData({
-  pg = pgClients.client, params = {}, query = {}, user = {},
-}) {
-  if (!params?.id) {
-    return { message: 'not enough params: id', status: 400 };
-  }
-
-  if (!user?.uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const { user_type: userType = 'regular' } = user;
-
-  const tokenData = await getToken({
-    uid: user?.uid,
-    token: params.id,
-    mode: 'w',
-    json: 1,
-  });
-
-  if (!tokenData && !params?.object_id) {
-    return { message: 'not enough params: object_id', status: 400 };
-  }
-
-  const dataset = await pg.query(`select dataset_id as id, table_name as table, column_list as columns, filter_list as filters,
-      sql_list as sql, style, form_setting, pk, access_level from bi.dataset where dataset_id=$1`, [tokenData?.dataset || params.id]).then(el => el.rows[0] || {});
-
-  if (!dataset?.id) {
-    return { message: 'dataset not found', status: 404 };
-  }
-
-  const tlist = await pg.query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist 
-      from pg_class where relkind in ('r','v')`).then(el => el.rows[0]?.tlist || []);
-
-  if (!dataset.table || !tlist.includes(dataset.table.replace(/"/g, '')) || (!pg.pk?.[dataset.table.replace(/"/g, '')] && !dataset.pk)) {
-    return { message: `table not found: ${dataset.table}`, status: 404 };
-  }
-
-  const { pk = dataset.pk, columns: dbColumns = [] } = await getMeta(dataset.table) || {};
-  const cols = dataset.columns?.filter((el) => el.name !== 'geom')?.map((el) => el.name || el)?.join(',');
-
-  const where = [`"${pk}" = $1`, dataset.query].filter((el) => el);
-
-  const geom = dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : '';
-  const files = dbColumns.find((el) => el.name === 'files' && pg.pgType[el.dataTypeID] === 'text') ? ',files' : '';
-  const q = `select "${pk}" as id, ${cols || '*'} ${files} ${geom} from ${dataset.table} t where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query.sql === '1' && (config.debug || userType.includes('admin'))) { return q; }
-
-  const data = await pg.query(q, [tokenData?.id || params.object_id]).then(el => el.rows?.[0] || {});
-
-  data.token = setToken({
-    ids: [JSON.stringify({
-      id: data.id,
-      table: dataset.table,
-      form: `${dataset.id}.form`,
-      dataset: dataset.id,
-    })],
-    uid: user?.uid,
-    array: 1,
-  })[0];
-
-  return data;
-}
+import {
+  config, pgClients, getMeta, setToken, getToken,
+} from '@opengis/fastify-table/utils.js';
+
+export default async function datasetFormData({
+  pg = pgClients.client, params = {}, query = {}, user = {},
+}) {
+  if (!params?.id) {
+    return { message: 'not enough params: id', status: 400 };
+  }
+
+  if (!user?.uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const { user_type: userType = 'regular' } = user;
+
+  const tokenData = await getToken({
+    uid: user?.uid,
+    token: params.id,
+    mode: 'w',
+    json: 1,
+  });
+
+  if (!tokenData && !params?.object_id) {
+    return { message: 'not enough params: object_id', status: 400 };
+  }
+
+  const dataset = await pg.query(`select dataset_id as id, table_name as table, column_list as columns, filter_list as filters,
+      sql_list as sql, style, form_setting, pk, access_level from bi.dataset where dataset_id=$1`, [tokenData?.dataset || params.id]).then(el => el.rows[0] || {});
+
+  if (!dataset?.id) {
+    return { message: 'dataset not found', status: 404 };
+  }
+
+  const tlist = await pg.query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist 
+      from pg_class where relkind in ('r','v')`).then(el => el.rows[0]?.tlist || []);
+
+  if (!dataset.table || !tlist.includes(dataset.table.replace(/"/g, '')) || (!pg.pk?.[dataset.table.replace(/"/g, '')] && !dataset.pk)) {
+    return { message: `table not found: ${dataset.table}`, status: 404 };
+  }
+
+  const { pk = dataset.pk, columns: dbColumns = [] } = await getMeta(dataset.table) || {};
+  const cols = dataset.columns?.filter((el) => el.name !== 'geom')?.map((el) => el.name || el)?.join(',');
+
+  const where = [`"${pk}" = $1`, dataset.query].filter((el) => el);
+
+  const geom = dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : '';
+  const files = dbColumns.find((el) => el.name === 'files' && pg.pgType[el.dataTypeID] === 'text') ? ',files' : '';
+  const q = `select "${pk}" as id, ${cols || '*'} ${files} ${geom} from ${dataset.table} t where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1' && (config.debug || userType.includes('admin'))) { return q; }
+
+  const data = await pg.query(q, [tokenData?.id || params.object_id]).then(el => el.rows?.[0] || {});
+
+  data.token = setToken({
+    ids: [JSON.stringify({
+      id: data.id,
+      table: dataset.table,
+      form: `${dataset.id}.form`,
+      dataset: dataset.id,
+    })],
+    uid: user?.uid,
+    array: 1,
+  })[0];
+
+  return data;
+}

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

@@ -1,43 +1,43 @@
-import {
-  config, getToken, dataUpdate, pgClients,
-} from '@opengis/fastify-table/utils.js';
-
-import datasetForms from '../utils/datasetForms.js';
-
-export default async function datasetDataUpdate({
-  pg = pgClients.client, params = {}, body = {}, 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 || !datasetForms[dataset.id]) {
-    return { message: 'dataset not found', status: 404 };
-  }
-
-  const res = await dataUpdate({
-    pg,
-    id: tokenData?.id || params?.object_id,
-    table,
-    data: body,
-    uid: user?.uid,
-  });
-
-  return res;
-}
+import {
+  config, getToken, dataUpdate, pgClients,
+} from '@opengis/fastify-table/utils.js';
+
+import datasetForms from '../utils/datasetForms.js';
+
+export default async function datasetDataUpdate({
+  pg = pgClients.client, params = {}, body = {}, 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 || !datasetForms[dataset.id]) {
+    return { message: 'dataset not found', status: 404 };
+  }
+
+  const res = await dataUpdate({
+    pg,
+    id: tokenData?.id || params?.object_id,
+    table,
+    data: body,
+    uid: user?.uid,
+  });
+
+  return res;
+}

package/server/routes/dataset/index.mjs

@@ -1,132 +1,132 @@
-import dbTables from './controllers/dbTables.js';
-import dbTablePreview from './controllers/dbTablePreview.js';
-
-import createDatasetPost from './controllers/createDatasetPost.js';
-import editDataset from './controllers/editDataset.js';
-import deleteDataset from './controllers/deleteDataset.js';
-import datasetData from './controllers/data.js';
-import datasetFormData from './controllers/table.js';
-import datasetDataInsert from './controllers/insert.js';
-import datasetDataUpdate from './controllers/update.js';
-import datasetDataDelete from './controllers/delete.js';
-import datasetDataExport from './controllers/export.js';
-import datasetForm from './controllers/form.js';
-import format from './controllers/format.js';
-import datasetEditComment from './controllers/comment.js';
-import biDbList from './controllers/bi.db.list.js'; // list db
-import biDatasetList from './controllers/bi.dataset.list.js'; // list datasets
-
-const policy = ['public'];
-
-export default async function route(fastify, opts) {
-  fastify.route({
-    method: 'GET',
-    url: '/bi-db-list',
-    schema: {},
-    config: { policy },
-    handler: biDbList,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/bi-datasets',
-    schema: {},
-    config: { policy },
-    handler: biDatasetList,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/gis-format',
-    config: { policy },
-    handler: format,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/db-tables',
-    schema: {},
-    config: { policy },
-    handler: dbTables,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/db-tables/:name',
-    schema: {},
-    config: { policy },
-    handler: dbTablePreview,
-  });
-  fastify.route({
-    method: 'POST',
-    url: '/dataset',
-    schema: {},
-    config: { policy },
-    handler: createDatasetPost,
-  });
-  fastify.route({
-    method: 'PUT',
-    url: '/dataset',
-    schema: {},
-    config: { policy },
-    handler: editDataset,
-  });
-  fastify.route({
-    method: 'DELETE',
-    url: '/dataset',
-    schema: {},
-    config: { policy },
-    handler: deleteDataset,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/dataset-data/:id',
-    schema: {},
-    config: { policy },
-    handler: datasetData,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/dataset-data/:id/:object_id',
-    schema: {},
-    config: { policy },
-    handler: datasetFormData,
-  });
-  fastify.route({
-    method: 'POST',
-    url: '/dataset-data/:id',
-    schema: {},
-    config: { policy },
-    handler: datasetDataInsert,
-  });
-  fastify.route({
-    method: 'PUT',
-    url: '/dataset-data/:id/:object_id?',
-    schema: {},
-    config: { policy },
-    handler: datasetDataUpdate,
-  });
-  fastify.route({
-    method: 'DELETE',
-    url: '/dataset-data/:id/:object_id?',
-    schema: {},
-    config: { policy },
-    handler: datasetDataDelete,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/dataset-form/:id',
-    schema: {},
-    config: { policy },
-    handler: datasetForm,
-  });
-  fastify.route({
-    method: 'GET',
-    url: '/dataset-export/:id',
-    schema: {},
-    config: { policy },
-    handler: datasetDataExport,
-  });
-  fastify.route({
-    method: 'POST',
-    url: '/dataset-comment/:id',
-    config: { policy },
-    handler: datasetEditComment,
-  });
-}
+import dbTables from './controllers/dbTables.js';
+import dbTablePreview from './controllers/dbTablePreview.js';
+
+import createDatasetPost from './controllers/createDatasetPost.js';
+import editDataset from './controllers/editDataset.js';
+import deleteDataset from './controllers/deleteDataset.js';
+import datasetData from './controllers/data.js';
+import datasetFormData from './controllers/table.js';
+import datasetDataInsert from './controllers/insert.js';
+import datasetDataUpdate from './controllers/update.js';
+import datasetDataDelete from './controllers/delete.js';
+import datasetDataExport from './controllers/export.js';
+import datasetForm from './controllers/form.js';
+import format from './controllers/format.js';
+import datasetEditComment from './controllers/comment.js';
+import biDbList from './controllers/bi.db.list.js'; // list db
+import biDatasetList from './controllers/bi.dataset.list.js'; // list datasets
+
+const policy = ['public'];
+
+export default async function route(fastify, opts) {
+  fastify.route({
+    method: 'GET',
+    url: '/bi-db-list',
+    schema: {},
+    config: { policy },
+    handler: biDbList,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/bi-datasets',
+    schema: {},
+    config: { policy },
+    handler: biDatasetList,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/gis-format',
+    config: { policy },
+    handler: format,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/db-tables',
+    schema: {},
+    config: { policy },
+    handler: dbTables,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/db-tables/:name',
+    schema: {},
+    config: { policy },
+    handler: dbTablePreview,
+  });
+  fastify.route({
+    method: 'POST',
+    url: '/dataset',
+    schema: {},
+    config: { policy },
+    handler: createDatasetPost,
+  });
+  fastify.route({
+    method: 'PUT',
+    url: '/dataset',
+    schema: {},
+    config: { policy },
+    handler: editDataset,
+  });
+  fastify.route({
+    method: 'DELETE',
+    url: '/dataset',
+    schema: {},
+    config: { policy },
+    handler: deleteDataset,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/dataset-data/:id',
+    schema: {},
+    config: { policy },
+    handler: datasetData,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/dataset-data/:id/:object_id',
+    schema: {},
+    config: { policy },
+    handler: datasetFormData,
+  });
+  fastify.route({
+    method: 'POST',
+    url: '/dataset-data/:id',
+    schema: {},
+    config: { policy },
+    handler: datasetDataInsert,
+  });
+  fastify.route({
+    method: 'PUT',
+    url: '/dataset-data/:id/:object_id?',
+    schema: {},
+    config: { policy },
+    handler: datasetDataUpdate,
+  });
+  fastify.route({
+    method: 'DELETE',
+    url: '/dataset-data/:id/:object_id?',
+    schema: {},
+    config: { policy },
+    handler: datasetDataDelete,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/dataset-form/:id',
+    schema: {},
+    config: { policy },
+    handler: datasetForm,
+  });
+  fastify.route({
+    method: 'GET',
+    url: '/dataset-export/:id',
+    schema: {},
+    config: { policy },
+    handler: datasetDataExport,
+  });
+  fastify.route({
+    method: 'POST',
+    url: '/dataset-comment/:id',
+    config: { policy },
+    handler: datasetEditComment,
+  });
+}