@opengis/gis 0.2.176 → 0.2.177

package/server/routes/widgets/functions/del.widget.js

@@ -1,18 +1,18 @@
-import { UnauthorizedError } from "@opengis/fastify-table/errors.js";
-import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function delWidget({
-    id, uid,
-}, pg = pgClients.client) {
-    if (!uid) {
-        throw UnauthorizedError('unauthorized');
-    }
-
-    const row = await dataDelete({
-        pg,
-        id,
-        table: 'gis.widgets',
-        uid,
-    });
-    return row;
+import { UnauthorizedError } from "@opengis/fastify-table/errors.js";
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function delWidget({
+    id, uid,
+}, pg = pgClients.client) {
+    if (!uid) {
+        throw UnauthorizedError('unauthorized');
+    }
+
+    const row = await dataDelete({
+        pg,
+        id,
+        table: 'gis.widgets',
+        uid,
+    });
+    return row;
 }

package/server/routes/widgets/functions/get.widget.js

@@ -1,42 +1,42 @@
-import { BadRequestError, NotFoundError } from "@opengis/fastify-table/errors.js";
-import { getMeta, pgClients } from "@opengis/fastify-table/utils.js";
-
-const table = 'gis.widgets';
-
-const columnType = {
-    text: 'text',
-    date: 'date',
-    bool: 'yes/no',
-    numeric: 'number',
-    integer: 'number',
-    'timestamp without time zone': 'date',
-    'timestamp with time zone': 'date',
-};
-
-export default async function getWidget({ map, id }, pg = pgClients.client) {
-    if (!map) {
-        throw BadRequestError('not enough params: map id');
-    }
-
-    const { columns = [] } = await getMeta({ pg, table }) || {};
-
-    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
-
-    const rows = pg.pk?.['gis.maps'] && pg.pk?.['gis.widgets'] ? await pg.query(
-        `SELECT widget_id as id, * FROM gis.widgets where map_id=$1 and ${id ? 'widget_id=$2' : '1=1'}`,
-        [map, id].filter(Boolean),
-    ).then(el => el.rows || []) : [];
-
-    if (id && !rows.length) {
-        throw NotFoundError('widget not found');
-    }
-
-    if (id) {
-        return { ...rows[0], fields };
-    }
-
-    return {
-        rows,
-        fields,
-    };
+import { BadRequestError, NotFoundError } from "@opengis/fastify-table/errors.js";
+import { getMeta, pgClients } from "@opengis/fastify-table/utils.js";
+
+const table = 'gis.widgets';
+
+const columnType = {
+    text: 'text',
+    date: 'date',
+    bool: 'yes/no',
+    numeric: 'number',
+    integer: 'number',
+    'timestamp without time zone': 'date',
+    'timestamp with time zone': 'date',
+};
+
+export default async function getWidget({ map, id }, pg = pgClients.client) {
+    if (!map) {
+        throw BadRequestError('not enough params: map id');
+    }
+
+    const { columns = [] } = await getMeta({ pg, table }) || {};
+
+    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+
+    const rows = pg.pk?.['gis.maps'] && pg.pk?.['gis.widgets'] ? await pg.query(
+        `SELECT widget_id as id, * FROM gis.widgets where map_id=$1 and ${id ? 'widget_id=$2' : '1=1'}`,
+        [map, id].filter(Boolean),
+    ).then(el => el.rows || []) : [];
+
+    if (id && !rows.length) {
+        throw NotFoundError('widget not found');
+    }
+
+    if (id) {
+        return { ...rows[0], fields };
+    }
+
+    return {
+        rows,
+        fields,
+    };
 }

package/server/routes/widgets/widgets.route.js

@@ -1,61 +1,61 @@
-import getWidget from './functions/get.widget.js';
-import addWidget from './functions/add.widget.js';
-import delWidget from './functions/del.widget.js';
-
-import { schemaInfo } from './widgets.schema.js';
-
-const publicParams = {
-    config: { policy: 'L0' },
-    schema: schemaInfo,
-    package: 'gis',
-}; // * L0 === public
-const privilegedParams = {
-    config: { policy: 'L1', role: 'admin' },
-    schema: schemaInfo,
-    package: 'gis',
-}; // ? just auth or admin
-
-export default function (app) {
-    if (!app.hasRoute({ method: 'GET', url: '/gis-widget/:map/:id?' })) {
-        app.get('/gis-widget/:map/:id?', publicParams, async ({ params, pg }) => {
-            const result = await getWidget({
-                id: params.id,
-                map: params.map
-            }, pg);
-            return result;
-        });
-    }
-    if (!app.hasRoute({ method: 'POST', url: '/gis-widget/:map/:id?' })) {
-        app.post('/gis-widget/:map/:id?', privilegedParams, async ({ method, body, params, user, pg }) => {
-            const result = await addWidget({
-                method,
-                id: params.id,
-                map: params.map,
-                body,
-                uid: user?.uid
-            }, pg);
-            return result;
-        });
-    }
-    if (!app.hasRoute({ method: 'PUT', url: '/gis-widget/:map/:id' })) {
-        app.put('/gis-widget/:map/:id', privilegedParams, async ({ method, body, params, user, pg }) => {
-            const result = await addWidget({
-                method,
-                id: params.id,
-                map: params.map,
-                body,
-                uid: user?.uid
-            }, pg);
-            return result;
-        });
-    }
-    if (!app.hasRoute({ method: 'DELETE', url: '/gis-widget/:map/:id' })) {
-        app.delete('/gis-widget/:map/:id', privilegedParams, async ({ params, user, pg }) => {
-            const result = await delWidget({
-                id: params.id,
-                uid: user?.uid
-            }, pg);
-            return result;
-        });
-    }
-}
+import getWidget from './functions/get.widget.js';
+import addWidget from './functions/add.widget.js';
+import delWidget from './functions/del.widget.js';
+
+import { schemaInfo } from './widgets.schema.js';
+
+const publicParams = {
+    config: { policy: 'L0' },
+    schema: schemaInfo,
+    package: 'gis',
+}; // * L0 === public
+const privilegedParams = {
+    config: { policy: 'L1', role: 'admin' },
+    schema: schemaInfo,
+    package: 'gis',
+}; // ? just auth or admin
+
+export default function (app) {
+    if (!app.hasRoute({ method: 'GET', url: '/gis-widget/:map/:id?' })) {
+        app.get('/gis-widget/:map/:id?', publicParams, async ({ params, pg }) => {
+            const result = await getWidget({
+                id: params.id,
+                map: params.map
+            }, pg);
+            return result;
+        });
+    }
+    if (!app.hasRoute({ method: 'POST', url: '/gis-widget/:map/:id?' })) {
+        app.post('/gis-widget/:map/:id?', privilegedParams, async ({ method, body, params, user, pg }) => {
+            const result = await addWidget({
+                method,
+                id: params.id,
+                map: params.map,
+                body,
+                uid: user?.uid
+            }, pg);
+            return result;
+        });
+    }
+    if (!app.hasRoute({ method: 'PUT', url: '/gis-widget/:map/:id' })) {
+        app.put('/gis-widget/:map/:id', privilegedParams, async ({ method, body, params, user, pg }) => {
+            const result = await addWidget({
+                method,
+                id: params.id,
+                map: params.map,
+                body,
+                uid: user?.uid
+            }, pg);
+            return result;
+        });
+    }
+    if (!app.hasRoute({ method: 'DELETE', url: '/gis-widget/:map/:id' })) {
+        app.delete('/gis-widget/:map/:id', privilegedParams, async ({ params, user, pg }) => {
+            const result = await delWidget({
+                id: params.id,
+                uid: user?.uid
+            }, pg);
+            return result;
+        });
+    }
+}

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

@@ -1,144 +1,144 @@
-/* eslint-disable indent */
-import { randomUUID } from 'node:crypto';
-
-import {
-    describe, test, expect, beforeAll, afterAll,
-} from 'vitest';
-
-import {
-    getPGAsync,
-} from '@opengis/fastify-table/utils.js';
-
-import { build, injectWithHeaders } from '../../../test/helper.js';
-
-const user = { uid: '1', user_type: 'admin' };
-const testKey = 'unittest';
-
-let pg;
-
-const obj = {};
-
-const cleanUp = async (when) => {
-    if (!pg) return;
-    const { rowCount: widgets } = await pg.query('delete from gis.widgets where (map_id like $1 or widget_id like $1)', [`${testKey}%`]);
-    console.log(`clean up widgets ${when}:`, widgets);
-    const { rowCount: maps } = await pg.query('delete from gis.maps where array[$1] && keywords', [testKey]);
-    console.log(`clean up maps ${when}:`, maps);
-}
-
-describe('maps api test', () => {
-    beforeAll(async () => {
-        await build();
-        pg = await getPGAsync();
-        // ensure not exists in case previous test fails / timeouts
-        await cleanUp('before');
-
-        await pg.query(
-            'insert into gis.maps (map_id, name, keywords, created_by, center) values($1, $1, array[$1], $2, $3) on conflict (map_id) do nothing returning *',
-            [testKey, user.uid, [30, 50]],
-        );
-        console.log('insert before success');
-    });
-
-    afterAll(async () => {
-        await cleanUp('after');
-    });
-
-    const name = [testKey, randomUUID()].join('-');
-
-    test('POST /gis-widget/:map/:id?', async () => {
-        const res = await injectWithHeaders({
-            method: 'POST',
-            url: `/api/gis-widget/${testKey}/${name}`,
-            payload: {
-                type: 'card1',
-            },
-            headers: { uid: user.uid, user_type: user.user_type }
-        });
-        expect(res.statusCode).toBe(200);
-        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
-        const json = res.json();
-        expect(json).toHaveProperty('map_id');
-        expect(json.map_id).toBe(testKey);
-    });
-
-    test('GET /gis-widget/:map/:id', async () => {
-        const res = await injectWithHeaders({
-            method: 'GET',
-            url: `/api/gis-widget/${testKey}`,
-            headers: { uid: user.uid, user_type: user.user_type }
-        });
-        expect(res.statusCode).toBe(200);
-        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
-        const json = res.json();
-        Object.assign(obj, { 'GET/gis-widget/:map': json });
-        expect(json).toHaveProperty('rows');
-        expect(json).toHaveProperty('fields');
-    });
-
-    test('GET /gis-widget/:map/:id', async () => {
-        /*await dataInsert({
-            table: 'gis.widgets',
-            id: name,
-            data: {
-                widget_id: name,
-                map_id: testKey,
-                type: 'card',
-                title: name,
-                config: {
-                    items: [{
-                        label: 'Карта тимчасових споруд',
-                        url: '/map/ts',
-                    }],
-                },
-                position: 'top-right',
-            },
-            uid: '1',
-        });*/
-        const res = await injectWithHeaders({
-            method: 'GET',
-            url: `/api/gis-widget/${testKey}/${name}`,
-            headers: { uid: user.uid, user_type: user.user_type }
-        });
-        expect(res.statusCode).toBe(200);
-        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
-        const json = res.json();
-        Object.assign(obj, { 'GET/gis-widget/:map/:id': json });
-        expect(json).toHaveProperty('widget_id');
-        expect(json).toHaveProperty('type');
-        expect(json).toHaveProperty('title');
-        expect(json).toHaveProperty('config');
-        expect(json).toHaveProperty('position');
-    });
-
-    test('PUT /gis-widget/:map/:id', async () => {
-        const res = await injectWithHeaders({
-            method: 'PUT',
-            url: `/api/gis-widget/${testKey}/${name}`,
-            payload: {
-                type: 'card1',
-            },
-            headers: { uid: user.uid, user_type: user.user_type }
-        });
-        expect(res.statusCode).toBe(200);
-        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
-        const json = res.json();
-        Object.assign(obj, { 'PUT/gis-widget/:map/:id': json });
-        expect(json).toHaveProperty('map_id');
-        expect(json.map_id).toBe(testKey);
-    });
-
-    test('DELETE /gis-widget/:map/:id', async () => {
-        const res = await injectWithHeaders({
-            method: 'DELETE',
-            url: `/api/gis-widget/${testKey}/${name}`,
-            headers: { uid: user.uid, user_type: user.user_type }
-        });
-        expect(res.statusCode).toBe(200);
-        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
-        const json = res.json();
-        Object.assign(obj, { 'DELETE/gis-widget/:map/:id': json });
-        expect(json).toHaveProperty('map_id');
-        expect(json.map_id).toBe(testKey);
-    });
-});
+/* eslint-disable indent */
+import { randomUUID } from 'node:crypto';
+
+import {
+    describe, test, expect, beforeAll, afterAll,
+} from 'vitest';
+
+import {
+    getPGAsync,
+} from '@opengis/fastify-table/utils.js';
+
+import { build, injectWithHeaders } from '../../../test/helper.js';
+
+const user = { uid: '1', user_type: 'admin' };
+const testKey = 'unittest';
+
+let pg;
+
+const obj = {};
+
+const cleanUp = async (when) => {
+    if (!pg) return;
+    const { rowCount: widgets } = await pg.query('delete from gis.widgets where (map_id like $1 or widget_id like $1)', [`${testKey}%`]);
+    console.log(`clean up widgets ${when}:`, widgets);
+    const { rowCount: maps } = await pg.query('delete from gis.maps where array[$1] && keywords', [testKey]);
+    console.log(`clean up maps ${when}:`, maps);
+}
+
+describe('maps api test', () => {
+    beforeAll(async () => {
+        await build();
+        pg = await getPGAsync();
+        // ensure not exists in case previous test fails / timeouts
+        await cleanUp('before');
+
+        await pg.query(
+            'insert into gis.maps (map_id, name, keywords, created_by, center) values($1, $1, array[$1], $2, $3) on conflict (map_id) do nothing returning *',
+            [testKey, user.uid, [30, 50]],
+        );
+        console.log('insert before success');
+    });
+
+    afterAll(async () => {
+        await cleanUp('after');
+    });
+
+    const name = [testKey, randomUUID()].join('-');
+
+    test('POST /gis-widget/:map/:id?', async () => {
+        const res = await injectWithHeaders({
+            method: 'POST',
+            url: `/api/gis-widget/${testKey}/${name}`,
+            payload: {
+                type: 'card1',
+            },
+            headers: { uid: user.uid, user_type: user.user_type }
+        });
+        expect(res.statusCode).toBe(200);
+        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
+        const json = res.json();
+        expect(json).toHaveProperty('map_id');
+        expect(json.map_id).toBe(testKey);
+    });
+
+    test('GET /gis-widget/:map/:id', async () => {
+        const res = await injectWithHeaders({
+            method: 'GET',
+            url: `/api/gis-widget/${testKey}`,
+            headers: { uid: user.uid, user_type: user.user_type }
+        });
+        expect(res.statusCode).toBe(200);
+        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
+        const json = res.json();
+        Object.assign(obj, { 'GET/gis-widget/:map': json });
+        expect(json).toHaveProperty('rows');
+        expect(json).toHaveProperty('fields');
+    });
+
+    test('GET /gis-widget/:map/:id', async () => {
+        /*await dataInsert({
+            table: 'gis.widgets',
+            id: name,
+            data: {
+                widget_id: name,
+                map_id: testKey,
+                type: 'card',
+                title: name,
+                config: {
+                    items: [{
+                        label: 'Карта тимчасових споруд',
+                        url: '/map/ts',
+                    }],
+                },
+                position: 'top-right',
+            },
+            uid: '1',
+        });*/
+        const res = await injectWithHeaders({
+            method: 'GET',
+            url: `/api/gis-widget/${testKey}/${name}`,
+            headers: { uid: user.uid, user_type: user.user_type }
+        });
+        expect(res.statusCode).toBe(200);
+        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
+        const json = res.json();
+        Object.assign(obj, { 'GET/gis-widget/:map/:id': json });
+        expect(json).toHaveProperty('widget_id');
+        expect(json).toHaveProperty('type');
+        expect(json).toHaveProperty('title');
+        expect(json).toHaveProperty('config');
+        expect(json).toHaveProperty('position');
+    });
+
+    test('PUT /gis-widget/:map/:id', async () => {
+        const res = await injectWithHeaders({
+            method: 'PUT',
+            url: `/api/gis-widget/${testKey}/${name}`,
+            payload: {
+                type: 'card1',
+            },
+            headers: { uid: user.uid, user_type: user.user_type }
+        });
+        expect(res.statusCode).toBe(200);
+        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
+        const json = res.json();
+        Object.assign(obj, { 'PUT/gis-widget/:map/:id': json });
+        expect(json).toHaveProperty('map_id');
+        expect(json.map_id).toBe(testKey);
+    });
+
+    test('DELETE /gis-widget/:map/:id', async () => {
+        const res = await injectWithHeaders({
+            method: 'DELETE',
+            url: `/api/gis-widget/${testKey}/${name}`,
+            headers: { uid: user.uid, user_type: user.user_type }
+        });
+        expect(res.statusCode).toBe(200);
+        expect(res.headers['content-type']).toBe('application/json; charset=utf-8');
+        const json = res.json();
+        Object.assign(obj, { 'DELETE/gis-widget/:map/:id': json });
+        expect(json).toHaveProperty('map_id');
+        expect(json.map_id).toBe(testKey);
+    });
+});

package/server/routes/widgets/widgets.schema.js

@@ -1,25 +1,25 @@
-export const schemaInfo = {
-    params: {
-        type: 'object',
-        properties: {
-            slug: {
-                type: 'string',
-            },
-            z: {
-                type: 'number',
-            },
-            y: {
-                type: 'number',
-            },
-            x: {
-                type: 'string',
-                pattern: '^\\d+\\.(pbf|vmt)$',
-            },
-            id: {
-                type: 'string',
-            },
-        },
-    },
-};
-
+export const schemaInfo = {
+    params: {
+        type: 'object',
+        properties: {
+            slug: {
+                type: 'string',
+            },
+            z: {
+                type: 'number',
+            },
+            y: {
+                type: 'number',
+            },
+            x: {
+                type: 'string',
+                pattern: '^\\d+\\.(pbf|vmt)$',
+            },
+            id: {
+                type: 'string',
+            },
+        },
+    },
+};
+
 export default null;

package/server/shared/listFiles.js

@@ -1,15 +1,15 @@
-const q = `SELECT 
-    file_id, entity_id, entity_type, file_path, uploaded_name, ext, size,
-    uid, cdate, file_type, ismain, isverified, uid as author, file_status
-FROM crm.files c
-where   entity_id=$1
-and     file_status<>3
-order by cdate desc`;
-
-export default async function listFiles({ entityId }, { pg } = {}) {
-    if (!pg) {
-        throw new Error('empty pg');
-    }
-
-    return pg.query(q, [entityId]).then((r) => r.rows);;
+const q = `SELECT 
+    file_id, entity_id, entity_type, file_path, uploaded_name, ext, size,
+    uid, cdate, file_type, ismain, isverified, uid as author, file_status
+FROM crm.files c
+where   entity_id=$1
+and     file_status<>3
+order by cdate desc`;
+
+export default async function listFiles({ entityId }, { pg } = {}) {
+    if (!pg) {
+        throw new Error('empty pg');
+    }
+
+    return pg.query(q, [entityId]).then((r) => r.rows);;
 } 

package/utils.js

@@ -1,13 +1,13 @@
-import gisRegistry from './server/routes/registers/functions/gis.registry.js';
-import gisRegistryList from './server/routes/registers/functions/gis.registry.list.js';
-import mapRegistry from './server/routes/registers/functions/map.registry.js';
-import rootFolder from './server/plugins/mapnik/funcs/rootFolder.mjs';
-import checkRasterFile from './server/plugins/mapnik/funcs/checkRasterFile.js';
-
-export {
-  gisRegistry,
-  gisRegistryList,
-  mapRegistry,
-  rootFolder,
-  checkRasterFile,
-};
+import gisRegistry from './server/routes/registers/functions/gis.registry.js';
+import gisRegistryList from './server/routes/registers/functions/gis.registry.list.js';
+import mapRegistry from './server/routes/registers/functions/map.registry.js';
+import rootFolder from './server/plugins/mapnik/funcs/rootFolder.mjs';
+import checkRasterFile from './server/plugins/mapnik/funcs/checkRasterFile.js';
+
+export {
+  gisRegistry,
+  gisRegistryList,
+  mapRegistry,
+  rootFolder,
+  checkRasterFile,
+};