@opengis/fastify-table 1.0.46 → 1.0.47

package/Changelog.md

@@ -1,5 +1,9 @@
 # fastify-table
 
+## 1.0.47 - 25.06.2024
+
+- add extra properties support
+
 ## 1.0.46 - 24.06.2024
 
 - fix data api edit geometry

package/crud/controllers/properties.add.js

@@ -0,0 +1,51 @@
+import dataInsert from "../funcs/dataInsert.js";
+
+const table = 'crm.properties';
+
+function checkKeyType({ body, key }) {
+    if (typeof body[key] === 'number' && !body[key].toString().includes('.')) {
+        return { [key]: 'int' };
+    } else if (typeof body[key] === 'object') {
+        return { [key]: 'json' };
+    } else if (Date.parse(body[key], 'yyyy/MM/ddTHH:mm:ss.000Z')) {
+        return { [key]: 'date' };
+    }
+    return { [key]: 'text' };
+}
+
+export default async function addExtraProperties({
+    pg, params = {}, body = {},
+}) {
+    const { id } = params;
+    if (!id) {
+        return { message: 'not enougn params: 1', status: 400 };
+    }
+    const extraProperties = Object.keys(body);
+    if (!extraProperties.length) {
+        return { message: 'not enougn params: 2', status: 400 };
+    }
+
+    if (!pg.pk?.[table]) {
+        return { message: 'table not found: crm.properties', status: 400 };
+    }
+
+    try {
+        await pg.query(`delete from crm.properties where object_id=$1`, [id]);
+        const keyTypeMatch = extraProperties.filter((key) => body[key]).reduce((acc, curr) => Object.assign(acc, checkKeyType({ body, key: curr })), {});
+        const res = await Promise.all(Object.keys(keyTypeMatch).map(async (key) => {
+            const propertyType = keyTypeMatch[key];
+            const { rows = [] } = await dataInsert({
+                pg, table, data: {
+                    property_type: propertyType,
+                    property_key: key,
+                    object_id: id,
+                    [`property_${propertyType}`]: body[key],
+                }
+            });
+            return { id: rows[0]?.property_id, type: propertyType, value: body[key] };
+        }));
+        return { message: { rows: res }, status: 200 };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
+}

package/crud/controllers/properties.get.js

@@ -0,0 +1,20 @@
+export default async function getExtraProperties({
+    pg, params = {},
+}) {
+    const { id } = params;
+    if (!id) {
+        return { message: 'not enougn params', status: 400 };
+    }
+    try {
+        const { rows = [] } = pg.pk?.['crm.properties']
+            ? await pg.query(`select property_key, property_type, property_text, property_int,
+            property_json, property_date from crm.properties where property_key is not null and object_id=$1`, [id])
+            : {};
+        if (!rows.length) return {};
+
+        const data = rows.reduce((acc, curr) => Object.assign(acc, { [curr.property_key]: curr[`property_${curr.property_type}`] }), {});
+        return { message: data, status: 200 };
+    } catch (err) {
+        return { error: err.toString(), status: 500 };
+    }
+}

package/crud/index.js

@@ -8,6 +8,9 @@ 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 = {}) {
@@ -24,6 +27,9 @@ async function plugin(fastify, config = {}) {
   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/package.json

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

package/server/migrations/crm.sql

@@ -115,4 +115,34 @@ ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS cdate timestamp without time zone D
 ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS editor_id text;
 ALTER TABLE crm.cls ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
 ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_pkey PRIMARY KEY (cls_id);
-ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_unique UNIQUE (code, parent);
+ALTER TABLE crm.cls ADD CONSTRAINT crm_cls_unique UNIQUE (code, parent);
+
+-- DROP TABLE crm.properties;
+CREATE TABLE IF NOT EXISTS crm.properties();
+ALTER TABLE crm.properties DROP CONSTRAINT IF EXISTS crm_properties_pkey;
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
+
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS table_name text;
+COMMENT ON COLUMN crm.properties.table_name IS 'Таблиця';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS object_id text;
+COMMENT ON COLUMN crm.properties.object_id IS 'ID Об''єкту';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_key text;
+COMMENT ON COLUMN crm.properties.object_id IS 'Назва атрибуту';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_text text;
+COMMENT ON COLUMN crm.properties.property_text IS 'Текст';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_int integer;
+COMMENT ON COLUMN crm.properties.property_int IS 'Integer';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_json json;
+COMMENT ON COLUMN crm.properties.property_json IS 'JSON';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_date date;
+COMMENT ON COLUMN crm.properties.property_json IS 'Дата';
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS property_type text;
+COMMENT ON COLUMN crm.properties.property_type IS 'Тип даних';
+
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
+ALTER TABLE crm.properties ADD COLUMN IF NOT EXISTS files json;
+
+ALTER TABLE crm.properties ADD CONSTRAINT crm_properties_pkey PRIMARY KEY(property_id);

package/test/api/crud.test.js

@@ -26,6 +26,26 @@ test('api crud', async (t) => {
     assert.ok(rep.rows ? rep.rows[0]?.map_id : rep.map_id);
   });
 
+  await t.test('POST /properties/:id', async () => {
+    const res = await app.inject({
+      method: 'POST',
+      url: `${prefix}/properties/5400000`,
+      body: {
+        custom_alias: 'testMap',
+        custom_ord: 5,
+      },
+    });
+    assert.ok(res.json().message.rows.length, 'not ok');
+  });
+
+  await t.test('GET /properties/:id', async () => {
+    const res = await app.inject({
+      method: 'GET',
+      url: `${prefix}/properties/5400000`,
+    });
+    assert.ok(res.json().message.custom_alias, 'not ok');
+  });
+
   await t.test('PUT /update', async () => {
     const res = await app.inject({
       method: 'PUT',