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

clean code and normalize billing eventNames (#9928)

Browse Source 
Solves :
https://github.com/twentyhq/private-issues/issues/251

**TLDR:**

Clean Billing Code using feedback of the previous PR (#9865). Normalized
the metadata and names of the products, prices, and meters in Stripe so
that they can be accessed in stripe's test mode and live mode.

**In order to test:**

1. Have the environment variable IS_BILLING_ENABLED set to true and add
the other required environment variables for Billing to work
2. Do a database reset (to ensure that the new feature flag is properly
added and that the billing tables are created)
3. Run the command: npx nx run twenty-server:command
billing:sync-plans-data (if you don't do that the products and prices
will not be present in the database)
4. Run the server , the frontend, the worker, and the stripe listen
command (stripe listen --forward-to
http://localhost:3000/billing/webhooks)
5. Buy a subscription for the Acme workspace
6. Create a workflow and run it
7. After the run has been finished check in sprite the quantity of
events in the CreditMeter, you should see that there is a new occurence
with value one.
This commit is contained in:
Ana Sofia Marin Alexandre
2025-01-30 13:39:02 -03:00
committed by GitHub
parent 625466f38d
commit d777f62651
8 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts
View File

@ -1,6 +1,6 @@
import { Injectable, Logger } from '@nestjs/common';
import { BILLING_EXECUTE_BILLED_FUNCTION } from 'src/engine/core-modules/billing/constants/billing-execute-billed-function.constant';
import { BILLING_FEATURE_USED } from 'src/engine/core-modules/billing/constants/billing-feature-used.constant';
import { BillingMeterEventName } from 'src/engine/core-modules/billing/enums/billing-meter-event-names';
import { BillingUsageEvent } from 'src/engine/core-modules/billing/types/billing-usage-event.type';
import { ScopedWorkspaceContextFactory } from 'src/engine/twenty-orm/factories/scoped-workspace-context.factory';
@ -74,7 +74,7 @@ export class WorkflowExecutorWorkspaceService {
(result.result ? undefined : 'Execution result error, no data or error');
if (!error) {
this.sendUsageEvent();
this.sendWorkflowNodeRunEvent();
}
const updatedStepOutput = {
@ -136,12 +136,12 @@ export class WorkflowExecutorWorkspaceService {
return { ...updatedOutput, status: WorkflowRunStatus.FAILED };
}
async sendUsageEvent() {
private sendWorkflowNodeRunEvent() {
const workspaceId =
this.scopedWorkspaceContextFactory.create().workspaceId ?? '';
this.workspaceEventEmitter.emitCustomBatchEvent<BillingUsageEvent>(
BILLING_EXECUTE_BILLED_FUNCTION,
BILLING_FEATURE_USED,
[
{
eventName: BillingMeterEventName.WORKFLOW_NODE_RUN,

6
packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service.ts
View File

@ -27,10 +27,10 @@ export class WorkflowRunnerWorkspaceService {
payload: object,
source: ActorMetadata,
) {
const canExecuteBilledFunction =
await this.billingUsageService.canExecuteBilledFunction(workspaceId);
const canFeatureBeUsed =
await this.billingUsageService.canFeatureBeUsed(workspaceId);
if (!canExecuteBilledFunction) {
if (!canFeatureBeUsed) {
this.logger.log(
'Cannot execute billed function, there is no subscription for this workspace',
);