Merge pull request #930 from aakashreddy-p/fix/aakash/variable-correction

fix: corrected the variables in it.

Author: aakashreddy-p

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

@@ -161,8 +161,8 @@ export class CreateSubscriptionDto {
     description: "Indicates if the change is an upgrade or downgrade",
     example: true,
   })
+  @IsOptional()
   @IsBoolean()
-  @IsNotEmpty()
   isUpgrade?: boolean;
 }
 

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

@@ -293,7 +293,7 @@ export class StripeSubscriptionRepository {
    */
   async addDowngradeDetails(
     teamId: string,
-    workspaces: Array<{ workspaceId: string; name: string }>,
+    workspaces: Array<{ id: string; name: string }>,
     users: Array<{ id: string; email: string }>,
     downgradeType?: SubscriptionDowngradeType,
   ): Promise<UpdateResult> {
@@ -437,7 +437,7 @@ export class StripeSubscriptionRepository {
    */
   async addUpgradeDetails(
     teamId: string,
-    workspaces: Array<{ workspaceId: string; name: string }>,
+    workspaces: Array<{ id: string; name: string }>,
   ): Promise<void> {
     try {
       if (!teamId) {

src/modules/billing/services/downgrade.service.ts

@@ -111,7 +111,12 @@ export class DownGradeService {
     return response;
   }
 
-  async restrictTeamWorkspace(teamId: string, workspaceIds: string[]) {
+  async restrictTeamWorkspace(teamId: string, workspaceIds: string[] = []) {
+    // If no workspaceIds passed → do nothing
+    if (!workspaceIds || workspaceIds.length === 0) {
+      console.log("No workspaceIds provided. Skipping restriction update.");
+      return;
+    }
     const teamObject = new ObjectId(teamId);
     const teamData =
       await this.downgradeTeamRepository.findTeamByTeamId(teamObject);
@@ -125,14 +130,11 @@ export class DownGradeService {
       }
       return workspace;
     });
-    const teamUpdated = {
-      workspaces: updatedWorkspaces,
-    };
-    const data = await this.downgradeTeamRepository.updateTeamById(
+    const teamUpdated = { workspaces: updatedWorkspaces };
+    return await this.downgradeTeamRepository.updateTeamById(
       teamObject,
       teamUpdated,
     );
-    return data;
   }
 
   /**
@@ -146,7 +148,7 @@ export class DownGradeService {
    */
   async addDowgradeDetails(
     teamId: string,
-    workspaces: Array<{ workspaceId: string; name: string }>,
+    workspaces: Array<{ id: string; name: string }>,
     users: Array<{ id: string; email: string }>,
   ) {
     try {
@@ -184,10 +186,10 @@ export class DownGradeService {
       const teamObject = new ObjectId(teamId);
       let workspacesToUnrestrict: WorkspaceDtoWithRestriction[] = [];
       let updatedWorkspaces: WorkspaceDtoWithRestriction[];
-      if (team.upgrade && team.upgrade.workspaces.length > 0) {
+      if (team?.upgrade && team?.upgrade.workspaces.length > 0) {
         // If the team is on an upgrade plan, unrestrict User select workspaces
         const workspacesToUnrestrictIds = new Set(
-          team.upgrade.workspaces.map((w) => w.workspaceId.toString()),
+          team.upgrade.workspaces.map((w) => w.id.toString()),
         );
 
         updatedWorkspaces = team.workspaces.map((workspace) => {

src/modules/billing/services/stripe-subscription.service.ts

@@ -2151,7 +2151,7 @@ export class StripeSubscriptionService {
       const OwnerEmail = team.users[0].email;
       // Extract workspace IDs from downgrade list (workspaces to keep)
       const downgradeWorkspaceIds =
-        teamDowngradeWorkspaces?.map((ws) => ws.workspaceId) || [];
+        teamDowngradeWorkspaces?.map((ws) => ws.id) || [];
       // Extract user IDs from downgrade list (users to keep)
       const downgradeUserIds = teamDowngradeUsers?.map((user) => user.id) || [];
       const downgradeUserEmails =

src/modules/billing/services/upgrade.service.ts

@@ -19,7 +19,7 @@ export class UpGradeService {
    */
   async addUpgradeDetails(
     teamId: string,
-    workspaces: Array<{ workspaceId: string; name: string }>,
+    workspaces: Array<{ id: string; name: string }>,
   ) {
     try {
       await this.stripeSubscriptionRepository.addUpgradeDetails(

src/modules/common/models/billing.model.ts

@@ -206,7 +206,7 @@ export class UpgradeDetails {
 export class upgradeWorkspace {
   @IsString()
   @IsOptional()
-  workspaceId: string;
+  id: string;
 
   @IsString()
   @IsOptional()
@@ -216,7 +216,7 @@ export class upgradeWorkspace {
 export class downgradeWorkspace {
   @IsString()
   @IsOptional()
-  workspaceId: string;
+  id: string;
 
   @IsString()
   @IsOptional()