twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-10-04 12:57:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken sync-metadata (#5154)

Browse Source 
An error has been recently introduced in the sync of fieldMetadata. This
PR fixes it

Additionnally, we are enabling email for trialing and past_due
workspaces. There is an ongoing work to introduce a more robust
activationStatus on workspace.
This commit is contained in:
Charles Bochet 2024-04-24 17:45:17 +02:00 committed by GitHub
parent 5d2d6bae08
commit 07c8779411
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service.ts
View File

@ -140,7 +140,7 @@ export class WorkspaceMetadataUpdaterService {
*/
const updatedFieldMetadataCollection = await this.updateEntities<
FieldMetadataEntity<'default'>
>(manager, FieldMetadataEntity, storage.objectMetadataUpdateCollection, [
>(manager, FieldMetadataEntity, storage.fieldMetadataUpdateCollection, [
'objectMetadataId',
'workspaceId',
]);
@ -241,7 +241,7 @@ export class WorkspaceMetadataUpdaterService {
manager: EntityManager,
entityClass: EntityTarget<Entity>,
updateCollection: Array<
DeepPartial<Omit<Entity, 'fields'>> & { id: string }
DeepPartial<Omit<Entity, 'fields' | 'options'>> & { id: string }
>,
keysToOmit: (keyof Entity)[] = [],
): Promise<{ current: Entity; altered: Entity }[]> {

2
packages/twenty-server/src/modules/calendar/crons/jobs/google-calendar-sync.cron.job.ts
View File

@ -29,7 +29,7 @@ export class GoogleCalendarSyncCronJob implements MessageQueueJob<undefined> {
const workspaceIds = (
await this.workspaceRepository.find({
where: {
subscriptionStatus: 'active',
subscriptionStatus: In(['active', 'trialing', 'past_due']),
},
select: ['id'],
})

2
packages/twenty-server/src/modules/messaging/crons/jobs/gmail-fetch-messages-from-cache.cron.job.ts
View File

@ -30,7 +30,7 @@ export class GmailFetchMessagesFromCacheCronJob
const workspaceIds = (
await this.workspaceRepository.find({
where: {
subscriptionStatus: 'active',
subscriptionStatus: In(['active', 'trialing', 'past_due']),
},
select: ['id'],
})

2
packages/twenty-server/src/modules/messaging/crons/jobs/gmail-partial-sync.cron.job.ts
View File

@ -36,7 +36,7 @@ export class GmailPartialSyncCronJob implements MessageQueueJob<undefined> {
const workspaceIds = (
await this.workspaceRepository.find({
where: {
subscriptionStatus: 'active',
subscriptionStatus: In(['active', 'trialing', 'past_due']),
},
select: ['id'],
})