database-connector 2.1.3 → 2.2.0

package/models/Payment.js

@@ -13,7 +13,6 @@ const mongoose = require('mongoose');
  *         - paymentStatus
  *         - paymentAmount
  *         - paymentCurrency
- *         - paymentMethod
  *         - paymentDate
  *         - paymentTime
  *         - paymentDetails
@@ -40,9 +39,10 @@ const mongoose = require('mongoose');
  *         paymentCurrency:
  *           type: string
  *           description: Currency of payment
- *         paymentMethod:
+ *         paymentMethodId:
  *           type: string
- *           description: Payment method
+ *           nullable: true
+ *           description: Reference to payment method type (PaymentType)
  *         paymentDate:
  *           type: string
  *           format: date
@@ -55,6 +55,11 @@ const mongoose = require('mongoose');
  *           type: number
  *           default: 0
  *           description: Total price
+ *         transactions:
+ *           type: array
+ *           items:
+ *             type: string
+ *           description: References to related transactions
  *         token:
  *           type: string
  *           description: Payment token
@@ -72,8 +77,9 @@ const mongoose = require('mongoose');
  *         paymentStatus: "succeeded"
  *         paymentAmount: 150.00
  *         paymentCurrency: "USD"
- *         paymentMethod: "card"
+ *         paymentMethodId: "507f1f77bcf86cd799439020"
  *         totalPrice: 150.00
+ *         transactions: ["507f1f77bcf86cd799439111", "507f1f77bcf86cd799439112"]
  *         createdAt: "2025-12-07T10:30:00.000Z"
  *         updatedAt: "2025-12-07T10:30:00.000Z"
  */
@@ -106,9 +112,11 @@ const paymentSchema = new mongoose.Schema(
 			type: String,
 			required: true,
 		},
-		paymentMethod: {
-			type: String,
-			required: true,
+		paymentMethodId: {
+			type: mongoose.Schema.Types.ObjectId,
+			required: false,
+			default: null,
+			ref: 'PaymentType',
 		},
 		paymentDate: {
 			type: Date,
@@ -127,57 +135,13 @@ const paymentSchema = new mongoose.Schema(
 			required: true,
 			default: 0,
 		},
-		card: {
-			brand: {
-				type: String,
-				required: true,
-			},
-			last4: {
-				type: String,
-				required: true,
-			},
-			exp_month: {
-				type: Number,
-				required: true,
-			},
-			exp_year: {
-				type: Number,
-				required: true,
-			},
-			funding: {
-				type: String,
-				required: true,
-			},
-			country: {
-				type: String,
-				required: true,
-			},
-			name: {
-				type: String,
-				required: true,
-			},
-			address_line1: {
-				type: String,
-				required: true,
-			},
-			address_line2: {
-				type: String,
-				required: true,
-			},
-			address_city: {
-				type: String,
-				required: true,
-			},
-			ccvVerified: {
-				type: Boolean,
-				required: true,
-				default: false,
-			},
-			ccv: {
-				type: String,
-				required: true
+		transactions: [
+			{
+				type: mongoose.Schema.Types.ObjectId,
+				ref: 'Transaction',
+				required: false,
 			}
-		},
+		],
 		timestamps: {
 			type: Date,
 			required: true,

package/models/Subscription.js

@@ -33,6 +33,10 @@ const mongoose = require('mongoose');
  *         paymentTypeId:
  *           type: string
  *           description: Reference to payment type
+ *         paymentIntentId:
+ *           type: string
+ *           nullable: true
+ *           description: Reference to payment intent (can be null)
  *         reductionOfferId:
  *           type: string
  *           description: Reference to reduction offer
@@ -59,6 +63,7 @@ const mongoose = require('mongoose');
  *         storeId: "507f1f77bcf86cd799439012"
  *         planId: "507f1f77bcf86cd799439013"
  *         paymentAmount: 99.99
+ *         paymentIntentId: "507f1f77bcf86cd799439099"
  *         status: "active"
  *         startDate: "2025-12-01T00:00:00.000Z"
  *         endDate: "2026-12-01T00:00:00.000Z"
@@ -94,6 +99,12 @@ const subscriptionSchema = new mongoose.Schema(
 			required: false,
 			ref: 'PaymentType',
 		},
+		paymentIntentId: {
+			type: mongoose.Schema.Types.ObjectId,
+			required: false,
+			ref: 'Payment',
+			default: null,
+		},
 		reductionOfferId: {
 			type: mongoose.Schema.Types.ObjectId,
 			required: false,

package/models/SubscriptionOffer.js

@@ -15,6 +15,10 @@ const mongoose = require('mongoose');
  *         discount:
  *           type: number
  *           description: Discount amount or percentage
+ *         discountType:
+ *           type: string
+ *           enum: [percentage, amount]
+ *           description: Type of discount (percentage or fixed amount)
  *         isActive:
  *           type: boolean
  *           default: false
@@ -28,6 +32,7 @@ const mongoose = require('mongoose');
  *       example:
  *         id: "507f1f77bcf86cd799439011"
  *         discount: 20
+ *         discountType: "percentage"
  *         isActive: true
  *         createdAt: "2025-11-01T10:30:00.000Z"
  *         updatedAt: "2025-12-01T15:45:00.000Z"
@@ -38,6 +43,11 @@ const subscriptionOfferSchema = new mongoose.Schema(
 			type: Number,
 			required: true,
 		},
+		discountType: {
+			type: String,
+			required: true,
+			enum: ['percentage', 'amount'],
+		},
 		isActive: {
 			type: Boolean,
 			required: true,

package/models/Transaction.js

@@ -0,0 +1,105 @@
+const mongoose = require('mongoose');
+
+/**
+ * @swagger
+ * components:
+ *   schemas:
+ *     Transaction:
+ *       type: object
+ *       required:
+ *         - paymentId
+ *         - amount
+ *         - status
+ *       properties:
+ *         id:
+ *           type: string
+ *           description: The transaction identifier
+ *         paymentId:
+ *           type: string
+ *           description: Reference to the payment
+ *         amount:
+ *           type: number
+ *           description: Transaction amount
+ *         paymentMethodId:
+ *           type: string
+ *           nullable: true
+ *           description: Reference to payment method type (PaymentType)
+ *         status:
+ *           type: string
+ *           enum: [pending, succeeded, failed, refunded, canceled]
+ *           description: Transaction status
+ *         gatewayTransactionId:
+ *           type: string
+ *           nullable: true
+ *           description: Provider transaction identifier (can be null)
+ *         transactionDate:
+ *           type: string
+ *           format: date-time
+ *           description: Date and time of the transaction
+ *         metadata:
+ *           type: object
+ *           nullable: true
+ *           description: Extra transaction metadata (can be null)
+ *         createdAt:
+ *           type: string
+ *           format: date-time
+ *         updatedAt:
+ *           type: string
+ *           format: date-time
+ *       example:
+ *         id: "507f1f77bcf86cd799439111"
+ *         paymentId: "507f1f77bcf86cd799439011"
+ *         amount: 100.0
+ *         currency: "USD"
+ *         paymentMethodId: "507f1f77bcf86cd799439020"
+ *         status: "succeeded"
+ *         gatewayTransactionId: "pi_3QX..."
+ *         transactionDate: "2025-12-07T10:30:00.000Z"
+ */
+const transactionSchema = new mongoose.Schema(
+	{
+		paymentId: {
+			type: mongoose.Schema.Types.ObjectId,
+			ref: 'Payment',
+			required: true,
+		},
+		amount: {
+			type: Number,
+			required: true,
+		},
+		paymentMethodId: {
+			type: mongoose.Schema.Types.ObjectId,
+			required: false,
+			default: null,
+			ref: 'PaymentType',
+		},
+		status: {
+			type: String,
+			enum: ['pending', 'succeeded', 'failed', 'refunded', 'canceled'],
+			required: true,
+			default: 'pending',
+		},
+		gatewayTransactionId: {
+			type: String,
+			required: false,
+			default: null,
+		},
+		transactionDate: {
+			type: Date,
+			required: true,
+			default: Date.now,
+		},
+		metadata: {
+			type: Object,
+			required: false,
+			default: null,
+		},
+	},
+	{ timestamps: true }
+);
+
+// Indexes for performance optimization
+transactionSchema.index({ paymentId: 1, createdAt: -1 });
+transactionSchema.index({ status: 1, createdAt: -1 });
+
+module.exports = mongoose.model('Transaction', transactionSchema);

package/models/User.js

@@ -55,6 +55,13 @@ const { policySchema } = require('database-connector/models/Policy');
  *         email:
  *           type: string
  *           description: User email address
+ *         isGoogleAuth:
+ *           type: boolean
+ *           default: false
+ *           description: Whether the user authenticated via Google
+ *         googleUid:
+ *           type: string
+ *           description: Google user identifier
  *         favouritsProductst:
  *           type: array
  *           items:
@@ -170,6 +177,13 @@ const userSchema = new mongoose.Schema(
 			type: String,
 			default: null,
 		},
+		isGoogleAuth: {
+			type: Boolean,
+			default: false,
+		},
+		googleUid: {
+			type: String,
+		},
 		favouritsProductst: [
 			{
 				productId: { type: String },

package/models/index.js

@@ -22,6 +22,7 @@ const User = require('./User');
 const Order = require('./Order');
 const Bill = require('./Bill');
 const Payment = require('./Payment');
+const Transaction = require('./Transaction');
 const Store = require('./Store');
 const Offer = require('./Offer');
 const Category = require('./Category');
@@ -58,6 +59,7 @@ module.exports = {
     Order,
     Bill,
     Payment,
+    Transaction,
     Store,
     Offer,
     Category,

package/package.json

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