@opengis/fastify-table 1.1.22 → 1.1.23

package/Changelog.md

@@ -1,6 +1,6 @@
 # fastify-table
 
-## 1.1.22 - 03.10.2024
+## 1.1.23 - 03.10.2024
 
 - add user API and unit tests
 

package/package.json

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

package/server/migrations/properties.sql

@@ -41,10 +41,10 @@ COMMENT ON COLUMN admin.user_properties.property_key IS 'Ключ';
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_json json;
 COMMENT ON COLUMN admin.user_properties.property_json IS 'Значення налаштування';
 
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_entity text;
-COMMENT ON COLUMN admin.properties.property_entity IS 'Сутність';
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_title text;
-COMMENT ON COLUMN admin.properties.property_title IS 'Назва';
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_entity text;
+COMMENT ON COLUMN admin.user_properties.property_entity IS 'Сутність';
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_title text;
+COMMENT ON COLUMN admin.user_properties.property_title IS 'Назва';
 
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS editor_id text;
@@ -53,6 +53,6 @@ ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS cdate timestamp witho
 ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS files json;
 
 ALTER TABLE admin.user_properties ADD CONSTRAINT admin_user_properties_property_id_pkey PRIMARY KEY(property_id);
-alter table admin.user_properties add constraint user_properties_key_uid_unique UNIQUE (property_key,uid);
+ALTER TABLE admin.user_properties ADD CONSTRAINT user_properties_key_uid_unique UNIQUE (property_key,property_entity,uid);
 
 COMMENT ON TABLE admin.user_properties IS 'Налаштування користувача';

package/table/funcs/metaFormat/getSelectVal.js

@@ -1,15 +1,16 @@
 import getSelect from '../../controllers/utils/getSelect.js';
-import pg from '../../../pg/pgClients.js';
+import pgClients from '../../../pg/pgClients.js';
 import redis from '../../../redis/client.js';
 
-export default async function metaFormat({ name, values }) {
+export default async function getSelectVal({ pg: pg1, name, values }) {
+  const pg = pg1 || pgClients.client;
   const cls = await getSelect(name);
   if (!cls?.arr && !cls?.sql) return null;
   const key = `select:${name}`;
   const cache = !cls.arr ? (await redis.hmget(key, values)).reduce((p, el, i) => ({ ...p, [values[i]]: el }), {}) : {};
 
   const data = cls.arr || (values.filter(el => !cache[el]).length
-    ? await pg.client.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
+    ? await pg.query(`with c(id,text) as (${cls.sql}) select * from c where id = any('{${values.filter(el => !cache[el])}}')`).then(el => el.rows)
     : []);
 
   const clsAr = { ...cache, ...data.reduce((p, el) => ({ ...p, [el.id.toString()]: el.color ? el : el.text }), {}) };