Merge branch 'release/2.36.0' into aakash/fix/downgrade-flow-updated

Author: aakashreddy-p

src/modules/billing/billing.module.ts

@@ -27,6 +27,7 @@ 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";
+import { UpGradeService } from "./services/upgrade.service";
 
 // Try to import the Stripe module, but don't crash if it's not available
 let StripeModule: any;
@@ -57,6 +58,7 @@ export class BillingModule {
       DownGradeUserRepository,
       DownGradeWorkspaceRepository,
       DownGradeService,
+      UpGradeService,
       ExcelEmailService,
       BillingAuditService,
       PromoCodeService,
@@ -87,6 +89,7 @@ export class BillingModule {
       DownGradeUserRepository,
       DownGradeWorkspaceRepository,
       DownGradeService,
+      UpGradeService,
       ExcelEmailService,
       PricingService,
       PaymentEmailService,

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

@@ -50,6 +50,7 @@ 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";
+import { UpGradeService } from "../services/upgrade.service";
 
 // Dynamically import Stripe services
 let StripeService: any;
@@ -74,6 +75,7 @@ export class StripeController {
     private readonly configService: ConfigService,
     private readonly salesEmailRepository: SalesEmailRepository,
     private readonly downgradeService: DownGradeService,
+    private readonly upgradeService: UpGradeService,
   ) {
     this.isStripeAvailable = !!this.stripeService;
 
@@ -342,6 +344,15 @@ export class StripeController {
           }
         }
       }
+      if (
+        createSubscriptionDto?.isUpgrade &&
+        createSubscriptionDto?.workspaces
+      ) {
+        await this.upgradeService.addUpgradeDetails(
+          createSubscriptionDto?.metadata?.hubId,
+          createSubscriptionDto?.workspaces,
+        );
+      }
 
       return subscription;
     } catch (error) {
@@ -425,13 +436,27 @@ export class StripeController {
         updateSubscriptionDto.seats,
         updateSubscriptionDto.paymentBehavior,
       );
-      if (subscription && updateSubscriptionDto?.workspaces) {
+      if (
+        subscription &&
+        updateSubscriptionDto?.workspaces &&
+        !updateSubscriptionDto?.isUpgrade
+      ) {
         await this.downgradeService.addDowgradeDetails(
           updateSubscriptionDto?.metadata?.hubId,
           updateSubscriptionDto?.workspaces,
           updateSubscriptionDto?.users,
         );
       }
+      if (
+        subscription &&
+        updateSubscriptionDto?.isUpgrade &&
+        updateSubscriptionDto?.workspaces
+      ) {
+        await this.upgradeService.addUpgradeDetails(
+          updateSubscriptionDto?.metadata?.hubId,
+          updateSubscriptionDto?.workspaces,
+        );
+      }
 
       return subscription;
     } catch (error) {
@@ -776,4 +801,49 @@ export class StripeController {
       );
     }
   }
+
+  @UseGuards(JwtAuthGuard, RolesGuard)
+  @Roles("user", "admin")
+  @Get("/:teamId/shared-workspaces/:selectedPlan")
+  @ApiOperation({
+    summary: "Check and unrestrict workspaces if required",
+    description:
+      "Checks whether workspaces can be unrestricted/restored based on the selected plan for a team.",
+  })
+  @ApiParam({
+    name: "teamId",
+    description: "Team ID",
+    example: "675a84b1bd31d451443ae019",
+  })
+  @ApiParam({
+    name: "selectedPlan",
+    description: "Plan selected for upgrade",
+    example: "professional_monthly",
+  })
+  @ApiResponse({
+    status: 200,
+    description: "unrestricted workspaces returned successfully",
+  })
+  @ApiResponse({ status: 404, description: "Team or data not found" })
+  @ApiResponse({
+    status: 400,
+    description: "Cannot get unrestrict workspaces.",
+  })
+  async getUnRestrictWorkspaces(
+    @Param("teamId") teamId: string,
+    @Param("selectedPlan") selectedPlan: string,
+  ): Promise<any> {
+    try {
+      const response = await this.upgradeService.getWorkspacesRestortable(
+        teamId,
+        selectedPlan,
+      );
+      return response;
+    } catch (error: any) {
+      throw new HttpException(
+        error.message || "Failed to get unrestricted workspaces",
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
 }

src/modules/billing/payloads/stripe.payload.ts

@@ -2,6 +2,7 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import {
   downgradeUser,
   downgradeWorkspace,
+  upgradeWorkspace,
 } from "@src/modules/common/models/billing.model";
 import {
   IsEmail,
@@ -144,6 +145,25 @@ export class CreateSubscriptionDto {
   @IsOptional()
   @IsString()
   promoCodeId?: string;
+
+  @ApiPropertyOptional({
+    description: "List of workspaces to downgrade",
+    example: [
+      { workspaceId: "workspace-id-1", name: "Workspace One" },
+      { workspaceId: "workspace-id-2", name: "Workspace Two" },
+    ],
+  })
+  @IsOptional()
+  @IsArray()
+  workspaces?: upgradeWorkspace[];
+
+  @ApiProperty({
+    description: "Indicates if the change is an upgrade or downgrade",
+    example: true,
+  })
+  @IsOptional()
+  @IsBoolean()
+  isUpgrade?: boolean;
 }
 
 export class SubscriptionResponseDto {
@@ -227,6 +247,14 @@ export class UpdateSubscriptionDto {
   @IsOptional()
   @IsArray()
   users?: downgradeUser[];
+
+  @ApiProperty({
+    description: "Indicates if the change is an upgrade or downgrade",
+    example: true,
+  })
+  @IsOptional()
+  @IsBoolean()
+  isUpgrade?: boolean;
 }
 
 export class CancelSubscriptionDto {

src/modules/billing/repositories/stripe-subscription.repository.ts

@@ -426,4 +426,77 @@ export class StripeSubscriptionRepository {
       throw error;
     }
   }
+
+  /**
+   * Add upgrade details (workspaces) to a team's upgrade record.
+   * Automatically avoids duplicates via MongoDB's $addToSet.$each.
+   *
+   * @param teamId The team to update
+   * @param workspaces Array of workspace objects {id, name}
+   * @returns MongoDB UpdateResult
+   */
+  async addUpgradeDetails(
+    teamId: string,
+    workspaces: Array<{ id: string; name: string }>,
+  ): Promise<void> {
+    try {
+      if (!teamId) {
+        throw new Error("teamId is required to update upgrade details.");
+      }
+      if (!workspaces || workspaces.length === 0) {
+        throw new Error("No workspaces provided to update upgrade details.");
+      }
+      const teamObjectId = new ObjectId(teamId);
+      const updateQuery = {
+        "upgrade.workspaces": { $each: workspaces },
+      };
+      const setQuery = {
+        updatedBy: "system",
+        updatedAt: new Date(),
+      };
+      await this.db.collection(Collections.TEAM).updateOne(
+        { _id: teamObjectId },
+        {
+          $addToSet: updateQuery,
+          $set: setQuery,
+        },
+      );
+    } catch (error) {
+      console.error("Error adding upgrade details:", error);
+      throw error;
+    }
+  }
+
+  /**
+   * Remove upgrade workspace details from a team record.
+   * This function removes the entire upgrade object from the team document.
+   *
+   * @param teamId The team to update
+   * @param workspaceIds Array of workspace IDs to remove
+   * @returns MongoDB UpdateResult
+   */
+  async removeUpgradeDetails(teamId: string): Promise<UpdateResult> {
+    try {
+      if (!teamId) {
+        throw new Error("teamId is required to remove downgrade details.");
+      }
+      const teamObjectId = new ObjectId(teamId);
+      const result = await this.db.collection(Collections.TEAM).updateOne(
+        { _id: teamObjectId },
+        {
+          $unset: {
+            upgrade: "", // Removes the entire upgrade object
+          },
+          $set: {
+            updatedBy: "system",
+            updatedAt: new Date(),
+          },
+        },
+      );
+      return result;
+    } catch (error) {
+      console.error("Error removing upgrade details:", error);
+      throw error;
+    }
+  }
 }