@classytic/revenue 0.2.3 → 0.2.4

package/README.md

@@ -47,8 +47,8 @@ const { transaction } = await revenue.monetization.create({
   paymentData: { method: 'card' },
 });
 
-// Verify → Refund
-await revenue.payments.verify(transaction.gateway.paymentIntentId);
+// Verify → Refund (use transaction._id - works for all providers)
+await revenue.payments.verify(transaction._id);
 ```
 
 ### Multi-Tenant (Marketplace/Platform)
@@ -130,7 +130,7 @@ export default mongoose.model('Transaction', transactionSchema);
 
 | Schema | Purpose | Key Fields |
 |--------|---------|------------|
-| `gatewaySchema` | Payment gateway integration | `type`, `paymentIntentId`, `sessionId` |
+| `gatewaySchema` | Payment gateway integration | `type`, `sessionId`, `paymentIntentId` |
 | `paymentDetailsSchema` | Payment method info | `walletNumber`, `trxId`, `bankName` |
 | `commissionSchema` | Commission tracking (marketplace) | `rate`, `grossAmount`, `gatewayFeeAmount`, `netAmount` |
 | `currentPaymentSchema` | Latest payment (for Order/Subscription models) | `transactionId`, `status`, `verifiedAt` |
@@ -164,7 +164,7 @@ const { subscription, transaction, paymentIntent } =
   });
 
 // Verify and activate
-await revenue.payments.verify(transaction.gateway.paymentIntentId);
+await revenue.payments.verify(transaction._id);
 await revenue.monetization.activate(subscription._id);
 
 // Renew subscription
@@ -599,6 +599,8 @@ export class StripeProvider extends PaymentProvider {
 
     return new PaymentIntent({
       id: intent.id,
+      sessionId: null,              // No session for direct intents
+      paymentIntentId: intent.id,   // Available immediately
       provider: 'stripe',
       status: intent.status,
       amount: intent.amount,

package/dist/types/providers/base.d.ts

@@ -11,6 +11,8 @@
 export class PaymentIntent {
     constructor(data: any);
     id: any;
+    sessionId: any;
+    paymentIntentId: any;
     provider: any;
     status: any;
     amount: any;

package/dist/types/services/payment.service.d.ts

@@ -13,7 +13,7 @@ export class PaymentService {
     /**
      * Verify a payment
      *
-     * @param {String} paymentIntentId - Payment intent ID or transaction ID
+     * @param {String} paymentIntentId - Payment intent ID, session ID, or transaction ID
      * @param {Object} options - Verification options
      * @param {String} options.verifiedBy - User ID who verified (for manual verification)
      * @returns {Promise<Object>} { transaction, status }
@@ -24,14 +24,14 @@ export class PaymentService {
     /**
      * Get payment status
      *
-     * @param {String} paymentIntentId - Payment intent ID or transaction ID
+     * @param {String} paymentIntentId - Payment intent ID, session ID, or transaction ID
      * @returns {Promise<Object>} { transaction, status }
      */
     getStatus(paymentIntentId: string): Promise<any>;
     /**
      * Refund a payment
      *
-     * @param {String} paymentId - Payment intent ID or transaction ID
+     * @param {String} paymentId - Payment intent ID, session ID, or transaction ID
      * @param {Number} amount - Amount to refund (optional, full refund if not provided)
      * @param {Object} options - Refund options
      * @param {String} options.reason - Refund reason
@@ -76,6 +76,11 @@ export class PaymentService {
      * @private
      */
     private _triggerHook;
+    /**
+     * Find transaction by sessionId, paymentIntentId, or transaction ID
+     * @private
+     */
+    private _findTransaction;
 }
 export default PaymentService;
 export type PaymentVerifyResult = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@classytic/revenue",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Enterprise revenue management system with subscriptions, purchases, proration, payment processing, escrow, and multi-party splits",
   "main": "index.js",
   "type": "module",

package/providers/base.js

@@ -12,17 +12,17 @@
 export class PaymentIntent {
   constructor(data) {
     this.id = data.id;
+    this.sessionId = data.sessionId || null;
+    this.paymentIntentId = data.paymentIntentId || null;
     this.provider = data.provider;
-    this.status = data.status; // 'pending', 'processing', 'requires_action', 'succeeded', 'failed'
+    this.status = data.status;
     this.amount = data.amount;
     this.currency = data.currency || 'BDT';
     this.metadata = data.metadata || {};
-
-    // Provider-specific data
-    this.clientSecret = data.clientSecret; // For frontend (Stripe)
-    this.paymentUrl = data.paymentUrl; // For redirect (SSLCommerz)
-    this.instructions = data.instructions; // For manual
-    this.raw = data.raw; // Raw provider response
+    this.clientSecret = data.clientSecret;
+    this.paymentUrl = data.paymentUrl;
+    this.instructions = data.instructions;
+    this.raw = data.raw;
   }
 }
 

package/services/monetization.service.js

@@ -177,8 +177,10 @@ export class MonetizationService {
         status: paymentIntent.status === 'succeeded' ? 'verified' : 'pending',
         gateway: {
           type: gateway,
-          paymentIntentId: paymentIntent.id,
+          sessionId: paymentIntent.sessionId,
+          paymentIntentId: paymentIntent.paymentIntentId,
           provider: paymentIntent.provider,
+          metadata: paymentIntent.metadata,
         },
         paymentDetails: {
           provider: gateway,
@@ -395,8 +397,10 @@ export class MonetizationService {
       status: paymentIntent.status === 'succeeded' ? 'verified' : 'pending',
       gateway: {
         type: gateway,
-        paymentIntentId: paymentIntent.id,
+        sessionId: paymentIntent.sessionId,
+        paymentIntentId: paymentIntent.paymentIntentId,
         provider: paymentIntent.provider,
+        metadata: paymentIntent.metadata,
       },
       paymentDetails: {
         provider: gateway,

package/services/payment.service.js

@@ -53,7 +53,7 @@ export class PaymentService {
   /**
    * Verify a payment
    *
-   * @param {String} paymentIntentId - Payment intent ID or transaction ID
+   * @param {String} paymentIntentId - Payment intent ID, session ID, or transaction ID
    * @param {Object} options - Verification options
    * @param {String} options.verifiedBy - User ID who verified (for manual verification)
    * @returns {Promise<Object>} { transaction, status }
@@ -62,16 +62,7 @@ export class PaymentService {
     const { verifiedBy = null } = options;
 
     const TransactionModel = this.models.Transaction;
-
-    // Find transaction by payment intent ID or transaction ID
-    let transaction = await TransactionModel.findOne({
-      'gateway.paymentIntentId': paymentIntentId,
-    });
-
-    if (!transaction) {
-      // Try finding by transaction ID directly
-      transaction = await TransactionModel.findById(paymentIntentId);
-    }
+    let transaction = await this._findTransaction(TransactionModel, paymentIntentId);
 
     if (!transaction) {
       throw new TransactionNotFoundError(paymentIntentId);
@@ -160,20 +151,12 @@ export class PaymentService {
   /**
    * Get payment status
    *
-   * @param {String} paymentIntentId - Payment intent ID or transaction ID
+   * @param {String} paymentIntentId - Payment intent ID, session ID, or transaction ID
    * @returns {Promise<Object>} { transaction, status }
    */
   async getStatus(paymentIntentId) {
     const TransactionModel = this.models.Transaction;
-
-    // Find transaction
-    let transaction = await TransactionModel.findOne({
-      'gateway.paymentIntentId': paymentIntentId,
-    });
-
-    if (!transaction) {
-      transaction = await TransactionModel.findById(paymentIntentId);
-    }
+    let transaction = await this._findTransaction(TransactionModel, paymentIntentId);
 
     if (!transaction) {
       throw new TransactionNotFoundError(paymentIntentId);
@@ -212,7 +195,7 @@ export class PaymentService {
   /**
    * Refund a payment
    *
-   * @param {String} paymentId - Payment intent ID or transaction ID
+   * @param {String} paymentId - Payment intent ID, session ID, or transaction ID
    * @param {Number} amount - Amount to refund (optional, full refund if not provided)
    * @param {Object} options - Refund options
    * @param {String} options.reason - Refund reason
@@ -222,15 +205,7 @@ export class PaymentService {
     const { reason = null } = options;
 
     const TransactionModel = this.models.Transaction;
-
-    // Find transaction
-    let transaction = await TransactionModel.findOne({
-      'gateway.paymentIntentId': paymentId,
-    });
-
-    if (!transaction) {
-      transaction = await TransactionModel.findById(paymentId);
-    }
+    let transaction = await this._findTransaction(TransactionModel, paymentId);
 
     if (!transaction) {
       throw new TransactionNotFoundError(paymentId);
@@ -384,26 +359,47 @@ export class PaymentService {
     }
 
     // Validate webhook event structure
-    if (!webhookEvent?.data?.paymentIntentId) {
+    if (!webhookEvent?.data?.sessionId && !webhookEvent?.data?.paymentIntentId) {
       throw new ValidationError(
-        `Invalid webhook event structure from ${providerName}: missing paymentIntentId`,
+        `Invalid webhook event structure from ${providerName}: missing sessionId or paymentIntentId`,
         { provider: providerName, eventType: webhookEvent?.type }
       );
     }
 
-    // Find transaction by payment intent ID from webhook
+    // Find transaction by sessionId first (for checkout flows), then paymentIntentId
     const TransactionModel = this.models.Transaction;
-    const transaction = await TransactionModel.findOne({
-      'gateway.paymentIntentId': webhookEvent.data.paymentIntentId,
-    });
+    let transaction = null;
+
+    if (webhookEvent.data.sessionId) {
+      transaction = await TransactionModel.findOne({
+        'gateway.sessionId': webhookEvent.data.sessionId,
+      });
+    }
+
+    if (!transaction && webhookEvent.data.paymentIntentId) {
+      transaction = await TransactionModel.findOne({
+        'gateway.paymentIntentId': webhookEvent.data.paymentIntentId,
+      });
+    }
 
     if (!transaction) {
       this.logger.warn('Transaction not found for webhook event', {
         provider: providerName,
         eventId: webhookEvent.id,
+        sessionId: webhookEvent.data.sessionId,
         paymentIntentId: webhookEvent.data.paymentIntentId,
       });
-      throw new TransactionNotFoundError(webhookEvent.data.paymentIntentId);
+      throw new TransactionNotFoundError(
+        webhookEvent.data.sessionId || webhookEvent.data.paymentIntentId
+      );
+    }
+
+    // Update gateway with complete information from webhook
+    if (webhookEvent.data.sessionId && !transaction.gateway.sessionId) {
+      transaction.gateway.sessionId = webhookEvent.data.sessionId;
+    }
+    if (webhookEvent.data.paymentIntentId && !transaction.gateway.paymentIntentId) {
+      transaction.gateway.paymentIntentId = webhookEvent.data.paymentIntentId;
     }
 
     // Check for duplicate webhook processing (idempotency)
@@ -512,6 +508,28 @@ export class PaymentService {
   _triggerHook(event, data) {
     triggerHook(this.hooks, event, data, this.logger);
   }
+
+  /**
+   * Find transaction by sessionId, paymentIntentId, or transaction ID
+   * @private
+   */
+  async _findTransaction(TransactionModel, identifier) {
+    let transaction = await TransactionModel.findOne({
+      'gateway.sessionId': identifier,
+    });
+
+    if (!transaction) {
+      transaction = await TransactionModel.findOne({
+        'gateway.paymentIntentId': identifier,
+      });
+    }
+
+    if (!transaction) {
+      transaction = await TransactionModel.findById(identifier);
+    }
+
+    return transaction;
+  }
 }
 
 export default PaymentService;