database-connector 2.4.13 → 2.4.14

package/models/Subscription.js

@@ -22,14 +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);
 
-	await subscriptionDoc.updateOne(
+	// Push the old state to the updated document's history
+	await updatedSubscriptionDoc.updateOne(
 		{ $push: { subscriptionsHistory: historySnapshot } },
-		{ $locals: { skipHistory: true } }
+		{ skipHistory: true }
 	);
 };
 
@@ -428,27 +430,62 @@ const subscriptionSchema = new mongoose.Schema(
 );
 
 // 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) {
-	// For save operations, check the $locals and save options where custom options are stored
-	if (doc?.$locals?.skipHistory) return next();
-	if (this?.$locals?.skipHistory) return next();
-	if (this?.$__?.saveOptions?.skipHistory) 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();
+});
+
+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;
+	}
 });
 
 subscriptionSchema.post('findOneAndUpdate', async function () {
 	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());
-	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);
+		}
+	}
+});
+
+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;
+	}
 });
 
 subscriptionSchema.post('updateOne', async function () {
 	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());
-	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);
+		}
+	}
 });
 
 // Indexes for performance optimization

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "database-connector",
-  "version": "2.4.13",
+  "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": {