@opengis/gis 0.2.176 → 0.2.177

package/server/routes/registers/functions/handleRegistryRequest.js

@@ -1,147 +1,167 @@
-import { getMeta, getFilterSQL, metaFormat, getFilterSQLParametrized } from "@opengis/fastify-table/utils.js";
-import { populateFilterOptions } from './classifiers.js';
-import { extractVisibleColumns } from './columns.js';
-
-const columnType = {
-  text: 'text',
-  date: 'date',
-  bool: 'yes/no',
-  numeric: 'number',
-  integer: 'number',
-  'timestamp without time zone': 'date',
-  'timestamp with time zone': 'date',
-};
-
-// eslint-disable-next-line import/prefer-default-export
-export async function handleRegistryRequest({
-  settings, query, object_id, offset = 0, limit = 16, page = 1, pg, sql,
-}) {
-  const {
-    name, table_name, description, card, columns, filters, query: whereQuery, pk,
-    register_id, view, order, is_downloadable, register_key, is_map, is_register, service_id, is_files,
-  } = settings;
-  const parsedColumns = Array.isArray(columns) ? columns : JSON.parse(columns);
-  const parsedCardColumns = Array.isArray(card) ? card : JSON.parse(card);
-  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 = (mode === 'card' && parsedCardColumns?.length) ? parsedCardColumns : 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, args = [] } = (filter || search)
-    ? await getFilterSQLParametrized({
-      table: table_name,
-      search,
-      filter,
-      filterList: activeFilters,
-    })
-    : { q: '1=1', args: [] };
-
-  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 $${args.length + 1}::bigint OFFSET $${args.length + 2}::bigint`;
-
-  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, args.concat([limit, offset])).then(el => el.rows || []);
-  const total = await pg.query(`SELECT COUNT(*) ${sqlBase}`, args).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,
-    args
-  });
-
-  return {
-    total,
-    limit,
-    page,
-    register_id,
-    name,
-    card,
-    table_name,
-    register_key,
-    description,
-    rows,
-    service_id,
-    columns: visibleColumns,
-    filters: activeFilters,
-    fields,
-    view,
-    is_downloadable,
-    is_map,
-    is_register,
-    is_files,
-    config: {
-      listConfig,
-    },
-  };
-}
+import { createHash } from 'node:crypto';
+
+import { getMeta, getRedis, metaFormat, getFilterSQLParametrized } from "@opengis/fastify-table/utils.js";
+import { populateFilterOptions } from './classifiers.js';
+import { extractVisibleColumns } from './columns.js';
+
+const columnType = {
+  text: 'text',
+  date: 'date',
+  bool: 'yes/no',
+  numeric: 'number',
+  integer: 'number',
+  'timestamp without time zone': 'date',
+  'timestamp with time zone': 'date',
+};
+
+const rclient = getRedis();
+
+// eslint-disable-next-line import/prefer-default-export
+export async function handleRegistryRequest({
+  settings, query, object_id, offset = 0, limit = 16, page = 1, pg, sql,
+}) {
+  const {
+    name, table_name, description, card, columns, filters, query: whereQuery, pk,
+    register_id, view, order, is_downloadable, register_key, is_map, is_register, service_id, is_files,
+  } = settings;
+  const parsedColumns = Array.isArray(columns) ? columns : JSON.parse(columns);
+  const parsedCardColumns = Array.isArray(card) ? card : JSON.parse(card);
+  const filtersParsed = Array.isArray(filters) ? filters : JSON.parse(filters);
+  const activeFilters = await Promise.all((filtersParsed || []).filter((f) => f.disabled !== true).map(async (el) => {
+    const hash = createHash('md5').update([register_id, el.name, el.data].filter(Boolean).join('-')).digest('hex');
+    const redisKey = `${pg?.options?.database}:registry-filter:${hash}`;
+
+    const r = {
+      ...el, id: el.name || el.id, type: el.type, api: `/api/gis-suggest/${hash}`
+    };
+
+    const unique = await rclient.setnx(redisKey, 1);
+    const ttl = await rclient.ttl(redisKey);
+
+    // skip subsequent calls
+    if (!unique && ttl !== -1) {
+      return r;
+    }
+
+    await rclient.set(redisKey, JSON.stringify({ register: register_id, filter: el.name }), 'EX', 15 * 60);
+    return r;
+  }));
+  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 = (mode === 'card' && parsedCardColumns?.length) ? parsedCardColumns : 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, args = [] } = (filter || search)
+    ? await getFilterSQLParametrized({
+      table: table_name,
+      search,
+      filter,
+      filterList: activeFilters,
+    })
+    : { q: '1=1', args: [] };
+
+  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 $${args.length + 1}::bigint OFFSET $${args.length + 2}::bigint`;
+
+  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, args.concat([limit, offset])).then(el => el.rows || []);
+  const total = await pg.query(`SELECT COUNT(*) ${sqlBase}`, args).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,
+    args
+  });
+
+  return {
+    total,
+    limit,
+    page,
+    register_id,
+    name,
+    card,
+    table_name,
+    register_key,
+    description,
+    rows,
+    service_id,
+    columns: visibleColumns,
+    filters: activeFilters,
+    fields,
+    view,
+    is_downloadable,
+    is_map,
+    is_register,
+    is_files,
+    config: {
+      listConfig,
+    },
+  };
+}

package/server/routes/registers/functions/map.registry.js

@@ -1,87 +1,87 @@
-import { pgClients, getFilterSQL, getTemplate } from "@opengis/fastify-table/utils.js";
-
-import { BadRequestError, NotFoundError } from "@opengis/fastify-table/errors.js";
-
-import { attachClassifiers } from './classifiers.js';
-
-export default async function mapRegistry({
-    slug, id, filter, limit: queryLimit, page = 1
-}, pg = pgClients.client) {
-    if (!slug || !id) {
-        throw BadRequestError('Params slug and id is required');
-    }
-
-    const mapTemplate = await getTemplate('map', slug);
-
-    if (!mapTemplate) {
-        throw NotFoundError('Template not found');
-    }
-
-    const listWidget = mapTemplate.widgets?.find(w => w.type === 'list' && w.visible !== false && w.id === id);
-
-    if (!listWidget) {
-        throw NotFoundError('List widget not found');
-    }
-
-    const {
-        table,
-        pk,
-        query: baseQuery = '1=1',
-        order,
-        config = {},
-        name = '',
-    } = listWidget;
-
-    const { columns = [], filters = [], limit: configLimit = 20 } = config;
-    const limit = queryLimit || configLimit;
-    const offset = limit * (page - 1);
-    const selectColumns = columns.map(col => col.name);
-
-    const classifiers = columns
-        .filter(col => col.data && ["select", "badge", "tags"].includes(col.format))
-        .map(col => ({ name: col.name, classifier: col.data }));
-
-
-    const { q: sqlFilter } = filter
-        ? await getFilterSQL({ table, filter })
-        : { q: '1=1' };
-
-    const whereConditions = [baseQuery, sqlFilter].filter(Boolean).join(" AND ");
-    const whereClause = whereConditions ? `WHERE ${whereConditions}` : "";
-
-    const sqlBase = `FROM ${table} ${whereClause}`;
-    const sqlOrder = order ? `ORDER BY ${order}` : "";
-    const sqlLimit = `LIMIT $1::bigint OFFSET $2::bigint`;
-    const sqlSelect = `SELECT ${pk} as id, ${selectColumns.join(", ")} 
-    ${sqlBase}`;
-    const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;
-    const totalQuery = `SELECT COUNT(*) ${sqlBase}`;
-
-    const [dataRes, countRes] = await Promise.all([
-        pg.query(dataQuery, [limit, offset]),
-        pg.query(totalQuery)
-    ]);
-
-    const rows = await attachClassifiers(dataRes?.rows, classifiers);
-    const total = parseInt(countRes?.rows[0]?.count || 0, 10);
-
-    const listViewConfig = {};
-    columns.forEach(col => {
-        if (col.view_type === 'title') listViewConfig.title = col?.name;
-        if (col.view_type === 'subtitle') listViewConfig.subtitle = col?.name;
-    });
-
-    return {
-        name,
-        rows,
-        total,
-        columns,
-        filters,
-        config: {
-            ...listWidget,
-            list: {
-                ...listViewConfig
-            }
-        }
-    };
-}
+import { pgClients, getFilterSQL, getTemplate } from "@opengis/fastify-table/utils.js";
+
+import { BadRequestError, NotFoundError } from "@opengis/fastify-table/errors.js";
+
+import { attachClassifiers } from './classifiers.js';
+
+export default async function mapRegistry({
+    slug, id, filter, limit: queryLimit, page = 1
+}, pg = pgClients.client) {
+    if (!slug || !id) {
+        throw BadRequestError('Params slug and id is required');
+    }
+
+    const mapTemplate = await getTemplate('map', slug);
+
+    if (!mapTemplate) {
+        throw NotFoundError('Template not found');
+    }
+
+    const listWidget = mapTemplate.widgets?.find(w => w.type === 'list' && w.visible !== false && w.id === id);
+
+    if (!listWidget) {
+        throw NotFoundError('List widget not found');
+    }
+
+    const {
+        table,
+        pk,
+        query: baseQuery = '1=1',
+        order,
+        config = {},
+        name = '',
+    } = listWidget;
+
+    const { columns = [], filters = [], limit: configLimit = 20 } = config;
+    const limit = queryLimit || configLimit;
+    const offset = limit * (page - 1);
+    const selectColumns = columns.map(col => col.name);
+
+    const classifiers = columns
+        .filter(col => col.data && ["select", "badge", "tags"].includes(col.format))
+        .map(col => ({ name: col.name, classifier: col.data }));
+
+
+    const { q: sqlFilter } = filter
+        ? await getFilterSQL({ table, filter })
+        : { q: '1=1' };
+
+    const whereConditions = [baseQuery, sqlFilter].filter(Boolean).join(" AND ");
+    const whereClause = whereConditions ? `WHERE ${whereConditions}` : "";
+
+    const sqlBase = `FROM ${table} ${whereClause}`;
+    const sqlOrder = order ? `ORDER BY ${order}` : "";
+    const sqlLimit = `LIMIT $1::bigint OFFSET $2::bigint`;
+    const sqlSelect = `SELECT ${pk} as id, ${selectColumns.join(", ")} 
+    ${sqlBase}`;
+    const dataQuery = `${sqlSelect} ${sqlOrder} ${sqlLimit}`;
+    const totalQuery = `SELECT COUNT(*) ${sqlBase}`;
+
+    const [dataRes, countRes] = await Promise.all([
+        pg.query(dataQuery, [limit, offset]),
+        pg.query(totalQuery)
+    ]);
+
+    const rows = await attachClassifiers(dataRes?.rows, classifiers);
+    const total = parseInt(countRes?.rows[0]?.count || 0, 10);
+
+    const listViewConfig = {};
+    columns.forEach(col => {
+        if (col.view_type === 'title') listViewConfig.title = col?.name;
+        if (col.view_type === 'subtitle') listViewConfig.subtitle = col?.name;
+    });
+
+    return {
+        name,
+        rows,
+        total,
+        columns,
+        filters,
+        config: {
+            ...listWidget,
+            list: {
+                ...listViewConfig
+            }
+        }
+    };
+}