@opengis/fastify-table 2.0.67 → 2.0.69

package/dist/index.js

@@ -1,18 +1,10 @@
 import fp from "fastify-plugin";
 import path from "node:path";
-import { existsSync, readdirSync, readFileSync, mkdirSync, writeFileSync, } from "node:fs";
-import { createHash } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import proxy from "@fastify/http-proxy";
 import config from "./config.js";
-import getTemplatePath from "./server/plugins/table/funcs/getTemplatePath.js";
+import { preForm, afterInsert, afterTable, afterTemplate, afterUpdate, preTemplate, onReady, onListen1, onListen2, } from "./functions.js";
 import addHook from "./server/plugins/hook/addHook.js";
-import getToken from "./server/plugins/crud/funcs/getToken.js";
-import getTemplate from "./server/plugins/table/funcs/getTemplate.js";
-import getRedis from "./server/plugins/redis/funcs/getRedis.js";
-import logger from "./server/plugins/logger/getLogger.js";
-import getMenu from "./server/routes/menu/controllers/getMenu.js";
-import getSelectVal from "./server/plugins/table/funcs/metaFormat/getSelectVal.js";
 const { maxFileSize = 512 } = config;
 const { name: execName } = path.parse(process.argv0);
 // helpers
@@ -26,6 +18,10 @@ import metricPlugin from "./server/plugins/metric/index.js";
 import redisPlugin from "./server/plugins/redis/index.js";
 import loggerPlugin from "./server/plugins/logger/index.js";
 import authPlugin from "./server/plugins/auth/index.js";
+// utils
+import addTemplateDir from "./server/plugins/table/funcs/addTemplateDir.js";
+import execMigrations from "./server/plugins/migration/exec.migrations.js";
+import pgClients from "./server/plugins/pg/pgClients.js";
 // routes
 import cronRoutes from "./server/routes/cron/index.js";
 import crudRoutes from "./server/routes/crud/index.js";
@@ -34,11 +30,6 @@ import propertiesRoutes from "./server/routes/properties/index.js";
 import tableRoutes from "./server/routes/table/index.js";
 import utilRoutes from "./server/routes/util/index.js";
 import accessRoutes from "./server/routes/access/index.js";
-// utils
-import addTemplateDir from "./server/plugins/table/funcs/addTemplateDir.js";
-import execMigrations from "./server/plugins/migration/exec.migrations.js";
-import locales from "./server/routes/table/controllers/utils/locales.js";
-import pgClients from "./server/plugins/pg/pgClients.js";
 import dblistRoutes from "./server/routes/dblist/index.js";
 import menuRoutes from "./server/routes/menu/index.js";
 import templatesRoutes from "./server/routes/templates/index.js";
@@ -46,219 +37,15 @@ import widgetRoutes from "./server/routes/widget/index.js";
 import authRoutes from "./server/routes/auth/index.js";
 import fileRoutes from "./server/routes/file/index.js";
 import grpcRoutes from "./server/routes/grpc/index.js";
-const { client } = pgClients;
-const rclient = getRedis();
-// core templates && cls
+import notificationsRoutes from "./server/routes/notifications/index.js";
 const filename = fileURLToPath(import.meta.url);
 const cwd = path.dirname(filename);
-addHook("preForm", async ({ form, user }) => {
-    if (!user?.uid)
-        return null;
-    const opt = await getToken({
-        mode: "w",
-        token: form,
-        uid: user.uid,
-        json: 1,
-    });
-    return opt;
-});
-addHook("afterTable", async ({ table, res = {}, payload: rows = [], user = {}, }) => {
-    const loadTable = await getTemplate("table", table);
-    const { uid } = config?.auth?.disable || process.env.NODE_ENV !== "admin"
-        ? { uid: "1" }
-        : user;
-    if (!uid ||
-        !table ||
-        !client?.pk?.[table] ||
-        !rows.length ||
-        !loadTable?.table ||
-        !client?.pk?.["crm.extra_data"] ||
-        !client?.pk?.["admin.custom_column"])
-        return;
-    // admin.custom_column - user column data
-    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
-      where _table and entity=$1 and uid=$2`, [table, uid]);
-    const extraColumnList = properties.map((row) => ({
-        id: row.column_id,
-        name: row.name,
-        title: row.title,
-        format: row.format,
-        data: row.data,
-    }));
-    if (!extraColumnList?.length)
-        return;
-    if (Array.isArray(res?.columns) && res?.columns?.length) {
-        extraColumnList.forEach((col) => res.columns.push(col));
-    }
-    const { rows: extraData = [] } = await client.query(`select object_id, json_object_agg( property_id, coalesce(value_date::text,value_text) ) as extra from crm.extra_data 
-      where property_entity=$1 and property_id=any($2) and object_id=any($3) group by object_id`, [
-        table,
-        extraColumnList?.map((el) => el.id),
-        rows.map((el) => el.id),
-    ]);
-    if (!extraData?.length) {
-        // Object.assign(rows?.[0] || {}, { ...extraColumnList.reduce((acc, curr) => Object.assign(acc, { [curr.name]: null }), {}) });
-        return;
-    }
-    rows
-        .filter((row) => extraData.map((el) => el?.object_id).includes(row.id))
-        .forEach((row) => {
-        const { extra = {} } = extraData.find((el) => el.object_id === row.id);
-        Object.assign(row, {
-            ...Object.fromEntries(Object.entries(extra).map((el) => [
-                extraColumnList.find((col) => col.id === el[0]).name,
-                el[1],
-            ])),
-        });
-    });
-    // admin.custom_column - metaFormat
-    await Promise.all(extraColumnList
-        .filter((el) => el?.data)
-        .map(async (attr) => {
-        const values = [
-            ...new Set(rows?.map((el) => el[attr.name]).flat()),
-        ].filter((el) => el);
-        if (!values.length)
-            return;
-        const cls = await getSelectVal({ name: attr.data, values });
-        if (!cls)
-            return;
-        rows.forEach((el) => {
-            const val = el[attr.name]?.map?.((c) => cls[c] || c) ||
-                cls[el[attr.name]] ||
-                el[attr.name];
-            if (!val)
-                return;
-            Object.assign(el, {
-                [val?.color ? `${attr.name}_data` : `${attr.name}_text`]: val.color ? val : val.text || val,
-            });
-        });
-    }));
-});
-// extract table from form token for user columns - p.2 - read (refactor to global token)
-addHook("preTemplate", async ({ name, type, user = {}, }) => {
-    if (!name || !type)
-        return;
-    const { uid } = config?.auth?.disable || process.env.NODE_ENV !== "admin"
-        ? { uid: "1" }
-        : user;
-    const tokenData = (await getToken({
-        uid,
-        token: name,
-        mode: "w",
-        json: 1,
-    })) || // edit?
-        (await getToken({
-            uid,
-            token: name,
-            mode: "a",
-            json: 1,
-        })) ||
-        {}; // add?
-    return { name: tokenData?.[type] };
-});
-addHook("afterTemplate", async ({ name, type, payload: data = {}, user = {}, }) => {
-    const { uid } = config?.auth?.disable || process.env.NODE_ENV !== "admin"
-        ? { uid: "1" }
-        : user;
-    // extract table from form token for user columns - p.1 - assign (refactor to global token)
-    if (!uid ||
-        !data ||
-        type !== "form" ||
-        !name ||
-        !client?.pk?.["admin.custom_column"])
-        return null;
-    const { form, id, table } = (await getToken({
-        uid,
-        token: name,
-        mode: "w",
-        json: 1,
-    })) || // edit?
-        (await getToken({
-            uid,
-            token: name,
-            mode: "a",
-            json: 1,
-        })) ||
-        {}; // add?
-    const { rows: properties = [] } = await client.query(`select name, title, format, data from admin.custom_column 
-      where entity=$1 and uid=$2`, [table || name, uid]);
-    await Promise.all(properties.map(async (el) => {
-        const clsData = el.data
-            ? await getTemplate(["cls", "select"], el.data)
-            : undefined;
-        const type = clsData
-            ? "Select"
-            : { date: "DatePicker" }[el.format || ""] || "Text";
-        Object.assign(data?.schema || data || {}, {
-            [el.name]: {
-                type,
-                ua: el.title,
-                data: el.data,
-                options: type === "Select" && Array.isArray(clsData) && clsData?.length
-                    ? clsData
-                    : undefined,
-                extra: 1,
-            },
-        });
-    }));
-});
-addHook("afterUpdate", async ({ table, body = {}, payload: res = {}, user = {}, }) => {
-    const { uid } = config?.auth?.disable || process.env.NODE_ENV !== "admin"
-        ? { uid: "1" }
-        : user;
-    if (!uid ||
-        !table ||
-        !Object.keys(body)?.length ||
-        !client?.pk?.["crm.extra_data"] ||
-        !client?.pk?.["admin.custom_column"])
-        return null;
-    const loadTable = await getTemplate("table", table);
-    if (!client?.pk?.[loadTable?.table || table])
-        return null;
-    const pk = client?.pk?.[loadTable?.table || table];
-    const id = res[pk];
-    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
-      where entity=$1 and uid=$2`, [table, uid]);
-    if (!id || !properties?.length || !client.pk?.["crm.extra_data"])
-        return null;
-    const q = `delete from crm.extra_data where property_entity='${table}' and object_id='${id}';${properties
-        .filter((el) => Object.keys(body).includes(el.name))
-        .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === "date" ? "value_date" : "value_text"})
-      select '${el.column_id}', '${el.name}', '${table}', '${id}', ${el.format?.toLowerCase() === "date"
-        ? `'${body[el.name]}'::timestamp without time zone`
-        : `'${body[el.name]}'::text`}`)
-        .join(";\n") || ""}`;
-    return client.query(q);
-});
-addHook("afterInsert", async ({ table, body, payload: res = {}, user = {}, }) => {
-    const { uid } = config?.auth?.disable || process.env.NODE_ENV !== "admin"
-        ? { uid: "1" }
-        : user;
-    if (!uid ||
-        !table ||
-        !Object.keys(body)?.length ||
-        !client?.pk?.["crm.extra_data"] ||
-        !client?.pk?.["admin.custom_column"])
-        return null;
-    const loadTable = await getTemplate("table", table);
-    if (!client?.pk?.[loadTable?.table || table])
-        return null;
-    const pk = client?.pk?.[loadTable?.table || table];
-    const id = res.rows?.[0]?.[pk];
-    const { rows: properties = [] } = await client.query(`select column_id, name, title, format, data from admin.custom_column 
-      where entity=$1 and uid=$2`, [table, uid]);
-    if (!id || !properties?.length)
-        return null;
-    const q = properties
-        .filter((el) => Object.keys(body).includes(el.name))
-        .map((el) => `insert into crm.extra_data(property_id,property_key,property_entity,object_id,${el.format?.toLowerCase() === "date" ? "value_date" : "value_text"})
-      select '${el.column_id}', '${el.name}', '${table}', '${id}', ${el.format?.toLowerCase() === "date"
-        ? `'${body[el.name]}'::timestamp without time zone`
-        : `'${body[el.name]}'::text`}`)
-        .join(";\n");
-    return client.query(q);
-});
+addHook("preForm", preForm);
+addHook("afterTable", afterTable);
+addHook("preTemplate", preTemplate);
+addHook("afterTemplate", afterTemplate);
+addHook("afterUpdate", afterUpdate);
+addHook("afterInsert", afterInsert);
 function plugin(fastify) {
     const opt = { prefix: "/api" };
     if (config.disableCors) {
@@ -266,30 +53,11 @@ function plugin(fastify) {
             reply.header("Access-Control-Allow-Origin", "*");
         });
     }
-    fastify.addHook("onReady", async () => {
-        if (existsSync("locales")) {
-            const subdirs = readdirSync("locales", { withFileTypes: true }).filter((el) => el.isDirectory());
-            const res = subdirs.reduce((acc, curr) => {
-                const content = readdirSync(`locales/${curr.name}`, {
-                    withFileTypes: true,
-                });
-                const obj = content
-                    .filter((el) => el.isFile())
-                    .reduce((acc1, file) => ({
-                    ...acc1,
-                    ...JSON.parse(readFileSync(`locales/${curr.name}/${file.name}`, "utf-8").replace(/[\u200B-\u200D\uFEFF]/g, "")),
-                }), {});
-                Object.keys(obj).reduce((acc1, curr1) => Object.assign(acc, {
-                    [curr1]: { ...acc[curr1], [curr.name]: obj?.[curr1] },
-                }), {});
-                return acc;
-            }, {});
-            Object.assign(locales, res);
-            console.log("locales loaded");
-        }
-    });
+    fastify.addHook("onListen", onListen1);
+    fastify.addHook("onListen", onListen2);
+    fastify.addHook("onReady", onReady);
     // core migrations (second argument for core only)
-    execMigrations(path.join(cwd, "server/migrations"), pgClients.client, true).catch((err) => console.log(err));
+    execMigrations(path.join(cwd, "server/migrations"), pgClients.client, true).catch((err) => console.warn(err.toString()));
     // core templates && cls
     config.templates?.forEach((el) => addTemplateDir(el));
     addTemplateDir(path.join(cwd, "module/core"));
@@ -335,6 +103,8 @@ function plugin(fastify) {
     // from fastify-file
     fastify.register(fileRoutes);
     fastify.register(grpcRoutes, opt);
+    // from admin
+    fastify.register(notificationsRoutes, opt);
     config.proxy?.forEach?.((el) => {
         if (execName === "bun") {
             fastify.all(`${el.source}/*`, async (req, reply) => {
@@ -379,175 +149,5 @@ function plugin(fastify) {
             });
         }
     });
-    // from opengis/admin
-    const user1 = config?.auth?.disable || process.env.NODE_ENV !== "admin"
-        ? { uid: "1" }
-        : null;
-    fastify.addHook("onListen", async () => {
-        const json = await getMenu({ user: { uid: "1" }, pg: client }, null);
-        // insert interface list to db (user access management)
-        if (client?.pk?.["admin.routes"] && json?.menus?.length) {
-            const menuList = json?.menus?.filter?.((el) => el?.table ||
-                el?.component ||
-                el?.menu?.length /*&& el?.ua || el?.en || el?.name*/) || [];
-            // skip dupes
-            //admin_route_menu_id_fkey
-            menuList.forEach((el) => Object.assign(el, { ua: el?.ua || el?.en || el?.name }));
-            const uniqueList = menuList.filter((el, idx, arr) => el?.ua &&
-                arr.map((item) => item?.ua).indexOf(el?.ua) ===
-                    idx);
-            const q = `insert into admin.menu(name, ord) values${uniqueList
-                .map((el, i) => `('${el?.ua.replace(/'/g, "''")}', ${i}) `)
-                .join(",")}
-            on conflict (name) do update set ord=excluded.ord, enabled=true returning name, menu_id`;
-            const { rows = [] } = uniqueList.length ? await client.query(q) : {};
-            const menus = rows.reduce((acc, curr) => Object.assign(acc, {
-                [curr.menu_id]: uniqueList.find((item) => item?.ua === curr.name),
-            }), {});
-            const values = Object.entries(menus).reduce((acc, curr) => {
-                if (curr[1]?.table || curr[1]?.component) {
-                    acc.push({ ...curr[1], menuId: curr[0] });
-                }
-                curr[1]?.menu?.forEach?.((el) => acc.push({ ...el, menuId: curr[0] }));
-                return acc;
-            }, []);
-            await Promise.all(values
-                .filter((el) => el?.table)
-                .map(async (el) => {
-                const loadTable = await getTemplate("table", el.table);
-                Object.assign(el, {
-                    table1: loadTable?.table || el.table,
-                    actions: loadTable?.actions,
-                    access: loadTable?.access,
-                });
-            }));
-            // console.log(values)
-            const q1 = `insert into admin.routes(route_id, alias, title, menu_id, table_name, actions, access, query) 
-            values ${values
-                .filter((el) => el?.path)
-                .map((el) => `('${el.path}', ${el.table ? `'${el.table}'` : null}, 
-            ${el.title || el.ua
-                ? `'${(el.title || el.ua).replace(/'/g, "''")}'`
-                : null}, 
-            ${el.menuId ? `'${el.menuId}'` : null}, ${el.table1 ? `'${el.table1}'` : null}, 
-            ${el.actions?.length ? `'{ ${el.actions} }'::text[]` : null}, ${el.access ? `'${el.access}'` : null}, 
-            ${el.query ? `'${el.query.replace(/'/g, "''")}'` : "'1=1'"})`)
-                .join(",")} 
-            on conflict (route_id) do update set menu_id=excluded.menu_id, alias=excluded.alias, title=excluded.title, enabled=true, query=excluded.query,
-            table_name=excluded.table_name, actions=excluded.actions, access=excluded.access returning route_id, table_name`;
-            try {
-                console.log("admin/hook routes sql start");
-                const { rowCount: menuCount } = await client.query(`delete from admin.menu 
-                where not array[menu_id] <@ $1::text[] and menu_id not in (select menu_id from admin.routes)`, [rows.map((el) => el.menu_id)]);
-                console.log("delete deprecated menus ok", menuCount);
-                const { rowCount: interfaceCount } = await client.query(`delete from admin.routes 
-                where not array[route_id] <@ $1::text[] and route_id not in (select route_id from admin.role_access)`, [values.filter((el) => el?.path)]);
-                console.log("delete deprecated interfaces ok", interfaceCount);
-                const { rowCount } = values?.length ? await client.query(q1) : {};
-                console.log("insert interfaces ok", rowCount);
-            }
-            catch (err) {
-                console.log("admin/hook routes sql error", values, q1, err);
-            }
-        }
-    });
-    fastify.addHook("onListen", async () => {
-        const clsQuery = [];
-        if (!client?.pk && client?.init) {
-            await client.init();
-        }
-        if (!client?.pk?.["admin.cls"])
-            return;
-        const selectList = getTemplatePath("select");
-        const clsList = getTemplatePath("cls")?.filter((el) => !(selectList?.map((el) => el?.[0]) || []).includes(el[0]));
-        const cls = (selectList || []).concat(clsList || [])?.map((el) => ({
-            name: el[0],
-            module: path.basename(path.dirname(path.dirname(el[1]))),
-            type: { json: "cls", sql: "select" }[el[2]],
-        }));
-        if (!cls?.length)
-            return;
-        try {
-            const hashes = await rclient
-                .hgetall("cls-insert-hashes")
-                .then((obj) => Object.keys(obj));
-            const dbdata = await client
-                .query(`select json_object_agg(name, hash) from admin.cls where parent is null`)
-                .then((el) => el.rows?.[0]?.json_object_agg || {});
-            const names = Object.keys(dbdata);
-            console.log("admin/hook cls promise start");
-            const qHashes = await Promise.all(cls
-                .filter((el, idx, arr) => arr.map((item) => item.name).indexOf(el.name) === idx)
-                .map(async (el) => {
-                const { name, module, type } = el;
-                const loadTemplate = await getTemplate(type, name);
-                el.hash = createHash("md5")
-                    .update(type === "cls"
-                    ? JSON.stringify(loadTemplate)
-                    : loadTemplate?.sql || loadTemplate || "")
-                    .digest("hex");
-                el.dbhash = dbdata[name];
-                // check for changes by redis hash / dropped from db / changed at git project
-                el.update =
-                    !hashes.includes(el.hash) ||
-                        !names.includes(name) ||
-                        el.hash !== el.dbhash;
-                if (type === "select" &&
-                    (loadTemplate?.sql || loadTemplate) &&
-                    el.update) {
-                    clsQuery.push(`insert into admin.cls(name,type,data,module,hash) values('${name}','sql','${(loadTemplate?.sql || loadTemplate)?.replace(/'/g, "''")}', '${module?.replace(/'/g, "''")}','${el.hash}')`);
-                    if (config.trace)
-                        console.log(name, type, "insert fresh select");
-                    return el.hash;
-                }
-                else if (type === "cls" && loadTemplate?.length && el.update) {
-                    clsQuery.push(`insert into admin.cls(name,type, module,hash) values('${name}','json', '${module?.replace(/'/g, "''")}','${el.hash}'); 
-            insert into admin.cls(code,name,parent,icon,color,data) 
-            select value->>'id',value->>'text','${name}',value->>'icon',value->>'color',value->>'data' 
-            from json_array_elements('${JSON.stringify(loadTemplate).replace(/'/g, "''")}'::json) on conflict (code,parent) do update set color=excluded.color;`);
-                    if (config.trace)
-                        console.log(name, type, "insert fresh cls");
-                    return el.hash;
-                }
-                else if (hashes.includes(el.hash)) {
-                    if (config.trace)
-                        console.log(name, type, names.includes(name)
-                            ? "skip equal hash"
-                            : "insert missing cls");
-                    return el.hash;
-                }
-                else {
-                    if (config.trace)
-                        console.log(name, type, "empty");
-                    return el.hash;
-                }
-            }));
-            // debug
-            const logDir = path.join(cwd, "log/migration");
-            mkdirSync(logDir, { recursive: true });
-            writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-cls.sql`), clsQuery.filter(Boolean).join(";"));
-            writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-cls.json`), JSON.stringify(cls));
-            const { rowCount = 0 } = await client.query("delete from admin.cls where $1::text[] && array[name,parent]", [
-                cls
-                    .filter((el) => el.update)
-                    .map((el) => el.name),
-            ]);
-            console.log("fastify-table/hook old cls deleted", rowCount);
-            if (clsQuery.filter((el) => el).length) {
-                console.log("fastify-table cls sql start", clsQuery?.length);
-                await client.query(clsQuery.filter((el) => el).join(";"));
-                await Promise.all(qHashes
-                    .filter(Boolean)
-                    .map(async (el) => rclient.hset("cls-insert-hashes", el, 1)));
-                logger.file("migration/hash", { list: qHashes.filter(Boolean) });
-                console.log("fastify-table/hook cls sql finish", clsQuery?.length);
-            }
-            console.log("fastify-table/hook cls promise finish", rowCount);
-        }
-        catch (err) {
-            console.error("fastify-table/hook cls sql error", err.toString());
-            console.trace(err);
-        }
-    });
 }
 export default fp(plugin);

package/dist/log/migration/dist-geoname-cls.json

@@ -0,0 +1 @@
+[{"name":"admin.user_id","module":"data","type":"select","hash":"29f728fe5e89fed0f2bec41657fae26e","dbhash":"29f728fe5e89fed0f2bec41657fae26e","update":false},{"name":"data.admin_statistic","module":"data","type":"select","hash":"8f0689a8995711c7693379a177ea4e92","dbhash":"8f0689a8995711c7693379a177ea4e92","update":false},{"name":"data.last_objects_all","module":"data","type":"select","hash":"f942c95781b420a837ae38c324cca7a9","dbhash":"f942c95781b420a837ae38c324cca7a9","update":false},{"name":"data.object_id","module":"data","type":"select","hash":"f5b4f8e86d5b3bf5da599b4e7d126ea2","dbhash":"f5b4f8e86d5b3bf5da599b4e7d126ea2","update":false},{"name":"data.site_statistic","module":"data","type":"select","hash":"fbc3b42fee3ef287b3a576bb1a0b43b4","dbhash":"fbc3b42fee3ef287b3a576bb1a0b43b4","update":false},{"name":"data_addition.change_status.parent","module":"data_addition","type":"select","hash":"517f0390a98a5642b94a62dbbd058441","dbhash":"517f0390a98a5642b94a62dbbd058441","update":false},{"name":"data_addition.deregistration.parent","module":"data_addition","type":"select","hash":"1dbbd6e0a48e52a9c23dedad368f06c3","dbhash":"1dbbd6e0a48e52a9c23dedad368f06c3","update":false},{"name":"data_addition.historical_name.parent","module":"data_addition","type":"select","hash":"3d42dee53b639fb594e9961492f577cc","dbhash":"3d42dee53b639fb594e9961492f577cc","update":false},{"name":"data_addition.national_lang_name.parent","module":"data_addition","type":"select","hash":"c3a9ac90dd38c02736503d003a0ca012","dbhash":"c3a9ac90dd38c02736503d003a0ca012","update":false},{"name":"data_addition.objects_atu.parent","module":"data_addition","type":"select","hash":"1629be10ba3bd71280621dc7e6737092","dbhash":"1629be10ba3bd71280621dc7e6737092","update":false},{"name":"data_addition.objects_countries.parent","module":"data_addition","type":"select","hash":"b389f543053bf35a5469580333cc1b0b","dbhash":"b389f543053bf35a5469580333cc1b0b","update":false},{"name":"data_addition.options_name.parent","module":"data_addition","type":"select","hash":"e5d02b5f8d64a18cf21b1daa448fe54e","dbhash":"e5d02b5f8d64a18cf21b1daa448fe54e","update":false},{"name":"data_addition.options_type.parent","module":"data_addition","type":"select","hash":"fb41e8f7b9cf18786611d8e880ff4051","dbhash":"fb41e8f7b9cf18786611d8e880ff4051","update":false},{"name":"data_addition.rename.parent","module":"data_addition","type":"select","hash":"c883a3baf1beb4a7d3d5bdb28062be69","dbhash":"c883a3baf1beb4a7d3d5bdb28062be69","update":false},{"name":"data_countries.object_id","module":"data_countries","type":"select","hash":"a6f120bea7bd0df1afcdb1b56484e516","dbhash":"a6f120bea7bd0df1afcdb1b56484e516","update":false},{"name":"dict.admin_status","module":"dict","type":"select","hash":"10452051e966f3051456226b78d1e11b","dbhash":"10452051e966f3051456226b78d1e11b","update":false},{"name":"dict.atu_countries","module":"dict","type":"select","hash":"c7368a1b9c10350e5709872d933a6ffb","dbhash":"c7368a1b9c10350e5709872d933a6ffb","update":false},{"name":"dict.atu_type","module":"dict","type":"select","hash":"376a4e7a7e77d5f9ee865b8a1fb25e07","dbhash":"376a4e7a7e77d5f9ee865b8a1fb25e07","update":false},{"name":"dict.community","module":"dict","type":"select","hash":"deb128826eb03dbca6762f058f49e980","dbhash":"deb128826eb03dbca6762f058f49e980","update":false},{"name":"dict.country_location","module":"dict","type":"select","hash":"333f3f56fc1a9f79f176f509d8aeca53","dbhash":"333f3f56fc1a9f79f176f509d8aeca53","update":false},{"name":"dict.district","module":"dict","type":"select","hash":"0d3a18d3fe4e6329567f5ba5cc360d53","dbhash":"0d3a18d3fe4e6329567f5ba5cc360d53","update":false},{"name":"dict.existence","module":"dict","type":"select","hash":"781bb2394e4f5eee87cbaf6ff1cc358e","dbhash":"781bb2394e4f5eee87cbaf6ff1cc358e","update":false},{"name":"dict.foreign_country","module":"dict","type":"select","hash":"dd4d5c31a9eea9abd538acdb952e99e9","dbhash":"dd4d5c31a9eea9abd538acdb952e99e9","update":false},{"name":"dict.info_source","module":"dict","type":"select","hash":"0ae17d8e43740078dea206cc7949151f","dbhash":"0ae17d8e43740078dea206cc7949151f","update":false},{"name":"dict.language","module":"dict","type":"select","hash":"fd1826c9ca150ef93bd251b923d6094e","dbhash":"fd1826c9ca150ef93bd251b923d6094e","update":false},{"name":"dict.object_type.adm","module":"dict","type":"select","hash":"0faeff4dc1c1f60996efe614d44a6e5f","dbhash":"0faeff4dc1c1f60996efe614d44a6e5f","update":false},{"name":"dict.object_type.geo","module":"dict","type":"select","hash":"34b82095969396e8a8497f93cda3dcc5","dbhash":"34b82095969396e8a8497f93cda3dcc5","update":false},{"name":"dict.object_type.pzf","module":"dict","type":"select","hash":"df2c1ced6405602aa8f262e437ac5062","dbhash":"df2c1ced6405602aa8f262e437ac5062","update":false},{"name":"dict.object_type.soc","module":"dict","type":"select","hash":"d60d3f993acb76e5782e4a3046756858","dbhash":"d60d3f993acb76e5782e4a3046756858","update":false},{"name":"dict.object_type","module":"dict","type":"select","hash":"9630e32f344f33580d5a90e305bf5cf2","dbhash":"9630e32f344f33580d5a90e305bf5cf2","update":false},{"name":"dict.region","module":"dict","type":"select","hash":"c1e0b38f520a004726694109398d5544","dbhash":"c1e0b38f520a004726694109398d5544","update":false},{"name":"dict.settlement_type","module":"dict","type":"select","hash":"49261c87bf6cd01e4ab32f65c94b5dbf","dbhash":"49261c87bf6cd01e4ab32f65c94b5dbf","update":false},{"name":"dict.source","module":"dict","type":"select","hash":"ac2bf8aca5c819e42b6529c73a7e1cb5","dbhash":"ac2bf8aca5c819e42b6529c73a7e1cb5","update":false},{"name":"dict.source_name","module":"dict","type":"select","hash":"9550cb3ad87783d7528c3c440be50a89","dbhash":"9550cb3ad87783d7528c3c440be50a89","update":false},{"name":"dict.source_type","module":"dict","type":"select","hash":"fee4eb12cd50344d2de7c49290238501","dbhash":"fee4eb12cd50344d2de7c49290238501","update":false},{"name":"core.accounts","module":"settings","type":"select","hash":"36eef3856f46bc0eecb61a6f911ced2e","dbhash":"36eef3856f46bc0eecb61a6f911ced2e","update":false},{"name":"core.menu_id","module":"settings","type":"select","hash":"3b08d360628afa15339f364f5e2ff211","dbhash":"3b08d360628afa15339f364f5e2ff211","update":false},{"name":"core.roles","module":"settings","type":"select","hash":"ed1290380ea5e5e7e48bd08b41cb7793","dbhash":"ed1290380ea5e5e7e48bd08b41cb7793","update":false},{"name":"core.routes.alias","module":"settings","type":"select","hash":"ac6afe9a8ebaf0b26236c4bae5297709","dbhash":"ac6afe9a8ebaf0b26236c4bae5297709","update":false},{"name":"core.routes","module":"settings","type":"select","hash":"306bddbe5b73b0628728a60f5335aaee","dbhash":"306bddbe5b73b0628728a60f5335aaee","update":false},{"name":"core.rules","module":"settings","type":"select","hash":"a86085f579f4abff5cf09e775e034ed3","dbhash":"a86085f579f4abff5cf09e775e034ed3","update":false},{"name":"core.user_mentioned","module":"settings","type":"select","hash":"6687f073de73a3ec4b6e0811d9310e7e","dbhash":"6687f073de73a3ec4b6e0811d9310e7e","update":false},{"name":"core.user_uid","module":"settings","type":"select","hash":"45f7d8a57ecbca5b433be7937be51d5c","dbhash":"45f7d8a57ecbca5b433be7937be51d5c","update":false},{"name":"data.exist_flag","module":"data","type":"cls","hash":"4cc57ff8d055dd194b51a6937d70f04c","dbhash":"4cc57ff8d055dd194b51a6937d70f04c","update":false},{"name":"data.latitude_dir","module":"data","type":"cls","hash":"542cd461818ff655002fec7bf23dcdb1","dbhash":"542cd461818ff655002fec7bf23dcdb1","update":false},{"name":"data.longitude_dir","module":"data","type":"cls","hash":"39f5c0554eab4f34ae25312d8dfafa78","dbhash":"39f5c0554eab4f34ae25312d8dfafa78","update":false},{"name":"data._type","module":"data","type":"cls","hash":"588c9b704054165dc6977f1262bbfee7","dbhash":"588c9b704054165dc6977f1262bbfee7","update":false},{"name":"access_type","module":"settings","type":"cls","hash":"e02065dbaed2ccb437a1722c00ed3fab","dbhash":"e02065dbaed2ccb437a1722c00ed3fab","update":false},{"name":"change_type","module":"settings","type":"cls","hash":"0fcaac1864fc81b9760075836c1bb2ac","dbhash":"0fcaac1864fc81b9760075836c1bb2ac","update":false},{"name":"core.actions","module":"settings","type":"cls","hash":"17862ea92ef5ad846a284fd68b4ff1f7","dbhash":"17862ea92ef5ad846a284fd68b4ff1f7","update":false},{"name":"core.column_type","module":"settings","type":"cls","hash":"8004d1fc1876e6f5a096b4f40a7f3775","dbhash":"8004d1fc1876e6f5a096b4f40a7f3775","update":false},{"name":"core.scope","module":"settings","type":"cls","hash":"c274693f6c7e9849704bbf4c46334871","dbhash":"c274693f6c7e9849704bbf4c46334871","update":false},{"name":"properties.site_status","module":"settings","type":"cls","hash":"2c2980706c5afe8808000d971b304cc9","dbhash":"2c2980706c5afe8808000d971b304cc9","update":false},{"name":"properties.widget_status","module":"settings","type":"cls","hash":"232f321af15895a9b33953c9bd500043","dbhash":"232f321af15895a9b33953c9bd500043","update":false},{"name":"users.user_type","module":"settings","type":"cls","hash":"9f6a303d48d2d33c68dbcd8e72ad0e83","dbhash":"9f6a303d48d2d33c68dbcd8e72ad0e83","update":false},{"name":"yes_no","module":"settings","type":"cls","hash":"50c527053426248c20b0a2f112ff9046","dbhash":"50c527053426248c20b0a2f112ff9046","update":false}]

package/dist/server/migrations/crm.sql

@@ -21,13 +21,23 @@ ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS link text;
 ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS author_id text;
 ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS entity_id text;
 
-ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS uid text;
 ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS files json;
-ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT (now())::timestamp without time zone;
-ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
 ALTER TABLE crm.notifications ADD CONSTRAINT crm_notifications_pkey PRIMARY KEY (notification_id);
 
+ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS type text;
+ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS created_at timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS updated_at timestamp without time zone DEFAULT (now())::timestamp without time zone;
+ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS created_by text;
+ALTER TABLE crm.notifications ADD COLUMN IF NOT EXISTS updated_by text;
+
+ALTER TABLE crm.notifications DROP COLUMN IF EXISTS cdate;
+ALTER TABLE crm.notifications DROP COLUMN IF EXISTS editor_date;
+ALTER TABLE crm.notifications DROP COLUMN IF EXISTS uid;
+ALTER TABLE crm.notifications DROP COLUMN IF EXISTS editor_id;
+
+ALTER TABLE crm.notifications ALTER COLUMN addressee_id SET NOT NULL;
+ALTER TABLE crm.notifications ALTER COLUMN body SET NOT NULL;
+
 COMMENT ON COLUMN crm.notifications.addressee_id is 'ID користувача отримувача повідомлення';
 COMMENT ON COLUMN crm.notifications.read is 'Чи було повідомлення прочитане';
 COMMENT ON COLUMN crm.notifications.sent is 'Чи було повідомлення відправлене';

package/dist/server/plugins/notifications/addNotification.d.ts

@@ -0,0 +1,12 @@
+import { ExtendedPG } from "../../types/core.js";
+export default function addUserNotification({ subject, body, link, addressee, author, entity, type, pg, }: {
+    subject?: string;
+    body: string;
+    link?: string;
+    addressee: string | number;
+    author: string | number;
+    entity?: string;
+    type?: string;
+    pg?: ExtendedPG;
+}): Promise<any>;
+//# sourceMappingURL=addNotification.d.ts.map

package/dist/server/plugins/notifications/addNotification.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"addNotification.d.ts","sourceRoot":"","sources":["../../../../server/plugins/notifications/addNotification.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,MAAM,qBAAqB,CAAC;AAK/D,wBAA8B,mBAAmB,CAAC,EAChD,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,MAAM,EACN,MAAM,EACN,IAAI,EACJ,EAAqB,GACtB,EAAE;IACD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB,gBAgBA"}

package/dist/server/plugins/notifications/addNotification.js

@@ -0,0 +1,18 @@
+import pgClients from "../pg/pgClients.js";
+import dataInsert from "../crud/funcs/dataInsert.js";
+export default async function addUserNotification({ subject, body, link, addressee, author, entity, type, pg = pgClients.client, }) {
+    const res = await dataInsert({
+        pg,
+        table: "crm.notifications",
+        data: {
+            subject,
+            body,
+            link,
+            addressee_id: addressee,
+            author_id: author,
+            entity_id: entity,
+            type,
+        },
+    });
+    return res?.rows?.[0] || {};
+}

package/dist/server/routes/access/index.d.ts

@@ -1,2 +1,2 @@
-export default function route(fastify: any, opt?: any): Promise<void>;
+export default function route(fastify: any, opt?: any): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/server/routes/access/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/access/index.ts"],"names":[],"mappings":"AAUA,wBAA8B,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,iBAY9D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/access/index.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAYxD"}

package/dist/server/routes/access/index.js

@@ -2,7 +2,7 @@ import accessGroup from "./controllers/access.group.js";
 import accessGroupPost from "./controllers/access.group.post.js";
 import accessInterface from "./controllers/access.interface.js";
 import { accessGroupPostSchema, accessGroupSchema, accessInterfaceSchema, } from "./schema.js";
-export default async function route(fastify, opt = {}) {
+export default function route(fastify, opt = {}) {
     fastify.get("/access-group/:id", { schema: accessGroupSchema }, accessGroup);
     fastify.post("/access-group/:id", { schema: accessGroupPostSchema }, accessGroupPost);
     fastify.get("/access-interface/:name", { schema: accessInterfaceSchema }, accessInterface);

package/dist/server/routes/auth/index.d.ts

@@ -1,4 +1,4 @@
 import { FastifyInstance } from "fastify";
-declare function plugin(app: FastifyInstance, opt?: any): Promise<void>;
+declare function plugin(app: FastifyInstance, opt?: any): void;
 export default plugin;
 //# sourceMappingURL=index.d.ts.map

package/dist/server/routes/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkC1C,iBAAe,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,GAAE,GAAQ,iBA8ExD;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkC1C,iBAAS,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,GAAE,GAAQ,QA8ElD;AAED,eAAe,MAAM,CAAC"}

package/dist/server/routes/auth/index.js

@@ -20,7 +20,7 @@ import oauthAuthorize from "./controllers/jwt/authorize.js";
 import oauthToken from "./controllers/jwt/token.js";
 import qrCode from "./controllers/2factor/qrcode.js";
 const params = { config: { policy: "L0" } };
-async function plugin(app, opt = {}) {
+function plugin(app, opt = {}) {
     if (opt.routes === false || config.auth?.customRoutes) {
         return;
     }

package/dist/server/routes/cron/index.d.ts

@@ -1,3 +1,3 @@
-declare function plugin(app: any, opt?: any): Promise<void>;
+declare function plugin(app: any, opt?: any): void;
 export default plugin;
 //# sourceMappingURL=index.d.ts.map

package/dist/server/routes/cron/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/cron/index.ts"],"names":[],"mappings":"AAUA,iBAAe,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,iBAM5C;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/cron/index.ts"],"names":[],"mappings":"AAUA,iBAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAMtC;AAED,eAAe,MAAM,CAAC"}