@opengis/fastify-table 1.1.15 → 1.1.17

package/Changelog.md

@@ -1,5 +1,13 @@
 # fastify-table
 
+## 1.1.17 - 30.09.2024
+
+- add relkinds to pg
+
+## 1.1.16 - 27.09.2024
+
+- add migrations
+
 ## 1.1.15 - 26.09.2024
 
 - fix update crud editor id/date + geom

package/package.json

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

package/pg/funcs/getMeta.js

@@ -21,7 +21,9 @@ export default async function getMeta(opt) {
 
   const geomAttr = fields.find((el) => pg.pgType[el.dataTypeID] === 'geometry')?.name; // change geometry text to geometry code
 
-  const res = { pk, columns: fields, geom: geomAttr };
+  const res = {
+    pk, columns: fields, geom: geomAttr, view: pg.relkinds?.[table] === 'v',
+  };
   data[table] = res;
   return res;
 }

package/pg/funcs/init.js

@@ -14,6 +14,10 @@ async function init(client) {
   const tlist = await client.query(`select array_agg((select nspname from pg_namespace where oid=relnamespace)||'.'||relname) tlist 
     from pg_class where relkind in ('r','v')`).then((d) => d.rows[0].tlist);
 
+  const { rows = [] } = await client.query(`select (select nspname from pg_namespace where oid=relnamespace)||'.'||relname as tname, relkind
+      from pg_class where relkind in ('r','v')`);
+  const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
+
   async function one(query, param = {}) {
     const data = await client.query(query, Array.isArray(param) ? param : param.args || []);
     const result = ((Array.isArray(data) ? data.pop() : data)?.rows || [])[0] || {};
@@ -29,7 +33,8 @@ async function init(client) {
     try {
       result = await clientCb.query(query, args);
       clientCb.end();
-    } catch (err) {
+    }
+    catch (err) {
       clientCb.end();
       cb(err.toString(), 1);
       throw err;
@@ -51,7 +56,7 @@ async function init(client) {
   }
 
   Object.assign(client, {
-    one, pgType, pk, tlist, queryCache, queryNotice,
+    one, pgType, pk, tlist, relkinds, queryCache, queryNotice,
   });
 }
 

package/server/migrations/properties.sql

@@ -28,4 +28,31 @@ ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS files json;
 
 ALTER TABLE admin.properties ADD CONSTRAINT admin_properties_property_id_pkey PRIMARY KEY(property_id);
 
-COMMENT ON TABLE admin.properties IS 'Налаштування';
+COMMENT ON TABLE admin.properties IS 'Налаштування';
+
+-- DROP TABLE admin.user_properties;
+CREATE TABLE IF NOT EXISTS admin.user_properties();
+ALTER TABLE admin.user_properties DROP CONSTRAINT IF EXISTS admin_user_properties_property_id_pkey;
+alter table admin.user_properties drop constraint if exists user_properties_key_uid_unique;
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
+
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS property_key text;
+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 uid text NOT NULL DEFAULT '1'::text;
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.user_properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
+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);
+
+COMMENT ON TABLE admin.user_properties IS 'Налаштування користувача';

package/server/migrations/users.sql

@@ -87,3 +87,48 @@ 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();
+
+-- DROP TABLE is exists admin.users_social_auth;
+CREATE TABLE if not exists admin.users_social_auth();
+ALTER TABLE admin.users_social_auth add column if not exists users_social_auth_id text NOT NULL DEFAULT next_id();
+ALTER TABLE admin.users_social_auth alter column users_social_auth_id set DEFAULT next_id();
+ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_pk cascade;
+ALTER TABLE admin.users_social_auth DROP CONSTRAINT if exists users_social_auth_users_fk cascade;
+
+ALTER TABLE admin.users_social_auth add column if not exists uid text not null;
+ALTER TABLE admin.users_social_auth add column if not exists user_name text;
+ALTER TABLE admin.users_social_auth add column if not exists sur_name text;
+ALTER TABLE admin.users_social_auth add column if not exists email text;
+ALTER TABLE admin.users_social_auth add column if not exists city text;
+ALTER TABLE admin.users_social_auth add column if not exists phone text;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_id text;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_type text;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_code text;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_obj json;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_date timestamp without time zone;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_softpro_code text;
+ALTER TABLE admin.users_social_auth add column if not exists enabled boolean;
+ALTER TABLE admin.users_social_auth add column if not exists cdate timestamp without time zone;
+ALTER TABLE admin.users_social_auth alter column cdate SET DEFAULT date_trunc('seconds'::text, now());
+
+ALTER TABLE admin.users_social_auth add column if not exists editor_id text;
+ALTER TABLE admin.users_social_auth add column if not exists lang text;
+ALTER TABLE admin.users_social_auth add column if not exists editor_date timestamp without time zone;
+ALTER TABLE admin.users_social_auth add column if not exists social_auth_url text;
+ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_pk PRIMARY KEY (users_social_auth_id);
+ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_users_fk FOREIGN KEY (uid) REFERENCES admin.users (uid) MATCH SIMPLE;
+
+COMMENT ON COLUMN admin.users_social_auth.uid IS 'id пользователя';
+COMMENT ON COLUMN admin.users_social_auth.user_name IS 'Имя пользователя';
+COMMENT ON COLUMN admin.users_social_auth.sur_name IS 'Фамилия';
+COMMENT ON COLUMN admin.users_social_auth.email IS 'email пользователя';
+COMMENT ON COLUMN admin.users_social_auth.city IS 'Місто';
+COMMENT ON COLUMN admin.users_social_auth.phone IS 'Телефон';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_id IS 'ID в соцсети';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_type IS 'тип соцсети';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_code IS 'код обьекта соцсети, используеться соцсетью';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_obj IS 'обьект соцсети';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_date IS 'время получение последнего обьекта соцсети';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_softpro_code IS 'код обьекта соцсети, создаваемый и используемый сервером авторизации';
+COMMENT ON COLUMN admin.users_social_auth.enabled IS 'Выключатель';
+COMMENT ON COLUMN admin.users_social_auth.social_auth_url IS 'URL для QR code';

package/table/controllers/data.js

@@ -21,7 +21,12 @@ export default async function dataAPI({
   const {
     table, columns, sql, cardSql, filters, form, meta, sqlColumns, ispublic,
   } = loadTable;
-  const { pk, columns: dbColumns = [] } = await getMeta(table);
+  const tableMeta = await getMeta(table);
+  if (tableMeta?.view) {
+    if (!loadTable?.key) return { message: `key not found: ${table}`, status: 404 };
+    Object.assign(tableMeta, { pk: loadTable?.key });
+  }
+  const { pk, columns: dbColumns = [] } = tableMeta || {};
 
   if (!pk) return { message: `table not found: ${table}`, status: 404 };