chore(web,api): remove redundant code; add/update e2e tests (#6688)

apps/api/src/app/integrations/e2e/update-integration.e2e.ts

@@ -971,8 +971,6 @@ describe('Update Integration - /integrations/:integrationId (PUT)', function ()
       _environmentId: session.environment._id,
     });
 
-    process.env.IS_IMPROVED_BILLING_ENABLED = 'true';
-
     await communityOrganizationRepository.update(
       { _id: session.organization._id },
       { $set: { apiServiceLevel: ApiServiceLevelEnum.BUSINESS } }
@@ -1013,8 +1011,6 @@ describe('Update Integration - /integrations/:integrationId (PUT)', function ()
       _environmentId: session.environment._id,
     });
 
-    process.env.IS_IMPROVED_BILLING_ENABLED = 'true';
-
     await communityOrganizationRepository.update(
       { _id: session.organization._id },
       { $set: { apiServiceLevel: ApiServiceLevelEnum.FREE } }

apps/api/src/app/integrations/usecases/update-integration/update-integration.usecase.ts

@@ -101,21 +101,7 @@ export class UpdateIntegration {
     command: UpdateIntegrationCommand,
     existingIntegration: IntegrationEntity
   ): Promise<boolean> {
-    const [isImprovedBillingEnabled, organization] = await Promise.all([
-      this.getFeatureFlag.execute(
-        GetFeatureFlagCommand.create({
-          userId: 'system',
-          environmentId: 'system',
-          organizationId: command.organizationId,
-          key: FeatureFlagsKeysEnum.IS_IMPROVED_BILLING_ENABLED,
-        })
-      ),
-      this.communityOrganizationRepository.findOne({ _id: command.organizationId }),
-    ]);
-
-    if (!isImprovedBillingEnabled) {
-      return false;
-    }
+    const organization = await this.communityOrganizationRepository.findOne({ _id: command.organizationId });
 
     const isRemoveNovuBrandingDefined = typeof command.removeNovuBranding !== 'undefined';
     const isRemoveNovuBrandingChanged =

apps/api/src/app/testing/billing/create-checkout-session.e2e-ee.ts

@@ -0,0 +1,112 @@
+/* eslint-disable global-require */
+import sinon from 'sinon';
+import { expect } from 'chai';
+// eslint-disable-next-line no-restricted-imports
+import { StripeBillingIntervalEnum } from '@novu/ee-billing/src/stripe/types';
+import { ApiServiceLevelEnum } from '@novu/shared';
+
+const checkoutSessionCreateParamsMock = {
+  mode: 'subscription',
+  customer: 'customer_id',
+  payment_method_types: ['card'],
+  tax_id_collection: {
+    enabled: true,
+  },
+  automatic_tax: {
+    enabled: true,
+  },
+  billing_address_collection: 'auto',
+  customer_update: {
+    name: 'auto',
+    address: 'auto',
+  },
+  success_url: `${process.env.FRONT_BASE_URL}/manage-account/billing?result=success&session_id={CHECKOUT_SESSION_ID}`,
+  cancel_url: `${process.env.FRONT_BASE_URL}/manage-account/billing?result=canceled`,
+};
+
+describe('Create checkout session', async () => {
+  if (!require('@novu/ee-billing').CreateCheckoutSession) {
+    throw new Error("CreateCheckoutSession doesn't exist");
+  }
+
+  const { CreateCheckoutSession } = require('@novu/ee-billing');
+
+  const getOrCreateCustomer = {
+    execute: () => Promise.resolve({ id: 'customer_id' }),
+  };
+  const getPrices = {
+    execute: () =>
+      Promise.resolve({
+        licensed: [{ id: 'licensed_price_id_1' }],
+        metered: [{ id: 'metered_price_id_1' }],
+      }),
+  };
+  const userRepository = {
+    findById: () =>
+      Promise.resolve({
+        _id: 'user_id',
+        email: '[email protected]',
+      }),
+  };
+
+  const stripeStub = {
+    checkout: {
+      sessions: {
+        create: () => {},
+      },
+    },
+  };
+  let checkoutCreateStub: sinon.SinonStub;
+
+  beforeEach(() => {
+    checkoutCreateStub = sinon.stub(stripeStub.checkout.sessions, 'create').resolves({ url: 'url' });
+  });
+
+  afterEach(() => {
+    checkoutCreateStub.reset();
+  });
+
+  it('Create checkout session with 1 subscription containing 1 licensed item and 1 metered item for monthly billing interval', async () => {
+    const usecase = new CreateCheckoutSession(stripeStub, getOrCreateCustomer, userRepository, getPrices);
+
+    const result = await usecase.execute({
+      organizationId: 'organization_id',
+      userId: 'user_id',
+      billingInterval: StripeBillingIntervalEnum.MONTH,
+      apiServiceLevel: ApiServiceLevelEnum.BUSINESS,
+    });
+
+    expect(checkoutCreateStub.lastCall.args.at(0)).to.deep.equal({
+      ...checkoutSessionCreateParamsMock,
+      line_items: [{ price: 'licensed_price_id_1', quantity: 1 }, { price: 'metered_price_id_1' }],
+      metadata: {
+        apiServiceLevel: ApiServiceLevelEnum.BUSINESS,
+        billingInterval: StripeBillingIntervalEnum.MONTH,
+      },
+    });
+
+    expect(result).to.deep.equal({ stripeCheckoutUrl: 'url' });
+  });
+
+  it('Create checkout session with 1 subscription containing 1 licensed item for annual billing interval', async () => {
+    const usecase = new CreateCheckoutSession(stripeStub, getOrCreateCustomer, userRepository, getPrices);
+
+    const result = await usecase.execute({
+      organizationId: 'organization_id',
+      userId: 'user_id',
+      billingInterval: StripeBillingIntervalEnum.YEAR,
+      apiServiceLevel: ApiServiceLevelEnum.BUSINESS,
+    });
+
+    expect(checkoutCreateStub.lastCall.args.at(0)).to.deep.equal({
+      ...checkoutSessionCreateParamsMock,
+      line_items: [{ price: 'licensed_price_id_1', quantity: 1 }],
+      metadata: {
+        apiServiceLevel: ApiServiceLevelEnum.BUSINESS,
+        billingInterval: StripeBillingIntervalEnum.YEAR,
+      },
+    });
+
+    expect(result).to.deep.equal({ stripeCheckoutUrl: 'url' });
+  });
+});