admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix pg-boss worker not working with dynamic injection (#6119)

Browse Source
This commit is contained in:
Charles Bochet
2024-07-03 19:17:29 +02:00
committed by GitHub
parent c57c5b2554
commit 4c57e838ca
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-server/src/engine/integrations/message-queue/message-queue.explorer.ts
View File

@ -156,7 +156,7 @@ export class MessageQueueExplorer implements OnModuleInit {
}), }),
); );
if (isRequestScoped && job.data) { if (isRequestScoped) {
const contextId = createContextId(); const contextId = createContextId();
if (this.moduleRef.registerRequestByContextId) { if (this.moduleRef.registerRequestByContextId) {
@ -164,7 +164,7 @@ export class MessageQueueExplorer implements OnModuleInit {
{ {
// Add workspaceId to the request object // Add workspaceId to the request object
req: { req: {
workspaceId: job.data.workspaceId, workspaceId: job.data?.workspaceId,
}, },
}, },
contextId, contextId,

4
packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts
View File

@ -1,5 +1,4 @@
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Scope } from '@nestjs/common';
import { Repository, In } from 'typeorm'; import { Repository, In } from 'typeorm';
@ -11,15 +10,14 @@ import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decora
import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service'; import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
import { BillingService } from 'src/engine/core-modules/billing/billing.service'; import { BillingService } from 'src/engine/core-modules/billing/billing.service';
import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager'; import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
import { CalendarChannelWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
import { import {
CalendarEventsImportJobData, CalendarEventsImportJobData,
CalendarEventsImportJob, CalendarEventsImportJob,
} from 'src/modules/calendar/calendar-event-import-manager/jobs/calendar-events-import.job'; } from 'src/modules/calendar/calendar-event-import-manager/jobs/calendar-events-import.job';
import { CalendarChannelWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
@Processor({ @Processor({
queueName: MessageQueue.cronQueue, queueName: MessageQueue.cronQueue,
scope: Scope.REQUEST,
}) })
export class CalendarEventsImportCronJob { export class CalendarEventsImportCronJob {
constructor( constructor(