@opengis/fastify-table 2.0.149 → 2.0.150

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

@@ -3,7 +3,7 @@ import getRedis from "../../redis/funcs/getRedis.js";
 import pgClients from "../../pg/pgClients.js";
 import getTemplate from "../../table/funcs/getTemplate.js";
 import config from "../../../../config.js";
-// import logChanges from "./utils/logChanges.js";
+import logChanges from "./utils/logChanges.js";
 import getInsertQuery from "./utils/getInsertQuery.js";
 import logger from "../../logger/getLogger.js";
 import extraData from "../../extra/extraData.js";
@@ -95,16 +95,16 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
                 Object.assign(res.rows[0], { [key]: parentRows.filter(Boolean) });
             }));
         }
-        // await logChanges({
-        //   pg: client,
-        //   table,
-        //   tokenData,
-        //   referer,
-        //   data,
-        //   id: id1,
-        //   uid,
-        //   type: "INSERT",
-        // });
+        await logChanges({
+            pg: client,
+            table,
+            tokenData,
+            referer,
+            data,
+            id: id1,
+            uid,
+            type: "INSERT",
+        });
         if (config.redis && rclient?.status !== "end") {
             rclient.incr(`pg:${client.options?.database}:${table}:crud`);
         }

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;;;;;;;;;;;;;;;;;;UA6JA"}
+{"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
@@ -75,35 +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]?.value, 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) => (newObj?.[el.entity_key] ||
-            getValue(old?.[el.entity_key]?.value, table)) &&
-            old?.[el.entity_key]?.hash !== 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]}"`)
@@ -111,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,
@@ -132,6 +179,7 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
             change_type: type,
             old,
             new: newData,
+            titles,
         };
     }
     catch (err) {

package/package.json

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