database-connector 2.4.4 → 2.4.6

package/CHANGELOG.md

@@ -29,6 +29,15 @@
   - Updated Swagger documentation to reflect new field
 
 - **Subscription Model**: Added multiple new fields and improvements
+  - **BREAKING CHANGE**: Changed `storeId` to `sellerId` - now references User (seller) instead of Store
+    - Updated all occurrences in main schema, subscriptionsHistory, and upcomingSubscriptions
+    - Updated indexes to use `sellerId` instead of `storeId`
+  - **BREAKING CHANGE**: Removed `histories` field and SubscriptionHistory collection tracking
+    - Simplified to use only embedded `subscriptionsHistory` array
+    - Automatic history snapshot creation now pushes to embedded subscriptionsHistory array on save/update
+    - History snapshots include all subscription fields (sellerId, planId, planTypeId, paymentTypeId, paymentIntentId, reductionOfferId, numberOfStores, billingAddress, invoiceRecipient, invoiceLink, status, dates, notes)
+    - Removed cascade delete logic (embedded arrays are deleted automatically with parent document)
+    - All history tracking done via embedded subscriptionsHistory and upcomingSubscriptions arrays
   - `planTypeId`: ObjectId reference to PlanType model
   - `numberOfStores`: Number (default: 1, minimum: 1) - tracks number of stores in subscription
   - `billingAddress`: Mixed object for billing address (Adresse de facturation)

package/models/Subscription.js

@@ -1,9 +1,8 @@
 const mongoose = require('mongoose');
 
 const buildSubscriptionHistorySnapshot = (subscriptionDoc) => ({
-	subscriptionId: subscriptionDoc._id,
 	paymentManagerId: subscriptionDoc.paymentManagerId,
-	storeId: subscriptionDoc.storeId,
+	sellerId: subscriptionDoc.sellerId,
 	planId: subscriptionDoc.planId,
 	planTypeId: subscriptionDoc.planTypeId,
 	subscriptionOfferId: subscriptionDoc.subscriptionOfferId,
@@ -24,28 +23,14 @@ const buildSubscriptionHistorySnapshot = (subscriptionDoc) => ({
 const recordSubscriptionHistory = async (subscriptionDoc) => {
 	if (!subscriptionDoc) return;
 
-	// Lazy-load to avoid require ordering issues
-	// eslint-disable-next-line global-require
-	const SubscriptionHistory = require('./SubscriptionHistory');
-
-	const history = await SubscriptionHistory.create(
-		buildSubscriptionHistorySnapshot(subscriptionDoc)
-	);
+	const historySnapshot = buildSubscriptionHistorySnapshot(subscriptionDoc);
 
 	await subscriptionDoc.updateOne(
-		{ $push: { histories: history._id } },
+		{ $push: { subscriptionsHistory: historySnapshot } },
 		{ skipHistory: true }
 	);
 };
 
-const deleteSubscriptionHistories = async (subscriptionId) => {
-	if (!subscriptionId) return;
-	// Lazy-load to avoid require ordering issues
-	// eslint-disable-next-line global-require
-	const SubscriptionHistory = require('./SubscriptionHistory');
-	await SubscriptionHistory.deleteMany({ subscriptionId });
-};
-
 /**
  * @swagger
  * components:
@@ -53,7 +38,7 @@ const deleteSubscriptionHistories = async (subscriptionId) => {
  *     Subscription:
  *       type: object
  *       required:
- *         - storeId
+ *         - sellerId
  *         - paymentAmount
  *         - startDate
  *         - endDate
@@ -64,9 +49,9 @@ const deleteSubscriptionHistories = async (subscriptionId) => {
  *         paymentManagerId:
  *           type: string
  *           description: Reference to the payment manager
- *         storeId:
+ *         sellerId:
  *           type: string
- *           description: Reference to the store
+ *           description: Reference to the seller (user)
  *         planId:
  *           type: string
  *           description: Reference to the plan
@@ -127,14 +112,19 @@ const deleteSubscriptionHistories = async (subscriptionId) => {
  *           type: string
  *           nullable: true
  *           description: Link to the invoice document
- *         histories:
+ *         subscriptionsHistory:
  *           type: array
- *           description: Immutable list of recorded subscription snapshots
+ *           description: Embedded array of historical subscription snapshots
  *           items:
- *             $ref: '#/components/schemas/SubscriptionHistory'
+ *             type: object
+ *         upcomingSubscriptions:
+ *           type: array
+ *           description: Embedded array of upcoming subscription configurations
+ *           items:
+ *             type: object
  *       example:
  *         id: "507f1f77bcf86cd799439011"
- *         storeId: "507f1f77bcf86cd799439012"
+ *         sellerId: "507f1f77bcf86cd799439012"
  *         planId: "507f1f77bcf86cd799439013"
  *         paymentAmount: 99.99
  *         paymentIntentId: "507f1f77bcf86cd799439099"
@@ -149,10 +139,10 @@ const subscriptionSchema = new mongoose.Schema(
 			required: false,
 			ref: 'User',
 		},
-		storeId: {
+		sellerId: {
 			type: mongoose.Schema.Types.ObjectId,
 			required: true,
-			ref: 'Store',
+			ref: 'User',
 		},
 		planId: {
 			type: mongoose.Schema.Types.ObjectId,
@@ -227,12 +217,6 @@ const subscriptionSchema = new mongoose.Schema(
 			type: String,
 			default: null,
 		},
-		histories: [
-			{
-				type: mongoose.Schema.Types.ObjectId,
-				ref: 'SubscriptionHistory',
-			},
-		],
 		subscriptionsHistory: [
 			{
 				paymentManagerId: {
@@ -240,10 +224,10 @@ const subscriptionSchema = new mongoose.Schema(
 					required: false,
 					ref: 'User',
 				},
-				storeId: {
+				sellerId: {
 					type: mongoose.Schema.Types.ObjectId,
 					required: false,
-					ref: 'Store',
+					ref: 'User',
 				},
 				planId: {
 					type: mongoose.Schema.Types.ObjectId,
@@ -324,10 +308,10 @@ const subscriptionSchema = new mongoose.Schema(
 					required: false,
 					ref: 'User',
 				},
-				storeId: {
+				sellerId: {
 					type: mongoose.Schema.Types.ObjectId,
 					required: false,
-					ref: 'Store',
+					ref: 'User',
 				},
 				planId: {
 					type: mongoose.Schema.Types.ObjectId,
@@ -405,7 +389,7 @@ const subscriptionSchema = new mongoose.Schema(
 	{ toJSON: { virtuals: true } }
 );
 
-// Auto-record history snapshots
+// Auto-record history snapshots to embedded subscriptionsHistory array
 subscriptionSchema.post('save', async function (doc) {
 	await recordSubscriptionHistory(doc);
 });
@@ -422,35 +406,15 @@ subscriptionSchema.post('updateOne', async function () {
 	await recordSubscriptionHistory(updatedDoc);
 });
 
-// Cascade delete: remove all histories when a subscription is deleted
-subscriptionSchema.pre('deleteOne', { document: true, query: false }, async function () {
-	await deleteSubscriptionHistories(this._id);
-});
-
-subscriptionSchema.post('findOneAndDelete', async function (doc) {
-	if (!doc) return;
-	await deleteSubscriptionHistories(doc._id);
-});
-
-subscriptionSchema.pre('deleteOne', { document: false, query: true }, async function () {
-	const filter = this.getFilter();
-	const docs = await this.model.find(filter).select('_id');
-	if (!docs || docs.length === 0) return;
-	const ids = docs.map((d) => d._id);
-	// eslint-disable-next-line global-require
-	const SubscriptionHistory = require('./SubscriptionHistory');
-	await SubscriptionHistory.deleteMany({ subscriptionId: { $in: ids } });
-});
-
 // Indexes for performance optimization
-subscriptionSchema.index({ storeId: 1 });
+subscriptionSchema.index({ sellerId: 1 });
 subscriptionSchema.index({ status: 1 });
 subscriptionSchema.index({ endDate: 1 });
 subscriptionSchema.index({ startDate: 1 });
 subscriptionSchema.index({ planId: 1 });
 subscriptionSchema.index({ planTypeId: 1 });
 subscriptionSchema.index({ paymentManagerId: 1 });
-subscriptionSchema.index({ storeId: 1, status: 1 });
+subscriptionSchema.index({ sellerId: 1, status: 1 });
 subscriptionSchema.index({ status: 1, endDate: 1 });
 
 module.exports = mongoose.model('Subscription', subscriptionSchema);

package/package.json

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