@opengis/bi 1.2.30 → 1.2.32

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

@@ -1,134 +1,134 @@
-import path from 'node:path';
-import { existsSync } from 'node:fs';
-
-import { config, pgClients, getFolder, file2json } from '@opengis/fastify-table/utils.js';
-
-import createTableQuery from '../utils/createTableQuery.js';
-import executeQuery from '../utils/executeQuery.js';
-import downloadRemoteFile from '../utils/downloadRemoteFile.js';
-
-const insertDataset = `insert into bi.dataset 
-(name, table_name, dataset_file_path, column_list, pk, data_source, uid)
-values($1,$2,$3,$4,$5,$6,$7) returning dataset_id`;
-
-export default async function createDatasetPost({
-  pg = pgClients.client, body = {}, user = {},
-}) {
-  if (!user?.uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  if (!body?.name) {
-    return { message: 'not enough query params: name', status: 400 };
-  }
-
-  if (!body?.table_name && !body?.file && !body?.column_list?.length && !body?.dataset_url) {
-    return { message: 'not enough query params: table / file / column_list/ url', status: 400 };
-  }
-
-  const {
-    name,
-    table_name: existingTable,
-    column_list: columns = [],
-    dataset_url: datasetUrl,
-    encoding,
-  } = body;
-
-  const rootDir = getFolder(config, 'local');
-
-  if (datasetUrl) {
-    const { filePath, error } = await downloadRemoteFile({
-      rootDir, url: datasetUrl, table: name || datasetUrl,
-    });
-    if (error || !filePath) {
-      return { message: error || 'file request URL error', status: 500 };
-    }
-    Object.assign(body, { file: filePath });
-  }
-
-  const { file: relPath } = body;
-
-  if (relPath) {
-    const filepath = path.join(rootDir, relPath);
-    const exists = existsSync(filepath);
-
-    if (!exists) {
-      return { message: 'Файл з вихідними даними не знайдено', status: 404 };
-    }
-
-    const json = await file2json({ filepath, encoding });
-
-    // excel sheets fix?
-    const data1 = (['.xls', '.xlsx'].includes(path.extname(filepath)) && !Array.isArray(json)) ? json[Object.keys(json)[0]] : json;
-    const data = path.extname(filepath) === '.json' && body?.key ? data1?.[body.key] : data1;
-
-    const features = ['.csv', '.xlsx', '.xls'].includes(path.extname(filepath))
-      ? data?.map?.((el) => ({ type: 'Feature', properties: Object.keys(el).reduce((acc, curr) => Object.assign(acc, { [curr]: el[curr] }), {}) }))
-      : data?.features || data?.map?.((el) => ({ type: 'Feature', geometry: el.geom, properties: Object.keys(el).filter((key) => key !== 'geom').reduce((acc, curr) => Object.assign(acc, { [curr]: el[curr] }), {}) }));
-
-    if (!Array.isArray(features) || !features?.length) {
-      return { message: 'Файл з вихідними даними порожній', status: 400 };
-    }
-
-    Object.assign(data, { features });
-
-    const fileColumns = Object.keys(data?.features[0]?.properties)
-      ?.filter((el) => !['editor_date', 'cdate', 'uid', 'editor_id', 'files'].includes(el.toLowerCase()))
-      ?.map((el) => ({ title: el, format: 'text' }));
-
-    const { sql, pkey, table } = createTableQuery(fileColumns, name);
-
-    const { datasetId, error } = await executeQuery({
-      pg,
-      sql,
-      data,
-      name,
-      table,
-      relPath,
-      columns: fileColumns,
-      pkey,
-      source: datasetUrl ? 'url' : 'file',
-      url: datasetUrl,
-      user,
-      dataKey: body?.key,
-    });
-
-    if (error) return { error, status: 500 };
-
-    pg.pk[table] = pkey;
-    pg.tlist.push(table);
-    return { message: { id: datasetId, table, source: datasetUrl ? 'url' : 'file' }, status: 200 };
-  }
-
-  if (existingTable) {
-    await pg.query(`alter table ${existingTable} add column if not exists geom public.geometry;
-    alter table ${existingTable} add column if not exists files json`);
-    const args = [name, existingTable, null, null, pg.pk?.[existingTable], JSON.stringify({ type: 'table' }), user?.uid];
-    const datasetId = await pg.query(insertDataset, args).then(el => el.rows?.[0]?.dataset_id);
-    return { message: { id: datasetId, table: existingTable, source: 'table' }, status: 200 };
-  }
-
-  if (!columns?.length) {
-    return { message: 'У даній заяві відсутні налаштування структури набору даних', status: 400 };
-  }
-
-  const { sql, pkey, table } = createTableQuery(columns, name);
-
-  const { datasetId, error } = await executeQuery({
-    pg,
-    sql,
-    name,
-    table,
-    relPath,
-    columns,
-    pkey,
-    source: 'newtable',
-    user,
-  });
-
-  if (error) return { error, status: 500 };
-
-  pg.pk[table] = pkey;
-  pg.tlist.push(table);
-  return { message: { id: datasetId, table, source: 'newtable' }, status: 200 };
-}
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+
+import { config, pgClients, getFolder, file2json } from '@opengis/fastify-table/utils.js';
+
+import createTableQuery from '../utils/createTableQuery.js';
+import executeQuery from '../utils/executeQuery.js';
+import downloadRemoteFile from '../utils/downloadRemoteFile.js';
+
+const insertDataset = `insert into bi.dataset 
+(name, table_name, dataset_file_path, column_list, pk, data_source, uid)
+values($1,$2,$3,$4,$5,$6,$7) returning dataset_id`;
+
+export default async function createDatasetPost({
+  pg = pgClients.client, body = {}, user = {},
+}) {
+  if (!user?.uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  if (!body?.name) {
+    return { message: 'not enough query params: name', status: 400 };
+  }
+
+  if (!body?.table_name && !body?.file && !body?.column_list?.length && !body?.dataset_url) {
+    return { message: 'not enough query params: table / file / column_list/ url', status: 400 };
+  }
+
+  const {
+    name,
+    table_name: existingTable,
+    column_list: columns = [],
+    dataset_url: datasetUrl,
+    encoding,
+  } = body;
+
+  const rootDir = getFolder(config, 'local');
+
+  if (datasetUrl) {
+    const { filePath, error } = await downloadRemoteFile({
+      rootDir, url: datasetUrl, table: name || datasetUrl,
+    });
+    if (error || !filePath) {
+      return { message: error || 'file request URL error', status: 500 };
+    }
+    Object.assign(body, { file: filePath });
+  }
+
+  const { file: relPath } = body;
+
+  if (relPath) {
+    const filepath = path.join(rootDir, relPath);
+    const exists = existsSync(filepath);
+
+    if (!exists) {
+      return { message: 'Файл з вихідними даними не знайдено', status: 404 };
+    }
+
+    const json = await file2json({ filepath, encoding });
+
+    // excel sheets fix?
+    const data1 = (['.xls', '.xlsx'].includes(path.extname(filepath)) && !Array.isArray(json)) ? json[Object.keys(json)[0]] : json;
+    const data = path.extname(filepath) === '.json' && body?.key ? data1?.[body.key] : data1;
+
+    const features = ['.csv', '.xlsx', '.xls'].includes(path.extname(filepath))
+      ? data?.map?.((el) => ({ type: 'Feature', properties: Object.keys(el).reduce((acc, curr) => Object.assign(acc, { [curr]: el[curr] }), {}) }))
+      : data?.features || data?.map?.((el) => ({ type: 'Feature', geometry: el.geom, properties: Object.keys(el).filter((key) => key !== 'geom').reduce((acc, curr) => Object.assign(acc, { [curr]: el[curr] }), {}) }));
+
+    if (!Array.isArray(features) || !features?.length) {
+      return { message: 'Файл з вихідними даними порожній', status: 400 };
+    }
+
+    Object.assign(data, { features });
+
+    const fileColumns = Object.keys(data?.features[0]?.properties)
+      ?.filter((el) => !['editor_date', 'cdate', 'uid', 'editor_id', 'files'].includes(el.toLowerCase()))
+      ?.map((el) => ({ title: el, format: 'text' }));
+
+    const { sql, pkey, table } = createTableQuery(fileColumns, name);
+
+    const { datasetId, error } = await executeQuery({
+      pg,
+      sql,
+      data,
+      name,
+      table,
+      relPath,
+      columns: fileColumns,
+      pkey,
+      source: datasetUrl ? 'url' : 'file',
+      url: datasetUrl,
+      user,
+      dataKey: body?.key,
+    });
+
+    if (error) return { error, status: 500 };
+
+    pg.pk[table] = pkey;
+    pg.tlist.push(table);
+    return { message: { id: datasetId, table, source: datasetUrl ? 'url' : 'file' }, status: 200 };
+  }
+
+  if (existingTable) {
+    await pg.query(`alter table ${existingTable} add column if not exists geom public.geometry;
+    alter table ${existingTable} add column if not exists files json`);
+    const args = [name, existingTable, null, null, pg.pk?.[existingTable], JSON.stringify({ type: 'table' }), user?.uid];
+    const datasetId = await pg.query(insertDataset, args).then(el => el.rows?.[0]?.dataset_id);
+    return { message: { id: datasetId, table: existingTable, source: 'table' }, status: 200 };
+  }
+
+  if (!columns?.length) {
+    return { message: 'У даній заяві відсутні налаштування структури набору даних', status: 400 };
+  }
+
+  const { sql, pkey, table } = createTableQuery(columns, name);
+
+  const { datasetId, error } = await executeQuery({
+    pg,
+    sql,
+    name,
+    table,
+    relPath,
+    columns,
+    pkey,
+    source: 'newtable',
+    user,
+  });
+
+  if (error) return { error, status: 500 };
+
+  pg.pk[table] = pkey;
+  pg.tlist.push(table);
+  return { message: { id: datasetId, table, source: 'newtable' }, status: 200 };
+}

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

@@ -1,149 +1,149 @@
-import {
-  config, pgClients, getMeta, getFilterSQL, setToken, getToken,
-} from '@opengis/fastify-table/utils.js';
-
-import metaFormat from '../utils/metaFormat.js';
-import datasetFormData from './table.js';
-import datasetFormBody from './form.js';
-
-const maxLimit = 100;
-
-export default async function datasetData(req, reply) {
-  const {
-    pg = pgClients.client, params = {}, query = {}, user = {},
-  } = req;
-  const time = Date.now();
-  const { uid, user_type: userType = 'regular' } = user;
-
-  if (!uid) {
-    // return { message: 'access restricted', status: 403 };
-  }
-
-  if (!params?.id) {
-    return { message: 'not enough params: id', status: 404 };
-  }
-
-  const tokenData = await getToken({
-    uid: user?.uid,
-    token: params.id,
-    mode: 'w',
-    json: 1,
-  });
-
-  if (tokenData?.dataset && tokenData?.id) {
-    return datasetFormData(req, reply);
-  }
-
-  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, dashboard_list from bi.dataset where dataset_id=$1`, [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 limit = Math.min(maxLimit, +(query.limit || 20));
-  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
-
-  const checkFilter = [query.filter, query.search].filter((el) => el).length;
-
-  const fData = checkFilter ? await getFilterSQL({
-    table: dataset.table,
-    filter: query.filter,
-    search: query.search,
-    json: 1,
-  }) : {};
-
-  const where = [dataset.query, fData.q].filter((el) => el);
-
-  const sqlTable = dataset.sql
-    ?.filter?.((el) => !el?.disabled && el?.sql?.replace)
-    ?.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid || '')}) ${el.name || `t${i}`} on 1=1 `)
-    ?.join('') || '';
-
-  const columnList = dbColumns.map((el) => el.name || el).join(',');
-  const order = columnList.includes('cdate') ? (`order by cdate ${query.desc ? 'desc' : ''}`) : '';
-
-  const q = `select 
-  ${cols || '*'} 
-    ${pk ? `,"${pk}" as id` : ''}
-    ${dbColumns.find((el) => el.name === 'files' && pg.pgType[el.dataTypeID] === 'text') ? ',files' : ''} 
-    ${dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
-    from (select * from ${dataset.table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}  ${order}) t 
-    ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`.replace(/{{uid}}/g, uid || '');
-
-  if (query.sql === '1' && (config.debug || userType.includes('admin'))) { return q; }
-
-  // console.log(pg.options.database, q);
-  const { rows = [] } = await pg.query(q);
-
-  const qCount = `select 
-    count(*)::int as total,  
-    count(*) FILTER(WHERE ${[fData.q].filter(el => el).join(' and ') || 'true'})::int as filtered 
-    from ${dataset.table} t ${sqlTable} 
-    where ${[dataset.query].filter(el => el).join(' and ') || 'true'} `.replace(/{{uid}}/g, uid || '');
-
-  const { total, filtered } = await pg.queryCache(qCount).then(el => el?.rows?.[0] || {});
-
-  await metaFormat({ rows, columns: dataset.columns });
-
-  if (rows?.length && uid) {
-    rows.filter((row) => row[pk] || row.id).forEach((row) => Object.assign(row, {
-      token: setToken({
-        ids: [JSON.stringify({
-          id: row[pk] || row.id,
-          table: dataset.table,
-          form: `${params.id}.form`,
-          dataset: params.id,
-        })],
-        uid,
-        array: 1,
-      })[0],
-    }));
-  }
-  const res = {
-    time: Date.now() - time,
-    access: dataset.access_level,
-    card: dataset.card,
-    actions: ['add', 'edit', 'del', 'get'],
-    total,
-    filtered,
-    count: rows.length,
-    pk,
-    table: dataset.table,
-    form: `${params.id}.form`,
-    dashboardList: dataset.dashboard_list,
-    rows,
-    columns: dataset.columns || dbColumns.map(col => ({ name: col.name, type: pg.pgType[col.dataTypeID], title: col.name })),
-    filters: dataset.filters,
-  };
-
-  if (uid) {
-    const addTokens = setToken({
-      ids: [JSON.stringify({
-        table: dataset.table,
-        form: `${params.id}.form`,
-        dataset: dataset.id,
-      })],
-      uid,
-      array: 1,
-    });
-
-    Object.assign(res, {
-      addToken: addTokens[0],
-    });
-    Object.assign(req, { params: { id: addTokens[0] } });
-    await datasetFormBody(req); // for inline edit
-  }
-
-  return res;
-}
+import {
+  config, pgClients, getMeta, getFilterSQL, setToken, getToken,
+} from '@opengis/fastify-table/utils.js';
+
+import metaFormat from '../utils/metaFormat.js';
+import datasetFormData from './table.js';
+import datasetFormBody from './form.js';
+
+const maxLimit = 100;
+
+export default async function datasetData(req, reply) {
+  const {
+    pg = pgClients.client, params = {}, query = {}, user = {},
+  } = req;
+  const time = Date.now();
+  const { uid, user_type: userType = 'regular' } = user;
+
+  if (!uid) {
+    // return { message: 'access restricted', status: 403 };
+  }
+
+  if (!params?.id) {
+    return { message: 'not enough params: id', status: 404 };
+  }
+
+  const tokenData = await getToken({
+    uid: user?.uid,
+    token: params.id,
+    mode: 'w',
+    json: 1,
+  });
+
+  if (tokenData?.dataset && tokenData?.id) {
+    return datasetFormData(req, reply);
+  }
+
+  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, dashboard_list from bi.dataset where dataset_id=$1`, [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 limit = Math.min(maxLimit, +(query.limit || 20));
+  const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
+
+  const checkFilter = [query.filter, query.search].filter((el) => el).length;
+
+  const fData = checkFilter ? await getFilterSQL({
+    table: dataset.table,
+    filter: query.filter,
+    search: query.search,
+    json: 1,
+  }) : {};
+
+  const where = [dataset.query, fData.q].filter((el) => el);
+
+  const sqlTable = dataset.sql
+    ?.filter?.((el) => !el?.disabled && el?.sql?.replace)
+    ?.map((el, i) => ` left join lateral (${el.sql.replace('{{uid}}', uid || '')}) ${el.name || `t${i}`} on 1=1 `)
+    ?.join('') || '';
+
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+  const order = columnList.includes('cdate') ? (`order by cdate ${query.desc ? 'desc' : ''}`) : '';
+
+  const q = `select 
+  ${cols || '*'} 
+    ${pk ? `,"${pk}" as id` : ''}
+    ${dbColumns.find((el) => el.name === 'files' && pg.pgType[el.dataTypeID] === 'text') ? ',files' : ''} 
+    ${dbColumns.find((el) => el.name === 'geom' && pg.pgType[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
+    from (select * from ${dataset.table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}  ${order}) t 
+    ${sqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`.replace(/{{uid}}/g, uid || '');
+
+  if (query.sql === '1' && (config.debug || userType.includes('admin'))) { return q; }
+
+  // console.log(pg.options.database, q);
+  const { rows = [] } = await pg.query(q);
+
+  const qCount = `select 
+    count(*)::int as total,  
+    count(*) FILTER(WHERE ${[fData.q].filter(el => el).join(' and ') || 'true'})::int as filtered 
+    from ${dataset.table} t ${sqlTable} 
+    where ${[dataset.query].filter(el => el).join(' and ') || 'true'} `.replace(/{{uid}}/g, uid || '');
+
+  const { total, filtered } = await pg.queryCache(qCount).then(el => el?.rows?.[0] || {});
+
+  await metaFormat({ rows, columns: dataset.columns });
+
+  if (rows?.length && uid) {
+    rows.filter((row) => row[pk] || row.id).forEach((row) => Object.assign(row, {
+      token: setToken({
+        ids: [JSON.stringify({
+          id: row[pk] || row.id,
+          table: dataset.table,
+          form: `${params.id}.form`,
+          dataset: params.id,
+        })],
+        uid,
+        array: 1,
+      })[0],
+    }));
+  }
+  const res = {
+    time: Date.now() - time,
+    access: dataset.access_level,
+    card: dataset.card,
+    actions: ['add', 'edit', 'del', 'get'],
+    total,
+    filtered,
+    count: rows.length,
+    pk,
+    table: dataset.table,
+    form: `${params.id}.form`,
+    dashboardList: dataset.dashboard_list,
+    rows,
+    columns: dataset.columns || dbColumns.map(col => ({ name: col.name, type: pg.pgType[col.dataTypeID], title: col.name })),
+    filters: dataset.filters,
+  };
+
+  if (uid) {
+    const addTokens = setToken({
+      ids: [JSON.stringify({
+        table: dataset.table,
+        form: `${params.id}.form`,
+        dataset: dataset.id,
+      })],
+      uid,
+      array: 1,
+    });
+
+    Object.assign(res, {
+      addToken: addTokens[0],
+    });
+    Object.assign(req, { params: { id: addTokens[0] } });
+    await datasetFormBody(req); // for inline edit
+  }
+
+  return res;
+}