@opengis/fastify-table 1.2.19 → 1.2.21

package/server/migrations/users.sql

@@ -1,176 +1,176 @@
-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 DROP CONSTRAINT if exists user_pk cascade;
-ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_user_rnokpp;
-
-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 user_rnokpp text;
-ALTER TABLE admin.users alter column user_rnokpp drop not null;
-ALTER TABLE admin.users add column if not exists social_auth_id text;
-ALTER TABLE admin.users add column if not exists social_auth_type 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);
-ALTER TABLE admin.users add CONSTRAINT admin_user_user_rnokpp UNIQUE (user_rnokpp);
-
-COMMENT ON TABLE admin.users IS 'Користувачі';
-
-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 'On / Off';
-COMMENT ON COLUMN admin.users.last_activity_date IS 'Дата останньої активності';
-COMMENT ON COLUMN admin.users.user_type IS 'Тип користувача';
-COMMENT ON COLUMN admin.users.salt IS 'Сіль';
-
-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();
-
--- 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 DROP CONSTRAINT if exists users_social_auth_social_id_email_unique;
-
-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 on delete cascade;
-ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_social_id_email_unique UNIQUE (social_auth_id,email);
-
-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';
-
-CREATE TABLE IF NOT EXISTS admin.user_cls();
-ALTER TABLE admin.user_cls DROP CONSTRAINT IF EXISTS admin_user_cls_pkey;
-ALTER TABLE admin.user_cls DROP CONSTRAINT IF EXISTS admin_user_unique;
-
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS user_clsid text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS code text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS parent text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS name text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS icon text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS data text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS type text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS files json;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS uid text;
-ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS color text;
-
-ALTER TABLE admin.user_cls ALTER COLUMN user_clsid SET NOT NULL;
-ALTER TABLE admin.user_cls ALTER COLUMN user_clsid SET DEFAULT next_id();
-ALTER TABLE admin.user_cls ALTER COLUMN cdate SET DEFAULT (now())::timestamp without time zone;
-ALTER TABLE admin.user_cls ALTER COLUMN uid SET NOT NULL;
-ALTER TABLE admin.user_cls ALTER COLUMN uid SET DEFAULT '1'::text;
-
-ALTER TABLE admin.user_cls ADD CONSTRAINT admin_user_cls_pkey PRIMARY KEY(user_clsid);
-ALTER TABLE admin.user_cls ADD CONSTRAINT admin_user_unique UNIQUE(code, parent);
-
-COMMENT ON TABLE admin.user_cls IS 'Користувацькі класифікатори';
-COMMENT ON COLUMN admin.user_cls.user_clsid IS 'ID';
-COMMENT ON COLUMN admin.user_cls.code IS 'Код';
-COMMENT ON COLUMN admin.user_cls.name IS 'Назва';
-COMMENT ON COLUMN admin.user_cls.icon IS 'Іконка';
+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 DROP CONSTRAINT if exists user_pk cascade;
+ALTER TABLE admin.users DROP CONSTRAINT if exists admin_user_user_rnokpp;
+
+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 user_rnokpp text;
+ALTER TABLE admin.users alter column user_rnokpp drop not null;
+ALTER TABLE admin.users add column if not exists social_auth_id text;
+ALTER TABLE admin.users add column if not exists social_auth_type 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);
+ALTER TABLE admin.users add CONSTRAINT admin_user_user_rnokpp UNIQUE (user_rnokpp);
+
+COMMENT ON TABLE admin.users IS 'Користувачі';
+
+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 'On / Off';
+COMMENT ON COLUMN admin.users.last_activity_date IS 'Дата останньої активності';
+COMMENT ON COLUMN admin.users.user_type IS 'Тип користувача';
+COMMENT ON COLUMN admin.users.salt IS 'Сіль';
+
+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();
+
+-- 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 DROP CONSTRAINT if exists users_social_auth_social_id_email_unique;
+
+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 on delete cascade;
+ALTER TABLE admin.users_social_auth add CONSTRAINT users_social_auth_social_id_email_unique UNIQUE (social_auth_id,email);
+
+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';
+
+CREATE TABLE IF NOT EXISTS admin.user_cls();
+ALTER TABLE admin.user_cls DROP CONSTRAINT IF EXISTS admin_user_cls_pkey;
+ALTER TABLE admin.user_cls DROP CONSTRAINT IF EXISTS admin_user_unique;
+
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS user_clsid text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS code text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS parent text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS name text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS icon text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS data text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS type text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS files json;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS cdate timestamp without time zone;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS uid text;
+ALTER TABLE admin.user_cls ADD COLUMN IF NOT EXISTS color text;
+
+ALTER TABLE admin.user_cls ALTER COLUMN user_clsid SET NOT NULL;
+ALTER TABLE admin.user_cls ALTER COLUMN user_clsid SET DEFAULT next_id();
+ALTER TABLE admin.user_cls ALTER COLUMN cdate SET DEFAULT (now())::timestamp without time zone;
+ALTER TABLE admin.user_cls ALTER COLUMN uid SET NOT NULL;
+ALTER TABLE admin.user_cls ALTER COLUMN uid SET DEFAULT '1'::text;
+
+ALTER TABLE admin.user_cls ADD CONSTRAINT admin_user_cls_pkey PRIMARY KEY(user_clsid);
+ALTER TABLE admin.user_cls ADD CONSTRAINT admin_user_unique UNIQUE(code, parent);
+
+COMMENT ON TABLE admin.user_cls IS 'Користувацькі класифікатори';
+COMMENT ON COLUMN admin.user_cls.user_clsid IS 'ID';
+COMMENT ON COLUMN admin.user_cls.code IS 'Код';
+COMMENT ON COLUMN admin.user_cls.name IS 'Назва';
+COMMENT ON COLUMN admin.user_cls.icon IS 'Іконка';
 COMMENT ON COLUMN admin.user_cls.color IS 'Колір';

package/server/plugins/crud/funcs/dataDelete.js

@@ -1,24 +1,24 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-import logChanges from './utils/logChanges.js';
-
-const rclient = getRedis();
-
-export default async function dataDelete({
-  table, tokenData, referer, id, pg: pg1, uid,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  const { pk } = await getMeta({ pg, table });
-  const table1 = table.replace(/"/g, '');
-  if (!pg.tlist?.includes(table1)) return 'table not exist';
-  const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
-
-  const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
-  await logChanges({
-    pg, table, tokenData, referer, id, uid, type: 'DELETE',
-  });
-  rclient.incr(`pg:${table}:crud`);
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+import logChanges from './utils/logChanges.js';
+
+const rclient = getRedis();
+
+export default async function dataDelete({
+  table, tokenData, referer, id, pg: pg1, uid,
+}) {
+  const pg = pg1 || getPG({ name: 'client' });
+  const { pk } = await getMeta({ pg, table });
+  const table1 = table.replace(/"/g, '');
+  if (!pg.tlist?.includes(table1)) return 'table not exist';
+  const delQuery = `delete from ${table} WHERE ${pk} = $1 returning *`;
+
+  const res = await pg.query(delQuery, [id]).then(el => el.rows?.[0] || {});
+  await logChanges({
+    pg, table, tokenData, referer, id, uid, type: 'DELETE',
+  });
+  rclient.incr(`pg:${table}:crud`);
+  return res;
+}

package/server/plugins/crud/funcs/dataInsert.js

@@ -1,53 +1,53 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-import logChanges from './utils/logChanges.js';
-
-const rclient = getRedis();
-
-export default async function dataInsert({
-  id, table, tokenData, referer, data, pg: pg1, uid,
-}) {
-  const pg = pg1 || getPG({ name: 'client' });
-  if (!data) return null;
-  const { columns } = await getMeta({ pg, table });
-  if (!columns) return null;
-
-  const names = columns.map((el) => el.name);
-
-  Object.assign(data, {
-    ...(id && pg.pk?.[table] ? { [pg.pk?.[table]]: id } : {}),
-    ...(table !== 'admin.users' ? { uid } : {}),
-    // editor_id: uid,
-  });
-  const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
-
-  const filterData = Object.keys(data)
-    .filter((el) => !['cdate', 'editor_date'].includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
-
-  const insertQuery = `insert into ${table}
-
-    ( ${filterData?.map((key) => `"${key[0]}"`).concat(systemColumns.map((el) => el[0])).join(',')}) 
-
-    values  (${filterData?.map((key, i) => (key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`)).concat(systemColumns.map((el) => el[1])).join(',')}) 
-    
-    returning *`;
-
-  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
-
-  const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
-  await logChanges({
-    pg,
-    table,
-    tokenData,
-    referer,
-    data,
-    id: res.rows?.[0]?.[pg.pk[table1]],
-    uid,
-    type: 'INSERT',
-  });
-
-  rclient.incr(`pg:${table}:crud`);
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+import logChanges from './utils/logChanges.js';
+
+const rclient = getRedis();
+
+export default async function dataInsert({
+  id, table, tokenData, referer, data, pg: pg1, uid,
+}) {
+  const pg = pg1 || getPG({ name: 'client' });
+  if (!data) return null;
+  const { columns } = await getMeta({ pg, table });
+  if (!columns) return null;
+
+  const names = columns.map((el) => el.name);
+
+  Object.assign(data, {
+    ...(id && pg.pk?.[table] ? { [pg.pk?.[table]]: id } : {}),
+    ...(table !== 'admin.users' ? { uid } : {}),
+    // editor_id: uid,
+  });
+  const systemColumns = ['cdate', 'editor_date'].filter((el) => names.includes(el)).map((el) => [el, 'now()']);
+
+  const filterData = Object.keys(data)
+    .filter((el) => !['cdate', 'editor_date'].includes(el) && (typeof data[el] === 'boolean' ? true : data[el]) && names.includes(el)).map((el) => [el, data[el]]);
+
+  const insertQuery = `insert into ${table}
+
+    ( ${filterData?.map((key) => `"${key[0]}"`).concat(systemColumns.map((el) => el[0])).join(',')}) 
+
+    values  (${filterData?.map((key, i) => (key[0] === 'geom' ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)` : `$${i + 1}`)).concat(systemColumns.map((el) => el[1])).join(',')}) 
+    
+    returning *`;
+
+  const res = await pg.query(insertQuery, [...filterData.map((el) => (typeof el[1] === 'object' && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]))]) || {};
+
+  const table1 = pg.pk[table] ? table : table.replace(/"/g, '');
+  await logChanges({
+    pg,
+    table,
+    tokenData,
+    referer,
+    data,
+    id: res.rows?.[0]?.[pg.pk[table1]],
+    uid,
+    type: 'INSERT',
+  });
+
+  rclient.incr(`pg:${table}:crud`);
+  return res;
+}

package/server/plugins/crud/funcs/dataUpdate.js

@@ -1,65 +1,65 @@
-import getPG from '../../pg/funcs/getPG.js';
-import getMeta from '../../pg/funcs/getMeta.js';
-import getRedis from '../../redis/funcs/getRedis.js';
-
-import logChanges from './utils/logChanges.js';
-
-const rclient = getRedis();
-const srids = {};
-
-function assignValue(key, i, srid = 4326, columnType = 'text') {
-  if (key === 'geom' && columnType === 'geometry') {
-    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)`;
-  }
-  if (key?.includes('geom') && columnType === 'geometry') {
-    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),${srid})`;
-  }
-  return `"${key}"=$${i + 2}`;
-}
-
-export default async function dataUpdate({
-  table, tokenData, referer, id, data, pg: pg1, uid,
-}) {
-  if (!data || !table || !id) return null;
-
-  const pg = pg1 || getPG({ name: 'client' });
-  const { columns, pk } = await getMeta({ pg, table });
-
-  const names = columns?.map((el) => el.name);
-
-  const filterData = Object.keys(data)
-    .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el) && !['editor_date', 'editor_id'].includes(el)));
-
-  const systemColumns = [['editor_date', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
-
-  const filterValue = filterData.map((el) => {
-    const { dataTypeID = 25 } = columns?.find?.((col) => col?.name === el) || {};
-    if (pg.pgType[dataTypeID]?.endsWith('[]') && ['string', 'number'].includes(typeof data[el])) {
-      Object.assign(data, { [el]: data[el].split(',') });
-    }
-    return [el, data[el]];
-  }).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
-
-  // update geometry with srid
-  if (!srids[table]) {
-    const { srids1 } = await pg.query(`select json_object_agg(_table,rel) as srids1 from (
-      select  f_table_schema||'.'||f_table_name as _table, 
-        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
-      from public.geometry_columns group by f_table_schema||'.'||f_table_name
-      )q`).then((res1) => res1.rows?.[0] || {});
-    Object.assign(srids, srids1);
-  }
-
-  const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? ',' : ''}` : ''}
-  ${filterData?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326, pg.pgType?.[columns.find(col => col.name === key)?.dataTypeID || '']))?.join(',')} 
-  WHERE ${pk} = $1 returning *`;
-  // console.log(updateQuery, filterValue);
-  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
-
-  await logChanges({
-    pg, table, tokenData, referer, data, id, uid, type: 'UPDATE',
-  });
-
-  rclient.incr(`pg:${table}:crud`);
-  return res;
-}
+import getPG from '../../pg/funcs/getPG.js';
+import getMeta from '../../pg/funcs/getMeta.js';
+import getRedis from '../../redis/funcs/getRedis.js';
+
+import logChanges from './utils/logChanges.js';
+
+const rclient = getRedis();
+const srids = {};
+
+function assignValue(key, i, srid = 4326, columnType = 'text') {
+  if (key === 'geom' && columnType === 'geometry') {
+    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),4326)`;
+  }
+  if (key?.includes('geom') && columnType === 'geometry') {
+    return `"${key}"=st_setsrid(st_geomfromgeojson($${i + 2}::json),${srid})`;
+  }
+  return `"${key}"=$${i + 2}`;
+}
+
+export default async function dataUpdate({
+  table, tokenData, referer, id, data, pg: pg1, uid,
+}) {
+  if (!data || !table || !id) return null;
+
+  const pg = pg1 || getPG({ name: 'client' });
+  const { columns, pk } = await getMeta({ pg, table });
+
+  const names = columns?.map((el) => el.name);
+
+  const filterData = Object.keys(data)
+    .filter((el) => (/* typeof data[el] === 'boolean' ? true : data[el] &&  */ names?.includes(el) && !['editor_date', 'editor_id'].includes(el)));
+
+  const systemColumns = [['editor_date', 'now()'], uid ? ['editor_id', `'${uid.replace(/'/g, "''")}'`] : []].filter((el) => names.includes(el[0])).map((el) => `${el[0]} = ${el[1]}`).join(',');
+
+  const filterValue = filterData.map((el) => {
+    const { dataTypeID = 25 } = columns?.find?.((col) => col?.name === el) || {};
+    if (pg.pgType[dataTypeID]?.endsWith('[]') && ['string', 'number'].includes(typeof data[el])) {
+      Object.assign(data, { [el]: data[el].split(',') });
+    }
+    return [el, data[el]];
+  }).map((el) => (typeof el[1] === 'object' && el[1] && (!Array.isArray(el[1]) || typeof el[1]?.[0] === 'object') ? JSON.stringify(el[1]) : el[1]));
+
+  // update geometry with srid
+  if (!srids[table]) {
+    const { srids1 } = await pg.query(`select json_object_agg(_table,rel) as srids1 from (
+      select  f_table_schema||'.'||f_table_name as _table, 
+        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
+      from public.geometry_columns group by f_table_schema||'.'||f_table_name
+      )q`).then((res1) => res1.rows?.[0] || {});
+    Object.assign(srids, srids1);
+  }
+
+  const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? ',' : ''}` : ''}
+  ${filterData?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326, pg.pgType?.[columns.find(col => col.name === key)?.dataTypeID || '']))?.join(',')} 
+  WHERE ${pk} = $1 returning *`;
+  // console.log(updateQuery, filterValue);
+  const res = await pg.query(updateQuery, [id, ...filterValue]).then(el => el?.rows?.[0]) || {};
+
+  await logChanges({
+    pg, table, tokenData, referer, data, id, uid, type: 'UPDATE',
+  });
+
+  rclient.incr(`pg:${table}:crud`);
+  return res;
+}