@opengis/fastify-table 1.0.85 → 1.0.87

package/Changelog.md

@@ -1,6 +1,10 @@
 # fastify-table
 
-## 1.0.85 - 23.08.2024
+## 1.0.87 - 26.08.2024
+
+- change of null handling method of update crud API
+
+## 1.0.86 - 23.08.2024
 
 - data API meta cls support
 

package/crud/funcs/dataUpdate.js

@@ -1,24 +1,24 @@
-import getPG from '../../pg/funcs/getPG.js';
-
-import getMeta from '../../pg/funcs/getMeta.js';
-
-export default async function dataUpdate({
-  table, id, data, pg: pg1,
-}) {
-  if (!data || !table || !id) return null;
-
-  const pg = pg1 || getPG({ name: 'client' });
-  const { columns, pk } = await getMeta(table);
-
-  const names = columns?.map((el) => el.name);
-  const filterData = Object.keys(data)
-    .filter((el) => (typeof data[el] === 'boolean' ? true : data[el] && names?.includes(el)));
-
-  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
-
-  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => (key === 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)` : `"${key}"=$${i + 2}`)).join(',')} 
-      WHERE ${pk} = $1 returning *`;
-  //  console.log(updateDataset);
-  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+
+import getMeta from '../../pg/funcs/getMeta.js';
+
+export default async function dataUpdate({
+  table, id, data, pg: pg1,
+}) {
+  if (!data || !table || !id) return null;
+
+  const pg = pg1 || getPG({ name: 'client' });
+  const { columns, pk } = await getMeta(table);
+
+  const names = columns?.map((el) => el.name);
+  const filterData = Object.keys(data)
+    .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el)));
+
+  const filterValue = filterData.map((el) => [el, data[el]]).map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
+
+  const updateQuery = `UPDATE ${table} SET ${filterData?.map((key, i) => (key === 'geom' ? `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)` : `"${key}"=$${i + 2}`)).join(',')} 
+      WHERE ${pk} = $1 returning *`;
+  // console.log(updateQuery, filterValue);
+  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
+  return res;
+}

package/package.json

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

package/table/index.js

@@ -11,7 +11,7 @@ import getTemplate from './controllers/utils/getTemplate.js';
 import getSelect from './controllers/utils/getSelect.js';
 
 const tableSchema = {
-  querystring: {
+  querystring1: {
     page: { type: 'string', pattern: '^(\\d+)$' },
     order: { type: 'string', pattern: '^(\\d+)$' },
     filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([\\w\\d_-]+)$' },

package/test/api/table.test.js

@@ -18,7 +18,7 @@ test('api table', async (t) => {
   await t.test('GET /data (meta bbox / cls)', async () => {
     const res = await app.inject({
       method: 'GET',
-      url: `${config.prefix || '/api'}/data/test.dataset.table?bbox=${bbox}&json=1`,
+      url: `${config.prefix || '/api'}/data/test.dataset.table?bbox=${bbox}`,
     });
     const json = res.json();
     assert.ok(json?.rows?.length === +count, 'meta bbox - not ok');