@sera4/essentia 1.1.17 → 1.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "type": "module",

package/paper-trail/index.js

@@ -2,10 +2,11 @@ import * as jsdiff from 'diff';
 import _ from 'lodash';
 import helpers from './helpers.js';
 import paginator from "../paginator/sql-pagination.js";
+import { utils } from "../utils/index.js"
 
 let failHard = false;
 let als;
-let Sequelize = null
+let Sequelize = null;
 
 const paperTrail = {};
 
@@ -28,11 +29,15 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 			'deleted_at',
 			'revision',
 		],
+		// additional fields to exclude on a global basis
+		excludeExtras: [],
 		revisionAttribute: 'revision',
 		revisionModel: 'Revision',
 		revisionChangeModel: 'RevisionChange',
 		enableRevisionChangeModel: false,
 		UUID: false,
+		// does this project use int's and UUIDs for some references (postgres)
+		mixedDocumentReference: false,
 		underscored: false,
 		underscoredAttributes: false,
 		defaultAttributes: {
@@ -52,10 +57,22 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 		mysql: false,
 	};
 
+	if (optsArg.mixedDocumentReference)
+		defaultOptions.defaultAttributes.documentUuid = "documentUuid";
+
 	if (optsArg.underscoredAttributes) {
 		helpers.toUnderscored(defaultOptions.defaultAttributes);
 	}
 
+	// deals with not wanting to overwrite the initial ones, just add some
+	if (optsArg.excludeExtras) {
+		if (optsArg.exclude) {
+			optsArg.exclude = [...optsArg.exclude, ...optsArg.excludeExtras ]
+		} else {
+			optsArg.exclude = [...defaultOptions.exclude, ...optsArg.excludeExtras ]
+		}
+	}
+
 	const options = _.defaults(optsArg, defaultOptions);
 
 	const log = options.log || console.log;
@@ -305,7 +322,11 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 				query[options.userModelAttribute] =
 					(store && store.get(options.continuationKey)) || opt.userId;
 
-				query[options.defaultAttributes.documentId] = instance.id;
+				if (options.mixedDocumentReference && utils.isValidUuidV4(instance.id)) {
+					query[options.defaultAttributes.documentUuid] = instance.id;
+				} else {
+					query[options.defaultAttributes.documentId] = instance.id;
+				}
 
 				const revision = Revision.build(query);
 
@@ -313,7 +334,6 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 					options.revisionAttribute,
 				);
 
-				// Save revision(
 				return revision
 					.save({ transaction: opt.transaction })
 					.then(objectRevision => {
@@ -462,13 +482,29 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 			this.addHook('afterUpdate', createAfterHook('update'));
 
 			// create association
-			return this.hasMany(sequelize.models[options.revisionModel], {
-				foreignKey: options.defaultAttributes.documentId,
-				constraints: false,
-				scope: {
-					model: this.name,
-				},
-			});
+			if (options.mixedDocumentReference) {
+				this.hasMany(sequelize.models[options.revisionModel], {
+					constraints: false,
+					foreignKey: options.defaultAttributes.documentUuid,
+				});
+				this.hasMany(sequelize.models[options.revisionModel], {
+					foreignKey: options.defaultAttributes.documentId,
+					constraints: false,
+					scope: {
+						model: this.name,
+					},
+				});
+			} else {
+				return this.hasMany(sequelize.models[options.revisionModel], {
+					foreignKey: options.defaultAttributes.documentId,
+					constraints: false,
+					scope: {
+						model: this.name,
+					},
+				});
+			}
+
+
 		},
 	});
 
@@ -521,17 +557,40 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 					type: Sequelize.UUID,
 					defaultValue: Sequelize.UUIDV4,
 				};
-				attributes[options.defaultAttributes.documentId].type =
-					Sequelize.UUID;
 
-					console.log("userModelatribute", options.userModelAttribute)
+				if (!options.mixedDocumentReference)
+					attributes[options.defaultAttributes.documentId].type = Sequelize.UUID;
+
 				attributes[options.userModelAttribute].type = Sequelize.UUID;
 			}
 
+			if (options.mixedDocumentReference) {
+				attributes[options.defaultAttributes.documentId].allowNull = true;
+				attributes[options.defaultAttributes.documentUuid] = {
+					type: Sequelize.UUID,
+					allowNull: true
+				}
+			}
+
 			if (options.debug) {
 				log('attributes', attributes);
 			}
 
+			let indexes = [{
+				name: "document_reference_id",
+				fields: [options.defaultAttributes.documentId]
+			}];
+
+			if (options.userModel)
+				indexes.push({ fields: [options.userModelAttribute]});
+
+			if (options.mixedDocumentReference) {
+				indexes.push({
+					name: "document_reference_uuid",
+					fields: [options.defaultAttributes.documentUuid]
+				})
+			}
+
 			// Revision model
 			const Revision = sequelize.define(
 				options.revisionModel,
@@ -539,8 +598,27 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 				{
 					underscored: options.underscored,
 					tableName: options.tableName,
+    			timestamps: true,
+    			createdAt: options.underscored ? "created_at" : "createdAt",
+					updatedAt: options.underscored ? "updated_at" : "updatedAt",
+					indexes
 				},
 			);
+
+			// safely prune down values
+			Revision.prototype.toJSON = function() {
+				let values = this.get();
+				const excludedFields = ["updated_at"];
+
+				// ensure that we always reference the id as document_id
+				values.document_id = values.document_id || values.document_uuid;
+				delete values.document_uuid;
+
+				return _.omitBy(values, function(value, key) {
+					return (excludedFields.includes(key) || (value === null));
+				});
+			};
+
 			Revision.associate = function associate(models) {
 				if (options.debug) {
 					log('models', models);
@@ -615,10 +693,13 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 			 * association through the associate call above.
 			 */
 			if (options.userModel) {
-				Revision.belongsTo(
-					sequelize.model(options.userModel),
-					options.belongsToUserOptions,
-				);
+				Revision.belongsTo(sequelize.model(options.userModel), {
+					as: "account",
+					foreignKey: {
+						fieldName: options.userModelAttribute
+					},
+					onDelete: "CASCADE"
+				});
 			}
 
 			return Revision;