@opengis/fastify-table 1.2.46 → 1.2.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.46",
+  "version": "1.2.48",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/extra/extraDataGet.js

@@ -1,58 +1,52 @@
-import { config, getTemplate, pgClients, getMeta } from "../../../utils.js";
+import { config, getTemplate, pgClients } from "../../../utils.js";
 
 const defaultTable = 'crm.extra_data';
 
 function format(key, value, schema) {
   if (!key || !schema?.[key]) return undefined; // skip non-existing
-  if (schema?.[key]?.type && ['Number', 'Switcher'].includes(schema?.[key]?.type)) {
+  if (schema?.[key]?.type && ['DataTable', 'Number', 'Switcher'].includes(schema?.[key]?.type)) {
     return JSON.parse(value || null);
   }
   return value;
 }
 
 export default async function extraDataGet({
-  table: mainTable, form, id,
+  rows = [], table, form,
 }, pg = pgClients.client) {
-  if (!id || !form || !mainTable) {
+  const ids = rows.map(row => row.id).filter(el => el);
+
+  if (!ids?.length || !form || !table) {
     return null;
   }
 
   const loadTemplate = await getTemplate('form', form);
   if (!loadTemplate?.extra) return null;
 
-  const table = config.extraData?.[mainTable]
-    || config.extraData?.[mainTable.split('.').shift()]
+  const extraDataTable = config.extraData?.[table]
+    || config.extraData?.[table.split('.').shift()]
     || config.extraData?.['default']
     || config.extraData
     || defaultTable;
 
-  const { pk: mainPK } = await getMeta({ pg, table: mainTable });
-  const { pk, columns: extraColumns = [] } = await getMeta({ pg, table });
-
-  if (!mainPK) {
-    return { error: `table pk not found: ${mainTable}`, status: 404 };
+  if (!pg.pk?.[table]) {
+    return { error: `table pk not found: ${table}`, status: 404 };
   }
 
-  if (!pk) {
-    return { error: `extra table pk not found: ${table}`, status: 404 };
+  if (!pg.pk?.[extraDataTable]) {
+    return { error: `extra table pk not found: ${extraDataTable}`, status: 404 };
   }
 
-  const mode = extraColumns.find((col) => col?.name === mainPK)
-    ? 'column'
-    : 'property';
-
-  const { rows = [] } = await pg.query(`select * from ${table} where ${mode === 'column' ? mainPK : 'object_id'}=$1`, [id]);
-
-  if (mode === 'column') {
-    const res = Object.keys(rows[0] || {})
-      .map(key => [key, format(key, rows?.[0]?.[key], loadTemplate?.schema)])
-      .filter(el => el[1])
-      .reduce((acc, curr) => Object.assign(acc, { [curr[0]]: curr[1] }), {});
-    Object.assign(res, { id: rows?.[0]?.[pg.pk?.[mainTable || '']] });
-    return res;
+  const { rows: extraRows = [] } = await pg.query(`select * from ${extraDataTable} where object_id=any($1::text[])`, [ids]);
+
+  if (rows?.length && extraRows?.length) {
+    rows.forEach(row => {
+      Object.assign(row, {
+        ...extraRows
+          .filter(el => el.object_id === row.id)
+          .reduce((acc, curr) => Object.assign(acc, {
+            [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema)
+          }), {})
+      });
+    });
   }
-
-  const res = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: format(curr.property_key, curr.value_text, loadTemplate?.schema) }), {});
-  Object.assign(res, { id: rows?.[0].object_id });
-  return res;
 };

package/server/routes/table/controllers/data.js

@@ -80,7 +80,7 @@ export default async function dataAPI(req, reply, called) {
     });
   }
 
-  const checkFilter = [query.filter, query.search, query.state, query.custom, loadTable?.extra].filter((el) => el).length;
+  const checkFilter = [query.filter, query.search, query.state, query.custom].filter((el) => el).length;
   const fData = checkFilter ? await getFilterSQL({
     pg,
     table: params.table,
@@ -119,7 +119,7 @@ export default async function dataAPI(req, reply, called) {
                      
                      ${dbColumns.find((el) => el.name === 'geom' && pg.pgType?.[el.dataTypeID] === 'geometry') ? ',st_asgeojson(geom)::json as geom' : ''} 
                      from (select * from ${table} where ${sqlTable ? 'true' : (where.join(' and ') || 'true')}  ${order}) t 
-                     ${sqlTable} ${loadTable?.extra && fData?.extraSqlList ? fData?.extraSqlList : ''} 
+                     ${sqlTable} 
                      ${params.id ? cardSqlTable : ''} 
                      where ${where.join(' and ') || 'true'} 
                      ${order} ${offset}  limit ${limit}`
@@ -162,14 +162,7 @@ export default async function dataAPI(req, reply, called) {
   const { total, filtered } = counts || {};
   const agg = Object.keys(counts).filter(el => !['total', 'filtered'].includes(el)).reduce((acc, el) => ({ ...acc, [el]: counts[el] }), {});
 
-  if (hookData?.id || params.id) {
-    const extraData = await extraDataGet({
-      table: loadTable?.table,
-      id: hookData?.id || params.id,
-      form,
-    }, pg);
-    Object.assign(rows[0] || {}, { ...extraData || {} });
-  }
+  await extraDataGet({ rows, table: loadTable?.table, form }, pg);
 
   await metaFormat({ rows, table: tokenData?.table || hookData?.table || params.table }, pg);