@opengis/gis 0.2.184 → 0.2.186

package/server/routes/registers/registers.route.test.js

@@ -136,7 +136,7 @@ describe('GIS routes', () => {
         const { table, filter } = await pg.query('select table_name as table, filters->0->>\'name\' as filter from gis.registers where register_id=$1', [testId]).then((r) => r.rows[0]);
         expect(filter).toBeTypeOf('string');
         const hash = 'unit-test';
-        const redisKey = `${pg.options.database}:registry-filter:${hash}`;
+        const redisKey = `${pg.options.database}:gis-suggest-filter:${hash}`;
         await rclient.set(redisKey, JSON.stringify({ register: testId, filter }), 'EX', 1 * 60);
         const res = await injectWithHeaders({
             method: 'GET',

package/server/routes/services/functions/get.services.js

@@ -1,6 +1,9 @@
+import { createHash } from 'node:crypto';
+
 import { NotFoundError } from '@opengis/fastify-table/errors.js';
 import {
-  dataUpdate, getMeta, pgClients, yml2json, getTemplate,
+  dataUpdate, getMeta, pgClients, yml2json,
+  getTemplate, getSelect, getRedis
 } from '@opengis/fastify-table/utils.js';
 
 const columnType = {
@@ -13,6 +16,8 @@ const columnType = {
   'timestamp with time zone': 'date',
 };
 
+const rclient = getRedis();
+
 export default async function getServices({ id }, pg = pgClients.client) {
   const t = await getTemplate('layer', id);
   if (t) return t;
@@ -79,9 +84,34 @@ export default async function getServices({ id }, pg = pgClients.client) {
       ?.split?.(','),
   }));
 
-  rows.filter(row => row.filters).forEach(row => Object.assign(row, {
-    filters: row.filters.map(filter => ({ ...filter, api: `/api/suggest/${row.source_path}:${filter.name}${filter.data && filter.name !== filter.data ? `?sel=${filter.data}` : ''}` })),
-  }));
+
+  if (id && rows.length && rows[0].filters) {
+    const activeFilters = await Promise.all((rows[0].filters || []).filter((f) => f.disabled !== true).map(async (el) => {
+      const hash = createHash('md5').update([id, el.name, el.data].filter(Boolean).join('-')).digest('hex');
+      const redisKey = `${pg?.options?.database}:gis-suggest-filter:${hash}`;
+
+      const cls = el.data ? await getSelect(el.data, pg) : undefined;
+      const { arr, sql } = cls || {};
+
+      const r = {
+        ...el, id: el.name || el.id, type: el.type, api: `/api/gis-suggest/${hash}`, options: arr, select: sql
+      };
+
+      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({ service: id, filter: el.name }), 'EX', 15 * 60);
+      return r;
+    }));
+    Object.assign(rows[0], {
+      filters: activeFilters,
+    });
+  }
 
   if (id) {
     return { ...rows[0], fields };

package/server/routes/services/services.route.test.js

@@ -49,6 +49,10 @@ describe('GIS routes', () => {
         expect(res1.body).toHaveProperty('service_id');
         expect(res1.body).toHaveProperty('name');
         expect(res1.body).toHaveProperty('service_key');
+        expect(res1.body).toHaveProperty('filters');
+        expect(res1.body.filters.length).toBeGreaterThan(0);
+        expect(res1.body.filters[0]).toHaveProperty('api');
+        expect(res1.body.filters[0].api).toMatch('/gis-suggest/');
 
         const res2 = await injectWithHeaders({
             url: `/api/gis-service/${res.body.rows[0].service_id}/${res.body.fields[0].name}`,