Release/2.34.0 to development.

.env.example

@@ -82,6 +82,7 @@ AZURE_CONNECTION_STRING=          # Azure Storage connection string
 AZURE_INSIGHTS_CONNECTION_STRING= # Azure Application Insights connection string
 FEEDBACK_BLOB_CONTAINER=          # Azure Blob container name for feedback storage
 AI_CONVERSATION_BLOB_CONTAINER=   # Azure Blob container name for AI Conversation storage
+DOWNGRADE_HUB_BLOB_CONTAINER=     # Azure Blob container name for downgrade Hub Details storage.
 
 # [AI SERVICES]
 # Azure OpenAI Configuration

.github/workflows/staging.yml

@@ -0,0 +1,44 @@
+name: Staging
+on:
+  push:
+    branches:
+      - release/2.34.0
+
+jobs:
+   build:
+      runs-on: ubuntu-latest
+      steps:
+         - uses: actions/checkout@master
+
+         - uses: Azure/docker-login@v1
+           with:
+              login-server: sparrowprod.azurecr.io
+              username: ${{ secrets.REGISTRY_USERNAME }}
+              password: ${{ secrets.REGISTRY_PASSWORD }}
+
+         - run: |
+              docker build . -t sparrowprod.azurecr.io/sparrow-api:${{ github.run_number }} --build-arg GITHUB_TOKEN=${{ secrets.SPARROW_GITHUB_TOKEN }}
+              docker push sparrowprod.azurecr.io/sparrow-api:${{ github.run_number }}
+   deploy:
+      needs: build
+      runs-on: ubuntu-latest
+      steps:
+         - uses: actions/checkout@master
+         - uses: richardrigutins/replace-in-files@v1
+           with:
+              files: "./deploymentManifests/deployment.yml"
+              search-text: '_BUILD__ID_'
+              replacement-text: '${{ github.run_number }}'
+
+         - uses: azure/setup-kubectl@v2.0
+
+         - uses: Azure/k8s-set-context@v2
+           with:
+              kubeconfig: ${{ secrets.KUBE_CONFIG }}
+
+         - uses: Azure/k8s-deploy@v4
+           with:
+              action: deploy
+              namespace: sparrow-staging
+              manifests: |
+                 ./deploymentManifests/deployment.yml

package.json

@@ -82,6 +82,7 @@
     "crypto-js": "^4.2.0",
     "curlconverter": "^4.9.0",
     "dotenv": "16.0.1",
+    "exceljs": "^4.4.0",
     "fastify": "4.28.1",
     "form-data": "^4.0.1",
     "gravatar": "1.8.2",

src/modules/billing/billing.module.ts

@@ -22,6 +22,11 @@ import { UserRepository } from "@src/modules/identity/repositories/user.reposito
 import { PricingService } from "@src/modules/workspace/services/pricing.repository";
 import { PricingRepository } from "@src/modules/workspace/repositories/pricing.repository";
 import { SalesEmailRepository } from "../workspace/repositories/sales-email.repository";
+import { DownGradeTeamRepository } from "./repositories/downgradeTeam.repository";
+import { DownGradeUserRepository } from "./repositories/downgradeUser.repository";
+import { DownGradeWorkspaceRepository } from "./repositories/downgradeWorkspace.repository";
+import { DownGradeService } from "./services/downgrade.service";
+import { ExcelEmailService } from "./services/excel-email.service";
 
 // Try to import the Stripe module, but don't crash if it's not available
 let StripeModule: any;
@@ -48,6 +53,11 @@ export class BillingModule {
       BillingAuditRepository,
       PromoCodeRepository,
       PricingRepository,
+      DownGradeTeamRepository,
+      DownGradeUserRepository,
+      DownGradeWorkspaceRepository,
+      DownGradeService,
+      ExcelEmailService,
       BillingAuditService,
       PromoCodeService,
       PricingService,
@@ -73,6 +83,11 @@ export class BillingModule {
       BillingAuditRepository,
       BillingAuditService,
       PromoCodeService,
+      DownGradeTeamRepository,
+      DownGradeUserRepository,
+      DownGradeWorkspaceRepository,
+      DownGradeService,
+      ExcelEmailService,
       PricingService,
       PaymentEmailService,
       PaymentEmailHelper,

src/modules/billing/controllers/stripe.controller.ts

@@ -49,6 +49,7 @@ import { SalesEmailRepository } from "@src/modules/workspace/repositories/sales-
 import { ConfigService } from "@nestjs/config";
 import { TrialType } from "@src/modules/common/enum/trial.enum";
 import { PricingPlan } from "@src/modules/common/models/pricing.model";
+import { DownGradeService } from "../services/downgrade.service";
 
 // Dynamically import Stripe services
 let StripeService: any;
@@ -72,6 +73,7 @@ export class StripeController {
     private readonly pricingService: PricingService,
     private readonly configService: ConfigService,
     private readonly salesEmailRepository: SalesEmailRepository,
+    private readonly downgradeService: DownGradeService,
   ) {
     this.isStripeAvailable = !!this.stripeService;
 
@@ -295,10 +297,10 @@ export class StripeController {
         for (const planBilling of currentPlan.billing) {
           if (planBilling.providers?.stripe === createSubscriptionDto.priceId) {
             selectedPlan = currentPlan;
-            break; 
+            break;
           }
         }
-        if (selectedPlan) break; 
+        if (selectedPlan) break;
       }
       if (selectedPlan) {
         // Replace or set planName
@@ -423,6 +425,13 @@ export class StripeController {
         updateSubscriptionDto.seats,
         updateSubscriptionDto.paymentBehavior,
       );
+      if (subscription && updateSubscriptionDto?.workspaces) {
+        await this.downgradeService.addDowgradeDetails(
+          updateSubscriptionDto?.metadata?.hubId,
+          updateSubscriptionDto?.workspaces,
+          updateSubscriptionDto?.users,
+        );
+      }
 
       return subscription;
     } catch (error) {
@@ -459,12 +468,17 @@ export class StripeController {
   ): Promise<SubscriptionResponseDto> {
     try {
       this.checkStripeAvailability();
-
       const subscription = await this.stripeService.cancelSubscription(
         subscriptionId,
         false, //disables cancellation at mid cycle
       );
-
+      if (subscription) {
+        await this.downgradeService.addDowgradeDetails(
+          cancelSubscriptionDto.teamId,
+          cancelSubscriptionDto.workspaces,
+          cancelSubscriptionDto.users,
+        );
+      }
       return { subscription };
     } catch (error) {
       throw new HttpException(
@@ -509,7 +523,11 @@ export class StripeController {
         subscriptionId,
         reactivateDto.metadata,
       );
-
+      if (subscription) {
+        await this.downgradeService.removeDowngradeDetails(
+          reactivateDto.metadata?.hubId,
+        );
+      }
       return { subscription };
     } catch (error) {
       throw new HttpException(

src/modules/billing/helpers/payment-email.helper.ts

@@ -6,6 +6,10 @@ import {
 } from "../services/payment-email.service";
 import { StripeCustomerService } from "../services/stripe-customer.service";
 import { PlanName } from "@src/modules/common/enum/plan.enum";
+import {
+  UserExcelDto,
+  WorkspaceExcelDto,
+} from "../payloads/downgrade-user.payload";
 
 // Dynamically import payment methods service
 let PaymentMethodsService: any;
@@ -187,6 +191,64 @@ export class PaymentEmailHelper {
     }
   }
 
+  /**
+   * Send plan downgraded emails to existing users in Hub.
+   */
+  async sendHubDowngradedEmail(
+    team: any,
+    startDate: Date,
+    previousPlan: string,
+    newPlan: string,
+    sendEmails: string[],
+    workspaces: WorkspaceExcelDto[],
+    users: UserExcelDto[],
+  ): Promise<void> {
+    try {
+      const emailData = await this.buildPlanDowngradeEmailData(
+        team,
+        startDate,
+        previousPlan,
+        newPlan,
+      );
+      if (!emailData) return;
+      const updateEmailData = { ...emailData, sendEmails, workspaces, users };
+      await this.paymentEmailService.sendPaymentEmail(
+        PaymentEmailType.HUB_DOWNGRADED,
+        updateEmailData,
+      );
+    } catch (error) {
+      console.error("Error sending plan downgraded email:", error);
+    }
+  }
+
+  /**
+   * Send plan downgraded emails to Removed users in Hub.
+   */
+  async sendHubDowngradeRemoveUserEmail(
+    team: any,
+    startDate: Date,
+    previousPlan: string,
+    newPlan: string,
+    sendEmails: string[],
+  ): Promise<void> {
+    try {
+      const emailData = await this.buildPlanDowngradeEmailData(
+        team,
+        startDate,
+        previousPlan,
+        newPlan,
+      );
+      if (!emailData) return;
+      const updateEmailData = { ...emailData, sendEmails };
+      await this.paymentEmailService.sendPaymentEmail(
+        PaymentEmailType.HUB_DOWNGRADED_REMOVE_USER,
+        updateEmailData,
+      );
+    } catch (error) {
+      console.error("Error sending plan downgraded email:", error);
+    }
+  }
+
   /**
    * Send upcoming payment email using customer's default payment method email
    */

src/modules/billing/helpers/stripe-webhook.helper.ts

@@ -95,19 +95,20 @@ export class StripeWebhookHelper {
    * Handle subscription updated webhook event
    */
   private async handleSubscriptionUpdated(event: any): Promise<void> {
+    // Check for resubscription (subscription reactivated)
+    const isResubscribed = this.detectResubscription(event);
     // Only handle for specific status changes, like cancellation
     await this.stripeSubscriptionService.handleSubscriptionUpdated(
       event.data.object,
       event.id,
+      isResubscribed
     );
 
     // Get the updated team data
     const teamUpdated = await this.stripeSubscriptionRepo.findTeamById(
       event.data.object.metadata?.hubId,
     );
 
-    // Check for resubscription (subscription reactivated)
-    const isResubscribed = this.detectResubscription(event);
     if (isResubscribed && teamUpdated) {
       // Send resubscription email
       await this.paymentEmailHelper.sendSubscriptionResubscribedEmail(