@opengis/fastify-table 1.0.56 → 1.0.58

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.58 - 08.07.2024
+
+- code optimization
+
+## 1.0.57 - 04.07.2024
+
+- fix crud update boolean column
+
 ## 1.0.56 - 04.07.2024
 
 - code optimization

package/crud/funcs/dataInsert.js

@@ -15,7 +15,7 @@ export default async function dataInsert({ table, data, pg: pg1 }) {
 
     ( ${filterData?.map((key) => `"${key[0]}"`).join(',')}) 
 
-    values  (${filterData?.map((key, i) => `$${i + 1}`).join(',')}) 
+    values  (${filterData?.map((key, i) => key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`).join(',')}) 
     
     returning *`;
 

package/crud/funcs/dataUpdate.js

@@ -12,11 +12,13 @@ export default async function dataUpdate({
 
   const names = columns?.map((el) => el.name);
   const filterData = Object.keys(data)
-    .filter((el) => data[el] && names?.includes(el));
+    .filter((el) => {
+      return 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}"=$${i + 2}`).join(',')} 
+  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]) || {};

package/crud/index.js

@@ -4,16 +4,10 @@ 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';
 
-import getExtraProperties from './controllers/properties.get.js';
-import addExtraProperties from './controllers/properties.add.js';
-
-// import config from '../config.js';
-
 async function plugin(fastify, config = {}) {
   const prefix = config.prefix || '/api';
   // funcs
@@ -25,13 +19,9 @@ 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);
-
-  fastify.get(`${prefix}/properties/:id`, {}, getExtraProperties);
-  fastify.post(`${prefix}/properties/:id`, {}, addExtraProperties);
 }
 
 export default plugin;

package/index.js

@@ -13,6 +13,7 @@ import notificationPlugin from './notification/index.js';
 import widgetPlugin from './widget/index.js';
 import crudPlugin from './crud/index.js';
 import policyPlugin from './policy/index.js';
+import utilPlugin from './util/index.js';
 
 import pgClients from './pg/pgClients.js';
 
@@ -81,6 +82,7 @@ async function plugin(fastify, opt) {
   crudPlugin(fastify, opt);
   notificationPlugin(fastify, opt);
   widgetPlugin(fastify, opt);
+  utilPlugin(fastify, opt);
 }
 export default fp(plugin);
 // export { rclient };

package/package.json

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

package/table/controllers/data.js

@@ -35,7 +35,7 @@ export default async function data(req) {
 
   const keyQuery = query.key && loadTable.key && !params.id ? `${loadTable.key}=$1` : null;
 
-  const limit = Math.min(maxLimit, +(query.limit || 10));
+  const limit = Math.min(maxLimit, +(query.limit || 20));
 
   const offset = query.page && query.page > 0 ? ` offset ${(query.page - 1) * limit}` : '';
   // id, query, filter

package/{crud → util}/controllers/properties.add.js

@@ -1,4 +1,4 @@
-import dataInsert from "../funcs/dataInsert.js";
+import dataInsert from "../../crud/funcs/dataInsert.js";
 
 const table = 'crm.properties';
 

package/util/index.js

@@ -0,0 +1,13 @@
+import getExtraProperties from './controllers/properties.get.js';
+import addExtraProperties from './controllers/properties.add.js';
+import nextId from './controllers/next.id.js';
+
+async function plugin(fastify, config = {}) {
+  const prefix = config.prefix || '/api';
+
+  fastify.get(`${prefix}/next-id`, {}, nextId);
+  fastify.get(`${prefix}/properties/:id`, {}, getExtraProperties);
+  fastify.post(`${prefix}/properties/:id`, {}, addExtraProperties);
+}
+
+export default plugin;