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

[FIX] Omition on previous integ of upgrade command compare version based on integer result (#10864)

Browse Source
This commit is contained in:
Paul Rastoin
2025-03-13 19:12:05 +01:00
committed by GitHub
parent ce42928143
commit dfb00f2b61
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/twenty-server/src/database/commands/command-runners/upgrade.command-runner.ts
View File

@ -13,7 +13,10 @@ import { EnvironmentService } from 'src/engine/core-modules/environment/environm
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager'; import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command'; import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
import { compareVersionMajorAndMinor } from 'src/utils/version/compare-version-minor-and-major'; import {
CompareVersionMajorAndMinorReturnType,
compareVersionMajorAndMinor,
} from 'src/utils/version/compare-version-minor-and-major';
type ValidateWorkspaceVersionEqualsWorkspaceFromVersionOrThrowArgs = { type ValidateWorkspaceVersionEqualsWorkspaceFromVersionOrThrowArgs = {
workspaceId: string; workspaceId: string;
@ -91,7 +94,7 @@ export abstract class UpgradeCommandRunner extends ActiveOrSuspendedWorkspacesMi
private async retrieveWorkspaceVersionAndCompareToWorkspaceFromVersion({ private async retrieveWorkspaceVersionAndCompareToWorkspaceFromVersion({
appVersion, appVersion,
workspaceId, workspaceId,
}: ValidateWorkspaceVersionEqualsWorkspaceFromVersionOrThrowArgs) { }: ValidateWorkspaceVersionEqualsWorkspaceFromVersionOrThrowArgs): Promise<CompareVersionMajorAndMinorReturnType> {
if (!isDefined(appVersion)) { if (!isDefined(appVersion)) {
throw new Error( throw new Error(
'Cannot run upgrade command when APP_VERSION is not defined', 'Cannot run upgrade command when APP_VERSION is not defined',
@ -103,9 +106,8 @@ export abstract class UpgradeCommandRunner extends ActiveOrSuspendedWorkspacesMi
this.logger.warn( this.logger.warn(
'VALIDATE_WORKSPACE_VERSION_FEATURE_FLAG set to true ignoring workspace versions validation step', 'VALIDATE_WORKSPACE_VERSION_FEATURE_FLAG set to true ignoring workspace versions validation step',
); );
const equalVersions = 0;
return equalVersions; return 'equal';
} }
const workspace = await this.workspaceRepository.findOneByOrFail({ const workspace = await this.workspaceRepository.findOneByOrFail({

7
packages/twenty-server/src/utils/version/__tests__/compare-version-minor-and-major.spec.ts
View File

@ -1,11 +1,14 @@
import { EachTestingContext } from 'twenty-shared'; import { EachTestingContext } from 'twenty-shared';
import { compareVersionMajorAndMinor } from 'src/utils/version/compare-version-minor-and-major'; import {
CompareVersionMajorAndMinorReturnType,
compareVersionMajorAndMinor,
} from 'src/utils/version/compare-version-minor-and-major';
type IsSameVersionTestCase = EachTestingContext<{ type IsSameVersionTestCase = EachTestingContext<{
version1: string; version1: string;
version2: string; version2: string;
expected?: ReturnType<typeof compareVersionMajorAndMinor>; expected?: CompareVersionMajorAndMinorReturnType;
expectToThrow?: boolean; expectToThrow?: boolean;
}>; }>;
describe('is-same-major-and-minor-version', () => { describe('is-same-major-and-minor-version', () => {

5
packages/twenty-server/src/utils/version/compare-version-minor-and-major.ts
View File

@ -1,6 +1,9 @@
import * as semver from 'semver'; import * as semver from 'semver';
type CompareVersionMajorAndMinorReturnType = 'lower' | 'equal' | 'higher'; export type CompareVersionMajorAndMinorReturnType =
| 'lower'
| 'equal'
| 'higher';
export function compareVersionMajorAndMinor( export function compareVersionMajorAndMinor(
rawVersion1: string, rawVersion1: string,
rawVersion2: string, rawVersion2: string,