@opengis/gis 0.2.20 → 0.2.22

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

@@ -1,38 +1,70 @@
-import { pgClients, getTemplate } from "@opengis/fastify-table/utils.js";
-
-import { handleRegistryRequest } from './funcs/handleRegistryRequest.js';
-
-const maxLimit = 100;
-const defaultLimit = 9;
-
-export default async function gisRegistry({
-    pg = pgClients.client, params = {}, query = {},
-}) {
-    const { slug, objectId } = params;
-    const { sql } = query;
-
-    const limit = Math.min(query.limit || defaultLimit, maxLimit);
-    const offset = query.page && query.page > 0 && !objectId ? (query.page - 1) * limit : 0;
-
-    //if (!slug) return reply.code(404).send({ message: 'Params slug is required', status: 404 });
-    if (!slug) throw new Error('Params slug is required');
-
-    const {
-        rows: [registry],
-    } = await pg.query(
-        `SELECT register_id, name, description, card, table_name, columns, filters, query, "order", pk, register_key, is_files, view
-        FROM gis.registers
-        WHERE  $1 in (register_key,register_id)`,
-        [slug]
-    );
-
-    if (registry) {
-        return handleRegistryRequest({ settings: registry, query, object_id: objectId, offset, limit, page: query.page, pg, sql });
-    }
-
-    const registryTemplate = await getTemplate('registry', slug);
-    //if (!registryTemplate) return reply.code(404).send({ message: 'Template not found', status: 404 });
-    if (!registryTemplate) throw new Error('Template not found');
-
-    return handleRegistryRequest({ settings: registryTemplate, query, object_id: objectId, offset, limit, page: query.page, pg, sql });
-}
+import { pgClients, getTemplate } from "@opengis/fastify-table/utils.js";
+
+import { handleRegistryRequest } from './funcs/handleRegistryRequest.js';
+
+const maxLimit = 100;
+const defaultLimit = 9;
+
+export default async function gisRegistry({
+    pg = pgClients.client, params = {}, query = {},
+}) {
+    const { slug, objectId } = params;
+    const { sql } = query;
+
+    const limit = Math.min(query.limit || defaultLimit, maxLimit);
+    const offset = query.page && query.page > 0 && !objectId ? (query.page - 1) * limit : 0;
+
+    //if (!slug) return reply.code(404).send({ message: 'Params slug is required', status: 404 });
+    if (!slug) throw new Error('Params slug is required');
+
+    const {
+        rows: [registry],
+    } = await pg.query(
+        `SELECT register_id, name, description, card, table_name,
+            columns, filters, query, "order", pk, register_key, 
+            is_files, view, is_downloadable, is_map, is_register, service_id
+        FROM gis.registers
+        WHERE  $1 in (register_key,register_id)`,
+        [slug]
+    );
+
+    if (registry) {
+        return handleRegistryRequest({
+            settings: registry,
+            query,
+            is_downloadable: registry.is_downloadable,
+            register_key: registry.register_key,
+            object_id: objectId,
+            is_map: registry.is_map,
+            is_register: registry.is_register,
+            is_files: registry.is_files,
+            service_id: registry.service_id,
+            offset,
+            limit,
+            page: query.page,
+            pg,
+            sql
+        });
+    }
+
+    const registryTemplate = await getTemplate('registry', slug);
+    //if (!registryTemplate) return reply.code(404).send({ message: 'Template not found', status: 404 });
+    if (!registryTemplate) throw new Error('Template not found');
+
+    return handleRegistryRequest({
+        settings: registryTemplate,
+        query,
+        object_id: objectId,
+        register_key: registry.register_key,
+        is_downloadable: registry?.is_downloadable || registryTemplate?.is_downloadable,
+        is_map: registryTemplate.is_map,
+        is_register: registryTemplate.is_register,
+        is_files: registryTemplate.is_files,
+        service_id: registryTemplate.service_id,
+        offset,
+        limit,
+        page: query.page,
+        pg,
+        sql
+    });
+}

package/server/routes/gis/registers/gis.registry.list.js

@@ -1,59 +1,59 @@
-import { pgClients, getTemplatePath, getTemplate } from "@opengis/fastify-table/utils.js";
-const pg = pgClients.client;
-
-export default async function gisRegistryList(req = {}) {
-    const { query = {} } = req;
-    const { page = 1, limit = 9, search = '' } = query;
-    const offset = limit * (page - 1);
-
-    const dbResult = await pg.query(
-        `SELECT register_key, name, description, keywords
-        FROM gis.registers
-        WHERE is_public = true AND is_active = true`
-    );
-
-    let templates = dbResult?.rows;
-    let fromDatabase = true;
-    
-    if (!templates?.length) {
-        fromDatabase = false;
-
-        const registryListTemplate = await getTemplatePath('registry');
-        if (!registryListTemplate?.length) throw new Error('Templates not found');
-
-        templates = ( await Promise.all(
-            registryListTemplate.map(async ([slug]) => {
-                try {
-                    const tpl = await getTemplate('registry', slug);
-                    if (tpl?.visible === false) return null;
-
-                    const { register_key, name, description, keywords } = tpl;
-                    return { register_key, name, description, keywords };
-                } catch {
-                    return null;
-                }
-            })
-        ));
-    }
-
-    const filteredBySearch = search
-        ? templates.filter(tpl => {
-            const q = search.toLowerCase();
-            return (
-                tpl.name?.toLowerCase().includes(q) ||
-                tpl.description?.toLowerCase().includes(q) ||
-                tpl.keywords?.join(' ').toLowerCase().includes(q)
-            );
-        })
-        : templates;
-
-    const paged = filteredBySearch.slice(offset, offset + limit);
-
-    return {
-        rows: paged,
-        total: filteredBySearch.length,
-        page: parseInt(page, 10),
-        limit: parseInt(limit, 10),
-        offset
-    };
-}
+import { pgClients, getTemplatePath, getTemplate } from "@opengis/fastify-table/utils.js";
+const pg = pgClients.client;
+
+export default async function gisRegistryList(req = {}) {
+    const { query = {} } = req;
+    const { page = 1, limit = 9, search = '' } = query;
+    const offset = limit * (page - 1);
+
+    const dbResult = await pg.query(
+        `SELECT register_key, name, description, keywords
+        FROM gis.registers
+        WHERE is_public = true AND is_active = true`
+    );
+
+    let templates = dbResult?.rows;
+    let fromDatabase = true;
+    
+    if (!templates?.length) {
+        fromDatabase = false;
+
+        const registryListTemplate = await getTemplatePath('registry');
+        if (!registryListTemplate?.length) throw new Error('Templates not found');
+
+        templates = ( await Promise.all(
+            registryListTemplate.map(async ([slug]) => {
+                try {
+                    const tpl = await getTemplate('registry', slug);
+                    if (tpl?.visible === false) return null;
+
+                    const { register_key, name, description, keywords } = tpl;
+                    return { register_key, name, description, keywords };
+                } catch {
+                    return null;
+                }
+            })
+        ));
+    }
+
+    const filteredBySearch = search
+        ? templates.filter(tpl => {
+            const q = search.toLowerCase();
+            return (
+                tpl.name?.toLowerCase().includes(q) ||
+                tpl.description?.toLowerCase().includes(q) ||
+                tpl.keywords?.join(' ').toLowerCase().includes(q)
+            );
+        })
+        : templates;
+
+    const paged = filteredBySearch.slice(offset, offset + limit);
+
+    return {
+        rows: paged,
+        total: filteredBySearch.length,
+        page: parseInt(page, 10),
+        limit: parseInt(limit, 10),
+        offset
+    };
+}

package/server/routes/gis/registers/insert.columns.js

@@ -1,107 +1,107 @@
-import { getToken } from '@opengis/fastify-table/utils.js';
-/**
- * Автозаповнення колонок Реєстру
- *
- * @method put
- * @summary Автозаповнення колонок Реєстру
- * @alias gis.registers
- * @type api
- * @tag dataset
- * @param   {String} token - токен
- * @returns {Number} status - номер помилки
- * @returns {String} error - опис помилки
- * @returns {String} message - повідомлення про успішне виконання і передача певних даних
- */
-export default async function insertColumns(req,reply) {
-  const {pg, user, params} = req;
-  const token = params.token;
-  if (!token) return { message: 'empty token', status: 400 };
-  try {
-
-    const tokenData = await getToken({ token, uid: user?.uid });
-    if (!tokenData) return reply.code(400).send({ message: 'access restricted', status: 400 });
-
-    const { id, type } = JSON.parse(tokenData) || {};
-    if (!id||!type) return reply.code(403).send({ message: 'access restricted', status: 403 });
-    if (!['services','registers'].includes(type)) return reply.code(403).send({ message: 'invalid type', status: 403 });
-
-    const tableColumn =  (type === 'registers') ? 'table_name':'source_path';
-    const jsonColumn = (type === 'registers') ? 'columns':'attributes';
-    const pk = (type === 'registers')?'register_id':'service_id';
-
-    const select = `update gis.${type} set ${jsonColumn}=
-        (select
-        jsonb_agg(row_to_json(q)) as column_list
-        from
-        (select 
-          q.column_name as name,
-          case 
-            when q.column_name='editor_id' and comment is null then 'Хто редагував'
-            when q.column_name ilike '%geom%' and comment is null then 'Геометрія'
-            when q.column_name='editor_date' and comment is null then 'Дата редагування'
-            when q.column_name='image' and comment is null then 'Зображення'
-            when q.column_name='file' and comment is null then 'Файл'
-            when q.column_name='files' and comment is null then 'Файли'
-            else comment
-          end as ua, 
-          case 
-            when q.data_type in ('text','character varying') then 'text'
-            when q.data_type ='ARRAY' then 'tags'
-            when q.data_type in ('integer','numeric','double precision') then 'number'
-            when q.data_type ='boolean' then 'yes/no'
-            when q.data_type='USER-DEFINED' then 'geom'
-            when q.data_type in ('date','timestamp without time zone') then 'date'
-          end as format,
-          '' as data,
-          false as hidden_register,
-          false as hidden_card
-        from 
-          (
-            select 
-              column_name, 
-              data_type, 
-              table_schema || '.' || table_name as table_name 
-            from 
-              (
-                select 
-                  distinct table_name, 
-                  table_schema, 
-                  column_name, 
-                  data_type
-                from 
-                  information_schema.columns
-              ) q
-          ) q 
-        
-          left join lateral (
-             SELECT
-                pgd.description AS comment,
-                 pgns.nspname||'.'||pgc.relname AS table_name,
-                pg_attribute.attname AS column_name
-                
-                FROM
-                pg_catalog.pg_description pgd
-                JOIN pg_catalog.pg_class pgc ON pgd.objoid = pgc.oid
-                JOIN pg_catalog.pg_namespace pgns ON pgc.relnamespace = pgns.oid
-                JOIN pg_catalog.pg_attribute pg_attribute ON pgc.oid = pg_attribute.attrelid
-                AND pg_attribute.attnum = pgd.objsubid
-          )b on b.column_name=q.column_name and b.table_name=q.table_name
-        where 
-          q.table_name = (
-            select 
-              ${tableColumn} 
-            from 
-              gis.${type} 
-            where
-             ${pk} = '${id}'
-          ) and q.column_name not in ('cdate','uid') and q.data_type<>'json')q
-        )
-        where ${pk} = '${id}'
-        `;
-    await pg.one(select);
-
-    return { message: 'Колонки заповнені упішно', status: 200 };
-  } catch (err) {
-    return reply.code(500).send({ message: err.message, status: 500 });
-  }
-}
+import { getToken } from '@opengis/fastify-table/utils.js';
+/**
+ * Автозаповнення колонок Реєстру
+ *
+ * @method put
+ * @summary Автозаповнення колонок Реєстру
+ * @alias gis.registers
+ * @type api
+ * @tag dataset
+ * @param   {String} token - токен
+ * @returns {Number} status - номер помилки
+ * @returns {String} error - опис помилки
+ * @returns {String} message - повідомлення про успішне виконання і передача певних даних
+ */
+export default async function insertColumns(req,reply) {
+  const {pg, user, params} = req;
+  const token = params.token;
+  if (!token) return { message: 'empty token', status: 400 };
+  try {
+
+    const tokenData = await getToken({ token, uid: user?.uid });
+    if (!tokenData) return reply.code(400).send({ message: 'access restricted', status: 400 });
+
+    const { id, type } = JSON.parse(tokenData) || {};
+    if (!id||!type) return reply.code(403).send({ message: 'access restricted', status: 403 });
+    if (!['services','registers'].includes(type)) return reply.code(403).send({ message: 'invalid type', status: 403 });
+
+    const tableColumn =  (type === 'registers') ? 'table_name':'source_path';
+    const jsonColumn = (type === 'registers') ? 'columns':'attributes';
+    const pk = (type === 'registers')?'register_id':'service_id';
+
+    const select = `update gis.${type} set ${jsonColumn}=
+        (select
+        jsonb_agg(row_to_json(q)) as column_list
+        from
+        (select 
+          q.column_name as name,
+          case 
+            when q.column_name='editor_id' and comment is null then 'Хто редагував'
+            when q.column_name ilike '%geom%' and comment is null then 'Геометрія'
+            when q.column_name='editor_date' and comment is null then 'Дата редагування'
+            when q.column_name='image' and comment is null then 'Зображення'
+            when q.column_name='file' and comment is null then 'Файл'
+            when q.column_name='files' and comment is null then 'Файли'
+            else comment
+          end as ua, 
+          case 
+            when q.data_type in ('text','character varying') then 'text'
+            when q.data_type ='ARRAY' then 'tags'
+            when q.data_type in ('integer','numeric','double precision') then 'number'
+            when q.data_type ='boolean' then 'yes/no'
+            when q.data_type='USER-DEFINED' then 'geom'
+            when q.data_type in ('date','timestamp without time zone') then 'date'
+          end as format,
+          '' as data,
+          false as hidden_register,
+          false as hidden_card
+        from 
+          (
+            select 
+              column_name, 
+              data_type, 
+              table_schema || '.' || table_name as table_name 
+            from 
+              (
+                select 
+                  distinct table_name, 
+                  table_schema, 
+                  column_name, 
+                  data_type
+                from 
+                  information_schema.columns
+              ) q
+          ) q 
+        
+          left join lateral (
+             SELECT
+                pgd.description AS comment,
+                 pgns.nspname||'.'||pgc.relname AS table_name,
+                pg_attribute.attname AS column_name
+                
+                FROM
+                pg_catalog.pg_description pgd
+                JOIN pg_catalog.pg_class pgc ON pgd.objoid = pgc.oid
+                JOIN pg_catalog.pg_namespace pgns ON pgc.relnamespace = pgns.oid
+                JOIN pg_catalog.pg_attribute pg_attribute ON pgc.oid = pg_attribute.attrelid
+                AND pg_attribute.attnum = pgd.objsubid
+          )b on b.column_name=q.column_name and b.table_name=q.table_name
+        where 
+          q.table_name = (
+            select 
+              ${tableColumn} 
+            from 
+              gis.${type} 
+            where
+             ${pk} = '${id}'
+          ) and q.column_name not in ('cdate','uid') and q.data_type<>'json')q
+        )
+        where ${pk} = '${id}'
+        `;
+    await pg.one(select);
+
+    return { message: 'Колонки заповнені упішно', status: 200 };
+  } catch (err) {
+    return reply.code(500).send({ message: err.message, status: 500 });
+  }
+}