Add nextPaymentDate to compose-payment

Author: TatianaFomina

src/billing/cloudpayments.ts

@@ -142,18 +142,33 @@ userId: ${userId}`
 
     const isCardLinkOperation = workspace.tariffPlanId.toString() === tariffPlanId && !workspace.isTariffPlanExpired();
 
+    // Calculate next payment date
+    const lastChargeDate = new Date(workspace.lastChargeDate);
+    const now = new Date();
+    let nextPaymentDate: Date;
+
+    if (isCardLinkOperation) {
+      nextPaymentDate = new Date(lastChargeDate);
+      nextPaymentDate.setMonth(lastChargeDate.getMonth() + 1);
+    } else {
+      nextPaymentDate = new Date(now);
+      nextPaymentDate.setMonth(nextPaymentDate.getMonth() + 1);
+    }
+
     let checksum;
 
     try {
       const checksumData = isCardLinkOperation ? {
         isCardLinkOperation: true,
         workspaceId: workspace._id.toString(),
         userId: userId,
+        nextPaymentDate: nextPaymentDate.toISOString(),
       } : {
         workspaceId: workspace._id.toString(),
         userId: userId,
         tariffPlanId: tariffPlan._id.toString(),
         shouldSaveCard: shouldSaveCard === 'true',
+        nextPaymentDate: nextPaymentDate.toISOString(),
       };
 
       checksum = await checksumService.generateChecksum(checksumData);
@@ -175,6 +190,7 @@ userId: ${userId}`
       isCardLinkOperation,
       currency: 'RUB',
       checksum,
+      nextPaymentDate: nextPaymentDate.toISOString(),
     });
   }
 

src/utils/checksumService.ts

@@ -20,6 +20,10 @@ interface PlanPurchaseChecksumData {
    * If true, we will save user card
    */
   shouldSaveCard: boolean;
+  /**
+   * Next payment date
+   */
+  nextPaymentDate: string;
 }
 
 interface CardLinkChecksumData {
@@ -35,6 +39,10 @@ interface CardLinkChecksumData {
    * True if this is card linking operation – charging minimal amount of money to validate card info
    */
   isCardLinkOperation: boolean;
+  /**
+   * Next payment date
+   */
+  nextPaymentDate: string;
 }
 
 /**
@@ -67,13 +75,15 @@ class ChecksumService {
         workspaceId: payload.workspaceId,
         userId: payload.userId,
         isCardLinkOperation: payload.isCardLinkOperation,
+        nextPaymentDate: payload.nextPaymentDate,
       };
     } else {
       return {
         workspaceId: payload.workspaceId,
         userId: payload.userId,
         tariffPlanId: payload.tariffPlanId,
         shouldSaveCard: payload.shouldSaveCard,
+        nextPaymentDate: payload.nextPaymentDate,
       };
     }
   }