@opengis/gis 0.2.40 → 0.2.41

package/server/routes/gis/registers/funcs/handleRegistryRequest.js

@@ -1,133 +1,133 @@
-import { populateFilterOptions } from './classifiers.js';
-import { extractVisibleColumns } from './columns.js';
-import { getMeta, getFilterSQL, metaFormat } from "@opengis/fastify-table/utils.js";
-
-const columnType = {
-    text: 'text',
-    date: 'date',
-    bool: 'yes/no',
-    numeric: 'number',
-    integer: 'number',
-    'timestamp without time zone': 'date',
-    'timestamp with time zone': 'date',
-};
-
-export async function handleRegistryRequest({ settings, query, object_id, is_downloadable, register_key, is_map, is_register, service_id, is_files, offset = 0, limit = 16, page = 1, pg, sql }) {
-    const { name, table_name, description, card, columns, filters, query: whereQuery, order, pk, register_id, view } = settings;
-    const parsedColumns = Array.isArray(columns) ? columns : JSON.parse(columns);
-    const filtersParsed = Array.isArray(filters) ? filters : JSON.parse(filters);
-    const activeFilters = (filtersParsed || []).filter((f) => f.disabled !== true).map(el => ({ ...el, id: el.name || el.id, type: el.type, api: '/api/suggest/' + table_name + ':' + el.name + (el.data ? `?sel=${el.data}` : '') }));
-    const { columns: fields1, geom } = await getMeta({ pg, table: table_name });
-
-    const fields = fields1?.map?.(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'] || 'text', label: title || name }));
-
-    const mode = object_id ? "card" : "table";
-    const visibleColumns = parsedColumns ? extractVisibleColumns(parsedColumns, mode) : [];
-    const selectColumns = visibleColumns.map((col) => col.name);
-    /*const columnsInfo = visibleColumns.map((col) => ({
-        name: col.name,
-        ua: col.ua,
-        format: col.format,
-        data: col.data,
-        view_type: col.view_type
-    }));*/
-
-    const classifiers = visibleColumns
-        .filter((col) => col.data && ["select", "badge", "tags"].includes(col.format))
-        .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
-
-    if (object_id) {
-        const sql = `
-            SELECT "${pk}" as id,* ${selectColumns.length ? `, ${selectColumns.join(", ")}` : ''} ${geom ? `, st_asgeojson(${geom})::json as geom` : ''}
-            FROM ${table_name}
-            WHERE ${pk} = $1
-        `;
-        const rows = await pg.query(sql, [object_id]).then(el => el.rows || []);
-        if (!rows.length) throw new Error('Object not found');
-
-        await metaFormat({ rows, table: table_name, cls: classifiers, sufix: true });
-
-        return {
-            row: rows[0],
-            card,
-            d: 1,
-            columns: visibleColumns,
-            is_downloadable,
-            register_key,
-            register_id,
-            service_id,
-            name,
-            is_files,
-            is_map,
-            is_register,
-        };
-    }
-
-    const { search, filter } = query || {};
-    const { q: sqlFilter } = (filter || search)
-        ? await getFilterSQL({
-            table: table_name,
-            search: search,
-            filter: filter,
-            filterList: activeFilters,
-        })
-        : { q: '1=1' };
-
-    const whereConditions = [whereQuery, sqlFilter].filter(Boolean).join(' AND ');
-
-    const sqlBase = `FROM ${table_name} WHERE ${whereConditions || 'true'}`;
-    const sqlOrder = order ? `ORDER BY ${order}` : "";
-    const sqlLimit = `LIMIT $1 OFFSET $2`;
-
-    const sqlSelect = `SELECT "${pk}" as id ${selectColumns.length ? `, ${selectColumns.join(", ")}` : ''} ${geom ? `, st_asgeojson(${geom})::json as geom` : ''} ${sqlBase}`;
-    const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;
-
-    if (sql) return dataQuery;
-
-    const rows = await pg.query(dataQuery, [limit, offset]).then(el => el.rows || []);
-    const total = await pg.query(`SELECT COUNT(*) ${sqlBase}`).then(el => +(el.rows[0]?.count || 0));
-
-    await metaFormat({ rows, table: table_name, cls: classifiers, sufix: true });
-
-    const listConfig = {};
-
-    if (parsedColumns?.length) {
-        for (const col of parsedColumns) {
-            if (col.view_type === 'title') listConfig.title = col.name;
-            if (col.view_type === 'subtitle') listConfig.subtitle = col.name;
-        }
-    }
-
-    await populateFilterOptions({
-        pg,
-        table: table_name,
-        filters: activeFilters,
-        columns,
-        whereConditions
-    });
-
-    return {
-        register_id,
-        name,
-        card,
-        table_name,
-        register_key,
-        description,
-        rows,
-        total,
-        service_id,
-        columns: visibleColumns,
-        filters: activeFilters,
-        fields,
-        limit,
-        page,
-        view,
-        is_downloadable,
-        is_map,
-        is_register,
-        is_files,
-        config: {
-            listConfig
-        }
-    };
-}
+import { populateFilterOptions } from './classifiers.js';
+import { extractVisibleColumns } from './columns.js';
+import { getMeta, getFilterSQL, metaFormat } from "@opengis/fastify-table/utils.js";
+
+const columnType = {
+    text: 'text',
+    date: 'date',
+    bool: 'yes/no',
+    numeric: 'number',
+    integer: 'number',
+    'timestamp without time zone': 'date',
+    'timestamp with time zone': 'date',
+};
+
+export async function handleRegistryRequest({ settings, query, object_id, is_downloadable, register_key, is_map, is_register, service_id, is_files, offset = 0, limit = 16, page = 1, pg, sql }) {
+    const { name, table_name, description, card, columns, filters, query: whereQuery, order, pk, register_id, view } = settings;
+    const parsedColumns = Array.isArray(columns) ? columns : JSON.parse(columns);
+    const filtersParsed = Array.isArray(filters) ? filters : JSON.parse(filters);
+    const activeFilters = (filtersParsed || []).filter((f) => f.disabled !== true).map(el => ({ ...el, id: el.name || el.id, type: el.type, api: '/api/suggest/' + table_name + ':' + el.name + (el.data ? `?sel=${el.data}` : '') }));
+    const { columns: fields1, geom } = await getMeta({ pg, table: table_name });
+
+    const fields = fields1?.map?.(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'] || 'text', label: title || name }));
+
+    const mode = object_id ? "card" : "table";
+    const visibleColumns = parsedColumns ? extractVisibleColumns(parsedColumns, mode) : [];
+    const selectColumns = visibleColumns.map((col) => col.name);
+    /*const columnsInfo = visibleColumns.map((col) => ({
+        name: col.name,
+        ua: col.ua,
+        format: col.format,
+        data: col.data,
+        view_type: col.view_type
+    }));*/
+
+    const classifiers = visibleColumns
+        .filter((col) => col.data && ["select", "badge", "tags"].includes(col.format))
+        .reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {});
+
+    if (object_id) {
+        const sql = `
+            SELECT "${pk}" as id,* ${selectColumns.length ? `, ${selectColumns.join(", ")}` : ''} ${geom ? `, st_asgeojson(${geom})::json as geom` : ''}
+            FROM ${table_name}
+            WHERE ${pk} = $1
+        `;
+        const rows = await pg.query(sql, [object_id]).then(el => el.rows || []);
+        if (!rows.length) throw new Error('Object not found');
+
+        await metaFormat({ rows, table: table_name, cls: classifiers, sufix: true });
+
+        return {
+            row: rows[0],
+            card,
+            d: 1,
+            columns: visibleColumns,
+            is_downloadable,
+            register_key,
+            register_id,
+            service_id,
+            name,
+            is_files,
+            is_map,
+            is_register,
+        };
+    }
+
+    const { search, filter } = query || {};
+    const { q: sqlFilter } = (filter || search)
+        ? await getFilterSQL({
+            table: table_name,
+            search: search,
+            filter: filter,
+            filterList: activeFilters,
+        })
+        : { q: '1=1' };
+
+    const whereConditions = [whereQuery, sqlFilter].filter(Boolean).join(' AND ');
+
+    const sqlBase = `FROM ${table_name} WHERE ${whereConditions || 'true'}`;
+    const sqlOrder = order ? `ORDER BY ${order}` : "";
+    const sqlLimit = `LIMIT $1 OFFSET $2`;
+
+    const sqlSelect = `SELECT "${pk}" as id ${selectColumns.length ? `, ${selectColumns.join(", ")}` : ''} ${geom ? `, st_asgeojson(${geom})::json as geom` : ''} ${sqlBase}`;
+    const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;
+
+    if (sql) return dataQuery;
+
+    const rows = await pg.query(dataQuery, [limit, offset]).then(el => el.rows || []);
+    const total = await pg.query(`SELECT COUNT(*) ${sqlBase}`).then(el => +(el.rows[0]?.count || 0));
+
+    await metaFormat({ rows, table: table_name, cls: classifiers, sufix: true });
+
+    const listConfig = {};
+
+    if (parsedColumns?.length) {
+        for (const col of parsedColumns) {
+            if (col.view_type === 'title') listConfig.title = col.name;
+            if (col.view_type === 'subtitle') listConfig.subtitle = col.name;
+        }
+    }
+
+    await populateFilterOptions({
+        pg,
+        table: table_name,
+        filters: activeFilters,
+        columns,
+        whereConditions
+    });
+
+    return {
+        register_id,
+        name,
+        card,
+        table_name,
+        register_key,
+        description,
+        rows,
+        total,
+        service_id,
+        columns: visibleColumns,
+        filters: activeFilters,
+        fields,
+        limit,
+        page,
+        view,
+        is_downloadable,
+        is_map,
+        is_register,
+        is_files,
+        config: {
+            listConfig
+        }
+    };
+}

package/server/routes/gis/registers/gis.export.js

@@ -1,149 +1,149 @@
-import { createReadStream } from 'node:fs';
-import { mkdir, writeFile } from 'node:fs/promises';
-import path from 'node:path';
-import { grpc, config, getMeta, getFolder, jsonToCsv } from '@opengis/fastify-table/utils.js';
-
-import getInfo from './funcs/get.info.js';
-import ContentType from './funcs/content.type.js';
-
-const { jsonToXls, geojsonToShp } = grpc();
-const rootDir = getFolder(config, 'local');
-
-/**
- * Експорт даних реєстру
- * @param {Object} query - Об'єкт запиту з форматом.
- * @param {Object} params - Об'єкт параметрів з slug та type.
- * @param {Function} reply 
- * @returns {boolean} File
- */
-
-export default async function gisExport({ pg, query = {}, params = {} }, reply) {
-    const { format } = query;
-    const { slug, type } = params;
-    if (!['csv', 'xlsx', 'shp', 'geojson'].includes(format)) {
-        return reply.code(401).send({ message: 'Param format is invalid. Allowed: csv, xlsx, shp, geojson', status: 404 });
-    }
-    if (!slug) return reply.code(401).send({ message: 'slug is not defined', status: 404 });
-    if (!type) return reply.code(401).send({ message: 'type is not defined', status: 404 });
-
-    let registerInfo;
-    let serviceInfo;
-
-    if (type === 'register') {
-        registerInfo = await pg.query(
-            `SELECT table_name, columns, query
-            FROM gis.registers
-            WHERE register_key = $1`,
-            [slug]
-        );
-    }
-    if (type === 'service') {
-        serviceInfo = await pg.query(
-            `SELECT source_path as table_name, attributes as columns, query
-            FROM gis.services
-            WHERE service_key = $1`,
-            [slug]
-        );
-    }
-    const finalInfo = registerInfo?.rows[0] || serviceInfo?.rows[0];
-
-    const exportable = finalInfo?.columns?.filter(c => c.is_export);
-    const colmodel = exportable.map(col => ({
-        name: col.name,
-        title: col.ua || col.name
-    }));
-    const { rows, table, srid, sqlList } = await getInfo({ finalInfo, format }, reply);
-    let filePath = ['csv', 'geojson', 'xlsx'].includes(format) ? path.join(rootDir, `/files/tmp/export_${table}_${Date.now()}.${format}`) : path.join(rootDir, `/files/tmp/export_${table}_${Date.now()}.zip`);
-    const ext = path.extname(filePath);
-    const filePathJSON = ['csv', 'geojson', 'shp'].includes(format) ? filePath.replace(ext, '.json') : filePath;
-    let exportedZipPaths = [];
-
-    const meta = await getMeta({ pg, table: table });
-    if ((format === 'geojson' || format === 'shp') && !meta?.geom) {
-        return reply.status(400).send('Ця таблиця не містить полів геометрії. Виберіть тип, який не потребує геометрії для вивантаження');
-    }
-
-    if (format === 'xlsx') {
-        if (!jsonToXls) {
-            const message = 'Сервіс конвертації jsonToXls тимчасово недоступний. Спробуйте експортувати дані у іншому форматі...';
-            const error = new Error(message);
-            error.status = 503;
-
-            throw error;
-        }
-        const { result } = await jsonToXls({
-            json: JSON.stringify(rows),
-            colmodel: JSON.stringify(colmodel),
-        });
-
-        await mkdir(path.dirname(filePath), { recursive: true });
-        await writeFile(filePath, result, 'base64');
-    }
-
-    if (format === 'csv') {
-        await mkdir(path.dirname(filePathJSON), { recursive: true });
-        await writeFile(filePathJSON, JSON.stringify(rows));
-
-        await jsonToCsv({
-            filePath: filePathJSON, colmodel, columnList: colmodel.map(c => c.name),
-        });
-    }
-
-    if (['shp', 'geojson'].includes(format)) {
-        if (format === 'geojson') {
-            const geojson = {
-                type: 'FeatureCollection',
-                features: rows.map((row) => ({
-                    type: 'Feature',
-                    geometry: row.geom,
-                    properties: Object.fromEntries(Object.entries(row).filter(([key]) => key !== 'geom')),
-                })),
-            };
-            filePath = filePathJSON.replace('.json', '.geojson');
-            await mkdir(path.dirname(filePath), { recursive: true });
-            await writeFile(filePath, JSON.stringify(geojson));
-        }
-
-        if (format === 'shp') {
-            const proj = `EPSG:${srid || 4326}`;
-            for (const { type, query } of sqlList) {
-                const { rows } = await pg.query(query);
-                if (!rows.length) continue;
-
-                const geojson = {
-                    type: 'FeatureCollection',
-                    features: rows.map(row => ({
-                        type: 'Feature',
-                        geometry: row.geom,
-                        properties: Object.fromEntries(Object.entries(row).filter(([k]) => k !== 'geom')),
-                    })),
-                };
-                const geomShort = type.toLowerCase().replace('st_', '');
-                const typedPath = filePath.replace('.zip', `_${geomShort}.zip`);
-
-                const filePathTyped = filePath.replace('.zip', `_${type.toLowerCase().replace('st_', '')}.zip`);
-                const { result: shpZipBuffer } = await geojsonToShp({
-                    geojson: JSON.stringify(geojson),
-                    proj,
-                });
-
-                await mkdir(path.dirname(filePathTyped), { recursive: true });
-                await writeFile(filePathTyped, Buffer.from(shpZipBuffer, 'base64'));
-
-                exportedZipPaths.push(typedPath);
-            }
-        }
-    }
-
-    let exportFilePath = filePath;
-
-    if (format === 'shp' && exportedZipPaths?.length > 0) {
-        exportFilePath = exportedZipPaths[0];
-    }
-
-    reply.header('Content-Disposition', `attachment; filename=${encodeURIComponent(path.basename(exportFilePath))}`);
-    reply.header('Content-Type', ContentType[format]);
-
-    const fileStream = createReadStream(exportFilePath);
-    return reply.send(fileStream);
+import { createReadStream } from 'node:fs';
+import { mkdir, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { grpc, config, getMeta, getFolder, jsonToCsv } from '@opengis/fastify-table/utils.js';
+
+import getInfo from './funcs/get.info.js';
+import ContentType from './funcs/content.type.js';
+
+const { jsonToXls, geojsonToShp } = grpc();
+const rootDir = getFolder(config, 'local');
+
+/**
+ * Експорт даних реєстру
+ * @param {Object} query - Об'єкт запиту з форматом.
+ * @param {Object} params - Об'єкт параметрів з slug та type.
+ * @param {Function} reply 
+ * @returns {boolean} File
+ */
+
+export default async function gisExport({ pg, query = {}, params = {} }, reply) {
+    const { format } = query;
+    const { slug, type } = params;
+    if (!['csv', 'xlsx', 'shp', 'geojson'].includes(format)) {
+        return reply.code(401).send({ message: 'Param format is invalid. Allowed: csv, xlsx, shp, geojson', status: 404 });
+    }
+    if (!slug) return reply.code(401).send({ message: 'slug is not defined', status: 404 });
+    if (!type) return reply.code(401).send({ message: 'type is not defined', status: 404 });
+
+    let registerInfo;
+    let serviceInfo;
+
+    if (type === 'register') {
+        registerInfo = await pg.query(
+            `SELECT table_name, columns, query
+            FROM gis.registers
+            WHERE register_key = $1`,
+            [slug]
+        );
+    }
+    if (type === 'service') {
+        serviceInfo = await pg.query(
+            `SELECT source_path as table_name, attributes as columns, query
+            FROM gis.services
+            WHERE service_key = $1`,
+            [slug]
+        );
+    }
+    const finalInfo = registerInfo?.rows[0] || serviceInfo?.rows[0];
+
+    const exportable = finalInfo?.columns?.filter(c => c.is_export);
+    const colmodel = exportable.map(col => ({
+        name: col.name,
+        title: col.ua || col.name
+    }));
+    const { rows, table, srid, sqlList } = await getInfo({ finalInfo, format }, reply);
+    let filePath = ['csv', 'geojson', 'xlsx'].includes(format) ? path.join(rootDir, `/files/tmp/export_${table}_${Date.now()}.${format}`) : path.join(rootDir, `/files/tmp/export_${table}_${Date.now()}.zip`);
+    const ext = path.extname(filePath);
+    const filePathJSON = ['csv', 'geojson', 'shp'].includes(format) ? filePath.replace(ext, '.json') : filePath;
+    let exportedZipPaths = [];
+
+    const meta = await getMeta({ pg, table: table });
+    if ((format === 'geojson' || format === 'shp') && !meta?.geom) {
+        return reply.status(400).send('Ця таблиця не містить полів геометрії. Виберіть тип, який не потребує геометрії для вивантаження');
+    }
+
+    if (format === 'xlsx') {
+        if (!jsonToXls) {
+            const message = 'Сервіс конвертації jsonToXls тимчасово недоступний. Спробуйте експортувати дані у іншому форматі...';
+            const error = new Error(message);
+            error.status = 503;
+
+            throw error;
+        }
+        const { result } = await jsonToXls({
+            json: JSON.stringify(rows),
+            colmodel: JSON.stringify(colmodel),
+        });
+
+        await mkdir(path.dirname(filePath), { recursive: true });
+        await writeFile(filePath, result, 'base64');
+    }
+
+    if (format === 'csv') {
+        await mkdir(path.dirname(filePathJSON), { recursive: true });
+        await writeFile(filePathJSON, JSON.stringify(rows));
+
+        await jsonToCsv({
+            filePath: filePathJSON, colmodel, columnList: colmodel.map(c => c.name),
+        });
+    }
+
+    if (['shp', 'geojson'].includes(format)) {
+        if (format === 'geojson') {
+            const geojson = {
+                type: 'FeatureCollection',
+                features: rows.map((row) => ({
+                    type: 'Feature',
+                    geometry: row.geom,
+                    properties: Object.fromEntries(Object.entries(row).filter(([key]) => key !== 'geom')),
+                })),
+            };
+            filePath = filePathJSON.replace('.json', '.geojson');
+            await mkdir(path.dirname(filePath), { recursive: true });
+            await writeFile(filePath, JSON.stringify(geojson));
+        }
+
+        if (format === 'shp') {
+            const proj = `EPSG:${srid || 4326}`;
+            for (const { type, query } of sqlList) {
+                const { rows } = await pg.query(query);
+                if (!rows.length) continue;
+
+                const geojson = {
+                    type: 'FeatureCollection',
+                    features: rows.map(row => ({
+                        type: 'Feature',
+                        geometry: row.geom,
+                        properties: Object.fromEntries(Object.entries(row).filter(([k]) => k !== 'geom')),
+                    })),
+                };
+                const geomShort = type.toLowerCase().replace('st_', '');
+                const typedPath = filePath.replace('.zip', `_${geomShort}.zip`);
+
+                const filePathTyped = filePath.replace('.zip', `_${type.toLowerCase().replace('st_', '')}.zip`);
+                const { result: shpZipBuffer } = await geojsonToShp({
+                    geojson: JSON.stringify(geojson),
+                    proj,
+                });
+
+                await mkdir(path.dirname(filePathTyped), { recursive: true });
+                await writeFile(filePathTyped, Buffer.from(shpZipBuffer, 'base64'));
+
+                exportedZipPaths.push(typedPath);
+            }
+        }
+    }
+
+    let exportFilePath = filePath;
+
+    if (format === 'shp' && exportedZipPaths?.length > 0) {
+        exportFilePath = exportedZipPaths[0];
+    }
+
+    reply.header('Content-Disposition', `attachment; filename=${encodeURIComponent(path.basename(exportFilePath))}`);
+    reply.header('Content-Type', ContentType[format]);
+
+    const fileStream = createReadStream(exportFilePath);
+    return reply.send(fileStream);
 }