build: release v2.38.0

src/modules/billing/services/payment-email.service.ts

@@ -17,6 +17,8 @@ export enum PaymentEmailType {
   SUBSCRIPTION_EXPIRED = "subscription_expired",
   PAYMENT_INFO_UPDATED = "payment_info_updated",
   DOWNGRADED_TO_COMMUNITY = "downgraded_to_community",
+  TRIAL_EXTENDED = "trial_extended",
+  PLAN_ADDED = "plan_added",
 }
 
 export interface PaymentEmailData {
@@ -50,6 +52,10 @@ export interface PaymentEmailData {
   workspaces?: any;
   users?: any;
   sendEmails?: string[];
+  price?: number;
+  features?: string[];
+  upgradeDate?: string;
+  nextBillingDate?: string;
 }
 
 @Injectable()
@@ -108,6 +114,12 @@ export class PaymentEmailService {
         case PaymentEmailType.DOWNGRADED_TO_COMMUNITY:
           await this.sendDowngradedToCommunityEmail(data);
           break;
+        case PaymentEmailType.TRIAL_EXTENDED:
+          await this.sendTrialExtendedEmail(data);
+          break;
+        case PaymentEmailType.PLAN_ADDED:
+          await this.sendPlanAddedEmail(data);
+          break;
         default:
           console.warn(`Unknown payment email type: ${emailType}`);
       }
@@ -634,7 +646,7 @@ export class PaymentEmailService {
     date: Date | number,
     options?: { grace_period?: boolean },
   ): string {
-    let d = typeof date === "number" ? new Date(date * 1000) : new Date(date);
+    const d = typeof date === "number" ? new Date(date * 1000) : new Date(date);
 
     if (options?.grace_period) {
       d.setDate(d.getDate() + 3);
@@ -646,4 +658,52 @@ export class PaymentEmailService {
       day: "numeric",
     });
   }
+
+  private async sendTrialExtendedEmail(data: PaymentEmailData): Promise<void> {
+    const transporter = this.emailService.createTransporter();
+    const emailsToSend = data.sendEmails || [data.ownerEmail];
+
+    for (const email of emailsToSend) {
+      const mailOptions = {
+        from: this.configService.get("app.senderEmail"),
+        to: email,
+        template: "trialExtendedEmail",
+        context: {
+          hubName: data.hubName,
+          planName: data.planName,
+          trialStart: this.formatDate(data.billingPeriodStart),
+          trialEnd: this.formatDate(data.billingPeriodEnd),
+          seats: data.totalSeats,
+        },
+        subject: `Your trial for ${data.hubName} has been extended`,
+      };
+
+      await this.emailService.sendEmail(transporter, mailOptions);
+    }
+  }
+
+  private async sendPlanAddedEmail(data: PaymentEmailData): Promise<void> {
+    const transporter = this.emailService.createTransporter();
+
+    const mailOptions = {
+      from: this.configService.get("app.senderEmail"),
+      to: data.ownerEmail,
+      text: "Plan Updated",
+      template: "planUpgradedEmail",
+      context: {
+        firstName: this.extractFirstName(data.ownerName),
+        hubName: data.hubName,
+        newPlanName: data.planName,
+        features: data.features,
+        price: data.price,
+        interval: data.interval,
+        upgradeDate: data.upgradeDate,
+        nextBillingDate: data.nextBillingDate,
+        sparrowEmail: this.configService.get("support.sparrowEmail"),
+      },
+      subject: `Your hub ${data.hubName} has been upgraded to ${data.planName}`,
+    };
+
+    await this.emailService.sendEmail(transporter, mailOptions);
+  }
 }

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

@@ -514,6 +514,10 @@ export class StripeSubscriptionService {
     const isTrialOngoing =
       trialEndDateStr && new Date(trialEndDateStr).getTime() > Date.now();
 
+    const isTrialExtension =
+      metadata?.trialExtension === "true" ||
+      (team?.billing?.in_trial === true && metadata?.trial_end_date);
+
     // Initialize or update the licenses object based on billing seats
     const currentSeats =
       latestSubscription?.quantity || metadata?.userCount || 1;
@@ -630,10 +634,17 @@ export class StripeSubscriptionService {
 
     // Create billing details object with successful payment status
     const billingDetails = {
-      current_period_start: period.start
-        ? new Date(period.start * 1000)
-        : new Date(),
-      current_period_end: period.end ? new Date(period.end * 1000) : null,
+      current_period_start: isTrialExtension
+        ? team.billing?.current_period_start
+        : period.start
+          ? new Date(period.start * 1000)
+          : new Date(),
+
+      current_period_end: isTrialExtension
+        ? new Date(metadata.trial_end_date)
+        : period.end
+          ? new Date(period.end * 1000)
+          : null,
       amount_billed: amount,
       currency: invoice.currency,
       status: SubscriptionStatus.ACTIVE,
@@ -663,7 +674,21 @@ export class StripeSubscriptionService {
       ),
     };
 
-    await this.updateTeamPlanWithBilling(metadata.hubId, plan, billingDetails);
+    // Get current team plan
+    const existingTeam = await this.stripeSubscriptionRepo.findTeamById(
+      metadata.hubId,
+    );
+
+    // Skip webhook overwrite ONLY if admin changed plan recently
+    if (existingTeam?.billing?.updatedBy === BillingSource.API_CALL) {
+      console.log("Skipping webhook overwrite due to admin plan change");
+    } else {
+      await this.updateTeamPlanWithBilling(
+        metadata.hubId,
+        plan,
+        billingDetails,
+      );
+    }
     if (!isDowngrading) {
       const teamIdObject = new ObjectId(metadata.hubId);
       const updateTeam =

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

@@ -166,6 +166,10 @@ export class User {
   @ValidateNested()
   @Type(() => TourGuideDto)
   tourGuide?: TourGuideDto;
+
+  @IsBoolean()
+  @IsOptional()
+  isWeeklyDigestEnabled?: boolean;
 }
 
 export class UserDto {

src/modules/identity/controllers/user.controller.ts

@@ -10,6 +10,7 @@ import {
   Req,
   Res,
   UseGuards,
+  Query,
 } from "@nestjs/common";
 import {
   ApiBearerAuth,
@@ -614,4 +615,29 @@ export class UserController {
       result,
     );
   }
+
+  @Get("unsubscribe-weekly-digest")
+  @ApiOperation({
+    summary: "Unsubscribe from weekly digest emails",
+  })
+  async unsubscribeWeeklyDigest(
+    @Query("userId") userId: string,
+    @Res() res: FastifyReply,
+  ) {
+    await this.userService.disableWeeklyDigest(userId);
+
+    return res.header("Content-Type", "text/html; charset=utf-8").send(`
+      <div style="
+        font-family: Arial, sans-serif;
+        text-align: center;
+        margin-top: 100px;
+        color: #111827;
+      ">
+        <h2>✅ You have been unsubscribed</h2>
+        <p style="color:#6b7280;">
+          You will no longer receive weekly digest emails.
+        </p>
+      </div>
+    `);
+  }
 }

src/modules/identity/repositories/user.repository.ts

@@ -3,7 +3,11 @@ import { Db, InsertOneResult, ModifyResult, ObjectId, WithId } from "mongodb";
 import { Collections } from "@src/modules/common/enum/database.collection.enum";
 import { createHmac } from "crypto";
 import { RegisterPayload } from "../payloads/register.payload";
-import { UpdateUserDto, UserDto, UserTourGuideDto } from "../payloads/user.payload";
+import {
+  UpdateUserDto,
+  UserDto,
+  UserTourGuideDto,
+} from "../payloads/user.payload";
 import {
   EarlyAccessEmail,
   EmailServiceProvider,
@@ -468,4 +472,85 @@ export class UserRepository {
       return false;
     }
   }
+
+  async getAllUsers(): Promise<WithId<User>[]> {
+    return await this.db
+      .collection<User>(Collections.USER)
+      .find(
+        { isEmailVerified: true }, // only verified users
+        { projection: { password: 0 } },
+      )
+      .toArray();
+  }
+
+  async getUsersForWeeklyDigest(email?: string): Promise<WithId<User>[]> {
+    return await this.db
+      .collection<User>(Collections.USER)
+      .find(
+        {
+          isEmailVerified: true,
+          isWeeklyDigestEnabled: { $ne: false },
+          ...(email ? { email } : {}),
+        },
+        {
+          projection: {
+            email: 1,
+            name: 1,
+            isWeeklyDigestEnabled: 1,
+          },
+        },
+      )
+      .toArray();
+  }
+
+  async disableWeeklyDigest(userId: string) {
+    return this.db
+      .collection(Collections.USER)
+      .updateOne(
+        { _id: new ObjectId(userId) },
+        { $set: { isWeeklyDigestEnabled: false } },
+      );
+  }
+
+  async updateUserByQuery(filter: any, update: any) {
+    return this.db.collection(Collections.USER).updateOne(filter, update);
+  }
+
+  /**
+   * Fetch users for weekly digest in batches using cursor-based pagination.
+   * @param batchSize Number of users to fetch per batch
+   * @param lastCursor The _id of the last user from the previous batch (for cursor-based pagination)
+   * @param qaEmail Optional email for QA testing (to fetch a single user)
+   * @returns Array of users for the current batch
+   */
+  async getUsersBatchForWeeklyDigest(
+    batchSize: number,
+    lastCursor?: ObjectId,
+    qaEmail?: string,
+  ): Promise<WithId<User>[]> {
+    const query: any = {
+      isEmailVerified: true,
+      isWeeklyDigestEnabled: { $ne: false },
+      ...(qaEmail ? { email: qaEmail } : {}),
+    };
+
+    // Cursor-based pagination: fetch users with _id greater than lastCursor
+    if (lastCursor) {
+      query._id = { $gt: lastCursor };
+    }
+
+    return await this.db
+      .collection<User>(Collections.USER)
+      .find(query, {
+        projection: {
+          _id: 1,
+          email: 1,
+          name: 1,
+          isWeeklyDigestEnabled: 1,
+        },
+      })
+      .sort({ _id: 1 })
+      .limit(batchSize)
+      .toArray();
+  }
 }

src/modules/identity/repositories/userInvites.repository.ts

@@ -71,4 +71,65 @@ export class UserInvitesRepository {
       .deleteOne({ email });
     return result;
   }
+
+  async getPendingInvites(start: Date, end: Date, email: string) {
+    return this.db
+      .collection(Collections.USERINVITES)
+      .find({
+        createdAt: { $gte: start, $lte: end },
+        email: email,
+      })
+      .limit(5)
+      .toArray();
+  }
+
+  /**
+   * Get pending invites for a batch of emails using aggregation.
+   * Returns invites grouped by email for efficient batch processing.
+   * @param start Start date range
+   * @param end End date range
+   * @param emails Array of email addresses to fetch pending invites for
+   * @returns Map of email to array of pending action strings
+   */
+  async getPendingInvitesForBatch(
+    start: Date,
+    end: Date,
+    emails: string[],
+  ): Promise<Map<string, string[]>> {
+    const results = await this.db
+      .collection(Collections.USERINVITES)
+      .aggregate([
+        {
+          $match: {
+            createdAt: { $gte: start, $lte: end },
+            email: { $in: emails },
+          },
+        },
+        {
+          $sort: { createdAt: -1 },
+        },
+        {
+          $group: {
+            _id: "$email",
+            invites: { $push: "$email" },
+          },
+        },
+        {
+          $project: {
+            _id: 1,
+            invites: { $slice: ["$invites", 5] },
+          },
+        },
+      ])
+      .toArray();
+
+    const invitesMap = new Map<string, string[]>();
+    for (const result of results) {
+      const pendingActions = (result.invites || []).map(
+        (email: string) => `Invitation sent to ${email}`,
+      );
+      invitesMap.set(result._id, pendingActions);
+    }
+    return invitesMap;
+  }
 }

src/modules/identity/services/user.service.ts

@@ -840,4 +840,11 @@ export class UserService {
     });
     return response;
   }
+
+  async disableWeeklyDigest(userId: string) {
+    return this.userRepository.updateUserByQuery(
+      { _id: new ObjectId(userId) },
+      { $set: { isWeeklyDigestEnabled: false } },
+    );
+  }
 }