chore(root): Feature flag clean ups (#7723)

Author: SokratisVidros

.source

@@ -47,47 +47,33 @@ after(async () => {
   }
 });
 
-afterEach(async function () {
-  sinon.restore();
-});
+async function cleanup() {
+  const jobsService = new JobsService();
+  await jobsService.runAllDelayedJobsImmediately();
+  await jobsService.awaitAllJobs();
 
-/*
- * async function cleanup() {
- *   const jobsService = new JobsService();
- *   await jobsService.runAllDelayedJobsImmediately();
- *   await jobsService.awaitAllJobs();
- */
+  await Promise.all([workflowQueue.drain(), standardQueue.drain(), subscriberProcessQueue.drain()]);
 
-//   await Promise.all([workflowQueue.drain(), standardQueue.drain(), subscriberProcessQueue.drain()]);
-
-/*
- *   await jobRepository._model.deleteMany({});
- * }
- */
+  await jobRepository._model.deleteMany({});
+}
 
-/*
- * function timeoutPromise(ms: number) {
- *   // eslint-disable-next-line no-promise-executor-return
- *   return new Promise((resolve) => setTimeout(resolve, ms));
- * }
- */
+function timeoutPromise(ms: number) {
+  // eslint-disable-next-line no-promise-executor-return
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 
-/*
- * afterEach(async function () {
- *   const TIMEOUT = 4500;
- *   sinon.restore();
- */
+afterEach(async function () {
+  const TIMEOUT = 4500;
+  sinon.restore();
 
-/*
- *   try {
- *     await Promise.race([
- *       cleanup(),
- *       timeoutPromise(TIMEOUT).then(() => {
- *         console.warn('Cleanup operation timed out after 5000ms - continuing with tests');
- *       }),
- *     ]);
- *   } catch (error) {
- *     console.error('Error during cleanup:', error);
- *   }
- * });
- */
+  try {
+    await Promise.race([
+      cleanup(),
+      timeoutPromise(TIMEOUT).then(() => {
+        console.warn('Cleanup operation timed out after 5000ms - continuing with tests');
+      }),
+    ]);
+  } catch (error) {
+    console.error('Error during cleanup:', error);
+  }
+});

apps/api/e2e/setup.ts

@@ -57,19 +57,19 @@ describe('Create checkout session #novu-v2', async () => {
     },
   };
   let checkoutCreateStub: sinon.SinonStub;
-  let getFeatureFlagStub: { execute: sinon.SinonStub };
+  let featureFlagsServiceStub: { getFlag: sinon.SinonStub };
   const IS_2025_Q1_TIERING_ENABLED = true;
 
   beforeEach(() => {
     checkoutCreateStub = sinon.stub(stripeStub.checkout.sessions, 'create').resolves({ url: 'url' });
-    getFeatureFlagStub = {
-      execute: sinon.stub().resolves(IS_2025_Q1_TIERING_ENABLED),
+    featureFlagsServiceStub = {
+      getFlag: sinon.stub().resolves(IS_2025_Q1_TIERING_ENABLED),
     };
   });
 
   afterEach(() => {
     checkoutCreateStub.reset();
-    getFeatureFlagStub.execute.reset();
+    featureFlagsServiceStub.getFlag.reset();
   });
 
   it('Create checkout session with 1 subscription containing 1 licensed item and 1 metered item for monthly billing interval', async () => {
@@ -78,7 +78,7 @@ describe('Create checkout session #novu-v2', async () => {
       getOrCreateCustomer,
       userRepository,
       getPrices,
-      getFeatureFlagStub
+      featureFlagsServiceStub
     );
 
     const result = await usecase.execute({
@@ -106,7 +106,7 @@ describe('Create checkout session #novu-v2', async () => {
       getOrCreateCustomer,
       userRepository,
       getPrices,
-      getFeatureFlagStub
+      featureFlagsServiceStub
     );
 
     const result = await usecase.execute({

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

@@ -19,12 +19,12 @@ describe('GetPrices #novu-v2', () => {
     },
   };
   let listPricesStub: sinon.SinonStub;
-  let getFeatureFlagStub: { execute: sinon.SinonStub };
+  let featureFlagsServiceStub: { getFlag: sinon.SinonStub };
   const IS_2025_Q1_TIERING_ENABLED = true;
 
   beforeEach(() => {
-    getFeatureFlagStub = {
-      execute: sinon.stub().resolves(IS_2025_Q1_TIERING_ENABLED),
+    featureFlagsServiceStub = {
+      getFlag: sinon.stub().resolves(IS_2025_Q1_TIERING_ENABLED),
     };
 
     listPricesStub = stripeStub.prices.list;
@@ -38,10 +38,10 @@ describe('GetPrices #novu-v2', () => {
 
   afterEach(() => {
     listPricesStub.reset();
-    getFeatureFlagStub.execute.reset();
+    featureFlagsServiceStub.getFlag.reset();
   });
 
-  const createUseCase = () => new GetPrices(stripeStub, getFeatureFlagStub);
+  const createUseCase = () => new GetPrices(stripeStub, featureFlagsServiceStub);
 
   const freeMeteredPriceLookupKey = IS_2025_Q1_TIERING_ENABLED
     ? ['free_usage_notifications_10k']

apps/api/src/app/billing/e2e/get-prices.e2e-ee.ts

@@ -1,11 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { EnvironmentEntity, IntegrationRepository, OrganizationEntity, UserEntity } from '@novu/dal';
-import {
-  areNovuEmailCredentialsSet,
-  areNovuSmsCredentialsSet,
-  GetFeatureFlagService,
-  GetFeatureFlagCommand,
-} from '@novu/application-generic';
+import { areNovuEmailCredentialsSet, areNovuSmsCredentialsSet, FeatureFlagsService } from '@novu/application-generic';
 
 import {
   ChannelTypeEnum,
@@ -26,7 +21,7 @@ export class CreateNovuIntegrations {
     private createIntegration: CreateIntegration,
     private integrationRepository: IntegrationRepository,
     private setIntegrationAsPrimary: SetIntegrationAsPrimary,
-    private getFeatureFlag: GetFeatureFlagService
+    private featureFlagService: FeatureFlagsService
   ) {}
 
   private async createEmailIntegration(command: CreateNovuIntegrationsCommand) {
@@ -110,14 +105,13 @@ export class CreateNovuIntegrations {
     });
 
     if (inAppIntegrationCount === 0) {
-      const isV2Enabled = await this.getFeatureFlag.getBoolean(
-        GetFeatureFlagCommand.create({
-          user: { _id: command.userId } as UserEntity,
-          environment: { _id: command.environmentId } as EnvironmentEntity,
-          organization: { _id: command.organizationId } as OrganizationEntity,
-          key: FeatureFlagsKeysEnum.IS_V2_ENABLED,
-        })
-      );
+      const isV2Enabled = await this.featureFlagService.getFlag({
+        user: { _id: command.userId } as UserEntity,
+        environment: { _id: command.environmentId } as EnvironmentEntity,
+        organization: { _id: command.organizationId } as OrganizationEntity,
+        key: FeatureFlagsKeysEnum.IS_V2_ENABLED,
+        defaultValue: false,
+      });
 
       const name = isV2Enabled ? 'Novu Inbox' : 'Novu In-App';
       await this.createIntegration.execute(

apps/api/src/app/integrations/usecases/create-novu-integrations/create-novu-integrations.usecase.ts

@@ -4,7 +4,6 @@ import {
   CalculateLimitNovuIntegration,
   ConditionsFilter,
   NormalizeVariables,
-  getFeatureFlagService,
 } from '@novu/application-generic';
 
 import { GetWebhookSupportStatus } from './get-webhook-support-status/get-webhook-support-status.usecase';
@@ -36,5 +35,4 @@ export const USE_CASES = [
   SetIntegrationAsPrimary,
   CreateNovuIntegrations,
   NormalizeVariables,
-  getFeatureFlagService,
 ];

apps/api/src/app/integrations/usecases/index.ts

@@ -9,9 +9,8 @@ import {
   AnalyticsService,
   buildIntegrationKey,
   encryptCredentials,
-  GetFeatureFlagService,
-  GetFeatureFlagCommand,
   InvalidateCacheService,
+  FeatureFlagsService,
 } from '@novu/application-generic';
 import { ApiServiceLevelEnum, CHANNELS_WITH_PRIMARY, FeatureFlagsKeysEnum } from '@novu/shared';
 
@@ -27,7 +26,7 @@ export class UpdateIntegration {
     private invalidateCache: InvalidateCacheService,
     private integrationRepository: IntegrationRepository,
     private analyticsService: AnalyticsService,
-    private getFeatureFlag: GetFeatureFlagService,
+    private featureFlagService: FeatureFlagsService,
     private communityOrganizationRepository: CommunityOrganizationRepository
   ) {}
 
@@ -153,12 +152,11 @@ export class UpdateIntegration {
       active: command.active,
     });
 
-    const isInvalidationDisabled = await this.getFeatureFlag.getBoolean(
-      GetFeatureFlagCommand.create({
-        organization: { _id: command.organizationId } as OrganizationEntity,
-        key: FeatureFlagsKeysEnum.IS_INTEGRATION_INVALIDATION_DISABLED,
-      })
-    );
+    const isInvalidationDisabled = await this.featureFlagService.getFlag({
+      key: FeatureFlagsKeysEnum.IS_INTEGRATION_INVALIDATION_DISABLED,
+      defaultValue: false,
+      organization: { _id: command.organizationId } as OrganizationEntity,
+    });
 
     if (!isInvalidationDisabled) {
       await this.invalidateCache.invalidateQuery({

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

@@ -2,7 +2,7 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 import { MessageEntity, MessageRepository, OrganizationEntity, SubscriberEntity } from '@novu/dal';
 import { ActorTypeEnum, FeatureFlagsKeysEnum } from '@novu/shared';
 
-import { GetFeatureFlagService, GetFeatureFlagCommand } from '@novu/application-generic';
+import { FeatureFlagsService } from '@novu/application-generic';
 import { GetMessagesCommand } from './get-messages.command';
 import { GetSubscriber, GetSubscriberCommand } from '../../../subscribers/usecases/get-subscriber';
 
@@ -11,7 +11,7 @@ export class GetMessages {
   constructor(
     private messageRepository: MessageRepository,
     private getSubscriberUseCase: GetSubscriber,
-    private getFeatureFlag: GetFeatureFlagService
+    private featureFlagService: FeatureFlagsService
   ) {}
 
   async execute(command: GetMessagesCommand) {
@@ -59,12 +59,11 @@ export class GetMessages {
       }
     }
 
-    const isEnabled = await this.getFeatureFlag.getBoolean(
-      GetFeatureFlagCommand.create({
-        key: FeatureFlagsKeysEnum.IS_NEW_MESSAGES_API_RESPONSE_ENABLED,
-        organization: { _id: command.organizationId } as OrganizationEntity,
-      })
-    );
+    const isEnabled = await this.featureFlagService.getFlag({
+      key: FeatureFlagsKeysEnum.IS_NEW_MESSAGES_API_RESPONSE_ENABLED,
+      organization: { _id: command.organizationId } as OrganizationEntity,
+      defaultValue: false,
+    });
 
     if (isEnabled) {
       return {

apps/api/src/app/messages/usecases/get-messages/get-messages.usecase.ts

@@ -10,11 +10,10 @@ import {
 import { CallHandler, ExecutionContext, Injectable, Logger, NestInterceptor } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import {
-  GetFeatureFlagService,
-  GetFeatureFlagCommand,
   Instrument,
   HttpRequestHeaderKeysEnum,
   HttpResponseHeaderKeysEnum,
+  FeatureFlagsService,
 } from '@novu/application-generic';
 import {
   ApiAuthSchemeEnum,
@@ -45,7 +44,7 @@ export class ApiRateLimitInterceptor extends ThrottlerGuard implements NestInter
     @InjectThrottlerStorage() protected readonly storageService: ThrottlerStorage,
     reflector: Reflector,
     private evaluateApiRateLimit: EvaluateApiRateLimit,
-    private getFeatureFlag: GetFeatureFlagService
+    private featureFlagService: FeatureFlagsService
   ) {
     super(options, storageService, reflector);
   }
@@ -73,14 +72,13 @@ export class ApiRateLimitInterceptor extends ThrottlerGuard implements NestInter
     const user = this.getReqUser(context);
     const { organizationId, environmentId, _id } = user;
 
-    const isEnabled = await this.getFeatureFlag.getBoolean(
-      GetFeatureFlagCommand.create({
-        environment: { _id: environmentId } as EnvironmentEntity,
-        organization: { _id: organizationId } as OrganizationEntity,
-        user: { _id } as UserEntity,
-        key: FeatureFlagsKeysEnum.IS_API_RATE_LIMITING_ENABLED,
-      })
-    );
+    const isEnabled = await this.featureFlagService.getFlag({
+      key: FeatureFlagsKeysEnum.IS_API_RATE_LIMITING_ENABLED,
+      defaultValue: false,
+      environment: { _id: environmentId } as EnvironmentEntity,
+      organization: { _id: organizationId } as OrganizationEntity,
+      user: { _id } as UserEntity,
+    });
 
     return !isEnabled;
   }
@@ -128,14 +126,13 @@ export class ApiRateLimitInterceptor extends ThrottlerGuard implements NestInter
      * The purpose of the dry run is to allow us to observe how
      * the rate limiting would behave without actually enforcing it.
      */
-    const isDryRun = await this.getFeatureFlag.getBoolean(
-      GetFeatureFlagCommand.create({
-        environment: { _id: environmentId } as EnvironmentEntity,
-        organization: { _id: organizationId } as OrganizationEntity,
-        user: { _id } as UserEntity,
-        key: FeatureFlagsKeysEnum.IS_API_RATE_LIMITING_DRY_RUN_ENABLED,
-      })
-    );
+    const isDryRun = await this.featureFlagService.getFlag({
+      environment: { _id: environmentId } as EnvironmentEntity,
+      organization: { _id: organizationId } as OrganizationEntity,
+      user: { _id } as UserEntity,
+      key: FeatureFlagsKeysEnum.IS_API_RATE_LIMITING_DRY_RUN_ENABLED,
+      defaultValue: false,
+    });
 
     res.header(HttpResponseHeaderKeysEnum.RATELIMIT_REMAINING, remaining);
     res.header(HttpResponseHeaderKeysEnum.RATELIMIT_LIMIT, limit);

apps/api/src/app/rate-limiting/guards/throttler.guard.ts

@@ -11,13 +11,7 @@ import {
   ServiceUnavailableException,
   UnprocessableEntityException,
 } from '@nestjs/common';
-import {
-  CacheService,
-  GetFeatureFlagService,
-  GetFeatureFlagCommand,
-  HttpResponseHeaderKeysEnum,
-  Instrument,
-} from '@novu/application-generic';
+import { CacheService, HttpResponseHeaderKeysEnum, Instrument, FeatureFlagsService } from '@novu/application-generic';
 import { Observable, of, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { createHash } from 'crypto';
@@ -42,7 +36,7 @@ const ALLOWED_METHODS = ['post', 'patch'];
 export class IdempotencyInterceptor implements NestInterceptor {
   constructor(
     private readonly cacheService: CacheService,
-    private getFeatureFlag: GetFeatureFlagService
+    private featureFlagService: FeatureFlagsService
   ) {}
 
   protected async isEnabled(context: ExecutionContext): Promise<boolean> {
@@ -54,14 +48,13 @@ export class IdempotencyInterceptor implements NestInterceptor {
     const user = this.getReqUser(context);
     const { organizationId, environmentId, _id } = user;
 
-    return await this.getFeatureFlag.getBoolean(
-      GetFeatureFlagCommand.create({
-        key: FeatureFlagsKeysEnum.IS_API_IDEMPOTENCY_ENABLED,
-        environment: { _id: environmentId } as EnvironmentEntity,
-        organization: { _id: organizationId } as OrganizationEntity,
-        user: { _id } as UserEntity,
-      })
-    );
+    return await this.featureFlagService.getFlag({
+      key: FeatureFlagsKeysEnum.IS_API_IDEMPOTENCY_ENABLED,
+      defaultValue: false,
+      environment: { _id: environmentId } as EnvironmentEntity,
+      organization: { _id: organizationId } as OrganizationEntity,
+      user: { _id } as UserEntity,
+    });
   }
 
   @Instrument()