database-connector 2.4.11 → 2.4.12

package/models/Subscription.js

@@ -27,9 +27,10 @@ const recordSubscriptionHistory = async (subscriptionDoc) => {
 
 	const historySnapshot = buildSubscriptionHistorySnapshot(subscriptionDoc);
 
-	await subscriptionDoc.updateOne(
-		{ $push: { subscriptionsHistory: historySnapshot } },
-		{ skipHistory: true }
+	// Use Model.updateOne instead of doc.updateOne to avoid triggering middleware
+	await mongoose.model('Subscription').updateOne(
+		{ _id: subscriptionDoc._id },
+		{ $push: { subscriptionsHistory: historySnapshot } }
 	);
 };
 
@@ -427,25 +428,60 @@ 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
 subscriptionSchema.post('save', async function (doc, next) {
-	// For save operations, check the $locals property where custom options are stored
-	if (doc.$locals && doc.$locals.skipHistory) return next();
-	if (this.$locals && this.$locals.skipHistory) return next();
+	// Check if we should skip history
+	if (doc._skipHistory) {
+		delete doc._skipHistory; // Clean up the flag
+		return next();
+	}
+	
 	await recordSubscriptionHistory(doc);
 	next();
 });
 
-subscriptionSchema.post('findOneAndUpdate', async function () {
-	if (this.getOptions && this.getOptions().skipHistory) return;
-	const updatedDoc = await this.model.findOne(this.getQuery());
-	await recordSubscriptionHistory(updatedDoc);
+// Pre-middleware for findOneAndUpdate to capture options
+subscriptionSchema.pre('findOneAndUpdate', function (next) {
+	if (this.getOptions && this.getOptions().skipHistory) {
+		this._skipHistory = true;
+	}
+	next();
+});
+
+subscriptionSchema.post('findOneAndUpdate', async function (doc) {
+	if (this._skipHistory) return;
+	
+	// Get the updated document
+	const updatedDoc = doc || await this.model.findOne(this.getQuery());
+	if (updatedDoc) {
+		await recordSubscriptionHistory(updatedDoc);
+	}
+});
+
+// Pre-middleware for updateOne to capture options
+subscriptionSchema.pre('updateOne', function (next) {
+	if (this.getOptions && this.getOptions().skipHistory) {
+		this._skipHistory = true;
+	}
+	next();
 });
 
 subscriptionSchema.post('updateOne', async function () {
-	if (this.getOptions && this.getOptions().skipHistory) return;
+	if (this._skipHistory) return;
+	
 	const updatedDoc = await this.model.findOne(this.getQuery());
-	await recordSubscriptionHistory(updatedDoc);
+	if (updatedDoc) {
+		await recordSubscriptionHistory(updatedDoc);
+	}
 });
 
 // Indexes for performance optimization
@@ -460,4 +496,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.11",
+  "version": "2.4.12",
   "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": {