@opengis/admin 0.2.77 → 0.2.78

package/server/routes/print/controllers/cardPrint.js

@@ -1,131 +1,131 @@
-import path from 'path';
-import qr from 'qrcode';
-import { readFile } from 'node:fs/promises';
-import { fileURLToPath } from 'url';
-import { createHash } from 'crypto';
-
-import {
-    config, getTemplate, pgClients, handlebars, getFilterSQL, logger, metaFormat, getMeta,
-} from '@opengis/fastify-table/utils.js';
-import { grpc } from '@opengis/fastify-file/utils.js';
-
-const { htmlToPdf } = grpc();
-const filename = fileURLToPath(import.meta.url);
-const dirname = path.dirname(filename);
-
-// printMap
-const host = 'https://data.gki.com.ua';
-const width = 850;
-const height = 400;
-const geomBuffer = 0.001;
-const layers = '';
-const basemap = 'voyager';
-
-export default async function cardPrint(req, reply) {
-    const { pg = pgClients.client, params = {}, query = {}, user = {} } = req;
-    const { table, id } = params;
-
-    const { template = 'card-print.pt', tab } = query;
-    const format = query.format || (config.debug ? 'html' : 'pdf');
-
-    const hash = createHash('md5').update([table, id, template, tab].join()).digest('hex');
-
-    // const rootDir = getFolder(req, 'local');
-    // const filepath = path.join(rootDir, '/files/tmp/print/', `${hash}.pdf`);
-
-    const headers = {
-        'Content-Disposition': `inline; filename=${hash}.pdf`,
-        'Content-Type': 'application/pdf',
-    };
-
-    if (!user?.uid) {
-        return { message: 'access restricted', status: 401 };
-    }
-
-    if (!table || !id) {
-        return { message: 'not enougn params: table, id', status: 400 };
-    }
-
-    const body = await getTemplate('table', table);
-    const { geom } = await getMeta({ pg, table: body?.table });
-
-    if (!body?.table) {
-        return { message: 'table nof found', status: 404 };
-    }
-
-    if (!body.key && !pg.pk?.[body.table]) {
-        return { message: 'pkey not found', status: 404 };
-    }
-
-    const where = `${body.query || '1=1'} and ${body.key || pg.pk?.[body.table]}=$1`;
-
-    const { optimizedSQL = `select * from ${body.table} where ${body.query || '1=1'} and ` } = await getFilterSQL({
-        pg,
-        table,
-        query: where,
-    })
-    const { rows = [] } = await pg.query(`select * ${geom ? `, st_asgeojson(${geom})::json as geom` : ''} from (${optimizedSQL})q where ${where}`, [id]);
-
-    const cls = body?.columns?.filter(el => el.data)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {});
-    await metaFormat({ rows, cls, sufix: false });
-
-    const data = rows?.[0];
-    if (!data) {
-        return { message: 'data not found', status: 404 };
-    }
-
-    Object.assign(data, { id: data[body.key || pg.pk?.[body.table]] });
-
-    const mapUrl = `${host}/api-user/print-map?basemap=${basemap}&layers=${layers || ''}&geojson=${JSON.stringify(data['geom'])}&base64=1&height=${height}&width=${width}&buffer=${geomBuffer}&nocache=1`;
-    const resp = data['geom'] ? await fetch(mapUrl) : null;
-    const printMap = data['geom'] ? await resp.text() : '';
-
-    const pt = await getTemplate('pt', template)
-        || await readFile(path.join(dirname, '../../../templates/pt/card-print.pt.hbs'), 'utf8');
-
-    const url = (req.protocol || 'https') + '://' + req.hostname + req.url;
-    const qrCode = `<img src="${await qr.toDataURL(url, { type: 'png', ec_level: 'M', size: 5, margin: 4 })}" alt="qrcode">`;
-
-    const cardTemplates = await getTemplate('card', table);
-    const index = cardTemplates?.find(el => el[0] === 'index.yml')?.[1];
-    const cardHbsTabs = cardTemplates.filter(el => el[0].endsWith('hbs'));
-
-    const orderedTabs = index?.panels?.flatMap(panel => panel.items?.map(item => {
-        const body = cardHbsTabs.find(el => el[0] === `${item.name}.hbs`)?.[1];
-        return { ...item, body };
-    })).filter(el => el.name && el.body);
-
-    const tabData = await Promise.all(orderedTabs.map(async (el) => {
-        const html = await handlebars.compile(el.body.replace(/\{\{\{button[^\}]*\}\}\}/g, ''))(data);
-        return { name: el.name, title: el.title, html };
-    }));
-
-    const title = data?.[body.meta.title || ''];
-
-    const columnTitles = body?.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {});
-    const obj = {
-        title,
-        table_title: body.ua || body.title,
-        printMap,
-        rows: tabData,
-        data: Object.keys(data).filter(el => columnTitles[el]).reduce((acc, curr) => Object.assign(acc, { [columnTitles[curr] || curr]: data[curr] }), {}),
-        rawData: data,
-        url,
-        qr: qrCode,
-    };
-
-    const html = await handlebars.compile(pt || 'template not found')(obj);
-
-    if (format == 'html') {
-        return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(html);
-    }
-
-    const result = await htmlToPdf({ html });
-    const buffer = Buffer.from(result.result, 'base64');
-
-    // await mkdir(path.dirname(filepath), { recursive: true });
-    // await writeFile(filepath, buffer);
-
-    logger.file('cardPrint', { table, id, format, uid: user?.uid });
-    return reply.headers(headers).send(buffer);
+import path from 'path';
+import qr from 'qrcode';
+import { readFile } from 'node:fs/promises';
+import { fileURLToPath } from 'url';
+import { createHash } from 'crypto';
+
+import {
+    config, getTemplate, pgClients, handlebars, getFilterSQL, logger, metaFormat, getMeta,
+} from '@opengis/fastify-table/utils.js';
+import { grpc } from '@opengis/fastify-file/utils.js';
+
+const { htmlToPdf } = grpc();
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+
+// printMap
+const host = 'https://data.gki.com.ua';
+const width = 850;
+const height = 400;
+const geomBuffer = 0.001;
+const layers = '';
+const basemap = 'voyager';
+
+export default async function cardPrint(req, reply) {
+    const { pg = pgClients.client, params = {}, query = {}, user = {} } = req;
+    const { table, id } = params;
+
+    const { template = 'card-print.pt', tab } = query;
+    const format = query.format || (config.debug ? 'html' : 'pdf');
+
+    const hash = createHash('md5').update([table, id, template, tab].join()).digest('hex');
+
+    // const rootDir = getFolder(req, 'local');
+    // const filepath = path.join(rootDir, '/files/tmp/print/', `${hash}.pdf`);
+
+    const headers = {
+        'Content-Disposition': `inline; filename=${hash}.pdf`,
+        'Content-Type': 'application/pdf',
+    };
+
+    if (!user?.uid) {
+        return { message: 'access restricted', status: 401 };
+    }
+
+    if (!table || !id) {
+        return { message: 'not enougn params: table, id', status: 400 };
+    }
+
+    const body = await getTemplate('table', table);
+    const { geom } = await getMeta({ pg, table: body?.table });
+
+    if (!body?.table) {
+        return { message: 'table nof found', status: 404 };
+    }
+
+    if (!body.key && !pg.pk?.[body.table]) {
+        return { message: 'pkey not found', status: 404 };
+    }
+
+    const where = `${body.query || '1=1'} and ${body.key || pg.pk?.[body.table]}=$1`;
+
+    const { optimizedSQL = `select * from ${body.table} where ${body.query || '1=1'} and ` } = await getFilterSQL({
+        pg,
+        table,
+        query: where,
+    })
+    const { rows = [] } = await pg.query(`select * ${geom ? `, st_asgeojson(${geom})::json as geom` : ''} from (${optimizedSQL})q where ${where}`, [id]);
+
+    const cls = body?.columns?.filter(el => el.data)?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.data }), {});
+    await metaFormat({ rows, cls, sufix: false });
+
+    const data = rows?.[0];
+    if (!data) {
+        return { message: 'data not found', status: 404 };
+    }
+
+    Object.assign(data, { id: data[body.key || pg.pk?.[body.table]] });
+
+    const mapUrl = `${host}/api-user/print-map?basemap=${basemap}&layers=${layers || ''}&geojson=${JSON.stringify(data['geom'])}&base64=1&height=${height}&width=${width}&buffer=${geomBuffer}&nocache=1`;
+    const resp = data['geom'] ? await fetch(mapUrl) : null;
+    const printMap = data['geom'] ? await resp.text() : '';
+
+    const pt = await getTemplate('pt', template)
+        || await readFile(path.join(dirname, '../../../templates/pt/card-print.pt.hbs'), 'utf8');
+
+    const url = (req.protocol || 'https') + '://' + req.hostname + req.url;
+    const qrCode = `<img src="${await qr.toDataURL(url, { type: 'png', ec_level: 'M', size: 5, margin: 4 })}" alt="qrcode">`;
+
+    const cardTemplates = await getTemplate('card', table);
+    const index = cardTemplates?.find(el => el[0] === 'index.yml')?.[1];
+    const cardHbsTabs = cardTemplates.filter(el => el[0].endsWith('hbs'));
+
+    const orderedTabs = index?.panels?.flatMap(panel => panel.items?.map(item => {
+        const body = cardHbsTabs.find(el => el[0] === `${item.name}.hbs`)?.[1];
+        return { ...item, body };
+    })).filter(el => el.name && el.body);
+
+    const tabData = await Promise.all(orderedTabs.map(async (el) => {
+        const html = await handlebars.compile(el.body.replace(/\{\{\{button[^\}]*\}\}\}/g, ''))(data);
+        return { name: el.name, title: el.title, html };
+    }));
+
+    const title = data?.[body.meta.title || ''];
+
+    const columnTitles = body?.columns?.reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.title || curr.ua }), {});
+    const obj = {
+        title,
+        table_title: body.ua || body.title,
+        printMap,
+        rows: tabData,
+        data: Object.keys(data).filter(el => columnTitles[el]).reduce((acc, curr) => Object.assign(acc, { [columnTitles[curr] || curr]: data[curr] }), {}),
+        rawData: data,
+        url,
+        qr: qrCode,
+    };
+
+    const html = await handlebars.compile(pt || 'template not found')(obj);
+
+    if (format == 'html') {
+        return reply.headers({ 'Content-Type': 'text/html; charset=utf-8' }).send(html);
+    }
+
+    const result = await htmlToPdf({ html });
+    const buffer = Buffer.from(result.result, 'base64');
+
+    // await mkdir(path.dirname(filepath), { recursive: true });
+    // await writeFile(filepath, buffer);
+
+    logger.file('cardPrint', { table, id, format, uid: user?.uid });
+    return reply.headers(headers).send(buffer);
 }

package/server/routes/properties/controllers/admin.properties.get.js

@@ -1,29 +1,29 @@
-const table = 'admin.properties';
-
-import { config, getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-
-export default async function getSettingsAPI({
-  pg = {}, params = {}, query = {},
-}) {
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const redis = getRedis();
-  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
-
-  const cache = await redis.get(keyCache);
-  if (cache && !config?.local) return JSON.parse(cache);
-
-  try {
-    const res = await getSettings({
-      pg, key: params.key, json: query.json, redis, table,
-    });
-    return { message: res, status: 200 };
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+const table = 'admin.properties';
+
+import { config, getRedis } from '@opengis/fastify-table/utils.js';
+
+import { getSettings } from '../../../../utils.js';
+
+export default async function getSettingsAPI({
+  pg = {}, params = {}, query = {},
+}) {
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const redis = getRedis();
+  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:${table}`;
+
+  const cache = await redis.get(keyCache);
+  if (cache && !config?.local) return JSON.parse(cache);
+
+  try {
+    const res = await getSettings({
+      pg, key: params.key, json: query.json, redis, table,
+    });
+    return { message: res, status: 200 };
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}

package/server/routes/properties/controllers/user.properties.get.js

@@ -1,30 +1,30 @@
-const table = 'admin.user_properties';
-
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-
-export default async function getUserProperties({
-  pg = {}, params = {}, query = {}, session = {},
-}) {
-  const { uid } = session.passport?.user || {};
-  if (!uid) {
-    return { message: 'access restreicted', status: 403 };
-  }
-
-  if (!pg.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const redis = getRedis();
-  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:user`;
-
-  const cache = await redis.get(keyCache);
-  if (cache) return JSON.parse(cache);
-
-  const res = await getSettings({
-    pg, key: params.key, json: query.json, redis, table, uid,
-  });
-  
-  return { message: res, status: 200 };
-}
+const table = 'admin.user_properties';
+
+import { getRedis } from '@opengis/fastify-table/utils.js';
+
+import { getSettings } from '../../../../utils.js';
+
+export default async function getUserProperties({
+  pg = {}, params = {}, query = {}, session = {},
+}) {
+  const { uid } = session.passport?.user || {};
+  if (!uid) {
+    return { message: 'access restreicted', status: 403 };
+  }
+
+  if (!pg.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const redis = getRedis();
+  const keyCache = `${pg.options?.database}:settings:${params?.key || 'all'}:${query?.json ? 'json' : 'plain'}:user`;
+
+  const cache = await redis.get(keyCache);
+  if (cache) return JSON.parse(cache);
+
+  const res = await getSettings({
+    pg, key: params.key, json: query.json, redis, table, uid,
+  });
+  
+  return { message: res, status: 200 };
+}

package/server/routes/properties/controllers/user.properties.post.js

@@ -1,30 +1,30 @@
-const table = 'admin.user_properties';
-
-import { setSettings } from '../../../../utils.js';
-
-export default async function postUserProperties({
-  pg, session = {}, body = {},
-}) {
-  const { uid } = session.passport?.user || {};
-
-  if (!uid) {
-    return { message: 'access restricted', status: 403 };
-  }
-
-  const { key, val } = body;
-
-  if ((!key || !val) && !Object.keys(body).length) {
-    return { message: 'not enough params', status: 400 };
-  }
-
-  if (!pg?.pk?.[table]) {
-    return { message: 'table not found', status: 404 };
-  }
-
-  const res = await setSettings({
-    pg, key, val, body, table, uid,
-  });
-  if (res?.error) return res;
-
-  return { message: res, status: 200 };
-}
+const table = 'admin.user_properties';
+
+import { setSettings } from '../../../../utils.js';
+
+export default async function postUserProperties({
+  pg, session = {}, body = {},
+}) {
+  const { uid } = session.passport?.user || {};
+
+  if (!uid) {
+    return { message: 'access restricted', status: 403 };
+  }
+
+  const { key, val } = body;
+
+  if ((!key || !val) && !Object.keys(body).length) {
+    return { message: 'not enough params', status: 400 };
+  }
+
+  if (!pg?.pk?.[table]) {
+    return { message: 'table not found', status: 404 };
+  }
+
+  const res = await setSettings({
+    pg, key, val, body, table, uid,
+  });
+  if (res?.error) return res;
+
+  return { message: res, status: 200 };
+}

package/server/routes/properties/funcs/getSettings.js

@@ -1,56 +1,56 @@
-import { getMeta } from '@opengis/fastify-table/utils.js';
-
-const match = {
-  property_key: 'key',
-  property_json: 'json',
-  property_int: 'int',
-  property_text: 'text',
-};
-
-function getQuery({
-  table, columns = [], key, uid,
-}) {
-  const columnList = columns?.filter((el) => match[el?.name]).map((el) => el?.name).map((el) => `${el} as ${match[el]}`);
-  const sql = `select ${columnList.join(',')} from ${table} where 1=1`;
-
-  if (table === 'admin.user_properties') {
-    const args = [uid, key].filter((el) => el);
-    const q = sql + (uid ? ' and uid=$1' : '') + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
-    return { q, args };
-  }
-  const args = [key].filter((el) => el);
-  const q = sql + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
-  return { q, args };
-}
-
-export default async function getSettings({
-  pg, redis, json, key, table = 'admin.properties', uid,
-}) {
-  const { columns = [] } = await getMeta({ table });
-
-  const { q, args } = getQuery({
-    table, columns, key, uid,
-  });
-
-  const { rows } = await pg.query(q, args);
-  const data = rows?.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
-  
-  const jsonData = Object.keys(data || {}).reduce((acc, curr) => {
-    const [ckey, csubkey] = curr.split('.');
-    if (!csubkey) return Object.assign(acc, { [curr]: data[curr] });
-    if (!acc[ckey]) Object.assign(acc, { [ckey]: {} });
-    Object.assign(acc[ckey], { [csubkey]: data[curr] });
-    return acc;
-  }, {});
-
-  // save both
-  if (redis) {
-    const keyCacheJSON = `${pg.options?.database}:settings:${key || 'all'}:json:${table}`;
-    await redis.set(keyCacheJSON, JSON.stringify(jsonData));
-
-    const keyCachePlain = `${pg.options?.database}:settings:${key || 'all'}:plain:${table}`;
-    await redis.set(keyCachePlain, JSON.stringify(data));
-  }
-
-  return json ? jsonData : data;
-}
+import { getMeta } from '@opengis/fastify-table/utils.js';
+
+const match = {
+  property_key: 'key',
+  property_json: 'json',
+  property_int: 'int',
+  property_text: 'text',
+};
+
+function getQuery({
+  table, columns = [], key, uid,
+}) {
+  const columnList = columns?.filter((el) => match[el?.name]).map((el) => el?.name).map((el) => `${el} as ${match[el]}`);
+  const sql = `select ${columnList.join(',')} from ${table} where 1=1`;
+
+  if (table === 'admin.user_properties') {
+    const args = [uid, key].filter((el) => el);
+    const q = sql + (uid ? ' and uid=$1' : '') + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
+    return { q, args };
+  }
+  const args = [key].filter((el) => el);
+  const q = sql + (key ? ` and property_key=$${args.indexOf(key) + 1}` : '');
+  return { q, args };
+}
+
+export default async function getSettings({
+  pg, redis, json, key, table = 'admin.properties', uid,
+}) {
+  const { columns = [] } = await getMeta({ table });
+
+  const { q, args } = getQuery({
+    table, columns, key, uid,
+  });
+
+  const { rows } = await pg.query(q, args);
+  const data = rows?.reduce((acc, curr) => Object.assign(acc, { [curr.key]: curr.json || curr.int || curr.text }), {});
+  
+  const jsonData = Object.keys(data || {}).reduce((acc, curr) => {
+    const [ckey, csubkey] = curr.split('.');
+    if (!csubkey) return Object.assign(acc, { [curr]: data[curr] });
+    if (!acc[ckey]) Object.assign(acc, { [ckey]: {} });
+    Object.assign(acc[ckey], { [csubkey]: data[curr] });
+    return acc;
+  }, {});
+
+  // save both
+  if (redis) {
+    const keyCacheJSON = `${pg.options?.database}:settings:${key || 'all'}:json:${table}`;
+    await redis.set(keyCacheJSON, JSON.stringify(jsonData));
+
+    const keyCachePlain = `${pg.options?.database}:settings:${key || 'all'}:plain:${table}`;
+    await redis.set(keyCachePlain, JSON.stringify(data));
+  }
+
+  return json ? jsonData : data;
+}

package/server/routes/properties/funcs/setSettings.js

@@ -1,44 +1,44 @@
-import { getRedis } from '@opengis/fastify-table/utils.js';
-
-import { getSettings } from '../../../../utils.js';
-import dataInsert from './utils/dataInsert.js';
-
-function checkValueType(val) {
-  if (val) {
-    if (typeof val === 'object') {
-      return 'property_json';
-    }
-    if (typeof val === 'number' && (!/\D/.test(val.toString()) && val.toString().length < 10)) {
-      return 'property_int';
-    }
-  }
-  return 'property_text';
-}
-
-export default async function setSettings({
-  pg, key, val, body = {}, table = 'admin.properties', uid,
-}) {
-  const body1 = key && val ? { [key]: val } : body;
-  const keys = Object.keys(body1);
-  try {
-    const redis = getRedis();
-    await pg.query(`delete from ${table} where property_key=any($1)`, [keys]);
-
-    await Promise.all(keys.map(async (el) => {
-      const columnType = table === 'admin.user_properties' ? 'property_json' : checkValueType(body1[el]);
-      const data = { property_key: el, [columnType]: body1[el], uid };
-      const { rows } = await dataInsert({
-        pg, table, data, uid,
-      });
-      return { key: el, rows: { val: body[el], data: rows?.[0] } };
-    }));
-
-    const res = await getSettings({
-      pg, redis, table, uid,
-    });
-    return res;
-  }
-  catch (err) {
-    return { error: err.toString(), status: 500 };
-  }
-}
+import { getRedis } from '@opengis/fastify-table/utils.js';
+
+import { getSettings } from '../../../../utils.js';
+import dataInsert from './utils/dataInsert.js';
+
+function checkValueType(val) {
+  if (val) {
+    if (typeof val === 'object') {
+      return 'property_json';
+    }
+    if (typeof val === 'number' && (!/\D/.test(val.toString()) && val.toString().length < 10)) {
+      return 'property_int';
+    }
+  }
+  return 'property_text';
+}
+
+export default async function setSettings({
+  pg, key, val, body = {}, table = 'admin.properties', uid,
+}) {
+  const body1 = key && val ? { [key]: val } : body;
+  const keys = Object.keys(body1);
+  try {
+    const redis = getRedis();
+    await pg.query(`delete from ${table} where property_key=any($1)`, [keys]);
+
+    await Promise.all(keys.map(async (el) => {
+      const columnType = table === 'admin.user_properties' ? 'property_json' : checkValueType(body1[el]);
+      const data = { property_key: el, [columnType]: body1[el], uid };
+      const { rows } = await dataInsert({
+        pg, table, data, uid,
+      });
+      return { key: el, rows: { val: body[el], data: rows?.[0] } };
+    }));
+
+    const res = await getSettings({
+      pg, redis, table, uid,
+    });
+    return res;
+  }
+  catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
+}