The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Only upgrade applications on provisioned workspaces (#24923)
Paul Rastoin2ae69eef9d6a
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.tsindex 253ce27ef73..950f08696ee 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.module.ts@@ -13,6 +13,7 @@ import { ApplicationVersionCheckCronJob } from 'src/engine/core-modules/applicatimport { ApplicationVersionCheckCronCommand } from 'src/engine/core-modules/application/application-upgrade/crons/commands/application-version-check.cron.command';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';+import { WorkspaceVersionModule } from 'src/engine/workspace-manager/workspace-version/workspace-version.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';@Module({@@ -27,6 +28,7 @@ import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permiPermissionsModule,TwentyConfigModule,WorkspaceIteratorModule,+ WorkspaceVersionModule,],providers: [ApplicationUpgradeService,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.tsindex b0a444f448f..82d86e63ecc 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/application-upgrade.service.ts@@ -11,15 +11,16 @@ import {type WorkspaceIteratorReport,} from 'src/database/commands/command-runners/workspace-iterator.service';import { ApplicationInstallService } from 'src/engine/core-modules/application/application-install/application-install.service';-import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import {ApplicationException,ApplicationExceptionCode,} from 'src/engine/core-modules/application/application.exception';import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';+import { WorkspaceVersionService } from 'src/engine/workspace-manager/workspace-version/services/workspace-version.service';const npmPackageMetadataSchema = z.object({version: z.string(),@@ -38,6 +39,7 @@ export class ApplicationUpgradeService {private readonly applicationRegistrationService: ApplicationRegistrationService,private readonly twentyConfigService: TwentyConfigService,private readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly workspaceVersionService: WorkspaceVersionService,) {}async checkForUpdates(@@ -128,6 +130,7 @@ export class ApplicationUpgradeService {appRegistration: ApplicationRegistrationEntity;targetVersion: string | null;applicationsToUpgrade: ApplicationEntity[];+ skippedNonProvisionedWorkspaceIds: string[];}> {const appRegistration = await this.appRegistrationRepository.findOneOrFail({where: { id: applicationRegistrationId },@@ -140,6 +143,7 @@ export class ApplicationUpgradeService {appRegistration,targetVersion: null,applicationsToUpgrade: [],+ skippedNonProvisionedWorkspaceIds: [],};}@@ -153,18 +157,34 @@ export class ApplicationUpgradeService {},});- let applicationsToUpgrade = applications.filter(+ const outdatedApplications = applications.filter((application) => application.version !== targetVersion,);- if (isDefined(workspaceCountLimit)) {- applicationsToUpgrade = applicationsToUpgrade.slice(- 0,- workspaceCountLimit,- );- }+ const provisionedWorkspaceIds = new Set(+ await this.workspaceVersionService.getProvisionedWorkspaceIds(),+ );- return { appRegistration, targetVersion, applicationsToUpgrade };+ const provisionedApplications = outdatedApplications.filter((application) =>+ provisionedWorkspaceIds.has(application.workspaceId),+ );++ const skippedNonProvisionedWorkspaceIds = outdatedApplications+ .filter(+ (application) => !provisionedWorkspaceIds.has(application.workspaceId),+ )+ .map((application) => application.workspaceId);++ const applicationsToUpgrade = isDefined(workspaceCountLimit)+ ? provisionedApplications.slice(0, workspaceCountLimit)+ : provisionedApplications;++ return {+ appRegistration,+ targetVersion,+ applicationsToUpgrade,+ skippedNonProvisionedWorkspaceIds,+ };}async upgradeApplications({diff --git a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/commands/upgrade-application.command.ts b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/commands/upgrade-application.command.tsindex e26bce931b0..e45e921455f 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-upgrade/commands/upgrade-application.command.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-upgrade/commands/upgrade-application.command.ts@@ -116,13 +116,17 @@ export class UpgradeApplicationCommand extends CommandRunner {? Array.from(options.workspaceId): undefined;- const { appRegistration, targetVersion, applicationsToUpgrade } =- await this.applicationUpgradeService.findApplicationsToUpgrade({- applicationRegistrationId: registration.id,- onlyAutoUpgrade: false,- workspaceIds,- workspaceCountLimit: options.workspaceCountLimit,- });+ const {+ appRegistration,+ targetVersion,+ applicationsToUpgrade,+ skippedNonProvisionedWorkspaceIds,+ } = await this.applicationUpgradeService.findApplicationsToUpgrade({+ applicationRegistrationId: registration.id,+ onlyAutoUpgrade: false,+ workspaceIds,+ workspaceCountLimit: options.workspaceCountLimit,+ });if (!isDefined(targetVersion)) {this.logger.warn(@@ -132,6 +136,12 @@ export class UpgradeApplicationCommand extends CommandRunner {return;}+ if (skippedNonProvisionedWorkspaceIds.length > 0) {+ this.logger.warn(+ `Skipping ${skippedNonProvisionedWorkspaceIds.length} non provisioned workspace(s): ${skippedNonProvisionedWorkspaceIds.join(', ')}`,+ );+ }+const impactedWorkspaceIds = applicationsToUpgrade.map((application) => application.workspaceId,);