Skip to content

chore: ensure default selected calendars in calendars processor job #26944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThyMinimalDev wants to merge 5 commits into
base: main
Choose a base branch
from
+23 −24
Open

chore: ensure default selected calendars in calendars processor job #26944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5073e35
chore: ensure default selected calendars handleEnsureDefaultCalendars
ThyMinimalDev Jan 16, 2026
2b7b954
fix: bypass cache when ensureDefaultSelectedCalendars is true
devin-ai-integration[bot] Jan 16, 2026
3dc301a
Merge branch 'main' into ensure-default-destination-calendars-api-v2
ThyMinimalDev Jan 16, 2026
bf1c408
Merge branch 'main' into ensure-default-destination-calendars-api-v2
ThyMinimalDev Jan 16, 2026
005e4fc
Merge branch 'main' into ensure-default-destination-calendars-api-v2
ThyMinimalDev Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/api/v2/src/ee/calendars/processors/calendars.processor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { CalendarsService } from "@/ee/calendars/services/calendars.service";
import { Process, Processor } from "@nestjs/bull";
import { Logger } from "@nestjs/common";
import { Job } from "bull";
import { CalendarsService } from "@/ee/calendars/services/calendars.service";

export const DEFAULT_CALENDARS_JOB = "default_calendars_job";
export const CALENDARS_QUEUE = "calendars";
Expand All @@ -20,8 +20,8 @@ export class CalendarsProcessor {
const { userId } = job.data;
try {
// getCalendars calls getConnectedDestinationCalendarsAndEnsureDefaultsInDb from platform libraries
// which gets the calendars from third party providers and ensure default calendars are set in DB
await this.calendarsService.getCalendars(userId);
// which gets the calendars from third party providers and ensure default destination and selected calendars are set in DB
await this.calendarsService.getCalendars(userId, true);
} catch (err) {
this.logger.error(`Failed to load default calendars of user with id: ${userId}`, {
userId,
Expand Down
41 changes: 20 additions & 21 deletions apps/api/v2/src/ee/calendars/services/calendars.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
import { CalendarsCacheService } from "@/ee/calendars/services/calendars-cache.service";
import { AppsRepository } from "@/modules/apps/apps.repository";
import { APPS_TYPE_ID_MAPPING } from "@calcom/platform-constants";
import {
CredentialsRepository,
CredentialsWithUserEmail,
} from "@/modules/credentials/credentials.repository";
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
import { UsersRepository } from "@/modules/users/users.repository";
type EventBusyDate,
getBusyCalendarTimes,
getConnectedDestinationCalendarsAndEnsureDefaultsInDb,
} from "@calcom/platform-libraries";
import type { Calendar } from "@calcom/platform-types";
import type { PrismaClient } from "@calcom/prisma";
import type { Prisma, User } from "@calcom/prisma/client";
import {
Injectable,
InternalServerErrorException,
Expand All @@ -16,16 +15,16 @@ import {
} from "@nestjs/common";
import { DateTime } from "luxon";
import { z } from "zod";

import { APPS_TYPE_ID_MAPPING } from "@calcom/platform-constants";
import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
import { CalendarsCacheService } from "@/ee/calendars/services/calendars-cache.service";
import { AppsRepository } from "@/modules/apps/apps.repository";
import {
getBusyCalendarTimes,
getConnectedDestinationCalendarsAndEnsureDefaultsInDb,
type EventBusyDate,
} from "@calcom/platform-libraries";
import type { Calendar } from "@calcom/platform-types";
import type { PrismaClient } from "@calcom/prisma";
import type { Prisma, User } from "@calcom/prisma/client";
CredentialsRepository,
CredentialsWithUserEmail,
} from "@/modules/credentials/credentials.repository";
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
import { UsersRepository } from "@/modules/users/users.repository";

@Injectable()
export class CalendarsService {
Expand All @@ -52,10 +51,10 @@ export class CalendarsService {
.filter((credential) => !!credential);
}

async getCalendars(userId: number) {
async getCalendars(userId: number, ensureDefaultSelectedCalendars = false) {
const cachedResult = await this.calendarsCacheService.getConnectedAndDestinationCalendarsCache(userId);

if (cachedResult) {
if (cachedResult && !ensureDefaultSelectedCalendars) {
return cachedResult;
}

Expand All @@ -71,7 +70,7 @@ export class CalendarsService {
(calendar) => !calendar.eventTypeId
),
},
onboarding: false,
onboarding: ensureDefaultSelectedCalendars,
eventTypeId: null,
prisma: this.dbWrite.prisma as unknown as PrismaClient,
});
Expand Down
Loading