@opengis/gis 0.2.176 → 0.2.178

package/server/routes/registers/registers.schema.js

@@ -1,246 +1,275 @@
-const queryFilterSchema = { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' };
-const querySearchSchema = { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' };
-
-const registerSchema = {
-    type: 'object',
-    additionalProperties: false,
-    properties: {
-        id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        register_id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        service_id: { type: ['string', 'null'], pattern: '^([\\d\\w._-]+)$' },
-
-        name: { type: 'string' },
-        description: { type: ['string', 'null'] },
-        keywords: { type: ['array', 'string', 'null'] },
-        holder: { type: ['string', 'null'] },
-
-        table_name: { type: 'string' },
-        pk: { type: 'string' },
-        query: { type: ['string', 'null'] },
-        geometry_column: { type: ['string', 'null'] },
-        sql_list: { type: ['array', 'string', 'null'] },
-
-        is_active: { type: 'boolean' },
-        is_public: { type: 'boolean' },
-
-        filters: {
-            type: 'array',
-            items: {
-                type: 'object',
-                additionalProperties: false,
-                // ? ua / label
-                required: ['name', 'type'],
-                properties: {
-                    ua: { type: 'string' },
-                    data: { type: 'string' },
-                    name: { type: 'string' },
-                    type: { type: 'string' },
-                    label: { type: 'string' },
-                },
-            },
-        },
-
-        columns: {
-            type: 'array',
-            items: {
-                type: 'object',
-            },
-        },
-
-        metadata: {
-            type: ['object', 'null'],
-        },
-
-        created_at: { type: 'string' },
-        created_by: { type: 'string' },
-        updated_by: { type: 'string' },
-        updated_at: { type: 'string' },
-
-        image: { type: ['string', 'null'] },
-        order: { type: ['string', 'null'] },
-        register_key: { type: ['string', 'null'] },
-
-        is_files: { type: 'boolean' },
-        view: { type: 'string' },
-
-        card: {
-            type: 'array',
-            items: {
-                type: 'object',
-                additionalProperties: false,
-                // ? ua / title / label
-                // ? format / type
-                required: ['name'],
-                properties: {
-                    name: { type: 'string' },
-                    title: { type: 'string' },
-                    type: { type: 'string' },
-                    label: { type: 'string' },
-                    format: { type: 'string' },
-                    meta: { type: 'string' },
-
-                    ua: { type: 'string' },
-                    data: { type: 'string' },
-                },
-            },
-        },
-
-        is_downloadable: { type: 'boolean' },
-        is_map: { type: 'boolean' },
-        is_register: { type: 'boolean' },
-
-        group_id: { type: ['string', 'null'] },
-
-        geom_type: { type: 'string' },
-
-        // This is a JSON string containing a GeoJSON Polygon
-        bbox: { type: 'string' },
-
-        keywords_text: { type: ['string', 'null'] },
-
-        token: { type: 'string' },
-
-        is_public_data: {
-            type: 'object',
-            additionalProperties: false,
-            required: ['id', 'text'],
-            properties: {
-                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-                text: { type: 'string' },
-                icon: { type: ['string', 'null'] },
-                color: { type: 'string' },
-            },
-        },
-
-        view_text: { type: 'string' },
-
-        is_active_data: {
-            type: 'object',
-            additionalProperties: false,
-            required: ['id', 'text'],
-            properties: {
-                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-                text: { type: 'string' },
-                icon: { type: ['string', 'null'] },
-                color: { type: 'string' },
-            },
-        },
-
-        is_downloadable_data: {
-            type: 'object',
-            additionalProperties: false,
-            required: ['id', 'text'],
-            properties: {
-                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-                text: { type: 'string' },
-                icon: { type: ['string', 'null'] },
-                color: { type: 'string' },
-            },
-        },
-
-        service_id_text: { type: 'string' },
-        geom_type_text: { type: 'string' },
-
-        tableData: {
-            type: 'array',
-            items: {
-                type: 'object',
-            },
-        },
-    },
-};
-
-export const gisRegistrySchema = {
-    params: {
-        type: 'object',
-        required: ['slug'],
-        properties: {
-            slug: { type: 'string' },
-            objectId: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-        },
-    },
-    querystring: {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-            filter: queryFilterSchema,
-            search: querySearchSchema,
-            limit: {
-                type: 'number',
-                minimum: 1,
-            },
-            page: {
-                type: 'number',
-                minimum: 1,
-            },
-            sql: {
-                type: 'string',
-                pattern: "^(\\d)$"
-            }
-        },
-    },
-};
-
-export const gisRegistryListSchema = {
-    querystring: {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-            search: querySearchSchema,
-            limit: {
-                type: 'number',
-                minimum: 1,
-            },
-            page: {
-                type: 'number',
-                minimum: 1,
-            },
-        },
-    },
-};
-
-export const addGisRegistrySchema = {
-    body: { ...registerSchema, required: ['name', 'register_key', 'table_name'] },
-};
-
-export const editGisRegistrySchema = {
-    params: {
-        type: 'object',
-        required: ['slug'],
-        properties: {
-            slug: { type: 'string' },
-        },
-    },
-    body: registerSchema
-};
-
-export const deleteGisRegistrySchema = {
-    params: {
-        type: 'object',
-        required: ['slug'],
-        properties: {
-            slug: { type: 'string' },
-        },
-    },
-};
-
-export const mapRegistrySchema = {};
-
-export const gisExportSchema = {
-    params: {
-        type: 'object',
-        required: ['slug'],
-        properties: {
-            slug: { type: 'string' },
-            type: { type: 'string', enum: ['register', 'service'] },
-        },
-    },
-    querystring: {
-        type: 'object',
-        properties: {
-            format: { type: 'string', enum: ['csv', 'xlsx', 'shp', 'geojson'], default: 'csv' },
-        },
-    },
-};
-
-export default null;
+const queryFilterSchema = {
+    type: ["string", "null"],
+    pattern:
+        '^([\\w-]+)=([А-Яа-яҐґЄєІіЇї\\w\\s\\\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=@%#$&^*+`~]*)$',
+};
+const querySearchSchema = { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' };
+
+const keySchema = {
+    type: "string",
+    pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-:—!?%@#$,'; ]+)$",
+};
+
+const registerSchema = {
+    type: 'object',
+    additionalProperties: false,
+    properties: {
+        id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        register_id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        service_id: { type: ['string', 'null'], pattern: '^([\\d\\w._-]+)$' },
+
+        name: { type: 'string' },
+        description: { type: ['string', 'null'] },
+        keywords: { type: ['array', 'string', 'null'] },
+        holder: { type: ['string', 'null'] },
+
+        table_name: { type: 'string' },
+        pk: { type: 'string' },
+        query: { type: ['string', 'null'] },
+        geometry_column: { type: ['string', 'null'] },
+        sql_list: { type: ['array', 'string', 'null'] },
+
+        is_active: { type: 'boolean' },
+        is_public: { type: 'boolean' },
+
+        filters: {
+            type: 'array',
+            items: {
+                type: 'object',
+                additionalProperties: false,
+                // ? ua / label
+                required: ['name', 'type'],
+                properties: {
+                    ua: { type: 'string' },
+                    data: { type: 'string' },
+                    name: { type: 'string' },
+                    type: { type: 'string' },
+                    label: { type: 'string' },
+                },
+            },
+        },
+
+        columns: {
+            type: 'array',
+            items: {
+                type: 'object',
+            },
+        },
+
+        metadata: {
+            type: ['object', 'null'],
+        },
+
+        created_at: { type: 'string' },
+        created_by: { type: 'string' },
+        updated_by: { type: 'string' },
+        updated_at: { type: 'string' },
+
+        image: { type: ['string', 'null'] },
+        order: { type: ['string', 'null'] },
+        register_key: { type: ['string', 'null'] },
+
+        is_files: { type: 'boolean' },
+        view: { type: 'string' },
+
+        card: {
+            type: 'array',
+            items: {
+                type: 'object',
+                additionalProperties: false,
+                // ? ua / title / label
+                // ? format / type
+                required: ['name'],
+                properties: {
+                    name: { type: 'string' },
+                    title: { type: 'string' },
+                    type: { type: 'string' },
+                    label: { type: 'string' },
+                    format: { type: 'string' },
+                    meta: { type: 'string' },
+
+                    ua: { type: 'string' },
+                    data: { type: 'string' },
+                },
+            },
+        },
+
+        is_downloadable: { type: 'boolean' },
+        is_map: { type: 'boolean' },
+        is_register: { type: 'boolean' },
+
+        group_id: { type: ['string', 'null'] },
+
+        geom_type: { type: 'string' },
+
+        // This is a JSON string containing a GeoJSON Polygon
+        bbox: { type: 'string' },
+
+        keywords_text: { type: ['string', 'null'] },
+
+        token: { type: 'string' },
+
+        is_public_data: {
+            type: 'object',
+            additionalProperties: false,
+            required: ['id', 'text'],
+            properties: {
+                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+                text: { type: 'string' },
+                icon: { type: ['string', 'null'] },
+                color: { type: 'string' },
+            },
+        },
+
+        view_text: { type: 'string' },
+
+        is_active_data: {
+            type: 'object',
+            additionalProperties: false,
+            required: ['id', 'text'],
+            properties: {
+                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+                text: { type: 'string' },
+                icon: { type: ['string', 'null'] },
+                color: { type: 'string' },
+            },
+        },
+
+        is_downloadable_data: {
+            type: 'object',
+            additionalProperties: false,
+            required: ['id', 'text'],
+            properties: {
+                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+                text: { type: 'string' },
+                icon: { type: ['string', 'null'] },
+                color: { type: 'string' },
+            },
+        },
+
+        service_id_text: { type: 'string' },
+        geom_type_text: { type: 'string' },
+
+        tableData: {
+            type: 'array',
+            items: {
+                type: 'object',
+            },
+        },
+    },
+};
+
+export const gisRegistrySchema = {
+    params: {
+        type: 'object',
+        required: ['slug'],
+        properties: {
+            slug: { type: 'string' },
+            objectId: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        },
+    },
+    querystring: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+            filter: queryFilterSchema,
+            search: querySearchSchema,
+            limit: {
+                type: 'number',
+                minimum: 1,
+            },
+            page: {
+                type: 'number',
+                minimum: 1,
+            },
+            sql: {
+                type: 'string',
+                pattern: "^(\\d)$"
+            }
+        },
+    },
+};
+
+export const gisRegistryListSchema = {
+    querystring: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+            search: querySearchSchema,
+            limit: {
+                type: 'number',
+                minimum: 1,
+            },
+            page: {
+                type: 'number',
+                minimum: 1,
+            },
+        },
+    },
+};
+
+export const addGisRegistrySchema = {
+    body: { ...registerSchema, required: ['name', 'register_key', 'table_name'] },
+};
+
+export const editGisRegistrySchema = {
+    params: {
+        type: 'object',
+        required: ['slug'],
+        properties: {
+            slug: { type: 'string' },
+        },
+    },
+    body: registerSchema
+};
+
+export const deleteGisRegistrySchema = {
+    params: {
+        type: 'object',
+        required: ['slug'],
+        properties: {
+            slug: { type: 'string' },
+        },
+    },
+};
+
+export const mapRegistrySchema = {};
+
+export const gisExportSchema = {
+    params: {
+        type: 'object',
+        required: ['slug'],
+        properties: {
+            slug: { type: 'string' },
+            type: { type: 'string', enum: ['register', 'service'] },
+        },
+    },
+    querystring: {
+        type: 'object',
+        properties: {
+            format: { type: 'string', enum: ['csv', 'xlsx', 'shp', 'geojson'], default: 'csv' },
+        },
+    },
+};
+
+export const gisSuggestSchema = {
+    params: {
+        type: 'object',
+        required: ['token'],
+        properties: {
+            token: { type: 'string' },
+        },
+    },
+    querystring: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+            key: keySchema,
+            json: { type: 'integer', enum: [1] },
+            val: querySearchSchema,
+            limit: { type: 'integer', minimum: 1, maximum: 100 },
+        },
+    },
+};
+
+export default null;

package/server/routes/root.mjs

@@ -1,3 +1,3 @@
-export default async function (fastify, opts) {
-  fastify.get(`/test`, () => { return { test: true } });
-}
+export default async function (fastify, opts) {
+  fastify.get(`/test`, () => { return { test: true } });
+}

package/server/routes/services/functions/add.service.js

@@ -1,63 +1,63 @@
-import { BadRequestError } from "@opengis/fastify-table/errors.js";
-import { dataDelete, dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
-
-async function updateTemplate(client, body, uid, id) {
-    if (!body || !id) return;
-
-    await dataDelete({
-        pg: client,
-        id,
-        table: 'admin.templates',
-        uid,
-    });
-    const rowCount = await dataInsert({
-        pg: client,
-        id,
-        table: 'admin.templates',
-        data: { body, name: id },
-        uid,
-    }).then(el => el.rowCount);
-    return rowCount;
-}
-export default async function addService({
-    method, id, body, uid = '0'
-}, pg = pgClients.client) {
-    if (method === 'PUT' && !id) {
-        throw BadRequestError('not enough params: id');
-    }
-
-    const client = await pg.connect();
-    try {
-        await client.query('begin');
-
-        if (method === 'POST') {
-            const row = await dataInsert({
-                pg: client,
-                id,
-                table: 'gis.services',
-                data: body,
-                uid,
-            }).then(r => r.rows[0]);
-            await updateTemplate(client, body.html, uid, row.service_id);
-            await client.query('commit');
-            return row;
-        }
-
-        const row = await dataUpdate({
-            pg: client,
-            id,
-            table: 'gis.services',
-            data: body,
-            uid,
-        });
-        await updateTemplate(client, body.html, uid, id);
-        await client.query('commit');
-        return row;
-
-    } catch (err) {
-        await client.query('rollback');
-        throw err;
-    } finally {
-        client.release();
-    }
+import { BadRequestError } from "@opengis/fastify-table/errors.js";
+import { dataDelete, dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+
+async function updateTemplate(client, body, uid, id) {
+    if (!body || !id) return;
+
+    await dataDelete({
+        pg: client,
+        id,
+        table: 'admin.templates',
+        uid,
+    });
+    const rowCount = await dataInsert({
+        pg: client,
+        id,
+        table: 'admin.templates',
+        data: { body, name: id },
+        uid,
+    }).then(el => el.rowCount);
+    return rowCount;
+}
+export default async function addService({
+    method, id, body, uid = '0'
+}, pg = pgClients.client) {
+    if (method === 'PUT' && !id) {
+        throw BadRequestError('not enough params: id');
+    }
+
+    const client = await pg.connect();
+    try {
+        await client.query('begin');
+
+        if (method === 'POST') {
+            const row = await dataInsert({
+                pg: client,
+                id,
+                table: 'gis.services',
+                data: body,
+                uid,
+            }).then(r => r.rows[0]);
+            await updateTemplate(client, body.html, uid, row.service_id);
+            await client.query('commit');
+            return row;
+        }
+
+        const row = await dataUpdate({
+            pg: client,
+            id,
+            table: 'gis.services',
+            data: body,
+            uid,
+        });
+        await updateTemplate(client, body.html, uid, id);
+        await client.query('commit');
+        return row;
+
+    } catch (err) {
+        await client.query('rollback');
+        throw err;
+    } finally {
+        client.release();
+    }
 }