@opengis/fastify-table 1.0.50 → 1.0.52

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.52 - 28.06.2024
+
+- add table get api
+
+## 1.0.51 - 27.06.2024
+
+- add next-id api
+
 ## 1.0.50 - 27.06.2024
 
 - refactor search api

package/crud/controllers/next.id.js

@@ -0,0 +1,4 @@
+export default async function nextId({ pg }) {
+  const { id } = await pg.one('select next_id() as id');
+  return { id: id.toString() };
+};

package/crud/index.js

@@ -4,6 +4,7 @@ import isFileExists from './funcs/isFileExists.js';
 import dataUpdate from './funcs/dataUpdate.js';
 import dataInsert from './funcs/dataInsert.js';
 
+import nextId from './controllers/next.id.js';
 import update from './controllers/update.js';
 import insert from './controllers/insert.js';
 import deleteCrud from './controllers/deleteCrud.js';
@@ -24,6 +25,7 @@ async function plugin(fastify, config = {}) {
   fastify.decorate('isFileExists', isFileExists);
 
   // api
+  fastify.get(`${prefix}/next-id`, {}, nextId);
   fastify.put(`${prefix}/table/:table/:id`, {}, update);
   fastify.delete(`${prefix}/table/:table/:id`, {}, deleteCrud);
   fastify.post(`${prefix}/table/:table`, {}, insert);

package/package.json

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

package/table/controllers/data.js

@@ -54,18 +54,6 @@ export default async function data(req) {
 
   const { rows } = await pg.query(q, (params.id ? [params.id] : null) || (query.key && loadTable.key ? [query.key] : []));
 
-  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 });
-      }));
-    }));
-  }
-
   const total = keyQuery || params.id ? rows.length : await pg.queryCache(`select count(*) from ${table} t where ${where.join(' and ') || 'true'}`).then((el) => el?.rows[0]?.count);
 
   await metaFormat({ rows, table: params.table });

package/table/controllers/table.js

@@ -0,0 +1,40 @@
+import getTemplate from './utils/getTemplate.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function table(req) {
+  const { pg, params = {}, query = {} } = 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, [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] || {};
+}

package/table/index.js

@@ -1,5 +1,6 @@
 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';
@@ -35,6 +36,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}/table/:table/:id`, { schema: tableSchema }, table);
   fastify.get(`${prefix}/card/:table/:id`, { schema: tableSchema }, card);
   fastify.get(`${prefix}/search`, { schema: searchTableSchema }, search);
   fastify.get(`${prefix}/filter/:table`, {}, filter);