@sera4/essentia 1.1.25 → 1.1.27

package/package.json

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

package/paper-trail/index.js

@@ -84,8 +84,8 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 	const log = options.log || console.log;
 
 	function createBeforeHook(operation) {
-
 		const beforeHook = function beforeHook(instance, opt) {
+
 			if (options.debug) {
 				log('beforeHook called');
 				log('instance:', instance);
@@ -100,6 +100,7 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 			}
 
 			const destroyOperation = operation === 'destroy';
+			const restoreOperation = operation === 'restore';
 
 			let previousVersion = {};
 			let currentVersion = {};
@@ -189,7 +190,7 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 				}
 			}
 
-			if (destroyOperation || (delta && delta.length > 0)) {
+			if (destroyOperation || restoreOperation || (delta && delta.length > 0)) {
 				const revisionId = (currentRevisionId || 0) + 1;
 				instance.set(options.revisionAttribute, revisionId);
 
@@ -224,12 +225,13 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 
 			const destroyOperation = operation === 'destroy';
 			const createOperation = operation === 'create';
+			const restoreOperation = operation === 'restore';
 
 			if (
 				instance.context &&
 				((instance.context.delta &&
 					instance.context.delta.length > 0) ||
-					destroyOperation)
+					destroyOperation || restoreOperation)
 			) {
 				const Revision = sequelize.model(options.revisionModel);
 				let RevisionChange;
@@ -245,6 +247,7 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 				let previousVersion = {};
 				let currentVersion = {};
 				if (!destroyOperation && options.enableCompression) {
+					opt.fields = opt.fields || instance._options.attributes
 					_.forEach(opt.fields, a => {
 						previousVersion[a] = instance._previousDataValues[a];
 						currentVersion[a] = instance.dataValues[a];
@@ -284,7 +287,9 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 				let document;
 				if (destroyOperation) {
 				 	document = { oldValues: currentVersion };
-				} else if (createOperation) {
+				} else if (createOperation || restoreOperation) {
+					// we want to print out the entire object as values MAY have changed when restoring
+					//  and for NEW objects, we want the initial state
 					document = { newValues: currentVersion };
 				} else {
 					document = { oldValues: previousVersion, newValues: currentVersion };
@@ -440,6 +445,7 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 	// beforeCreate(instance, options, fn)
 	// beforeDestroy(instance, options, fn)
 	// beforeUpdate(instance, options, fn)
+	// beforeRestore(instance, options, fn)
 	// (-)
 	// create
 	// destroy
@@ -448,6 +454,7 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 	// afterCreate(instance, options, fn)
 	// afterDestroy(instance, options, fn)
 	// afterUpdate(instance, options, fn)
+	// afterRestore(instance, options, fn)
 	// (6)
 	// afterBulkCreate(instances, options, fn)
 	// afterBulkDestroy(instances, options, fn)
@@ -499,9 +506,11 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 			this.addHook('beforeCreate', createBeforeHook('create'));
 			this.addHook('beforeDestroy', createBeforeHook('destroy'));
 			this.addHook('beforeUpdate', createBeforeHook('update'));
+			this.addHook('beforeRestore', createBeforeHook('restore'));
 			this.addHook('afterCreate', createAfterHook('create'));
 			this.addHook('afterDestroy', createAfterHook('destroy'));
 			this.addHook('afterUpdate', createAfterHook('update'));
+			this.addHook('afterRestore', createAfterHook('restore'));
 
 			// create association
 			if (options.mixedDocumentReference) {