@opengis/fastify-table 1.0.77 → 1.0.79

package/Changelog.md

@@ -1,8 +1,12 @@
 # fastify-table
 
+## 1.0.79 - 15.08.2024
+
+- refactor /table API
+
 ## 1.0.77 - 13.08.2024
 
-- add statusMonotor API
+- add statusMonitor API
 
 ## 1.0.75 - 12.08.2024
 

package/package.json

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

package/table/controllers/data.js

@@ -18,7 +18,7 @@ export default async function dataAPI(req) {
   if (!loadTable) { return { message: 'template not found', status: 404 }; }
 
   const {
-    table, columns, sql, cardSql, filters, form, meta,
+    table, columns, sql, cardSql, filters, form, meta, sqlColumns,
   } = loadTable;
   const { pk, columns: dbColumns = [] } = await getMeta(table);
 
@@ -58,7 +58,7 @@ export default async function dataAPI(req) {
   const access = await getAccess(req, params.table);
   const where = [(opt?.id || params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search, access?.query || '1=1'].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,' : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : ''} ${query.id || query.key ? '*' : sqlColumns || cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
 
   if (query.sql === '1') { return q; }
 

package/table/controllers/table.js

@@ -1,44 +1,47 @@
-import getTemplate from './utils/getTemplate.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function tableAPI(req) {
-  const {
-    pg, params = {}, query = {}, opt = {},
-  } = req;
-  if (!params.id) return { message: 'not enough params', status: 400 };
-
-  const loadTable = await getTemplate('table', params.table);
-  if (!loadTable) { return { message: 'not found', status: 404 }; }
-
-  const {
-    table, columns, form,
-  } = 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 where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
-  const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
-  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table} t where ${where.join(' and ') || 'true'} limit 1`;
-
-  if (query.sql === '1') return q;
-
-  const { rows } = await pg.query(q, [opt.id || params.id]);
-
-  const formData = form ? (await getTemplate('form', form) || {}) : {};
-  const extraKeys = Object.keys(formData)?.filter((key) => formData?.[key]?.type === 'DataTable' && formData?.[key]?.table && formData?.[key]?.parent_id && formData[key]?.colModel);
-  if (extraKeys?.length) {
-    await Promise.all(rows?.map(async (row) => {
-      await Promise.all(extraKeys?.map(async (key) => {
-        const { colModel, table: extraTable, parent_id: parentId } = formData[key];
-        const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
-        Object.assign(row, { [key]: extraRows });
-      }));
-    }));
-  }
-
-  return rows?.[0] || {};
-}
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function tableAPI(req) {
+  const {
+    pg, params = {}, query = {}, opt = {},
+  } = req;
+  if (!params.id) return { message: 'not enough params', status: 400 };
+
+  const loadTable = await getTemplate('table', opt?.table || params.table);
+  if (!loadTable) { return { message: 'not found', status: 404 }; }
+
+  const {
+    table, /* columns, */ form,
+  } = 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 schema = await getTemplate('form', opt?.form || form) || {};
+  // skip DataTable from another table
+  const extraKeys = Object.keys(schema)?.filter((key) => schema[key]?.type === 'DataTable' && schema[key]?.table && schema[key]?.parent_id && schema[key]?.colModel?.length);
+  // skip non-existing columns
+  const columnList = dbColumns.map((el) => el.name || el).join(',');
+
+  const cols = Object.keys(schema || {}).filter((col) => columnList.includes(col) && !extraKeys.includes(col))?.join(',');
+  const where = [`"${pk}" = $1`, loadTable.query].filter((el) => el);
+  const geom = columnList.includes('geom') ? 'st_asgeojson(geom)::json as geom,' : '';
+  const q = `select "${pk}" as id, ${geom} ${cols || '*'} from ${table} t where ${where.join(' and ') || 'true'} limit 1`;
+
+  if (query.sql === '1') return q;
+
+  const { rows } = await pg.query(q, [opt?.id || params.id]);
+
+  if (extraKeys?.length) {
+    await Promise.all(rows?.map(async (row) => {
+      await Promise.all(extraKeys?.map(async (key) => {
+        const { colModel, table: extraTable, parent_id: parentId } = schema[key];
+        const { rows: extraRows } = await pg.query(`select ${parentId} as parent, ${colModel.map((col) => col.name).join(',')} from ${extraTable} a where ${parentId}=$1`, [row.id]);
+        Object.assign(row, { [key]: extraRows });
+      }));
+    }));
+  }
+
+  return rows?.[0] || {};
+}

package/table/index.js

@@ -1,78 +1,78 @@
-import suggest from './controllers/suggest.js';
-import data from './controllers/data.js';
-import table from './controllers/table.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';
-import metaFormat from './funcs/metaFormat/index.js';
-import getFilterSQL from './funcs/getFilterSQL/index.js';
-import getTemplate from './controllers/utils/getTemplate.js';
-
-const tableSchema = {
-  querystring: {
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    order: { type: 'string', pattern: '^(\\d+)$' },
-    filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([\\w\\d_-]+)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-const searchSchema = {
-  querystring: {
-    page: { type: 'string', pattern: '^(\\d+)$' },
-    limit: { type: 'string', pattern: '^(\\d+)$' },
-    order: { type: 'string', pattern: '^([\\w_.]+)$' },
-    desc: { type: 'string', pattern: '^(desc)|(asc)$' },
-    key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-};
-
-const suggestSchema = {
-  querystring: {
-    lang: { type: 'string', pattern: '^([\\w.]+)$' },
-    // parent: { type: 'string', pattern: '^([\\w,./]+)$' },
-    sel: { type: 'string', pattern: '^([\\w,./]+)$' },
-    name: { type: 'string', pattern: '^([\\w,./]+)$' },
-    // key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
-    // val: { type: 'string', pattern: '^([\\w.,]+)$' },
-    sql: { type: 'string', pattern: '^(\\d)$' },
-  },
-  params: {
-    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-  },
-};
-
-const formSchema = {
-  params: {
-    form: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-const filterSchema = {
-  params: {
-    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
-  },
-};
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  fastify.decorate('metaFormat', metaFormat);
-  fastify.decorate('getFilterSQL', getFilterSQL);
-  fastify.decorate('getTemplate', getTemplate);
-
-  fastify.get(`${prefix}/suggest/:data`, { schema: suggestSchema }, suggest);
-  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
-  fastify.get(`${prefix}/table/:table/:id`, { schema: tableSchema }, table);
-  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
-  fastify.get(`${prefix}/search`, { schema: searchSchema }, search);
-  fastify.get(`${prefix}/filter/:table`, { schema: filterSchema }, filter);
-  fastify.get(`${prefix}/form/:form`, { schema: formSchema }, form);
-}
-
-export default plugin;
+import suggest from './controllers/suggest.js';
+import data from './controllers/data.js';
+import table from './controllers/table.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';
+import metaFormat from './funcs/metaFormat/index.js';
+import getFilterSQL from './funcs/getFilterSQL/index.js';
+import getTemplate from './controllers/utils/getTemplate.js';
+
+const tableSchema = {
+  querystring: {
+    page: { type: 'string', pattern: '^(\\d+)$' },
+    order: { type: 'string', pattern: '^(\\d+)$' },
+    filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([\\w\\d_-]+)$' },
+  },
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+const searchSchema = {
+  querystring: {
+    page: { type: 'string', pattern: '^(\\d+)$' },
+    limit: { type: 'string', pattern: '^(\\d+)$' },
+    order: { type: 'string', pattern: '^([\\w_.]+)$' },
+    desc: { type: 'string', pattern: '^(desc)|(asc)$' },
+    key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+};
+
+const suggestSchema = {
+  querystring: {
+    lang: { type: 'string', pattern: '^([\\w.]+)$' },
+    // parent: { type: 'string', pattern: '^([\\w,./]+)$' },
+    sel: { type: 'string', pattern: '^([\\w,./]+)$' },
+    name: { type: 'string', pattern: '^([\\w,./]+)$' },
+    // key: { type: 'string', pattern: '^([\\w\\d_]+)$' },
+    // val: { type: 'string', pattern: '^([\\w.,]+)$' },
+    sql: { type: 'string', pattern: '^(\\d)$' },
+  },
+  params: {
+    id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+  },
+};
+
+const formSchema = {
+  params: {
+    form: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+const filterSchema = {
+  params: {
+    table: { type: 'string', pattern: '^([\\w\\d_.]+)$' },
+  },
+};
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+  fastify.decorate('metaFormat', metaFormat);
+  fastify.decorate('getFilterSQL', getFilterSQL);
+  fastify.decorate('getTemplate', getTemplate);
+
+  fastify.get(`${prefix}/suggest/:data`, { schema: suggestSchema }, suggest);
+  fastify.get(`${prefix}/data/:table/:id?`, { schema: tableSchema }, data); // vs.crm.data.api с node
+  fastify.get(`${prefix}/table/:table/:id`, { schema: tableSchema }, table);
+  fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
+  fastify.get(`${prefix}/search`, { schema: searchSchema }, search);
+  fastify.get(`${prefix}/filter/:table`, { schema: filterSchema }, filter);
+  fastify.get(`${prefix}/form/:form`, { schema: formSchema }, form);
+}
+
+export default plugin;