@lucaapp/service-utils 5.13.0 → 5.14.0

package/dist/lib/atomicAuditLog/index.d.ts

@@ -11,6 +11,8 @@ interface AtomicAuditLogOptions {
     attributeRevisionModelTableName?: string;
     primaryKeyType?: typeof DataTypes.UUID | typeof DataTypes.INTEGER;
     viewPartitionCount?: number;
+    getContext?: () => Record<string, unknown> | null | undefined;
+    getCorrelationId?: () => string | null | undefined;
 }
 export interface PartitionResult {
     archiveTableName: string;
@@ -21,7 +23,11 @@ export declare class AtomicAuditLog {
     private tableName;
     private primaryKeyType;
     private viewPartitionCount;
+    private getContext?;
+    private getCorrelationId?;
+    private knownColumnsCache?;
     constructor(sequelize: Sequelize, options?: AtomicAuditLogOptions);
+    private getKnownColumns;
     getTableName(): string;
     getViewName(): string;
     addHistory<T extends Model>(model: ModelStatic<T>, options?: AddHistoryOptions): void;

package/dist/lib/atomicAuditLog/index.js

@@ -63,6 +63,21 @@ class AtomicAuditLog {
         this.tableName = options.attributeRevisionModelTableName ?? 'AuditLogs';
         this.primaryKeyType = options.primaryKeyType ?? sequelize_1.DataTypes.INTEGER;
         this.viewPartitionCount = options.viewPartitionCount ?? 6;
+        this.getContext = options.getContext;
+        this.getCorrelationId = options.getCorrelationId;
+    }
+    async getKnownColumns() {
+        if (!this.knownColumnsCache) {
+            this.knownColumnsCache = this.sequelize
+                .query(`SELECT column_name FROM information_schema.columns
+           WHERE table_name = :tableName AND table_schema = current_schema()`, {
+                replacements: { tableName: this.tableName },
+                type: sequelize_1.QueryTypes.SELECT,
+            })
+                .then(rows => new Set(rows.map(row => row.column_name)))
+                .catch(() => new Set());
+        }
+        return this.knownColumnsCache;
     }
     getTableName() {
         return this.tableName;
@@ -86,31 +101,45 @@ class AtomicAuditLog {
         if (dialect !== 'postgres') {
             return;
         }
-        const lockKey = `hashtext('${this.tableName}:${modelId}')`;
-        await this.sequelize.query(`SELECT pg_advisory_xact_lock(${lockKey})`, {
-            transaction,
-            type: sequelize_1.QueryTypes.SELECT,
-        });
-        const query = `
-      INSERT INTO "${this.tableName}" ("modelId", "model", "operation", "diff", "revision", "createdAt")
-      SELECT
-        :modelId,
-        :modelName,
-        :operation,
-        :diff::jsonb,
-        COALESCE(
-          (SELECT MAX("revision") + 1 FROM "${this.tableName}" WHERE "modelId" = :modelId),
-          0
-        ),
-        NOW()
-    `;
+        const knownColumns = await this.getKnownColumns();
+        const useRevision = knownColumns.has('revision');
+        if (useRevision) {
+            const lockKey = `hashtext('${this.tableName}:${modelId}')`;
+            await this.sequelize.query(`SELECT pg_advisory_xact_lock(${lockKey})`, {
+                transaction,
+                type: sequelize_1.QueryTypes.SELECT,
+            });
+        }
+        const replacements = {
+            modelId,
+            modelName,
+            operation,
+            diff: JSON.stringify(diff),
+        };
+        const columns = ['"modelId"', '"model"', '"operation"', '"diff"'];
+        const values = [':modelId', ':modelName', ':operation', ':diff::jsonb'];
+        if (this.getContext && knownColumns.has('context')) {
+            const context = this.getContext() ?? null;
+            columns.push('"context"');
+            values.push(':context::jsonb');
+            replacements.context = context === null ? null : JSON.stringify(context);
+        }
+        if (this.getCorrelationId && knownColumns.has('correlationId')) {
+            columns.push('"correlationId"');
+            values.push(':correlationId');
+            replacements.correlationId = this.getCorrelationId() ?? null;
+        }
+        if (useRevision) {
+            columns.push('"revision"');
+            values.push(`COALESCE((SELECT MAX("revision") + 1 FROM "${this.tableName}" WHERE "modelId" = :modelId), 0)`);
+        }
+        columns.push('"createdAt"');
+        values.push('NOW()');
+        const query = useRevision
+            ? `INSERT INTO "${this.tableName}" (${columns.join(', ')})\n      SELECT ${values.join(', ')}`
+            : `INSERT INTO "${this.tableName}" (${columns.join(', ')}) VALUES (${values.join(', ')})`;
         await this.sequelize.query(query, {
-            replacements: {
-                modelId,
-                modelName,
-                operation,
-                diff: JSON.stringify(diff),
-            },
+            replacements,
             type: sequelize_1.QueryTypes.INSERT,
             transaction,
         });

package/dist/lib/pgBoss/helpers.js

@@ -17,7 +17,9 @@ const createSequelizeDbAdapter = (sequelize) => ({
         const connectionManager = sequelize.connectionManager;
         const connection = await connectionManager.getConnection({ type: 'write' });
         try {
-            const result = await connection.query(text, values);
+            const result = values && values.length > 0
+                ? await connection.query(text, values)
+                : await connection.query(text);
             return {
                 rows: Array.isArray(result.rows) ? result.rows : [],
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "5.13.0",
+  "version": "5.14.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -99,6 +99,7 @@
     "follow-redirects": "^1.16.0",
     "axios": "1.16.0",
     "path-to-regexp": "0.1.13",
-    "ip-address": "10.1.1"
+    "ip-address": "10.1.1",
+    "fast-xml-builder": "^1.1.7"
   }
 }