@sera4/essentia 1.1.19 → 1.1.20

package/package.json

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

package/paper-trail/index.js

@@ -47,11 +47,14 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 		als: null,
 		userModel: false,
 		userModelAttribute: 'userId',
+		tenantModel: false,
+		tenantModelAttribute: 'tenantId',
 		enableCompression: false,
 		enableMigration: false,
 		enableStrictDiff: true,
 		continuationNamespace: null,
 		continuationKey: 'userId',
+		continuationTenantKey: 'tenantId',
 		metaDataFields: null,
 		metaDataContinuationKey: 'metaData',
 		mysql: false,
@@ -322,6 +325,9 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 				query[options.userModelAttribute] =
 					(store && store.get(options.continuationKey)) || opt.userId;
 
+				query[options.tenantModelAttribute] =
+					(store && store.get(options.continuationTenantKey)) || opt.tenantId;
+
 				if (options.mixedDocumentReference && utils.isValidUuidV4(instance.id)) {
 					query[options.defaultAttributes.documentUuid] = instance.id;
 				} else {
@@ -546,10 +552,20 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 				allowNull: false,
 			};
 
-			attributes[options.userModelAttribute] = {
-				type: Sequelize.INTEGER,
-				allowNull: true
-			};
+			if (options.userModel) {
+				attributes[options.userModelAttribute] = {
+					type: options.UUID ? Sequelize.UUID : Sequelize.INTEGER,
+					allowNull: true
+				};
+			}
+
+			if (options.tenantModel) {
+				attributes[options.tenantModelAttribute] = {
+					type: options.UUID ? Sequelize.UUID : Sequelize.INTEGER,
+					allowNull: true
+				};
+			}
+
 
 			if (options.UUID) {
 				attributes.id = {
@@ -584,6 +600,9 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 			if (options.userModel)
 				indexes.push({ fields: [options.userModelAttribute]});
 
+			if (options.tenantModel)
+				indexes.push({ fields: [options.tenantModelAttribute]});
+
 			if (options.mixedDocumentReference) {
 				indexes.push({
 					name: "document_reference_uuid",
@@ -624,10 +643,19 @@ paperTrail.init = (sequelize, sequelizePackage, optionsArg) => {
 					log('models', models);
 				}
 
-				Revision.belongsTo(
-					sequelize.model(options.userModel),
-					options.belongsToUserOptions,
-				);
+				if (options.userModel) {
+					Revision.belongsTo(
+						sequelize.model(options.userModel),
+						options.belongsToUserOptions,
+					);
+				}
+
+				if (options.tenantModel) {
+					Revision.belongsTo(
+						sequelize.model(options.tenantModel),
+						options.belongsToTenantOptions,
+					);
+				}
 			};
 
 			if (options.enableRevisionChangeModel) {