@sera4/essentia 1.1.16 → 1.1.18

package/package.json

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

package/paper-trail/index.js

@@ -5,7 +5,7 @@ import paginator from "../paginator/sql-pagination.js";
 
 let failHard = false;
 let als;
-let Sequelize = null
+let Sequelize = null;
 
 const paperTrail = {};
 
@@ -28,6 +28,8 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 			'deleted_at',
 			'revision',
 		],
+		// additional fields to exclude on a global basis
+		excludeExtras: [],
 		revisionAttribute: 'revision',
 		revisionModel: 'Revision',
 		revisionChangeModel: 'RevisionChange',
@@ -56,6 +58,15 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 		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;
@@ -313,7 +324,6 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 					options.revisionAttribute,
 				);
 
-				// Save revision(
 				return revision
 					.save({ transaction: opt.transaction })
 					.then(objectRevision => {
@@ -521,10 +531,10 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 					type: Sequelize.UUID,
 					defaultValue: Sequelize.UUIDV4,
 				};
+
 				attributes[options.defaultAttributes.documentId].type =
 					Sequelize.UUID;
 
-					console.log("userModelatribute", options.userModelAttribute)
 				attributes[options.userModelAttribute].type = Sequelize.UUID;
 			}
 
@@ -539,6 +549,9 @@ 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"
 				},
 			);
 			Revision.associate = function associate(models) {
@@ -595,7 +608,6 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 					foreignKey: options.defaultAttributes.revisionId,
 					constraints: false,
 				});
-				paginator.paginate(Revision);
 
 				RevisionChange.belongsTo(Revision);
 
@@ -603,6 +615,8 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 					db[RevisionChange.name] = RevisionChange;
 			}
 
+			paginator.paginate(Revision);
+
 			if (db)
 				db[Revision.name] = Revision;
 
@@ -614,10 +628,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;
@@ -633,4 +650,4 @@ paperTrail.enableFailHard = () => {
 	failHard = true;
 };
 
-export default paperTrail;
+export default paperTrail;