@opengis/fastify-table 1.0.45 → 1.0.47

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.0.47 - 25.06.2024
+
+- add extra properties support
+
+## 1.0.46 - 24.06.2024
+
+- fix data api edit geometry
+
 ## 1.0.45 - 19.06.2024
 
 - fix data api table template order

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

@@ -1,29 +1,35 @@
-import getOPt from './funcs/getOpt.js';
-import setOpt from './funcs/setOpt.js';
-import isFileExists from './funcs/isFileExists.js';
-import dataUpdate from './funcs/dataUpdate.js';
-import dataInsert from './funcs/dataInsert.js';
-
-import update from './controllers/update.js';
-import insert from './controllers/insert.js';
-import deleteCrud from './controllers/deleteCrud.js';
-
-// import config from '../config.js';
-
-async function plugin(fastify, config = {}) {
-  const prefix = config.prefix || '/api';
-  // funcs
-  fastify.decorate('setOpt', setOpt);
-  fastify.decorate('getOpt', getOPt);
-  fastify.decorate('dataUpdate', dataUpdate);
-  fastify.decorate('dataInsert', dataInsert);
-
-  fastify.decorate('isFileExists', isFileExists);
-
-  // api
-  fastify.put(`${prefix}/table/:table/:id`, {}, update);
-  fastify.delete(`${prefix}/table/:table/:id`, {}, deleteCrud);
-  fastify.post(`${prefix}/table/:table`, {}, insert);
-}
-
-export default plugin;
+import getOPt from './funcs/getOpt.js';
+import setOpt from './funcs/setOpt.js';
+import isFileExists from './funcs/isFileExists.js';
+import dataUpdate from './funcs/dataUpdate.js';
+import dataInsert from './funcs/dataInsert.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
+  fastify.decorate('setOpt', setOpt);
+  fastify.decorate('getOpt', getOPt);
+  fastify.decorate('dataUpdate', dataUpdate);
+  fastify.decorate('dataInsert', dataInsert);
+
+  fastify.decorate('isFileExists', isFileExists);
+
+  // api
+  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.45",
+  "version": "1.0.47",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/migrations/admin.sql

@@ -0,0 +1,246 @@
+create schema if not exists admin;
+
+-- DROP TABLE is exists admin.users;
+CREATE TABLE if not exists admin.users();
+ALTER TABLE admin.users add column if not exists uid text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_uid_pkey cascade;
+
+ALTER TABLE admin.users add column if not exists login text;
+ALTER TABLE admin.users add column if not exists password text NOT NULL DEFAULT ''::text;
+ALTER TABLE admin.users add column if not exists user_name text;
+ALTER TABLE admin.users add column if not exists sur_name text;
+ALTER TABLE admin.users add column if not exists father_name text;
+ALTER TABLE admin.users add column if not exists email text;
+ALTER TABLE admin.users add column if not exists phone text;
+ALTER TABLE admin.users add column if not exists avatar text;
+ALTER TABLE admin.users add column if not exists enabled boolean;
+ALTER TABLE admin.users add column if not exists user_personal_code text;
+ALTER TABLE admin.users add column if not exists last_activity_date timestamp without time zone;
+ALTER TABLE admin.users add column if not exists user_type text DEFAULT 'regular'::text;
+ALTER TABLE admin.users add column if not exists salt text;
+ALTER TABLE admin.users add column if not exists cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.users add column if not exists editor_id text;
+ALTER TABLE admin.users add column if not exists editor_date timestamp without time zone;
+
+ALTER TABLE admin.users add CONSTRAINT admin_user_uid_pkey PRIMARY KEY (uid);
+
+COMMENT ON COLUMN admin.users.uid IS 'ID користувача';
+COMMENT ON COLUMN admin.users.login IS 'Логін користувача';
+COMMENT ON COLUMN admin.users.password IS 'Пароль користувача';
+COMMENT ON COLUMN admin.users.user_name IS 'Ім''я користувача';
+COMMENT ON COLUMN admin.users.sur_name IS 'Прізвище користувача';
+COMMENT ON COLUMN admin.users.father_name IS 'По-батькові користувача';
+COMMENT ON COLUMN admin.users.email IS 'Ел. пошта користувача';
+COMMENT ON COLUMN admin.users.phone IS 'Номер телефону користувача';
+COMMENT ON COLUMN admin.users.avatar IS 'Аватар';
+COMMENT ON COLUMN admin.users.enabled IS 'Вкл. / Відкл';
+COMMENT ON COLUMN admin.users.last_activity_date IS 'Дата останньої активності';
+COMMENT ON COLUMN admin.users.user_type IS 'Тип користувача';
+COMMENT ON COLUMN admin.users.salt IS 'Сіль';
+
+-- drop table if exists admin.user_group;
+CREATE TABLE if not exists admin.user_group();
+alter table admin.user_group DROP CONSTRAINT if exists admin_user_group_id_pkey cascade;
+
+ALTER TABLE admin.user_group ADD COLUMN if not exists user_group_id text;
+ALTER TABLE admin.user_group ALTER COLUMN user_group_id SET NOT NULL;
+ALTER TABLE admin.user_group ALTER COLUMN user_group_id SET DEFAULT next_id();
+ALTER TABLE admin.user_group ADD COLUMN if not exists group_name text;
+ALTER TABLE admin.user_group ADD COLUMN if not exists enabled boolean;
+ALTER TABLE admin.user_group ADD COLUMN if not exists cdate timestamp without time zone;
+ALTER TABLE admin.user_group ALTER COLUMN cdate SET DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.user_group ADD COLUMN if not exists uid text;
+ALTER TABLE admin.user_group ADD COLUMN if not exists editor_id text;
+ALTER TABLE admin.user_group ADD COLUMN if not exists editor_date timestamp without time zone;
+
+ALTER TABLE admin.user_group
+ADD CONSTRAINT admin_user_group_id_pkey PRIMARY KEY(user_group_id);
+
+COMMENT ON COLUMN admin.user_group.user_group_id IS 'Вкл./Выкл.';
+COMMENT ON COLUMN admin.user_group.group_name IS 'Назва групи';
+COMMENT ON COLUMN admin.user_group.enabled IS 'Вкл./Відкл.';
+COMMENT ON COLUMN admin.user_group.cdate IS 'Дата створення';
+COMMENT ON COLUMN admin.user_group.uid IS 'Хто створив';
+COMMENT ON COLUMN admin.user_group.editor_id IS 'Останній редагувач';
+COMMENT ON COLUMN admin.user_group.editor_date IS 'Дата останнього редагування';
+
+-- drop table if exists admin.user_access;
+CREATE TABLE if not exists admin.user_access();
+alter table admin.user_access DROP CONSTRAINT if exists admin_user_access_id_pkey;
+alter table admin.user_access DROP CONSTRAINT if exists admin_user_access_user_group_id_fkey;
+alter table admin.user_access DROP CONSTRAINT if exists admin_user_access_interface_id_uid_unique;
+alter table admin.user_access DROP CONSTRAINT if exists admin_user_access_interface_id_fkey;
+
+alter table admin.user_access add column if not exists user_access_id text NOT NULL DEFAULT next_id();
+alter table admin.user_access add column if not exists interface_id text NOT NULL;
+alter table admin.user_access add column if not exists user_group_id text;
+alter table admin.user_access add column if not exists user_uid text;
+alter table admin.user_access add column if not exists scope text;
+alter table admin.user_access add column if not exists actions text[];
+ALTER TABLE admin.user_access ADD COLUMN IF NOT EXISTS access_granted text;
+ALTER TABLE admin.user_access ADD COLUMN IF NOT EXISTS access_granted_time timestamp without time zone;
+alter table admin.user_access add column if not exists cdate timestamp without time zone NOT NULL DEFAULT date_trunc('seconds'::text, now());
+alter table admin.user_access add column if not exists uid text;
+alter table admin.user_access add column if not exists editor_id text;
+alter table admin.user_access add column if not exists editor_date timestamp without time zone;
+
+alter table admin.user_access 
+add CONSTRAINT admin_user_access_id_pkey PRIMARY KEY (user_access_id);
+
+alter table admin.user_access 
+add CONSTRAINT admin_user_access_user_group_id_fkey FOREIGN KEY (user_group_id) REFERENCES admin.user_group (user_group_id);
+
+alter table admin.user_access 
+add CONSTRAINT admin_user_access_interface_id_uid_unique UNIQUE (interface_id, user_uid, user_group_id);
+alter table admin.user_access 
+add constraint admin_user_access_interface_id_fkey FOREIGN KEY (interface_id) REFERENCES admin.interface_list(interface_id);
+
+COMMENT ON TABLE admin.user_access IS 'Налаштування прав. Відношення груп / окремих користувачів до шаблонів';
+COMMENT ON COLUMN admin.user_access.interface_id IS 'ID шаблона';
+COMMENT ON COLUMN admin.user_access.user_group_id IS 'ID групи';
+COMMENT ON COLUMN admin.user_access.user_uid IS 'ID користувача';
+COMMENT ON COLUMN admin.user_access.scope IS 'Обмеження виведення (власні, відповідальний, всі)';
+COMMENT ON COLUMN admin.user_access.actions IS 'Доступні дії';
+COMMENT ON COLUMN admin.user_access.access_granted IS 'Ідентифікатор користувача який надав доступ';
+COMMENT ON COLUMN admin.user_access.access_granted_time IS 'Час коли надали доступ';
+
+CREATE INDEX if not exists admin_user_access_interface_id_idx
+ON admin.user_access USING btree (interface_id COLLATE pg_catalog."default");
+
+CREATE INDEX if not exists admin_user_access_user_group_id_idx
+ON admin.user_access USING btree (user_group_id COLLATE pg_catalog."default");
+
+-- DROP TABLE if exists admin.user_group_rel;
+CREATE TABLE if not exists admin.user_group_rel();
+ALTER TABLE admin.user_group_rel DROP CONSTRAINT IF EXISTS admin_user_group_rel_pkey;
+ALTER TABLE admin.user_group_rel DROP CONSTRAINT IF EXISTS admin_user_group_rel_user_group_id_fkey;
+ALTER TABLE admin.user_group_rel DROP CONSTRAINT IF EXISTS admin_user_group_rel_user_uid_fkey;
+ALTER TABLE admin.user_group_rel DROP CONSTRAINT IF EXISTS admin_user_group_rel_user_uid_user_group_id_key;
+
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS ugr_id text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS user_uid text NOT NULL;
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS user_group_id text NOT NULL;
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT date_trunc('seconds'::text, now());
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS expiration date;
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS access_granted text;
+ALTER TABLE admin.user_group_rel ADD COLUMN IF NOT EXISTS access_granted_time timestamp without time zone;
+
+ALTER TABLE admin.user_group_rel ADD CONSTRAINT admin_user_group_rel_pkey PRIMARY KEY (ugr_id);
+ALTER TABLE admin.user_group_rel ADD CONSTRAINT admin_user_group_rel_user_group_id_fkey FOREIGN KEY (user_group_id) REFERENCES admin.user_group (user_group_id);
+ALTER TABLE admin.user_group_rel ADD CONSTRAINT admin_user_group_rel_user_uid_fkey FOREIGN KEY (user_uid) REFERENCES admin.users (uid);
+ALTER TABLE admin.user_group_rel ADD CONSTRAINT admin_user_group_rel_user_uid_user_group_id_key UNIQUE (user_uid, user_group_id);
+
+COMMENT ON TABLE admin.user_group_rel IS 'Відношення користувачів до груп';
+COMMENT ON COLUMN admin.user_group_rel.user_uid IS 'ID користувача';
+COMMENT ON COLUMN admin.user_group_rel.user_group_id IS 'ID групи';
+COMMENT ON COLUMN admin.user_group_rel.uid IS 'Користувач, який створив запис в БД';
+COMMENT ON COLUMN admin.user_group_rel.expiration IS 'закінчення терміну дії доступу до групи';
+COMMENT ON COLUMN admin.user_group_rel.access_granted IS 'Ідентифікатор користувача який надав доступ';
+COMMENT ON COLUMN admin.user_group_rel.access_granted_time IS 'Час коли надали доступ';
+
+CREATE INDEX IF NOT EXISTS admin_user_group_access_user_uid_idx ON admin.user_group_rel USING btree (user_uid COLLATE pg_catalog."default");
+
+CREATE INDEX IF NOT EXISTS admin_user_group_rel_cdate_btree_idx ON admin.user_group_rel USING btree (cdate);
+
+CREATE INDEX IF NOT EXISTS admin_user_group_rel_editor_date_btree_idx ON admin.user_group_rel USING btree (editor_date);
+
+CREATE INDEX IF NOT EXISTS admin_user_group_rel_user_uid_gin_idx ON admin.user_group_rel USING gin (user_uid COLLATE pg_catalog."default" gin_trgm_ops);
+
+CREATE INDEX IF NOT EXISTS admin_user_group_user_group_id_idx ON admin.user_group_rel USING btree (user_group_id COLLATE pg_catalog."default");
+
+-- DROP TABLE if exists admin.menu;
+CREATE TABLE if not exists admin.menu();
+alter table admin.menu DROP CONSTRAINT if exists admin_menu_id_pkey cascade;
+alter table admin.menu DROP CONSTRAINT if exists admin_menu_name_unique;
+
+alter table admin.menu add column if not exists menu_id text NOT NULL default next_id();
+alter table admin.menu add column if not exists name text;
+alter table admin.menu add column if not exists ord numeric;
+alter table admin.menu add column if not exists enabled boolean NOT NULL DEFAULT true;
+alter table admin.menu add column if not exists uid text;
+alter table admin.menu add column if not exists editor_id text;
+alter table admin.menu add column if not exists editor_date timestamp without time zone;
+alter table admin.menu add column if not exists cdate timestamp without time zone DEFAULT now();
+alter table admin.menu add CONSTRAINT admin_menu_id_pkey PRIMARY KEY (menu_id);
+alter table admin.menu add CONSTRAINT admin_menu_name_unique UNIQUE (name);
+
+COMMENT ON TABLE admin.menu IS 'Пункти меню';
+COMMENT ON COLUMN admin.menu.menu_id IS 'Ідентифікатор пункту меню';
+COMMENT ON COLUMN admin.menu.name IS 'Назва пункту меню';
+COMMENT ON COLUMN admin.menu.ord IS 'Порядковий номер';
+COMMENT ON COLUMN admin.menu.enabled IS 'On / Off';
+
+-- DROP TABLE if exists admin.interface_list;
+CREATE TABLE if not exists admin.interface_list();
+alter table admin.interface_list DROP CONSTRAINT if exists admin_interface_id_pkey cascade;
+
+alter table admin.interface_list add column if not exists interface_id text NOT NULL default next_id();
+alter table admin.interface_list add column if not exists alias text NOT NULL;
+alter table admin.interface_list add column if not exists title text;
+alter table admin.interface_list add column if not exists public boolean;
+alter table admin.interface_list add column if not exists menu_id text;
+alter table admin.interface_list add column if not exists uid text;
+alter table admin.interface_list add column if not exists editor_id text;
+alter table admin.interface_list add column if not exists editor_date timestamp without time zone;
+alter table admin.interface_list add column if not exists cdate timestamp without time zone DEFAULT now();
+alter table admin.interface_list add column if not exists enabled boolean NOT NULL DEFAULT true;
+alter table admin.interface_list add CONSTRAINT admin_interface_id_pkey PRIMARY KEY (interface_id);
+alter table admin.interface_list add constraint admin_interface_menu_id_fkey FOREIGN KEY (menu_id) REFERENCES admin.menu(menu_id);
+
+COMMENT ON TABLE admin.interface_list IS 'Список інтерфейсів';
+COMMENT ON COLUMN admin.interface_list.interface_id IS 'Ідентифікатор інтерфейса';
+COMMENT ON COLUMN admin.interface_list.alias IS 'Назва файлу інтерфейса';
+COMMENT ON COLUMN admin.interface_list.title IS 'Назва інтерфейсу українською';
+COMMENT ON COLUMN admin.interface_list.public IS 'Ознака чи для всіх показується';
+COMMENT ON COLUMN admin.interface_list.enabled IS 'On / Off';
+COMMENT ON COLUMN admin.interface_list.menu_id IS 'Пункт меню (для collapse)';
+
+CREATE EXTENSION if not exists pgcrypto SCHEMA public VERSION "1.3";
+CREATE OR REPLACE FUNCTION admin.crypt(text, text) RETURNS text AS '$libdir/pgcrypto', 'pg_crypt' LANGUAGE c IMMUTABLE STRICT COST 1;
+
+-- DROP FUNCTION admin.insert_update_user_before();
+CREATE OR REPLACE FUNCTION admin.insert_update_user_before()
+RETURNS trigger AS
+
+$BODY$
+DECLARE 
+
+iterations  int;
+hash character varying;
+
+BEGIN
+
+ if(TG_OP='INSERT' or (TG_OP='UPDATE' and new.password<>old.password)) then
+	if(char_length(new.password) <> 0 and char_length(new.password) < 8) then
+		--raise exception 'password must be longer than 8 characters';
+	end if;
+	new.salt=md5(now()::text);
+	--raise exception '%','change pass';
+	if(new.salt ='') then
+		new.salt=gen_salt('md5');	
+	end if;	
+	iterations = 10;
+	hash=''; 
+	
+	loop   		
+		if iterations=0 then
+			exit;
+		end if;
+		hash = md5(new.password||hash||new.salt);
+		iterations=iterations-1;
+	end loop;
+	new.password=admin.crypt(hash,new.salt);
+	
+ end if;
+ RETURN new;
+END
+$BODY$
+
+LANGUAGE plpgsql VOLATILE COST 100;
+  
+DROP TRIGGER if exists insert_update_user_before on admin.users;
+CREATE TRIGGER insert_update_user_before BEFORE INSERT OR UPDATE ON admin.users FOR EACH ROW 
+EXECUTE PROCEDURE admin.insert_update_user_before();

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/table/controllers/data.js

@@ -17,7 +17,9 @@ export default async function data(req) {
   const {
     table, columns, sql, cardSql, filters, form, meta,
   } = loadTable;
-  const { pk, columns: dbColumns } = await getMeta(table);
+  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(',');
@@ -46,7 +48,7 @@ export default async function data(req) {
 
   const where = [(params.id ? ` "${pk}" = $1` : null), keyQuery, loadTable.query, fData.q, state, custom, search].filter((el) => el);
   const cardColumns = cardSqlFiltered.length ? `,${cardSqlFiltered.map((el) => el.name)}` : '';
-  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
+  const q = `select  ${pk ? `"${pk}" as id,` : ''} ${columnList.includes('geom') ? `st_asgeojson(geom)::json as geom,` : ''} ${query.id || query.key ? '*' : cols || '*'} ${cardColumns} from ${table} t ${sqlTable} ${cardSqlTable} where ${where.join(' and ') || 'true'} ${order} ${offset}  limit ${limit}`;
 
   if (query.sql === '1') { return q; }
 

package/table/controllers/utils/getTemplate.js

@@ -1,28 +1,28 @@
-import { readFile } from 'fs/promises';
-import fs from 'fs';
-import path from 'path';
-import config from '../../../config.js';
-
-const loadTemplate = {};
-
-export default async function getTemplateDir(type, name) {
-  if (!type) return null;
-  if (!name) return null;
-
-  const cwd = process.cwd();
-  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
-
-  if (!loadTemplate[type]) {
-    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
-    loadTemplate[type] = typeList;
-  }
-
-  const fullname = loadTemplate[type].find((el) => path.parse(el).name === name);
-  const ext = fullname ? path.extname(fullname)?.slice(1) : null;
-  if (!ext) return null;
-
-  const sql = loadTemplate[type].includes(`${name}.sql`) ? await readFile(path.join(typeDir, `${name}.sql`), 'utf-8') : null;
-  const data = loadTemplate[type].includes(`${name}.json`) ? JSON.parse(await readFile(path.join(typeDir, `${name}.json`), 'utf-8')) : await readFile(path.join(typeDir, `${name}.${ext}`), 'utf-8');
-  if (sql) return { ...data || {}, sql };
-  return data;
-}
+import { readFile } from 'fs/promises';
+import fs from 'fs';
+import path from 'path';
+import config from '../../../config.js';
+
+const loadTemplate = {};
+
+export default async function getTemplateDir(type, name) {
+  if (!type) return null;
+  if (!name) return null;
+
+  const cwd = process.cwd();
+  const typeDir = path.join(cwd, (config.templateDir || 'server/templates'), type);
+
+  if (!loadTemplate[type]) {
+    const typeList = fs.existsSync(typeDir) ? fs.readdirSync(typeDir) : [];
+    loadTemplate[type] = typeList;
+  }
+
+  const fullname = loadTemplate[type].find((el) => path.parse(el).name === name);
+  const ext = fullname ? path.extname(fullname)?.slice(1) : null;
+  if (!ext) return null;
+
+  const sql = loadTemplate[type].includes(`${name}.sql`) ? await readFile(path.join(typeDir, `${name}.sql`), 'utf-8') : null;
+  const data = loadTemplate[type].includes(`${name}.json`) ? JSON.parse(await readFile(path.join(typeDir, `${name}.json`), 'utf-8')) : await readFile(path.join(typeDir, `${name}.${ext}`), 'utf-8');
+  if (sql) return { ...data || {}, sql };
+  return data;
+}

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',