@opengis/gis 0.2.176 → 0.2.177

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

@@ -1,80 +1,91 @@
-import gisRegistry from './functions/gis.registry.js';
-import gisRegistryList from './functions/gis.registry.list.js';
-// import mapRegistry from './functions/map.registry.js';
-import gisExport from './functions/gis.export.js';
-import addGisRegistry from './functions/add.registry.js';
-import deleteGisRegistry from './functions/del.registry.js';
-
-import {
-    gisRegistrySchema,
-    gisRegistryListSchema,
-    addGisRegistrySchema,
-    editGisRegistrySchema,
-    deleteGisRegistrySchema,
-    gisExportSchema,
-} from './registers.schema.js';
-
-const publicParams = { config: { policy: 'L0', package: 'gis' } };
-
-async function route(app) {
-    app.get('/gis-registry/:slug', { ...publicParams, schema: gisRegistrySchema }, async ({ params, query, pg }) => {
-        const result = await gisRegistry({
-            slug: params.slug,
-            search: query.search,
-            filter: query.filter,
-            page: query.page,
-            limit: query.limit,
-            sql: query.sql,
-        }, pg);
-        return result;
-    });
-    app.get('/gis-registry/:slug/:objectId', { ...publicParams, schema: gisRegistrySchema }, async ({ params, query, pg }) => {
-        const result = await gisRegistry({
-            slug: params.slug,
-            objectId: params.objectId,
-            search: query.search,
-            filter: query.filter,
-            page: query.page,
-            limit: query.limit,
-            sql: query.sql,
-        }, pg);
-        return result;
-    });
-    app.get('/gis-registry', { ...publicParams, schema: gisRegistryListSchema }, async ({ query, pg }) => {
-        const result = await gisRegistryList({
-            page: query.page,
-            limit: query.limit,
-            search: query.search,
-        }, pg);
-        return result;
-    });
-    app.post('/gis-registry/:slug?', { ...publicParams, schema: addGisRegistrySchema }, async ({ method, params, body, user, pg }) => {
-        const result = await addGisRegistry({
-            method, slug: params.slug, body, uid: user?.uid,
-        }, pg);
-        return result;
-    });
-    app.put('/gis-registry/:slug', { ...publicParams, schema: editGisRegistrySchema }, async ({ method, params, body, user, pg }) => {
-        const result = await addGisRegistry({
-            method, slug: params.slug, body, uid: user?.uid,
-        }, pg);
-        return result;
-    });
-    app.delete('/gis-registry/:slug', { ...publicParams, schema: deleteGisRegistrySchema }, async ({ params, user, pg }) => {
-        const result = await deleteGisRegistry({
-            slug: params.slug,
-            uid: user?.uid,
-        }, pg);
-        return result;
-    });
-    // app.get('/map-registry/:slug/:id', { ...publicParams, schema: mapRegistrySchema }, mapRegistry);
-    app.get('/gis-export/:type/:slug', { ...publicParams, schema: gisExportSchema }, async ({ params, query, pg }, reply) => {
-        const result = await gisExport({
-            slug: params.slug,
-            type: params.type,
-            format: query.format,
-        }, pg);
-        return reply.headers(result.headers).send(result.data);
-    });
-}
-export default route;
+import gisRegistry from './functions/gis.registry.js';
+import gisRegistryList from './functions/gis.registry.list.js';
+// import mapRegistry from './functions/map.registry.js';
+import gisExport from './functions/gis.export.js';
+import addGisRegistry from './functions/add.registry.js';
+import deleteGisRegistry from './functions/del.registry.js';
+import gisSuggest from './functions/gis.suggest.js';
+
+import {
+    gisRegistrySchema,
+    gisRegistryListSchema,
+    addGisRegistrySchema,
+    editGisRegistrySchema,
+    deleteGisRegistrySchema,
+    gisExportSchema,
+    gisSuggestSchema,
+} from './registers.schema.js';
+
+const publicParams = { config: { policy: 'L0', package: 'gis' } };
+
+async function route(app) {
+    app.get('/gis-registry/:slug', { ...publicParams, schema: gisRegistrySchema }, async ({ params, query, pg }) => {
+        const result = await gisRegistry({
+            slug: params.slug,
+            search: query.search,
+            filter: query.filter,
+            page: query.page,
+            limit: query.limit,
+            sql: query.sql,
+        }, pg);
+        return result;
+    });
+    app.get('/gis-registry/:slug/:objectId', { ...publicParams, schema: gisRegistrySchema }, async ({ params, query, pg }) => {
+        const result = await gisRegistry({
+            slug: params.slug,
+            objectId: params.objectId,
+            search: query.search,
+            filter: query.filter,
+            page: query.page,
+            limit: query.limit,
+            sql: query.sql,
+        }, pg);
+        return result;
+    });
+    app.get('/gis-registry', { ...publicParams, schema: gisRegistryListSchema }, async ({ query, pg }) => {
+        const result = await gisRegistryList({
+            page: query.page,
+            limit: query.limit,
+            search: query.search,
+        }, pg);
+        return result;
+    });
+    app.post('/gis-registry/:slug?', { ...publicParams, schema: addGisRegistrySchema }, async ({ method, params, body, user, pg }) => {
+        const result = await addGisRegistry({
+            method, slug: params.slug, body, uid: user?.uid,
+        }, pg);
+        return result;
+    });
+    app.put('/gis-registry/:slug', { ...publicParams, schema: editGisRegistrySchema }, async ({ method, params, body, user, pg }) => {
+        const result = await addGisRegistry({
+            method, slug: params.slug, body, uid: user?.uid,
+        }, pg);
+        return result;
+    });
+    app.delete('/gis-registry/:slug', { ...publicParams, schema: deleteGisRegistrySchema }, async ({ params, user, pg }) => {
+        const result = await deleteGisRegistry({
+            slug: params.slug,
+            uid: user?.uid,
+        }, pg);
+        return result;
+    });
+    // app.get('/map-registry/:slug/:id', { ...publicParams, schema: mapRegistrySchema }, mapRegistry);
+    app.get('/gis-export/:type/:slug', { ...publicParams, schema: gisExportSchema }, async ({ params, query, pg }, reply) => {
+        const result = await gisExport({
+            slug: params.slug,
+            type: params.type,
+            format: query.format,
+        }, pg);
+        return reply.headers(result.headers).send(result.data);
+    });
+    app.get('/gis-suggest/:token', { ...publicParams, schema: gisSuggestSchema }, async ({ params, query, pg }) => {
+        const result = await gisSuggest({
+            token: params.token,
+            key: query.key,
+            val: query.val,
+            limit: query.limit,
+        }, pg);
+        return result;
+    });
+}
+export default route;

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

@@ -1,145 +1,145 @@
-import { afterAll, beforeAll, describe, expect, test } from 'vitest';
-
-import { getPGAsync } from '@opengis/fastify-table/utils.js';
-
-import { build, injectWithHeaders } from '../../../test/helper.js';
-
-let pg;
-
-beforeAll(async () => {
-    await build();
-
-    pg = await getPGAsync();
-
-    await cleanUp('before');
-});
-
-afterAll(async () => {
-    await cleanUp('after');
-});
-
-const testId = 'testRegister';
-
-const cleanUp = async (when) => {
-    if (!pg) return;
-    const rowCount2 = await pg.query('delete from gis.registers where register_id=$1', [testId]).then(r => r.rowCount || 0);
-    console.log(`clean up finished: ${when}`, rowCount2);
-};
-
-describe('GIS routes', () => {
-    test('GET /gis-registry/:slug returns 200', async () => {
-        const { slug, table } = await pg.query('SELECT register_id as slug, table_name as table FROM gis.registers where table_name is not null limit 1').then(r => r.rows[0]) || {};
-        const pkey = pg.pk?.[table];
-        expect(pkey).toBeDefined();
-
-        const res = await injectWithHeaders({
-            url: `/api/gis-registry/${slug}`,
-        });
-
-        expect(res.statusCode).toBe(200);
-        [
-            "total", "limit", "page", "register_id", "name", "card", "table_name", "register_key", "description",
-            "rows", "service_id", "columns", "filters", "fields", "view", "is_downloadable", "is_map", "is_register",
-            "is_files", "config"
-        ].forEach(key => expect(res.body).toHaveProperty(key));
-    });
-
-    test('GET /gis-registry/:slug/:objectId returns 200', async () => {
-        const { slug, table } = await pg.query('SELECT register_id as slug, table_name as table FROM gis.registers where table_name is not null limit 1').then(r => r.rows[0]) || {};
-        const pkey = pg.pk?.[table];
-        expect(pkey).toBeDefined();
-
-        const objectId = await pg.query(`select ${pkey} from ${table} limit 1`).then(r => r.rows?.[0]?.[pkey]);
-        expect(objectId).toBeDefined();
-
-        const url = `/api/gis-registry/${slug}/${objectId}`;
-        const res = await injectWithHeaders({
-            url,
-        });
-
-        expect(res.statusCode, url).toBe(200);
-        [
-            "row", "card", "d", "columns", "is_downloadable", "register_key", "register_id", "service_id",
-            "name", "is_files", "is_map", "is_register"
-        ].forEach(key => expect(res.body).toHaveProperty(key));
-    });
-
-    test('GET /gis-registry returns 200', async () => {
-        const res = await injectWithHeaders({
-            url: '/api/gis-registry',
-        });
-
-        expect(res.statusCode).toBe(200);
-        ["rows", "total", "page", "limit", "offset"].forEach(key => expect(res.body).toHaveProperty(key));
-    });
-
-    test('POST /gis-registry returns 200', async () => {
-        const table = pg.tlist.find(el => el.includes('parcel') || el.includes('address') || el.includes('street')) || pg.tlist[0];
-        await pg.query('delete from gis.registers where register_id=$1', [testId]);
-
-        const payload = {
-            register_key: 'unit-test',
-            name: 'unit-test',
-            table_name: table
-        };
-
-        const res = await injectWithHeaders({
-            method: 'POST',
-            url: `/api/gis-registry/${testId}`,
-            payload
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.body).toHaveProperty('register_id');
-        expect(res.body).toHaveProperty('register_key');
-        expect(res.body).toHaveProperty('name');
-        expect(res.body.name).toBe(payload.name);
-        expect(res.body).toHaveProperty('table_name');
-    });
-
-    test('PUT /gis-registry/:slug returns 200', async () => {
-        const payload = {
-            name: 'unit-test edited',
-        };
-        const res = await injectWithHeaders({
-            method: 'PUT',
-            url: `/api/gis-registry/${testId}`,
-            payload
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.body).toHaveProperty('register_id');
-        expect(res.body).toHaveProperty('register_key');
-        expect(res.body).toHaveProperty('name');
-        expect(res.body.name).toBe(payload.name);
-        expect(res.body).toHaveProperty('table_name');
-    });
-
-    // ! before delete
-    test('GET /gis-export/:type/:slug returns 200', async () => {
-        const res = await injectWithHeaders({
-            url: `/api/gis-export/register/${testId}`,
-            format: 'csv'
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.headers).toHaveProperty('content-type');
-        expect(res.headers['content-type']).toBe('text/csv');
-        expect(res.headers).toHaveProperty('content-disposition');
-        expect(res.headers['content-disposition']).toMatch('attachment; filename=');
-        expect(res.body.length).toBeGreaterThan(0);
-    });
-
-    test('DELETE /gis-registry/:slug returns 200', async () => {
-        const res = await injectWithHeaders({
-            method: 'DELETE',
-            url: `/api/gis-registry/${testId}`,
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.body).toHaveProperty('register_id');
-        expect(res.body).toHaveProperty('register_key');
-        expect(res.body).toHaveProperty('name');
-        expect(res.body).toHaveProperty('table_name');
-    });
+import { afterAll, beforeAll, describe, expect, test } from 'vitest';
+
+import { getPGAsync } from '@opengis/fastify-table/utils.js';
+
+import { build, injectWithHeaders } from '../../../test/helper.js';
+
+let pg;
+
+beforeAll(async () => {
+    await build();
+
+    pg = await getPGAsync();
+
+    await cleanUp('before');
+});
+
+afterAll(async () => {
+    await cleanUp('after');
+});
+
+const testId = 'testRegister';
+
+const cleanUp = async (when) => {
+    if (!pg) return;
+    const rowCount2 = await pg.query('delete from gis.registers where register_id=$1', [testId]).then(r => r.rowCount || 0);
+    console.log(`clean up finished: ${when}`, rowCount2);
+};
+
+describe('GIS routes', () => {
+    test('GET /gis-registry/:slug returns 200', async () => {
+        const { slug, table } = await pg.query('SELECT register_id as slug, table_name as table FROM gis.registers where table_name is not null limit 1').then(r => r.rows[0]) || {};
+        const pkey = pg.pk?.[table];
+        expect(pkey).toBeDefined();
+
+        const res = await injectWithHeaders({
+            url: `/api/gis-registry/${slug}`,
+        });
+
+        expect(res.statusCode).toBe(200);
+        [
+            "total", "limit", "page", "register_id", "name", "card", "table_name", "register_key", "description",
+            "rows", "service_id", "columns", "filters", "fields", "view", "is_downloadable", "is_map", "is_register",
+            "is_files", "config"
+        ].forEach(key => expect(res.body).toHaveProperty(key));
+    });
+
+    test('GET /gis-registry/:slug/:objectId returns 200', async () => {
+        const { slug, table } = await pg.query('SELECT register_id as slug, table_name as table FROM gis.registers where table_name is not null limit 1').then(r => r.rows[0]) || {};
+        const pkey = pg.pk?.[table];
+        expect(pkey).toBeDefined();
+
+        const objectId = await pg.query(`select ${pkey} from ${table} limit 1`).then(r => r.rows?.[0]?.[pkey]);
+        expect(objectId).toBeDefined();
+
+        const url = `/api/gis-registry/${slug}/${objectId}`;
+        const res = await injectWithHeaders({
+            url,
+        });
+
+        expect(res.statusCode, url).toBe(200);
+        [
+            "row", "card", "d", "columns", "is_downloadable", "register_key", "register_id", "service_id",
+            "name", "is_files", "is_map", "is_register"
+        ].forEach(key => expect(res.body).toHaveProperty(key));
+    });
+
+    test('GET /gis-registry returns 200', async () => {
+        const res = await injectWithHeaders({
+            url: '/api/gis-registry',
+        });
+
+        expect(res.statusCode).toBe(200);
+        ["rows", "total", "page", "limit", "offset"].forEach(key => expect(res.body).toHaveProperty(key));
+    });
+
+    test('POST /gis-registry returns 200', async () => {
+        const table = pg.tlist.find(el => el.includes('parcel') || el.includes('address') || el.includes('street')) || pg.tlist[0];
+        await pg.query('delete from gis.registers where register_id=$1', [testId]);
+
+        const payload = {
+            register_key: 'unit-test',
+            name: 'unit-test',
+            table_name: table
+        };
+
+        const res = await injectWithHeaders({
+            method: 'POST',
+            url: `/api/gis-registry/${testId}`,
+            payload
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('register_id');
+        expect(res.body).toHaveProperty('register_key');
+        expect(res.body).toHaveProperty('name');
+        expect(res.body.name).toBe(payload.name);
+        expect(res.body).toHaveProperty('table_name');
+    });
+
+    test('PUT /gis-registry/:slug returns 200', async () => {
+        const payload = {
+            name: 'unit-test edited',
+        };
+        const res = await injectWithHeaders({
+            method: 'PUT',
+            url: `/api/gis-registry/${testId}`,
+            payload
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('register_id');
+        expect(res.body).toHaveProperty('register_key');
+        expect(res.body).toHaveProperty('name');
+        expect(res.body.name).toBe(payload.name);
+        expect(res.body).toHaveProperty('table_name');
+    });
+
+    // ! before delete
+    test('GET /gis-export/:type/:slug returns 200', async () => {
+        const res = await injectWithHeaders({
+            url: `/api/gis-export/register/${testId}`,
+            format: 'csv'
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.headers).toHaveProperty('content-type');
+        expect(res.headers['content-type']).toBe('text/csv');
+        expect(res.headers).toHaveProperty('content-disposition');
+        expect(res.headers['content-disposition']).toMatch('attachment; filename=');
+        expect(res.body.length).toBeGreaterThan(0);
+    });
+
+    test('DELETE /gis-registry/:slug returns 200', async () => {
+        const res = await injectWithHeaders({
+            method: 'DELETE',
+            url: `/api/gis-registry/${testId}`,
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('register_id');
+        expect(res.body).toHaveProperty('register_key');
+        expect(res.body).toHaveProperty('name');
+        expect(res.body).toHaveProperty('table_name');
+    });
 });