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

fix no billing subscription error (#11257)

Browse Source 
closes https://github.com/twentyhq/core-team-issues/issues/625

Context : 
Soft-deleted workspaces no longer have any subscriptions. Computing
inactivity causes an error.
This commit is contained in:
Etienne
2025-03-28 15:45:13 +01:00
committed by GitHub
parent 3e5a6d0a5e
commit da9e078283
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
View File

@ -319,11 +319,13 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
softDelete,
);
}
this.logger.log(`workspace ${id} user workspaces deleted`);
await this.workspaceCacheStorageService.flush(
workspace.id,
workspace.metadataVersion,
);
this.logger.log(`workspace ${id} cache flushed`);
if (softDelete) {
if (this.billingService.isBillingEnabled()) {
@ -348,6 +350,7 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
await this.customDomainService.deleteCustomHostnameByHostnameSilently(
workspace.customDomain,
);
this.logger.log(`workspace ${id} custom domain deleted`);
}
await this.workspaceRepository.delete(id);

49
packages/twenty-server/src/engine/workspace-manager/workspace-cleaner/services/cleaner.workspace-service.ts
View File

@ -326,32 +326,35 @@ export class CleanerWorkspaceService {
for (const workspace of workspaces) {
try {
const isSoftDeletedWorkspace = isDefined(workspace.deletedAt);
if (isSoftDeletedWorkspace) {
const daysSinceSoftDeleted = workspace.deletedAt
? differenceInDays(new Date(), workspace.deletedAt)
: 0;
if (
daysSinceSoftDeleted >
this.inactiveDaysBeforeDelete -
this.inactiveDaysBeforeSoftDelete &&
deletedWorkspacesCount <
this.maxNumberOfWorkspacesDeletedPerExecution
) {
this.logger.log(
`${dryRun ? 'DRY RUN - ' : ''}Destroying workspace ${workspace.id} ${workspace.displayName}`,
);
if (!dryRun) {
await this.workspaceService.deleteWorkspace(workspace.id);
}
deletedWorkspacesCount++;
}
continue;
}
const workspaceInactivity =
await this.computeWorkspaceBillingInactivity(workspace);
const daysSinceSoftDeleted = workspace.deletedAt
? differenceInDays(new Date(), workspace.deletedAt)
: 0;
if (
daysSinceSoftDeleted >
this.inactiveDaysBeforeDelete - this.inactiveDaysBeforeSoftDelete &&
deletedWorkspacesCount < this.maxNumberOfWorkspacesDeletedPerExecution
) {
this.logger.log(
`${dryRun ? 'DRY RUN - ' : ''}Destroying workspace ${workspace.id} ${workspace.displayName}`,
);
if (!dryRun) {
await this.workspaceService.deleteWorkspace(workspace.id);
}
deletedWorkspacesCount++;
continue;
}
if (
workspaceInactivity > this.inactiveDaysBeforeSoftDelete &&
!isDefined(workspace.deletedAt)
) {
if (workspaceInactivity > this.inactiveDaysBeforeSoftDelete) {
await this.informWorkspaceMembersAndSoftDeleteWorkspace(
workspace,
workspaceInactivity,