@opengis/gis 0.2.176 → 0.2.177

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

@@ -1,54 +1,54 @@
-import { beforeAll, describe, expect, test } from 'vitest';
-
-import { getPGAsync } from '@opengis/fastify-table/utils.js';
-
-import { build, injectWithHeaders } from '../../../test/helper.js';
-
-let pg;
-
-describe('OGC routes', () => {
-    beforeAll(async () => {
-        await build();
-
-        pg = await getPGAsync();
-    });
-
-    test('GET /map-info-point validates query', async () => {
-        const { id, table } = await pg.query('select ogc_service_id as id, table_name as table from gis.ogc_service WHERE enabled and table_name is not null limit 1').then(r => r.rows[0]) || {};
-        expect(table).toBeDefined();
-        const { x, y } = await pg.query(`select st_x(st_pointonsurface(geom)) as x, st_y(st_pointonsurface(geom)) as y from ${table} where geom is not null limit 1`).then(r => r.rows[0]) || {};
-        expect(x).toBeDefined();
-        expect(y).toBeDefined();
-        const res = await injectWithHeaders({
-            url: '/api/map-info-point',
-            query: {
-                x,
-                y,
-                layers: id,
-                // index: 0,
-            },
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.body).toHaveProperty('time');
-        expect(res.body).toHaveProperty('index');
-        expect(res.body.index).toBeTypeOf('number');
-        expect(res.body).toHaveProperty('count');
-        expect(res.body.count).toBeTypeOf('number');
-        expect(res.body.count).toBeGreaterThan(0);
-        expect(res.body).toHaveProperty('data');
-        expect(res.body).toHaveProperty('fields');
-        expect(res.body.data).toHaveProperty('layer');
-        expect(res.body.data).toHaveProperty('geom');
-        expect(res.body.data).toHaveProperty('id');
-        expect(res.body.data).toHaveProperty('distance');
-        expect(res.body.data).toHaveProperty('data');
-        expect(res.body.data.data).toHaveProperty('geom');
-        expect(res.body.fields).toBeInstanceOf(Array);
-        expect(res.body.fields.length).toBeGreaterThan(0);
-        expect(res.body.fields[0]).toHaveProperty('name');
-        expect(res.body.fields[0]).toHaveProperty('type');
-        expect(res.body.fields[0]).toHaveProperty('label');
-        expect(res.body).toHaveProperty('html');
-    });
+import { beforeAll, describe, expect, test } from 'vitest';
+
+import { getPGAsync } from '@opengis/fastify-table/utils.js';
+
+import { build, injectWithHeaders } from '../../../test/helper.js';
+
+let pg;
+
+describe('OGC routes', () => {
+    beforeAll(async () => {
+        await build();
+
+        pg = await getPGAsync();
+    });
+
+    test('GET /map-info-point validates query', async () => {
+        const { id, table } = await pg.query('select ogc_service_id as id, table_name as table from gis.ogc_service WHERE enabled and table_name is not null limit 1').then(r => r.rows[0]) || {};
+        expect(table).toBeDefined();
+        const { x, y } = await pg.query(`select st_x(st_pointonsurface(geom)) as x, st_y(st_pointonsurface(geom)) as y from ${table} where geom is not null limit 1`).then(r => r.rows[0]) || {};
+        expect(x).toBeDefined();
+        expect(y).toBeDefined();
+        const res = await injectWithHeaders({
+            url: '/api/map-info-point',
+            query: {
+                x,
+                y,
+                layers: id,
+                // index: 0,
+            },
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('time');
+        expect(res.body).toHaveProperty('index');
+        expect(res.body.index).toBeTypeOf('number');
+        expect(res.body).toHaveProperty('count');
+        expect(res.body.count).toBeTypeOf('number');
+        expect(res.body.count).toBeGreaterThan(0);
+        expect(res.body).toHaveProperty('data');
+        expect(res.body).toHaveProperty('fields');
+        expect(res.body.data).toHaveProperty('layer');
+        expect(res.body.data).toHaveProperty('geom');
+        expect(res.body.data).toHaveProperty('id');
+        expect(res.body.data).toHaveProperty('distance');
+        expect(res.body.data).toHaveProperty('data');
+        expect(res.body.data.data).toHaveProperty('geom');
+        expect(res.body.fields).toBeInstanceOf(Array);
+        expect(res.body.fields.length).toBeGreaterThan(0);
+        expect(res.body.fields[0]).toHaveProperty('name');
+        expect(res.body.fields[0]).toHaveProperty('type');
+        expect(res.body.fields[0]).toHaveProperty('label');
+        expect(res.body).toHaveProperty('html');
+    });
 });

package/server/routes/ogc/ogc.schema.js

@@ -1,16 +1,16 @@
-export const mapInfoPointSchema = {
-    querystring: {
-        type: 'object',
-        additionalProperties: false,
-        properties: {
-            sql: { type: 'number', enum: [1, 2] },
-            x: { type: 'number', minimum: -180, maximum: 180 }, // longitude
-            y: { type: 'number', minimum: -90, maximum: 90 }, // latitude
-            layers: { type: 'string' },
-            index: { type: 'number', minimum: 0 },
-        },
-        required: ['x', 'y', 'layers'],
-    },
-};
-
-export default null;
+export const mapInfoPointSchema = {
+    querystring: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+            sql: { type: 'number', enum: [1, 2] },
+            x: { type: 'number', minimum: -180, maximum: 180 }, // longitude
+            y: { type: 'number', minimum: -90, maximum: 90 }, // latitude
+            layers: { type: 'string' },
+            index: { type: 'number', minimum: 0 },
+        },
+        required: ['x', 'y', 'layers'],
+    },
+};
+
+export default null;

package/server/routes/permissions/functions/catalog.permissions.edit.js

@@ -1,20 +1,20 @@
-import { BadRequestError } from "@opengis/fastify-table/errors.js";
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function catalogPermissionsEdit({ uid, body }, pg = pgClients.client) {
-    if (!uid) {
-        throw BadRequestError('not enough params: id');
-    }
-
-    if (!body?.length) {
-        throw BadRequestError('body is empty');
-    }
-
-    await pg.query(`delete from gis.services_users_rel where user_id = $1`, [uid]);
-
-    const promises = body.map(el => pg.query(`insert into gis.services_users_rel (service_id,user_id,created_by,actions) values ($1,$2,$2,$3)`, [el.service_id, uid, el.actions]));
-
-    await Promise.all(promises);
-
-    return { status: 201, message: `Inserted ${body?.length} permissions` };
-}
+import { BadRequestError } from "@opengis/fastify-table/errors.js";
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function catalogPermissionsEdit({ uid, body }, pg = pgClients.client) {
+    if (!uid) {
+        throw BadRequestError('not enough params: id');
+    }
+
+    if (!body?.length) {
+        throw BadRequestError('body is empty');
+    }
+
+    await pg.query(`delete from gis.services_users_rel where user_id = $1`, [uid]);
+
+    const promises = body.map(el => pg.query(`insert into gis.services_users_rel (service_id,user_id,created_by,actions) values ($1,$2,$2,$3)`, [el.service_id, uid, el.actions]));
+
+    await Promise.all(promises);
+
+    return { status: 201, message: `Inserted ${body?.length} permissions` };
+}

package/server/routes/permissions/functions/catalog.permissions.js

@@ -1,13 +1,13 @@
-import { BadRequestError } from "@opengis/fastify-table/errors.js";
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function catalogPermissions({ uid }, pg = pgClients.client) {
-    if (!uid) {
-        throw BadRequestError('not enough params: id');
-    }
-
-    const { total, layer_list } = await pg.query(
-        `select count(*)::int as total, array_agg(json_build_object('service_id',service_id,'actions',actions)) as layer_list from gis.services_users_rel where user_id=$1`, [uid]).then(r => r.rows?.[0] || {});
-
-    return { total, layer_list };
+import { BadRequestError } from "@opengis/fastify-table/errors.js";
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function catalogPermissions({ uid }, pg = pgClients.client) {
+    if (!uid) {
+        throw BadRequestError('not enough params: id');
+    }
+
+    const { total, layer_list } = await pg.query(
+        `select count(*)::int as total, array_agg(json_build_object('service_id',service_id,'actions',actions)) as layer_list from gis.services_users_rel where user_id=$1`, [uid]).then(r => r.rows?.[0] || {});
+
+    return { total, layer_list };
 }

package/server/routes/permissions/functions/get.permissions.js

@@ -1,59 +1,59 @@
-export default async function getPermissions({ pg, uid }) {
-  if (!uid) return { all_layers: false, group_list: [] };
-  const selectPermissions = `
-            select
-            case when a.user_type='admin' then true else a.all_layers end as all_layers,
-            b.layer_list,
-            c.group_list
-            from admin.users a
-            left join lateral (
-                select array_agg(service_id) as layer_list
-                from gis.services_users_rel
-                where user_id = a.uid
-            ) b on true
-            left join lateral (
-                select
-                array_agg(distinct group_id) as group_list
-                from
-                (
-                    select 
-                    group_id
-                    from gis.services
-                    where is_active
-                    and service_id = any(b.layer_list)
-
-                    union all
-
-                    select
-                    group_id
-                    from gis.ogc_service
-                    where enabled and 
-                    ogc_service_id = any(b.layer_list)
-
-                    union all
-
-                    select group_id
-                    from gis.rasters
-                    where is_active and 
-                    raster_id = any(b.layer_list)
-
-                    union all
-
-                    select group_id
-                    from gis.cartocss
-                    where enabled and 
-                    cartocss_id = any(b.layer_list)
-                )q
-                where group_id in (
-                    select group_id
-                    from gis.group_list
-                    where enabled
-                ) 
-            ) c on true
-            where a.uid = $1
-            limit 1
-        `;
-  const { all_layers, group_list, layer_list } = await pg.query(selectPermissions, [uid]).then(el => el?.rows?.[0] || {});
-
-  return { all_layers, group_list, layer_list };
-}
+export default async function getPermissions({ pg, uid }) {
+  if (!uid) return { all_layers: false, group_list: [] };
+  const selectPermissions = `
+            select
+            case when a.user_type='admin' then true else a.all_layers end as all_layers,
+            b.layer_list,
+            c.group_list
+            from admin.users a
+            left join lateral (
+                select array_agg(service_id) as layer_list
+                from gis.services_users_rel
+                where user_id = a.uid
+            ) b on true
+            left join lateral (
+                select
+                array_agg(distinct group_id) as group_list
+                from
+                (
+                    select 
+                    group_id
+                    from gis.services
+                    where is_active
+                    and service_id = any(b.layer_list)
+
+                    union all
+
+                    select
+                    group_id
+                    from gis.ogc_service
+                    where enabled and 
+                    ogc_service_id = any(b.layer_list)
+
+                    union all
+
+                    select group_id
+                    from gis.rasters
+                    where is_active and 
+                    raster_id = any(b.layer_list)
+
+                    union all
+
+                    select group_id
+                    from gis.cartocss
+                    where enabled and 
+                    cartocss_id = any(b.layer_list)
+                )q
+                where group_id in (
+                    select group_id
+                    from gis.group_list
+                    where enabled
+                ) 
+            ) c on true
+            where a.uid = $1
+            limit 1
+        `;
+  const { all_layers, group_list, layer_list } = await pg.query(selectPermissions, [uid]).then(el => el?.rows?.[0] || {});
+
+  return { all_layers, group_list, layer_list };
+}

package/server/routes/permissions/functions/gis.catalog.js

@@ -1,80 +1,80 @@
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-import getPermissions from './get.permissions.js';
-
-export default async function gisCatalog({ uid }, pg = pgClients.client) {
-  // permissions
-  const { all_layers, group_list, layer_list } = await getPermissions({ pg, uid });
-
-  if (!all_layers && !group_list?.length && !layer_list?.length) {
-    return {
-      status: 204, categoriesCount: 0, layersCount: 0, servicesCount: 0, rastersCount: 0, categories: [], layers: [],
-    };
-  }
-
-  // groups
-  const selectCategories = `select group_id as category_id, trim(group_name) as name, icon from gis.group_list where enabled and ${all_layers ? '$1' : 'group_id = any($1)'} order by trim(group_name)`;
-  const { rows: categories } = await pg.query(selectCategories, [all_layers ? true : group_list]);
-  const categoriesCount = categories?.length || 0;
-
-  // services
-  const selectLayers = `
-    select
-    service_id as layer_id,
-    group_id as category_id,
-    name,
-    service_type,
-    source_path,
-    geom_type /*,
-   style,
-    popup,
-    card,
-    bi,
-    legend,
-    attributes,
-    popup*/
-    from gis.services
-    where is_active and 
-    ${all_layers ? '$1' : 'service_id = any($1)'}`;
-  const { rows: services } = await pg.query(selectLayers, [all_layers ? true : layer_list]);
-  const servicesCount = services?.length || 0;
-
-  // ogc services
-  const selectOgcServices = `select ogc_service_id as layer_id,group_id as category_id,name,service as service_type,url,html from gis.ogc_service where enabled and ${all_layers ? '$1' : 'ogc_service_id = any($1)'}`;
-  const { rows: ogcServices } = await pg.query(selectOgcServices, [all_layers ? true : layer_list]);
-  const ogcServicesCount = ogcServices?.length || 0;
-
-  // rasters
-  const selectRasters = `select raster_id as layer_id, group_id as category_id,name,'raster' as service_type,source_path from gis.rasters where enabled and ${all_layers ? '$1' : 'raster_id = any($1)'}`;
-  const { rows: rasters } = await pg.query(selectRasters, [all_layers ? true : layer_list]);
-  const rastersCount = rasters?.length || 0;
-
-  // cartocss
-  const selectCartocss = `select cartocss_id as layer_id, group_id as category_id,name,'cartocss' as service_type,config from gis.cartocss where enabled and ${all_layers ? '$1' : 'cartocss_id = any($1)'}`;
-  const { rows: cartocss } = await pg.query(selectCartocss, [all_layers ? true : layer_list]);
-  const cartocssCount = cartocss?.length || 0;
-
-  const layers = [
-    ...services,
-    ...ogcServices,
-    ...rasters,
-    ...cartocss,
-  ];
-  const layersCount = layers?.length || 0;
-
-  const res = {
-    categoriesCount,
-    layersCount,
-    servicesCount,
-    ogcServicesCount,
-    rastersCount,
-    cartocssCount,
-    categories,
-    layers,
-
-  };
-
-  // const statusCode = (!layersCount && !categoriesCount) ? 204 : 200;
-
-  return res;
-}
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+import getPermissions from './get.permissions.js';
+
+export default async function gisCatalog({ uid }, pg = pgClients.client) {
+  // permissions
+  const { all_layers, group_list, layer_list } = await getPermissions({ pg, uid });
+
+  if (!all_layers && !group_list?.length && !layer_list?.length) {
+    return {
+      status: 204, categoriesCount: 0, layersCount: 0, servicesCount: 0, rastersCount: 0, categories: [], layers: [],
+    };
+  }
+
+  // groups
+  const selectCategories = `select group_id as category_id, trim(group_name) as name, icon from gis.group_list where enabled and ${all_layers ? '$1' : 'group_id = any($1)'} order by trim(group_name)`;
+  const { rows: categories } = await pg.query(selectCategories, [all_layers ? true : group_list]);
+  const categoriesCount = categories?.length || 0;
+
+  // services
+  const selectLayers = `
+    select
+    service_id as layer_id,
+    group_id as category_id,
+    name,
+    service_type,
+    source_path,
+    geom_type /*,
+   style,
+    popup,
+    card,
+    bi,
+    legend,
+    attributes,
+    popup*/
+    from gis.services
+    where is_active and 
+    ${all_layers ? '$1' : 'service_id = any($1)'}`;
+  const { rows: services } = await pg.query(selectLayers, [all_layers ? true : layer_list]);
+  const servicesCount = services?.length || 0;
+
+  // ogc services
+  const selectOgcServices = `select ogc_service_id as layer_id,group_id as category_id,name,service as service_type,url,html from gis.ogc_service where enabled and ${all_layers ? '$1' : 'ogc_service_id = any($1)'}`;
+  const { rows: ogcServices } = await pg.query(selectOgcServices, [all_layers ? true : layer_list]);
+  const ogcServicesCount = ogcServices?.length || 0;
+
+  // rasters
+  const selectRasters = `select raster_id as layer_id, group_id as category_id,name,'raster' as service_type,source_path from gis.rasters where enabled and ${all_layers ? '$1' : 'raster_id = any($1)'}`;
+  const { rows: rasters } = await pg.query(selectRasters, [all_layers ? true : layer_list]);
+  const rastersCount = rasters?.length || 0;
+
+  // cartocss
+  const selectCartocss = `select cartocss_id as layer_id, group_id as category_id,name,'cartocss' as service_type,config from gis.cartocss where enabled and ${all_layers ? '$1' : 'cartocss_id = any($1)'}`;
+  const { rows: cartocss } = await pg.query(selectCartocss, [all_layers ? true : layer_list]);
+  const cartocssCount = cartocss?.length || 0;
+
+  const layers = [
+    ...services,
+    ...ogcServices,
+    ...rasters,
+    ...cartocss,
+  ];
+  const layersCount = layers?.length || 0;
+
+  const res = {
+    categoriesCount,
+    layersCount,
+    servicesCount,
+    ogcServicesCount,
+    rastersCount,
+    cartocssCount,
+    categories,
+    layers,
+
+  };
+
+  // const statusCode = (!layersCount && !categoriesCount) ? 204 : 200;
+
+  return res;
+}

package/server/routes/permissions/permissions.route.js

@@ -1,35 +1,35 @@
-import catalogPermissions from './functions/catalog.permissions.js';
-import catalogPermissionsEdit from './functions/catalog.permissions.edit.js';
-import gisCatalog from './functions/gis.catalog.js';
-
-const privateParams = { config: { policy: 'L1' } };
-
-import { getCatalogPermissionsSchema, editCatalogPermissionsSchema } from './permissions.schema.js';
-
-export default function route(fastify) {
-  if (!fastify.hasRoute({ method: 'GET', url: '/api/catalog' })) {
-    console.log('\x1b[34m%s\x1b[0m', 'add catalog from gis');
-    // does not use any parameters - schema is not neccessary
-    fastify.get('/catalog', { ...privateParams, schema: {} }, async ({ user, pg }) => {
-      const result = await gisCatalog({ uid: user?.uid }, pg);
-      return result;
-    });
-  }
-  if (!fastify.hasRoute({ method: 'GET', url: '/api/catalog-permissions/:uid' })) {
-    console.log('\x1b[34m%s\x1b[0m', 'add catalog-permissions from gis');
-    fastify.get('/catalog-permissions/:uid', { ...privateParams, schema: getCatalogPermissionsSchema }, async ({ params, pg }) => {
-      const result = await catalogPermissions({ uid: params.uid }, pg);
-      return result;
-    });
-  }
-  if (!fastify.hasRoute({ method: 'POST', url: '/api/catalog-permissions/:uid' })) {
-    console.log('\x1b[34m%s\x1b[0m', 'add catalog-permissions-edit from gis');
-    fastify.post('/catalog-permissions/:uid', { ...privateParams, schema: editCatalogPermissionsSchema }, async ({ params, body, pg }) => {
-      const result = await catalogPermissionsEdit({
-        uid: params.uid,
-        body,
-      }, pg);
-      return result;
-    });
-  }
-}
+import catalogPermissions from './functions/catalog.permissions.js';
+import catalogPermissionsEdit from './functions/catalog.permissions.edit.js';
+import gisCatalog from './functions/gis.catalog.js';
+
+const privateParams = { config: { policy: 'L1' } };
+
+import { getCatalogPermissionsSchema, editCatalogPermissionsSchema } from './permissions.schema.js';
+
+export default function route(fastify) {
+  if (!fastify.hasRoute({ method: 'GET', url: '/api/catalog' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add catalog from gis');
+    // does not use any parameters - schema is not neccessary
+    fastify.get('/catalog', { ...privateParams, schema: {} }, async ({ user, pg }) => {
+      const result = await gisCatalog({ uid: user?.uid }, pg);
+      return result;
+    });
+  }
+  if (!fastify.hasRoute({ method: 'GET', url: '/api/catalog-permissions/:uid' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add catalog-permissions from gis');
+    fastify.get('/catalog-permissions/:uid', { ...privateParams, schema: getCatalogPermissionsSchema }, async ({ params, pg }) => {
+      const result = await catalogPermissions({ uid: params.uid }, pg);
+      return result;
+    });
+  }
+  if (!fastify.hasRoute({ method: 'POST', url: '/api/catalog-permissions/:uid' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add catalog-permissions-edit from gis');
+    fastify.post('/catalog-permissions/:uid', { ...privateParams, schema: editCatalogPermissionsSchema }, async ({ params, body, pg }) => {
+      const result = await catalogPermissionsEdit({
+        uid: params.uid,
+        body,
+      }, pg);
+      return result;
+    });
+  }
+}

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

@@ -1,35 +1,35 @@
-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' };
-
-let pg;
-
-describe('permissions api test', () => {
-    beforeAll(async () => {
-        await build();
-        pg = await getPGAsync();
-    });
-
-    afterAll(async () => {
-    });
-
-    test('GET /catalog', async () => {
-
-    });
-
-    test('POST /catalog-permissions/:uid', async () => {
-
-    });
-
-    test('GET /catalog-permissions/:uid', async () => {
-
-    });
-});
+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' };
+
+let pg;
+
+describe('permissions api test', () => {
+    beforeAll(async () => {
+        await build();
+        pg = await getPGAsync();
+    });
+
+    afterAll(async () => {
+    });
+
+    test('GET /catalog', async () => {
+
+    });
+
+    test('POST /catalog-permissions/:uid', async () => {
+
+    });
+
+    test('GET /catalog-permissions/:uid', async () => {
+
+    });
+});