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

Fix delete incomplete workspaces (#3893)

Browse Source 
* Fix delete incomplete workspaces

* Add multiple workspace filtering option
This commit is contained in:
martmull 2024-02-09 12:26:10 +01:00 committed by GitHub
parent 7425223f83
commit 9299ad1432
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/twenty-server/src/workspace/workspace-cleaner/commands/delete-incomplete-workspaces.command.ts
View File

@ -2,15 +2,16 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Logger } from '@nestjs/common';
import { Command, CommandRunner, Option } from 'nest-commander';
import { FindOptionsWhere, Repository } from 'typeorm';
import { FindOptionsWhere, In, Repository } from 'typeorm';
import { WorkspaceService } from 'src/core/workspace/services/workspace.service';
import { Workspace } from 'src/core/workspace/workspace.entity';
import { getDryRunLogHeader } from 'src/utils/get-dry-run-log-header';
import { DataSourceService } from 'src/metadata/data-source/data-source.service';
type DeleteIncompleteWorkspacesCommandOptions = {
dryRun?: boolean;
workspaceId?: string;
workspaceIds?: string[];
};
@Command({
@ -23,6 +24,7 @@ export class DeleteIncompleteWorkspacesCommand extends CommandRunner {
private readonly workspaceService: WorkspaceService,
@InjectRepository(Workspace, 'core')
private readonly workspaceRepository: Repository<Workspace>,
private readonly dataSourceService: DataSourceService,
) {
super();
}
@ -37,12 +39,12 @@ export class DeleteIncompleteWorkspacesCommand extends CommandRunner {
}
@Option({
flags: '-w, --workspace-id [workspace_id]',
description: 'workspace id',
flags: '-w, --workspace-ids [workspace_ids]',
description: 'comma separated workspace ids',
required: false,
})
parseWorkspaceId(value: string): string {
return value;
parseWorkspaceIds(value: string): string[] {
return value.split(',');
}
async run(
@ -53,12 +55,28 @@ export class DeleteIncompleteWorkspacesCommand extends CommandRunner {
subscriptionStatus: 'incomplete',
};
if (options.workspaceId) {
where.id = options.workspaceId;
if (options.workspaceIds) {
where.id = In(options.workspaceIds);
}
const incompleteWorkspaces = await this.workspaceRepository.findBy(where);
for (const incompleteWorkspace of incompleteWorkspaces) {
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),
);
if (incompleteWorkspacesToDelete.length) {
this.logger.log(
`Running Deleting incomplete workspaces on ${incompleteWorkspacesToDelete.length} workspaces`,
);
}
for (const incompleteWorkspace of incompleteWorkspacesToDelete) {
this.logger.log(
`${getDryRunLogHeader(options.dryRun)}Deleting workspace ${
incompleteWorkspace.id

7
packages/twenty-server/src/workspace/workspace-cleaner/workspace-cleaner.module.ts
View File

@ -7,9 +7,14 @@ import { Workspace } from 'src/core/workspace/workspace.entity';
import { CleanInactiveWorkspacesCommand } from 'src/workspace/workspace-cleaner/commands/clean-inactive-workspaces.command';
import { StartCleanInactiveWorkspacesCronCommand } from 'src/workspace/workspace-cleaner/commands/start-clean-inactive-workspaces.cron.command';
import { StopCleanInactiveWorkspacesCronCommand } from 'src/workspace/workspace-cleaner/commands/stop-clean-inactive-workspaces.cron.command';
import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
@Module({
imports: [TypeOrmModule.forFeature([Workspace], 'core'), WorkspaceModule],
imports: [
TypeOrmModule.forFeature([Workspace], 'core'),
WorkspaceModule,
DataSourceModule,
],
providers: [
DeleteIncompleteWorkspacesCommand,
CleanInactiveWorkspacesCommand,