@opengis/fastify-table 2.0.148 → 2.0.150

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAsC3E,eAAe,MAAM,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../config.ts"],"names":[],"mappings":"AAWA,QAAA,MAAM,MAAM,KAA8D,CAAC;AAgD3E,eAAe,MAAM,CAAC"}

package/dist/config.js

@@ -15,6 +15,13 @@ Object.assign(config, {
 if (existsSync(`.env.local`)) {
     dotenv.config({ path: `.env.local` }); // ! load .env.local
 }
+// example: bun server kamianske
+if (process.cwd().split("\\").pop() &&
+    process.cwd().split("\\").pop() === "fastify-table" &&
+    process.argv[2] &&
+    existsSync(`.env.${process.argv[2]}`)) {
+    dotenv.config({ path: `.env.${process.argv[2]}` }); // ! for debug only
+}
 if (process.env?.NODE_ENV && existsSync(`.env.${process.env.NODE_ENV}`)) {
     dotenv.config({ path: `.env.${process.env.NODE_ENV}` }); // ! load .env.{{production}} etc.
 }

package/dist/server/plugins/crud/funcs/utils/logChanges.d.ts

@@ -16,6 +16,7 @@ export default function logChanges({ pg, table: table1, tokenData, referer, id,
     change_type: string;
     old: any;
     new: any;
+    titles: Record<string, string>;
     error?: undefined;
 } | {
     error: any;
@@ -26,5 +27,6 @@ export default function logChanges({ pg, table: table1, tokenData, referer, id,
     change_id?: undefined;
     old?: undefined;
     new?: undefined;
+    titles?: undefined;
 } | null>;
 //# sourceMappingURL=logChanges.d.ts.map

package/dist/server/plugins/crud/funcs/utils/logChanges.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logChanges.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/crud/funcs/utils/logChanges.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AA4B5D,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,GAAO,EACP,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;CACd;;;;;;;;;;;;;;;;;;UAuJA"}
+{"version":3,"file":"logChanges.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/crud/funcs/utils/logChanges.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AA8C5D,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,GAAO,EACP,IAAI,GACL,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;CACd;;;;;;;;;;;;;;;;;;;;UA8MA"}

package/dist/server/plugins/crud/funcs/utils/logChanges.js

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
 import getTemplate from "../../../table/funcs/getTemplate.js";
 import metaFormat from "../../../table/funcs/metaFormat/index.js";
+import getMeta from "../../../pg/funcs/getMeta.js";
 const defaultTitles = {
     editor_date: "Дата оновлення",
     editor_id: "Редактор",
@@ -14,15 +15,26 @@ const defaultTitles = {
     size: "Розмір файлу",
     ext: "Розширення файлу",
 };
-function getValue(val, tableName) {
+// skip log of system columns changes made by CRUD functions - log only changes of data
+const systemColumns = [
+    "cdate",
+    "editor_date",
+    "created_at",
+    "updated_at",
+    "editor_id",
+    "uid",
+    "updated_by",
+    "created_by",
+];
+function getValue(val, tableName, columnTypes) {
+    if (typeof val === "boolean")
+        return val;
     if (!val)
         return null;
     if (["crm.files"].includes(tableName)) {
         return typeof val === "object" ? JSON.stringify(val) : val;
     }
-    return typeof val === "object"
-        ? JSON.stringify(val)?.substring?.(0, 30)
-        : val?.toString?.()?.substring?.(0, 30);
+    return typeof val === "object" ? null : val?.toString?.()?.substring?.(0, 30);
 }
 // extract titles and cls from form schema
 // alt: extract table template from referer -> form
@@ -49,10 +61,11 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
             .query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
     values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id])
             .then((el) => el.rows?.[0] || {});
-        const q = `select json_object_agg(entity_key, value_hash) from (
+        const q = `select json_object_agg(entity_key, json_build_object('hash',value_hash,'value',value_new)) from (
       select
         entity_key,
         value_hash,
+        value_new,
         ( rank() over (partition by entity_key order by cdate desc) = 1 ) as is_latest
       from log.table_changes_data
 
@@ -74,33 +87,70 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
         const body = await getTemplate("form", tokenData?.form);
         const schema = body?.schema || body || {};
         const titles = Object.keys(schema).reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].title || schema[curr].ua }), {});
+        Object.assign(titles, defaultTitles);
         const cls = Object.keys(schema)
             .filter((el) => schema[el]?.data)
             .reduce((acc, curr) => Object.assign(acc, { [curr]: schema[curr].data }), {});
-        const data1 = data
-            ? await metaFormat({
-                rows: [data],
-                cls,
-                sufix: false,
-                reassign: false,
-            }, pg)
-            : null;
-        const newObj = Object.fromEntries(Object.entries(data1?.[0] || {}).map((el) => [
-            [titles[el[0]] || defaultTitles[el[0]] || el[0]],
-            el[1],
-        ]));
-        const changesData = Object.keys(newObj || {})
-            .map((el) => ({
+        // const original = JSON.parse(JSON.stringify(data));
+        const row = await metaFormat({
+            rows: [data].filter(Boolean),
+            cls,
+            sufix: false,
+            reassign: false,
+        }, pg).then((el) => el[0]);
+        const newObj1 = {};
+        const meta = await getMeta({ pg, table });
+        const columnTypes = (meta?.columns || []).reduce((acc, curr) => ({
+            ...acc,
+            [curr.name]: pg?.pgType?.[curr.dataTypeID],
+        }), {});
+        if (type !== "DELETE") {
+            Object.keys(row || {})
+                .filter((key) => !systemColumns.includes(key))
+                .reduce((acc, curr) => {
+                Object.assign(newObj1, {
+                    [titles[curr] || curr]: columnTypes[curr] === "geometry"
+                        ? {}
+                        : {
+                            value: getValue(row[curr], table, columnTypes),
+                            hash: typeof row[curr] === "boolean" || row[curr]
+                                ? createHash("md5")
+                                    .update(JSON.stringify(row[curr]))
+                                    .digest("hex")
+                                : null,
+                        },
+                });
+                return acc;
+            });
+        }
+        const newGeoms = await Promise.all(Object.keys(newObj1)
+            .filter((key) => row[key] && columnTypes[key] === "geometry")
+            .map(async (key) => pg
+            .query(typeof row[key] === "string" // binary geometry as string via update?
+            ? "select st_asgeojson(st_pointonsurface($1))::json"
+            : "select st_asgeojson(st_pointonsurface(st_geomfromgeojson($1)))::json", [row[key]])
+            .then((el) => ({ key, geometry: el.rows[0].st_asgeojson })))).then((r) => r.reduce((acc, curr) => {
+            const value = curr.geometry.coordinates.join(",");
+            const hash = createHash("md5")
+                .update(JSON.stringify(value))
+                .digest("hex");
+            newObj1[curr.key] = { value, hash };
+            return { ...acc, [curr.key]: { value, hash } };
+        }, {}));
+        const changesData = Object.keys(newObj1 || {})
+            .filter((key) => typeof newObj1?.[key] === "boolean" || newObj1?.[key])
+            .filter((key) => old[key] ? old[key].hash !== newObj1[key]?.hash : newObj1[key]?.hash)
+            .map((key) => ({
             change_id: changeId,
-            entity_key: el,
-            value_old: getValue(old?.[el], table),
-            value_new: type === "DELETE" ? null : getValue(newObj?.[el], table),
-            value_hash: newObj?.[el]
-                ? createHash("md5").update(JSON.stringify(newObj?.[el])).digest("hex")
-                : null,
+            entity_key: key,
+            value_old: old?.[key]?.value,
+            value_new: newObj1?.[key]?.value,
+            value_hash: newObj1?.[key]?.hash,
             uid,
-        }))
-            .filter((el) => old?.[el.entity_key] !== el.value_hash);
+        }));
+        if (process.env.NODE_ENV === "test") {
+            console.log("changesData", changesData);
+        }
         const res = await Promise.all(changesData.map(async (el) => {
             const insertQuery = `insert into log.table_changes_data (${Object.entries(el)
                 ?.map((key) => `"${key[0]}"`)
@@ -108,18 +158,18 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
       values (${Object.entries(el)
                 ?.map((key, i) => `$${i + 1}`)
                 .join(",")}) returning *`;
-            const { rows = [] } = (await pg.query(insertQuery, [
+            const row1 = await pg
+                .query(insertQuery, [
                 ...Object.entries(el).map((el1) => el1[1] &&
                     typeof el1[1] === "object" &&
                     (!Array.isArray(el1[1]) || typeof el1[1]?.[0] === "object")
                     ? JSON.stringify(el1[1])
                     : el1[1]),
-            ])) || {};
-            return rows[0];
+            ])
+                .then((el) => el.rows?.[0] || {});
+            return row1;
         }));
-        const newData = type === "DELETE"
-            ? {}
-            : (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.value_new }), {});
+        const newData = (Array.isArray(res) ? res : [res]).reduce((acc, curr) => Object.assign(acc, { [curr.entity_key]: curr.value_new }), {});
         // console.log('logChanges OK', type);
         return {
             change_id: changeId,
@@ -129,6 +179,7 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
             change_type: type,
             old,
             new: newData,
+            titles,
         };
     }
     catch (err) {

package/dist/server/routes/widget/controllers/widget.get.d.ts

@@ -2,5 +2,5 @@
  * Дістає CRM для widget
  *
  */
-export default function widgetGet({ pg, user, params, query, unittest }: any, reply: any): Promise<any>;
+export default function widgetGet({ pg, user, params, query }: any, reply: any): Promise<any>;
 //# sourceMappingURL=widget.get.d.ts.map

package/dist/server/routes/widget/controllers/widget.get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"widget.get.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.get.ts"],"names":[],"mappings":"AAyBA;;;GAGG;AAEH,wBAA8B,SAAS,CACrC,EAAE,EAAqB,EAAE,IAAS,EAAE,MAAW,EAAE,KAAU,EAAE,QAAQ,EAAE,EAAE,GAAG,EAC5E,KAAK,EAAE,GAAG,gBAkLX"}
+{"version":3,"file":"widget.get.d.ts","sourceRoot":"","sources":["../../../../../server/routes/widget/controllers/widget.get.ts"],"names":[],"mappings":"AAyBA;;;GAGG;AAEH,wBAA8B,SAAS,CACrC,EAAE,EAAqB,EAAE,IAAS,EAAE,MAAW,EAAE,KAAU,EAAE,EAAE,GAAG,EAClE,KAAK,EAAE,GAAG,gBA+KX"}

package/dist/server/routes/widget/controllers/widget.get.js

@@ -23,7 +23,8 @@ const pkList = {
  * Дістає CRM для widget
  *
  */
-export default async function widgetGet({ pg = pgClients.client, user = {}, params = {}, query = {}, unittest }, reply) {
+export default async function widgetGet({ pg = pgClients.client, user = {}, params = {}, query = {} }, reply) {
+    const time = [Date.now()];
     const param = user?.uid
         ? await getToken({
             token: params.objectid,
@@ -43,8 +44,7 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
     left join admin.users u on u.uid=c.uid 
     where entity_id=$1 order by cdate desc`
             : "select communication_id, entity_id, body, subject, cdate, uid from crm.communications where entity_id=$1 order by cdate desc",
-        history: `select * from (
-      SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
+        history: `SELECT change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
       ${username} as username, u.login, u.avatar
       FROM log.table_changes a
       left join admin.users u on a.change_user_id = u.uid
@@ -54,26 +54,12 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
           where change_id=a.change_id
         )q
       )b on 1=1
-      where b.json_agg is not null and (entity_id=$1 or entity_id in (
-        select communication_id as comments from crm.communications where entity_id=$1
-        union all select checklist_id from crm.checklists where entity_id=$1)
+      where a.change_type != 'INSERT' and b.json_agg is not null and (entity_id=$1 or entity_id in (
+        select communication_id from crm.communications where entity_id=$1
+        union all select checklist_id from crm.checklists where entity_id=$1
+        union all select file_id from crm.files where entity_id=$1) 
       )
-
-    union all
-    select change_id, entity_id, entity_type, change_type, change_date, a.change_user_id, a.uid, a.cdate, b.json_agg as changes,
-        ${username} as username, u.login, u.avatar
-        FROM log.table_changes a
-        left join admin.users u on a.change_user_id = u.uid
-            left join lateral(
-          select json_agg(o) from (
-            select json_object_agg(entity_key, coalesce(value_new, value_old)) as o from log.table_changes_data
-            where change_id=a.change_id and entity_key not in ('uid', 'file_status', 'editor_id', 'cdate', 'editor_date', 'entity_id')
-          )q 
-        )b on 1=1
-        where a.change_type in ('INSERT', 'DELETE') and a.entity_id in (select file_id from crm.files where entity_id=$1)
-        limit 100
-
-    )q order by cdate desc limit 100`,
+      order by cdate desc limit 100`,
         checklist: pg.pk["admin.users"]
             ? `SELECT checklist_id, entity_id, subject, is_done, done_date, c.uid, c.cdate, ${username} as username, u.login, u.avatar
       FROM crm.checklists c
@@ -102,9 +88,11 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
     if (!q) {
         return reply.status(400).send("invalid widget type");
     }
-    /* data */
-    const t1 = Date.now();
-    const { rows = [] } = await pg.query(q, [objectid, params.type === "gallery" ? galleryExtList : null].filter((el) => el));
+    /* rows */
+    const rows = await pg
+        .query(q, [objectid, params.type === "gallery" ? galleryExtList : null].filter(Boolean))
+        .then((el) => el.rows || []);
+    time.push(Date.now());
     rows.forEach((row) => Object.assign(row, { username: row.username?.trim?.() || row.login }));
     /* reactions */
     const widgetPkey = pkList[params.type];
@@ -121,26 +109,32 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
         });
     }
     /* Object info  */
-    const { tableName } = pg.pk["log.table_changes"]
+    const tableName = pg.pk["log.table_changes"]
         ? await pg
-            .query('select entity_type as "tableName" from log.table_changes where entity_id=$1 limit 1', [objectid])
-            .then((el) => el.rows?.[0] || {})
+            .query("select entity_type from log.table_changes where entity_id=$1 limit 1", [objectid])
+            .then((el) => el.rows?.[0]?.entity_type)
+        : null;
+    const { pk, columns = [] } = tableName
+        ? await getMeta({ pg, table: tableName })
         : {};
-    const { pk, columns = [] } = await getMeta({ pg, table: tableName });
     const authorIdColumn = columns.find((col) => ["uid", "created_by"].includes(col.name))?.name;
-    if (!pk && params.type === "history" && !unittest) {
+    if (!pk &&
+        params.type === "history" &&
+        process.env.NODE_ENV !== "test" &&
+        !process.env.VITEST) {
         return reply.status(404).send("log table not found");
     }
     const q1 = `select ${username} as author, u.login, a.cdate, a.editor_date from ${tableName} a 
   left join admin.users u on a.${authorIdColumn}=u.uid where a.${pk}=$1 limit 1`;
     const data = pg.pk["admin.users"] && pk && tableName
         ? await pg
-            .query(q, [
+            .query(q1, [
             objectid,
             params.type === "gallery" ? galleryExtList : null,
-        ].filter((el) => el))
+        ].filter(Boolean))
             .then((el) => el.rows?.[0] || {})
         : {};
+    time.push(Date.now());
     if (query.debug && user?.user_type === "admin") {
         return {
             q,
@@ -151,7 +145,7 @@ export default async function widgetGet({ pg = pgClients.client, user = {}, para
         };
     }
     return reply.status(200).send({
-        time: { data: Date.now() - t1 },
+        time: { rows: time[1] - time[0], data: time[2] - time[1] },
         rows,
         user: { uid: user?.uid, name: user?.user_name },
         data: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.148",
+  "version": "2.0.150",
   "type": "module",
   "description": "core-plugins",
   "keywords": [