From 2f5989e6c30fd873d147814c3254ccd6e9414e2b Mon Sep 17 00:00:00 2001 From: meetul Date: Fri, 13 Feb 2026 16:11:41 +0530 Subject: [PATCH] account for how many instances to generate based on recurrenceRule's specified count --- ...reateRecurringEventInstancesDuringQuery.ts | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/helpers/event/createEventHelpers/createRecurringEventInstancesDuringQuery.ts b/src/helpers/event/createEventHelpers/createRecurringEventInstancesDuringQuery.ts index c88b9deb78..225608165d 100644 --- a/src/helpers/event/createEventHelpers/createRecurringEventInstancesDuringQuery.ts +++ b/src/helpers/event/createEventHelpers/createRecurringEventInstancesDuringQuery.ts @@ -16,8 +16,9 @@ import type { InterfaceGenerateRecurringInstancesData } from "../recurringEventH * @remarks The following steps are followed: * 1. Get the limit date upto which we would want to update the recurrenceRules by generating new instances. * 2. Get a recurrence rules to be used for instance generation during this query. - * 3. For every reurrence rule found, generate new instances after their latestInstanceDates. - * 4. Update the latestInstanceDate for the recurrence rules. + * 3. For every recurrence rule found, get the number of existing instances and how many more to generate. + * 4. For every reurrence rule found, generate new instances after their latestInstanceDates. + * 5. Update the latestInstanceDate for the recurrence rules. */ export const createRecurringEventInstancesDuringQuery = async ( @@ -61,13 +62,28 @@ export const createRecurringEventInstancesDuringQuery = async ( const recurrenceStartDate = addDays(latestInstanceDate, 1); // get the dates for recurrence - const recurringInstanceDates = getRecurringInstanceDates( + let recurringInstanceDates = getRecurringInstanceDates( recurrenceRule.recurrenceRuleString, recurrenceStartDate, recurrenceRule.endDate, calendarDate ); + // find out how many instances following the recurrence rule already exist and how many more to generate + const { count: totalInstancesCount } = recurrenceRule; + if (totalInstancesCount) { + const totalExistingInstances = await Event.countDocuments({ + recurrenceRuleId: recurrenceRule._id, + }); + + const remainingInstances = totalInstancesCount - totalExistingInstances; + + recurringInstanceDates = recurringInstanceDates.slice( + 0, + Math.min(recurringInstanceDates.length, remainingInstances) + ); + } + /* c8 ignore start */ if (session) { // start a transaction