@opengis/fastify-table 1.0.46 → 1.0.48

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.48 - 26.06.2024
+
+- search api no specified table mode support
+
+## 1.0.47 - 25.06.2024
+
+- add extra properties support
+
 ## 1.0.46 - 24.06.2024
 
 - fix data api edit geometry

package/crud/controllers/properties.add.js

@@ -0,0 +1,51 @@
+import dataInsert from "../funcs/dataInsert.js";
+
+const table = 'crm.properties';
+
+function checkKeyType({ body, key }) {
+    if (typeof body[key] === 'number' && !body[key].toString().includes('.')) {
+        return { [key]: 'int' };
+    } else if (typeof body[key] === 'object') {
+        return { [key]: 'json' };
+    } else if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
+        return { [key]: 'date' };
+    }
+    return { [key]: 'text' };
+}
+
+export default async function addExtraProperties({
+    pg, params = {}, body = {},
+}) {
+    const { id } = params;
+    if (!id) {
+        return { message: 'not enougn params: 1', status: 400 };
+    }
+    const extraProperties = Object.keys(body);
+    if (!extraProperties.length) {
+        return { message: 'not enougn params: 2', status: 400 };
+    }
+
+    if (!pg.pk?.[table]) {
+        return { message: 'table not found: crm.properties', status: 400 };
+    }
+
+    try {
+        await pg.query(`delete from crm.properties where object_id=$1`, [id]);
+        const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
+        const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
+            const propertyType = keyTypeMatch[key];
+            const { rows = [] } = await dataInsert({
+                pg, table, data: {
+                    property_type: propertyType,
+                    property_key: key,
+                    object_id: id,
+                    [`property_${propertyType}`]: body[key],
+                }
+            });
+            return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
+        }));
+        return { message: { rows: res }, status: 200 };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
+}

package/crud/controllers/properties.get.js

@@ -0,0 +1,20 @@
+export default async function getExtraProperties({
+    pg, params = {},
+}) {
+    const { id } = params;
+    if (!id) {
+        return { message: 'not enougn params', status: 400 };
+    }
+    try {
+        const { rows = [] } = pg.pk?.['crm.properties']
+            ? await pg.query(`select property_key, property_type, property_text, property_int,
+            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
+            : {};
+        if (!rows.length) return {};
+
+        const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
+        return { message: data, status: 200 };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
+}

package/crud/index.js

@@ -8,6 +8,9 @@ import update from './controllers/update.js';
 import insert from './controllers/insert.js';
 import deleteCrud from './controllers/deleteCrud.js';
 
+import getExtraProperties from './controllers/properties.get.js';
+import addExtraProperties from './controllers/properties.add.js';
+
 // import config from '../config.js';
 
 async function plugin(fastify, config = {}) {
@@ -24,6 +27,9 @@ async function plugin(fastify, config = {}) {
   fastify.put(`${prefix}/table/:table/:id`, {}, update);
   fastify.delete(`${prefix}/table/:table/:id`, {}, deleteCrud);
   fastify.post(`${prefix}/table/:table`, {}, insert);
+
+  fastify.get(`${prefix}/properties/:id`, {}, getExtraProperties);
+  fastify.post(`${prefix}/properties/:id`, {}, addExtraProperties);
 }
 
 export default plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/migrations/crm.sql

@@ -115,4 +115,34 @@ ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS cdate timestamp without time zone D
 ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
 ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_pkey PRIMARY KEY (cls_id);
-ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_unique UNIQUE (code, parent);
+ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_unique UNIQUE (code, parent);
+
+-- DROP TABLE crm.properties;
+CREATE TABLE IF NOT EXISTS crm.properties();
+ALTER TABLE crm.properties DROP CONSTRAINT IF EXISTS crm_properties_pkey;
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
+
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS table_name text;
+COMMENT ON COLUMN crm.properties.table_name IS 'Таблиця';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS object_id text;
+COMMENT ON COLUMN crm.properties.object_id IS 'ID Об''єкту';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_key text;
+COMMENT ON COLUMN crm.properties.object_id IS 'Назва атрибуту';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_text text;
+COMMENT ON COLUMN crm.properties.property_text IS 'Текст';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_int integer;
+COMMENT ON COLUMN crm.properties.property_int IS 'Integer';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_json json;
+COMMENT ON COLUMN crm.properties.property_json IS 'JSON';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_date date;
+COMMENT ON COLUMN crm.properties.property_json IS 'Дата';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_type text;
+COMMENT ON COLUMN crm.properties.property_type IS 'Тип даних';
+
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS files json;
+
+ALTER TABLE crm.properties ADD CONSTRAINT crm_properties_pkey PRIMARY KEY(property_id);

package/table/controllers/card.js

@@ -0,0 +1,41 @@
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import metaFormat from '../funcs/metaFormat/index.js';
+
+export default async function card(req) {
+  const time = Date.now();
+  const {
+    pg, params, query = {},
+  } = req;
+
+  const loadTable = await getTemplate('table', params.table);
+
+  if (!loadTable) { return { status: 404, message: 'not found' }; }
+
+  const { table, columns, meta, sql, cardSql } = loadTable;
+  const { pk, columns: dbColumns = [] } = await getMeta(table);
+
+  if (!pk) return { message: `table not found: ${table}`, status: 404 };
+
+  const cols = columns.map((el) => el.name || el).join(',');
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+  const sqlTable = sql?.filter?.((el) => !el?.disabled && el?.sql?.replace).map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)?.join('') || '';
+  const cardSqlFiltered = params.id ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) : [];
+  const cardSqlTable = cardSqlFiltered.length ? cardSqlFiltered.map((el, i) => ` left join lateral (select json_agg(row_to_json(q)) as ${el.name} from (${el.sql})q) ct${i}  on 1=1 `).join('') || '' : '';
+
+  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
+  const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? `st_asgeojson(geom)::json as geom,` : ''} ${cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} 
+  where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') { return q; }
+
+  const { rows } = await pg.query(q, [params.id]);
+
+  await metaFormat({ rows, table: params.table });
+
+  const data = meta.card?.length ? meta.card.reduce((acc, curr) => Object.assign(acc, { [columns.find((col) => col.name === curr)?.ua || '']: rows[0][curr] }), {}) : {};
+  return {
+    time: Date.now() - time, data,
+  };
+}

package/table/controllers/search.js

@@ -1,17 +1,20 @@
 import getTemplate from './utils/getTemplate.js';
 import getMeta from '../../pg/funcs/getMeta.js';
 import metaFormat from '../funcs/metaFormat/index.js';
+import getTemplates from './utils/getTemplates.js';
 
-const maxLimit = 100;
+function sequence(tables, data, fn) {
+  return tables.reduce((promise, table) => promise.then(() => fn({
+    ...data, tableName: table.replace('.json', ''),
+  })), Promise.resolve());
+}
 
-export default async function data({
-  pg, query = {},
+async function getData({
+  pg, tableName, query = {}, maxLimit, res,
 }) {
-  const time = Date.now();
+  const loadTable = await getTemplate('table', tableName);
 
-  const loadTable = await getTemplate('table', query.table);
-
-    if (!loadTable) { return { message: 'not found', status: 404 }; }
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
 
   const { table, columns, meta } = loadTable;
   const { pk } = await getMeta(table);
@@ -20,22 +23,46 @@ export default async function data({
   const [orderColumn, orderDir] = (query.order || loadTable.order || '').split('-');
   const order = cols.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
 
-  const limit = Math.min(maxLimit, +(query.limit || 10));
+  const limit = Math.max(maxLimit - res.rows.length, 0);
+  // Math.max(query.offset - res.rows.length,0)
   const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
 
   const search = meta?.search && query.key ? `(${meta?.search.concat(meta?.title ? `,${meta?.title}` : '').split(',').map(el => `${el} ilike '%${query.key}%'`).join(' or ')})` : null;
 
   const where = [loadTable.query, search].filter((el) => el);
   const q = `select  ${pk ? `"${pk}" as id,` : ''} * from ${table} t where ${where.join(' and ') || 'true'} ${order} ${offset} limit ${limit}`;
-
-  if (query.sql === '1') return q;
+  if (query.sql) {
+    res.sql.push(q);
+    return;
+  }
 
   const { rows } = await pg.query(q);
 
-  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
+  const total = await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count) || 0;
+
+  await metaFormat({ rows, table: tableName });
+  res.total += +total;
+  rows.forEach((row) => res.rows.push({ ...row, register: tableName }));
+}
+
+export default async function data({
+  pg, query = {},
+}) {
+  const time = Date.now();
+
+  try {
+    const tables = query.table ? [query.table] : await getTemplates('table');
+    const res = { rows: [], sql: [], total: 0 };
+
+    const maxLimit = Math.min(100, query.limit || '16');
+    await sequence(tables, { pg, query, maxLimit, res }, getData);
+
+    if (query.sql) return res.sql.join(';\n');
 
-  await metaFormat({ rows, table: query.table });
-  return {
-    time: Date.now() - time, total, count: rows.length, rows,
-  };
+    return {
+      time: Date.now() - time, total: res.total, count: res.rows.length, rows: res.rows,
+    };
+  } catch (err) {
+    return { error: err.toString(), status: 500 };
+  }
 }

package/table/controllers/utils/getTemplates.js

@@ -0,0 +1,18 @@
+import fs from 'fs';
+import path from 'path';
+import config from '../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type) {
+    if (!type) return null;
+    
+    const cwd = process.cwd();
+    const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+    
+    if (!loadTemplate[type]) {
+        const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+        loadTemplate[type] = typeList;
+    }
+    return loadTemplate[type];
+}

package/table/index.js

@@ -1,5 +1,6 @@
 import suggest from './controllers/suggest.js';
 import data from './controllers/data.js';
+import card from './controllers/card.js';
 import search from './controllers/search.js';
 import filter from './controllers/filter.js';
 import form from './controllers/form.js';
@@ -34,6 +35,7 @@ async function plugin(fastify, config = {}) {
 
   fastify.get(`${prefix}/suggest/:data`, {}, suggest);
   fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
   fastify.get(`${prefix}/search`, { schema: searchTableSchema }, search);
   fastify.get(`${prefix}/filter/:table`, {}, filter);
   fastify.get(`${prefix}/form/:form`, {}, form);

package/test/api/crud.test.js

@@ -26,6 +26,26 @@ test('api crud', async (t) => {
     assert.ok(rep.rows ? rep.rows[0]?.map_id : rep.map_id);
   });
 
+  await t.test('POST /properties/:id', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/properties/5400000`,
+      body: {
+        custom_alias: 'testMap',
+        custom_ord: 5,
+      },
+    });
+    assert.ok(res.json().message.rows.length, 'not ok');
+  });
+
+  await t.test('GET /properties/:id', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/properties/5400000`,
+    });
+    assert.ok(res.json().message.custom_alias, 'not ok');
+  });
+
   await t.test('PUT /update', async () => {
     const res = await app.inject({
       method: 'PUT',