@opengis/gis 0.2.174 → 0.2.176

package/server/routes/maps/maps.route.js

@@ -1,58 +1,58 @@
-import getMap from './functions/get.map.js';
-import addMap from './functions/add.map.js';
-import delMap from './functions/del.map.js';
-
-import { schemaInfo } from './maps.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-map/:id?' })) {
-        app.get('/gis-map/:id?', publicParams, async ({ params, pg }) => {
-            const result = await getMap({
-                id: params.id,
-            }, pg);
-            return result;
-        });
-    }
-    if (!app.hasRoute({ method: 'POST', url: '/gis-map/:id?' })) {
-        app.post('/gis-map/:id?', privilegedParams, async ({ method, body, params, user, pg }) => {
-            const result = await addMap({
-                method,
-                id: params.id,
-                body,
-                uid: user?.uid,
-            }, pg);
-            return result;
-        });
-    }
-    if (!app.hasRoute({ method: 'PUT', url: '/gis-map/:id' })) {
-        app.put('/gis-map/:id', privilegedParams, async ({ method, body, params, user, pg }) => {
-            const result = await addMap({
-                method,
-                id: params.id,
-                body,
-                uid: user?.uid,
-            }, pg);
-            return result;
-        });
-    }
-    if (!app.hasRoute({ method: 'DELETE', url: '/gis-map/:id' })) {
-        app.delete('/gis-map/:id', privilegedParams, async ({ params, user, pg }) => {
-            const result = await delMap({
-                id: params.id,
-                uid: user?.uid,
-            }, pg);
-            return result;
-        });
-    }
-}
+import getMap from './functions/get.map.js';
+import addMap from './functions/add.map.js';
+import delMap from './functions/del.map.js';
+
+import { schemaInfo } from './maps.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-map/:id?' })) {
+        app.get('/gis-map/:id?', publicParams, async ({ params, pg }) => {
+            const result = await getMap({
+                id: params.id,
+            }, pg);
+            return result;
+        });
+    }
+    if (!app.hasRoute({ method: 'POST', url: '/gis-map/:id?' })) {
+        app.post('/gis-map/:id?', privilegedParams, async ({ method, body, params, user, pg }) => {
+            const result = await addMap({
+                method,
+                id: params.id,
+                body,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        });
+    }
+    if (!app.hasRoute({ method: 'PUT', url: '/gis-map/:id' })) {
+        app.put('/gis-map/:id', privilegedParams, async ({ method, body, params, user, pg }) => {
+            const result = await addMap({
+                method,
+                id: params.id,
+                body,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        });
+    }
+    if (!app.hasRoute({ method: 'DELETE', url: '/gis-map/:id' })) {
+        app.delete('/gis-map/:id', privilegedParams, async ({ params, user, pg }) => {
+            const result = await delMap({
+                id: params.id,
+                uid: user?.uid,
+            }, pg);
+            return result;
+        });
+    }
+}

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

@@ -1,231 +1,231 @@
-/* eslint-disable indent */
-import { randomUUID } from 'node:crypto';
-
-import {
-    describe, test, expect, beforeAll, afterAll,
-} from 'vitest';
-
-import {
-    getPGAsync, dataInsert,
-} 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 = {};
-
-describe('maps api test', () => {
-    beforeAll(async () => {
-        await build();
-        pg = await getPGAsync();
-        // ensure not exists in case previous test fails / timeouts
-        const { rowCount } = await pg.query('delete from gis.maps where array[$1] && keywords', [testKey]);
-        console.log('clean up before: ', rowCount);
-        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 () => {
-        const { rowCount: maps } = await pg.query('delete from gis.maps where array[$1] && keywords', [testKey]);
-        console.log('clean up maps after: ', maps);
-        const { rowCount: widgets } = await pg.query('delete from gis.widgets where map_id in ($1,$2)', [testKey, name]);
-        console.log('clean up widgets after: ', widgets);
-    });
-
-    test('GET /gis-map', async () => {
-        const res = await injectWithHeaders({
-            method: 'GET',
-            url: '/api/gis-map',
-            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-map': json });
-        expect(json).toHaveProperty('rows');
-        expect(json.rows.length).toBeTruthy();
-        expect(json.rows[0]).toHaveProperty('map_id');
-        expect(json.rows[0]).toHaveProperty('name');
-        expect(json.rows[0]).toHaveProperty('map_key');
-        expect(json).toHaveProperty('fields');
-        expect(json.fields[0]).toHaveProperty('name');
-        expect(json.fields[0]).toHaveProperty('type');
-        expect(json.fields[0]).toHaveProperty('label');
-    }, 15000);
-
-    test('GET /gis-map/:id', async () => {
-        const res = await injectWithHeaders({
-            method: 'GET',
-            url: `/api/gis-map/${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-map/:id': json });
-        expect(json).toHaveProperty('map_id');
-        expect(json.map_id).toBe(testKey);
-        expect(json).toHaveProperty('name');
-        expect(json).toHaveProperty('map_key');
-        expect(json).toHaveProperty('widgets');
-        expect(json).toHaveProperty('layers');
-        expect(json).toHaveProperty('center');
-        expect(Array.isArray(json.center)).toBeTruthy();
-        expect(json.center[0]).toBe(30);
-        expect(json.center[1]).toBe(50);
-        // expect(json.fields[0]).toHaveProperty('name');
-        // expect(json.fields[0]).toHaveProperty('type');
-        // expect(json.fields[0]).toHaveProperty('label');
-    });
-
-    const name = [testKey, randomUUID()].join('-');
-
-    test('POST /gis-map', async () => {
-        const res = await injectWithHeaders({
-            method: 'POST',
-            url: '/api/gis-map',
-            payload: {
-                name,
-                map_key: name,
-                keywords: [testKey],
-                widgets: [{
-                    type: 'legend',
-                    position: 'bottom-right',
-                }],
-                layers: ['dbcb186818e3', '3c95e341465d'],
-            },
-            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, { 'POST/gis-map': json });
-        expect(json).toHaveProperty('map_id');
-        expect(json).toHaveProperty('widgets');
-        expect(Array.isArray(json.widgets)).toBeTruthy();
-        expect(json.widgets[0]).toHaveProperty('type');
-        expect(json.widgets[0].type).toBe('legend');
-        expect(json).toHaveProperty('layers');
-        expect(Array.isArray(json.layers)).toBeTruthy();
-        expect(json.layers[0]).toBe('dbcb186818e3');
-    });
-
-    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);
-    });
-
-    test('PUT /gis-map/:id', async () => {
-        const res = await injectWithHeaders({
-            method: 'PUT',
-            url: `/api/gis-map/${testKey}`,
-            payload: {
-                keywords: [testKey],
-                description: 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, { 'PUT/gis-map/:id': json });
-        expect(json).toHaveProperty('map_id');
-        expect(json.map_id).toBe(testKey);
-    });
-
-    test('DELETE /gis-map/:id', async () => {
-        const res = await injectWithHeaders({
-            method: 'DELETE',
-            url: `/api/gis-map/${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, { 'DELETE/gis-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, dataInsert,
+} 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 = {};
+
+describe('maps api test', () => {
+    beforeAll(async () => {
+        await build();
+        pg = await getPGAsync();
+        // ensure not exists in case previous test fails / timeouts
+        const { rowCount } = await pg.query('delete from gis.maps where array[$1] && keywords', [testKey]);
+        console.log('clean up before: ', rowCount);
+        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 () => {
+        const { rowCount: maps } = await pg.query('delete from gis.maps where array[$1] && keywords', [testKey]);
+        console.log('clean up maps after: ', maps);
+        const { rowCount: widgets } = await pg.query('delete from gis.widgets where map_id in ($1,$2)', [testKey, name]);
+        console.log('clean up widgets after: ', widgets);
+    });
+
+    test('GET /gis-map', async () => {
+        const res = await injectWithHeaders({
+            method: 'GET',
+            url: '/api/gis-map',
+            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-map': json });
+        expect(json).toHaveProperty('rows');
+        expect(json.rows.length).toBeTruthy();
+        expect(json.rows[0]).toHaveProperty('map_id');
+        expect(json.rows[0]).toHaveProperty('name');
+        expect(json.rows[0]).toHaveProperty('map_key');
+        expect(json).toHaveProperty('fields');
+        expect(json.fields[0]).toHaveProperty('name');
+        expect(json.fields[0]).toHaveProperty('type');
+        expect(json.fields[0]).toHaveProperty('label');
+    }, 15000);
+
+    test('GET /gis-map/:id', async () => {
+        const res = await injectWithHeaders({
+            method: 'GET',
+            url: `/api/gis-map/${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-map/:id': json });
+        expect(json).toHaveProperty('map_id');
+        expect(json.map_id).toBe(testKey);
+        expect(json).toHaveProperty('name');
+        expect(json).toHaveProperty('map_key');
+        expect(json).toHaveProperty('widgets');
+        expect(json).toHaveProperty('layers');
+        expect(json).toHaveProperty('center');
+        expect(Array.isArray(json.center)).toBeTruthy();
+        expect(json.center[0]).toBe(30);
+        expect(json.center[1]).toBe(50);
+        // expect(json.fields[0]).toHaveProperty('name');
+        // expect(json.fields[0]).toHaveProperty('type');
+        // expect(json.fields[0]).toHaveProperty('label');
+    });
+
+    const name = [testKey, randomUUID()].join('-');
+
+    test('POST /gis-map', async () => {
+        const res = await injectWithHeaders({
+            method: 'POST',
+            url: '/api/gis-map',
+            payload: {
+                name,
+                map_key: name,
+                keywords: [testKey],
+                widgets: [{
+                    type: 'legend',
+                    position: 'bottom-right',
+                }],
+                layers: ['dbcb186818e3', '3c95e341465d'],
+            },
+            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, { 'POST/gis-map': json });
+        expect(json).toHaveProperty('map_id');
+        expect(json).toHaveProperty('widgets');
+        expect(Array.isArray(json.widgets)).toBeTruthy();
+        expect(json.widgets[0]).toHaveProperty('type');
+        expect(json.widgets[0].type).toBe('legend');
+        expect(json).toHaveProperty('layers');
+        expect(Array.isArray(json.layers)).toBeTruthy();
+        expect(json.layers[0]).toBe('dbcb186818e3');
+    });
+
+    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);
+    });
+
+    test('PUT /gis-map/:id', async () => {
+        const res = await injectWithHeaders({
+            method: 'PUT',
+            url: `/api/gis-map/${testKey}`,
+            payload: {
+                keywords: [testKey],
+                description: 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, { 'PUT/gis-map/:id': json });
+        expect(json).toHaveProperty('map_id');
+        expect(json.map_id).toBe(testKey);
+    });
+
+    test('DELETE /gis-map/:id', async () => {
+        const res = await injectWithHeaders({
+            method: 'DELETE',
+            url: `/api/gis-map/${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, { 'DELETE/gis-map/:id': json });
+        expect(json).toHaveProperty('map_id');
+        expect(json.map_id).toBe(testKey);
+    });
+});

package/server/routes/maps/maps.schema.js

@@ -1,10 +1,10 @@
-export const schemaInfo = {
-    params: {
-        type: 'object',
-        properties: {
-            id: { type: "string", pattern: '^([\\d\\w._-]+)$' },
-        },
-    },
-};
-
+export const schemaInfo = {
+    params: {
+        type: 'object',
+        properties: {
+            id: { type: "string", pattern: '^([\\d\\w._-]+)$' },
+        },
+    },
+};
+
 export default null;