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

rename core-module environment to twenty-config (#11445)

Browse Source 
closes https://github.com/twentyhq/core-team-issues/issues/759
This commit is contained in:
nitin
2025-04-09 17:41:26 +05:30
committed by GitHub
parent fe6d0241a8
commit bd3ec6d5e3
193 changed files with 1454 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ import { In, Repository } from 'typeorm';
import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
import { EmailService } from 'src/engine/core-modules/email/email.service';
import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserService } from 'src/engine/core-modules/user/services/user.service';
import { UserVarsService } from 'src/engine/core-modules/user/user-vars/services/user-vars.service';
@ -39,7 +39,7 @@ export class CleanerWorkspaceService {
constructor(
private readonly workspaceService: WorkspaceService,
private readonly environmentService: EnvironmentService,
private readonly twentyConfigService: TwentyConfigService,
private readonly userVarsService: UserVarsService,
private readonly userService: UserService,
private readonly emailService: EmailService,
@ -51,18 +51,19 @@ export class CleanerWorkspaceService {
@InjectRepository(UserWorkspace, 'core')
private readonly userWorkspaceRepository: Repository<UserWorkspace>,
) {
this.inactiveDaysBeforeSoftDelete = this.environmentService.get(
this.inactiveDaysBeforeSoftDelete = this.twentyConfigService.get(
'WORKSPACE_INACTIVE_DAYS_BEFORE_SOFT_DELETION',
);
this.inactiveDaysBeforeDelete = this.environmentService.get(
this.inactiveDaysBeforeDelete = this.twentyConfigService.get(
'WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION',
);
this.inactiveDaysBeforeWarn = this.environmentService.get(
this.inactiveDaysBeforeWarn = this.twentyConfigService.get(
'WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION',
);
this.maxNumberOfWorkspacesDeletedPerExecution = this.environmentService.get(
'MAX_NUMBER_OF_WORKSPACES_DELETED_PER_EXECUTION',
);
this.maxNumberOfWorkspacesDeletedPerExecution =
this.twentyConfigService.get(
'MAX_NUMBER_OF_WORKSPACES_DELETED_PER_EXECUTION',
);
}
async computeWorkspaceBillingInactivity(
@ -128,9 +129,9 @@ export class CleanerWorkspaceService {
this.emailService.send({
to: workspaceMember.userEmail,
from: `${this.environmentService.get(
from: `${this.twentyConfigService.get(
'EMAIL_FROM_NAME',
)} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
)} <${this.twentyConfigService.get('EMAIL_FROM_ADDRESS')}>`,
subject: t`Action needed to prevent workspace deletion`,
html,
text,
@ -202,9 +203,9 @@ export class CleanerWorkspaceService {
this.emailService.send({
to: workspaceMember.userEmail,
from: `${this.environmentService.get(
from: `${this.twentyConfigService.get(
'EMAIL_FROM_NAME',
)} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
)} <${this.twentyConfigService.get('EMAIL_FROM_ADDRESS')}>`,
subject: 'Your workspace has been deleted',
html,
text,