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

Fix Active Workspaces check (#6084)

Browse Source 
We have recently deprecated our subscriptionStatus on workspace to
replace it by a check on existing subscription (+ freeAccess
featureFlag) but the logic was not properly implemented
This commit is contained in:
Charles Bochet
2024-07-01 16:45:56 +02:00
committed by GitHub
parent bb627a91e2
commit 88915291d9
5 changed files with 87 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts → packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command.ts
View File

@ -2,27 +2,29 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Logger } from '@nestjs/common';
import { Command, CommandRunner, Option } from 'nest-commander';
import { FindOptionsWhere, In, Repository } from 'typeorm';
import { In, Repository } from 'typeorm';
import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { getDryRunLogHeader } from 'src/utils/get-dry-run-log-header';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
import { SubscriptionStatus } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
import { getDryRunLogHeader } from 'src/utils/get-dry-run-log-header';
import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
import { LoadServiceWithWorkspaceContext } from 'src/engine/twenty-orm/context/load-service-with-workspace.context';
type DeleteIncompleteWorkspacesCommandOptions = {
type DeleteWorkspacesCommandOptions = {
dryRun?: boolean;
workspaceIds?: string[];
workspaceIds: string[];
};
@Command({
name: 'workspace:delete-incomplete',
description: 'Delete incomplete workspaces',
name: 'workspace:delete',
description: 'Delete workspace',
})
export class DeleteIncompleteWorkspacesCommand extends CommandRunner {
private readonly logger = new Logger(DeleteIncompleteWorkspacesCommand.name);
export class DeleteWorkspacesCommand extends CommandRunner {
private readonly logger = new Logger(DeleteWorkspacesCommand.name);
constructor(
private readonly workspaceService: WorkspaceService,
private readonly loadServiceWithWorkspaceContext: LoadServiceWithWorkspaceContext,
@InjectRepository(Workspace, 'core')
private readonly workspaceRepository: Repository<Workspace>,
private readonly dataSourceService: DataSourceService,
@ -42,7 +44,7 @@ export class DeleteIncompleteWorkspacesCommand extends CommandRunner {
@Option({
flags: '-w, --workspace-ids [workspace_ids]',
description: 'comma separated workspace ids',
required: false,
required: true,
})
parseWorkspaceIds(value: string): string[] {
return value.split(',');
@ -50,41 +52,43 @@ export class DeleteIncompleteWorkspacesCommand extends CommandRunner {
async run(
_passedParam: string[],
options: DeleteIncompleteWorkspacesCommandOptions,
options: DeleteWorkspacesCommandOptions,
): Promise<void> {
const where: FindOptionsWhere<Workspace> = {
currentBillingSubscription: { status: SubscriptionStatus.Incomplete },
};
const workspaces = await this.workspaceRepository.find({
where: { id: In(options.workspaceIds) },
});
if (options.workspaceIds) {
where.id = In(options.workspaceIds);
}
const incompleteWorkspaces = await this.workspaceRepository.findBy(where);
const dataSources =
await this.dataSourceService.getManyDataSourceMetadata();
const workspaceIdsWithSchema = dataSources.map(
(dataSource) => dataSource.workspaceId,
);
const incompleteWorkspacesToDelete = incompleteWorkspaces.filter(
(incompleteWorkspace) =>
workspaceIdsWithSchema.includes(incompleteWorkspace.id),
const workspacesToDelete = workspaces.filter((Workspace) =>
workspaceIdsWithSchema.includes(Workspace.id),
);
if (incompleteWorkspacesToDelete.length) {
if (workspacesToDelete.length) {
this.logger.log(
`Running Deleting incomplete workspaces on ${incompleteWorkspacesToDelete.length} workspaces`,
`Running Deleting workspaces on ${workspacesToDelete.length} workspaces`,
);
}
for (const incompleteWorkspace of incompleteWorkspacesToDelete) {
for (const workspace of workspacesToDelete) {
this.logger.log(
`${getDryRunLogHeader(options.dryRun)}Deleting workspace ${
incompleteWorkspace.id
} name: '${incompleteWorkspace.displayName}'`,
workspace.id
} name: '${workspace.displayName}'`,
);
const workspaceServiceInstance =
await this.loadServiceWithWorkspaceContext.load(
this.workspaceService,
workspace.id,
);
if (!options.dryRun) {
await this.workspaceService.softDeleteWorkspace(incompleteWorkspace.id);
await workspaceServiceInstance.softDeleteWorkspace(workspace.id);
}
}
}

4
packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module.ts
View File

@ -2,12 +2,12 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
import { DeleteIncompleteWorkspacesCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/delete-incomplete-workspaces.command';
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { CleanInactiveWorkspacesCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/clean-inactive-workspaces.command';
import { StartCleanInactiveWorkspacesCronCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command';
import { StopCleanInactiveWorkspacesCronCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command';
import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
import { DeleteWorkspacesCommand } from 'src/engine/workspace-manager/workspace-cleaner/commands/delete-workspaces.command';
@Module({
imports: [
@ -16,7 +16,7 @@ import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-s
DataSourceModule,
],
providers: [
DeleteIncompleteWorkspacesCommand,
DeleteWorkspacesCommand,
CleanInactiveWorkspacesCommand,
StartCleanInactiveWorkspacesCronCommand,
StopCleanInactiveWorkspacesCronCommand,