database-connector 2.4.12 → 2.4.14

package/models/Subscription.js

@@ -22,15 +22,16 @@ const buildSubscriptionHistorySnapshot = (subscriptionDoc) => ({
 	createdAt: new Date(),
 });
 
-const recordSubscriptionHistory = async (subscriptionDoc) => {
-	if (!subscriptionDoc) return;
+const recordSubscriptionHistory = async (oldSubscriptionDoc, updatedSubscriptionDoc) => {
+	if (!oldSubscriptionDoc || !updatedSubscriptionDoc) return;
 
-	const historySnapshot = buildSubscriptionHistorySnapshot(subscriptionDoc);
+	// Build snapshot from the OLD state (before update)
+	const historySnapshot = buildSubscriptionHistorySnapshot(oldSubscriptionDoc);
 
-	// Use Model.updateOne instead of doc.updateOne to avoid triggering middleware
-	await mongoose.model('Subscription').updateOne(
-		{ _id: subscriptionDoc._id },
-		{ $push: { subscriptionsHistory: historySnapshot } }
+	// Push the old state to the updated document's history
+	await updatedSubscriptionDoc.updateOne(
+		{ $push: { subscriptionsHistory: historySnapshot } },
+		{ skipHistory: true }
 	);
 };
 
@@ -428,59 +429,62 @@ const subscriptionSchema = new mongoose.Schema(
 	{ toJSON: { virtuals: true } }
 );
 
-// Pre-save middleware to check skipHistory flag
-subscriptionSchema.pre('save', function (next) {
-	// Store the skipHistory flag on the document itself
-	if (this.$locals && this.$locals.skipHistory) {
-		this._skipHistory = true;
-	}
-	next();
-});
-
 // Auto-record history snapshots to embedded subscriptionsHistory array
+// On creation: Skip history (no previous state to record)
+// On update: Record the PREVIOUS state before the update happens
 subscriptionSchema.post('save', async function (doc, next) {
-	// Check if we should skip history
-	if (doc._skipHistory) {
-		delete doc._skipHistory; // Clean up the flag
-		return next();
-	}
-	
-	await recordSubscriptionHistory(doc);
-	next();
+	// Skip history on save operations (creation or manual saves)
+	// History should only be recorded on updates via findOneAndUpdate/updateOne
+	return next();
 });
 
-// Pre-middleware for findOneAndUpdate to capture options
-subscriptionSchema.pre('findOneAndUpdate', function (next) {
-	if (this.getOptions && this.getOptions().skipHistory) {
-		this._skipHistory = true;
+subscriptionSchema.pre('findOneAndUpdate', async function () {
+	const options = this.getOptions ? this.getOptions() : this.options;
+	if (options?.skipHistory || options?.$locals?.skipHistory || this?.$locals?.skipHistory) return;
+	
+	// Fetch the OLD document BEFORE the update happens
+	const oldDoc = await this.model.findOne(this.getQuery());
+	if (oldDoc) {
+		// Store old document in options to access in post hook
+		this._oldDoc = oldDoc;
 	}
-	next();
 });
 
-subscriptionSchema.post('findOneAndUpdate', async function (doc) {
-	if (this._skipHistory) return;
+subscriptionSchema.post('findOneAndUpdate', async function () {
+	const options = this.getOptions ? this.getOptions() : this.options;
+	if (options?.skipHistory || options?.$locals?.skipHistory || this?.$locals?.skipHistory) return;
 	
-	// Get the updated document
-	const updatedDoc = doc || await this.model.findOne(this.getQuery());
-	if (updatedDoc) {
-		await recordSubscriptionHistory(updatedDoc);
+	// Record history from the OLD document (captured in pre hook)
+	if (this._oldDoc) {
+		const updatedDoc = await this.model.findOne(this.getQuery());
+		if (updatedDoc) {
+			await recordSubscriptionHistory(this._oldDoc, updatedDoc);
+		}
 	}
 });
 
-// Pre-middleware for updateOne to capture options
-subscriptionSchema.pre('updateOne', function (next) {
-	if (this.getOptions && this.getOptions().skipHistory) {
-		this._skipHistory = true;
+subscriptionSchema.pre('updateOne', async function () {
+	const options = this.getOptions ? this.getOptions() : this.options;
+	if (options?.skipHistory || options?.$locals?.skipHistory || this?.$locals?.skipHistory) return;
+	
+	// Fetch the OLD document BEFORE the update happens
+	const oldDoc = await this.model.findOne(this.getQuery());
+	if (oldDoc) {
+		// Store old document in options to access in post hook
+		this._oldDoc = oldDoc;
 	}
-	next();
 });
 
 subscriptionSchema.post('updateOne', async function () {
-	if (this._skipHistory) return;
+	const options = this.getOptions ? this.getOptions() : this.options;
+	if (options?.skipHistory || options?.$locals?.skipHistory || this?.$locals?.skipHistory) return;
 	
-	const updatedDoc = await this.model.findOne(this.getQuery());
-	if (updatedDoc) {
-		await recordSubscriptionHistory(updatedDoc);
+	// Record history from the OLD document (captured in pre hook)
+	if (this._oldDoc) {
+		const updatedDoc = await this.model.findOne(this.getQuery());
+		if (updatedDoc) {
+			await recordSubscriptionHistory(this._oldDoc, updatedDoc);
+		}
 	}
 });
 
@@ -496,4 +500,4 @@ subscriptionSchema.index({ sellerId: 1, status: 1 });
 subscriptionSchema.index({ status: 1, endDate: 1 });
 subscriptionSchema.index({ stores: 1 });
 
-module.exports = mongoose.model('Subscription', subscriptionSchema);
+module.exports = mongoose.model('Subscription', subscriptionSchema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "database-connector",
-  "version": "2.4.12",
+  "version": "2.4.14",
   "description": "MongoDB models package with Mongoose schemas for e-commerce applications. Includes User, Product, Store, Order and more with built-in validation and virtual properties.",
   "main": "models/index.js",
   "scripts": {