fix(api): invalidation (#5810)

* fix: invalidation * fix: user id
novuhq · Jun 24, 2024 · 36aa672 · 36aa672
1 parent 67558e8
commit 36aa672
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/apps/api/src/app/inbox/usecases/session/session.usecase.ts b/apps/api/src/app/inbox/usecases/session/session.usecase.ts
@@ -42,7 +42,6 @@ export class Session {
       SelectIntegrationCommand.create({
         environmentId: environment._id,
         organizationId: environment._organizationId,
-        userId: command.subscriberId,
         channelType: ChannelTypeEnum.IN_APP,
         providerId: InAppProviderIdEnum.Novu,
         filterData: {},

diff --git a/apps/api/src/app/integrations/usecases/update-integration/update-integration.usecase.ts b/apps/api/src/app/integrations/usecases/update-integration/update-integration.usecase.ts
@@ -1,12 +1,14 @@
-import { BadRequestException, Injectable, NotFoundException, Inject, Logger, ConflictException } from '@nestjs/common';
+import { BadRequestException, ConflictException, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { IntegrationEntity, IntegrationRepository } from '@novu/dal';
 import {
   AnalyticsService,
-  encryptCredentials,
   buildIntegrationKey,
+  encryptCredentials,
+  GetFeatureFlag,
+  GetFeatureFlagCommand,
   InvalidateCacheService,
 } from '@novu/application-generic';
-import { CHANNELS_WITH_PRIMARY } from '@novu/shared';
+import { CHANNELS_WITH_PRIMARY, FeatureFlagsKeysEnum } from '@novu/shared';
 
 import { UpdateIntegrationCommand } from './update-integration.command';
 import { CheckIntegration } from '../check-integration/check-integration.usecase';
@@ -19,7 +21,8 @@ export class UpdateIntegration {
   constructor(
     private invalidateCache: InvalidateCacheService,
     private integrationRepository: IntegrationRepository,
-    private analyticsService: AnalyticsService
+    private analyticsService: AnalyticsService,
+    private getFeatureFlag: GetFeatureFlag
   ) {}
 
   private async calculatePriorityAndPrimaryForActive({
@@ -123,11 +126,22 @@ export class UpdateIntegration {
       active: command.active,
     });
 
-    await this.invalidateCache.invalidateQuery({
-      key: buildIntegrationKey().invalidate({
-        _organizationId: command.organizationId,
-      }),
-    });
+    const isInvalidationDisabled = await this.getFeatureFlag.execute(
+      GetFeatureFlagCommand.create({
+        userId: command.userId,
+        environmentId: command.environmentId as string,
+        organizationId: command.organizationId,
+        key: FeatureFlagsKeysEnum.IS_INTEGRATION_INVALIDATION_DISABLED,
+      })
+    );
+
+    if (!isInvalidationDisabled) {
+      await this.invalidateCache.invalidateQuery({
+        key: buildIntegrationKey().invalidate({
+          _organizationId: command.organizationId,
+        }),
+      });
+    }
 
     const environmentId = command.environmentId ?? existingIntegration._environmentId;
 

diff --git a/libs/shared/src/types/feature-flags/feature-flags.ts b/libs/shared/src/types/feature-flags/feature-flags.ts
@@ -13,4 +13,5 @@ export enum FeatureFlagsKeysEnum {
   IS_TEAM_MEMBER_INVITE_NUDGE_ENABLED = 'IS_TEAM_MEMBER_INVITE_NUDGE_ENABLED',
   IS_V2_EXPERIENCE_ENABLED = 'IS_V2_EXPERIENCE_ENABLED',
   IS_MIXPANEL_RECORDING_ENABLED = 'IS_MIXPANEL_RECORDING_ENABLED',
+  IS_INTEGRATION_INVALIDATION_DISABLED = 'IS_INTEGRATION_INVALIDATION_DISABLED',
 }
diff --git a/libs/shared/src/types/feature-flags/flags.types.ts b/libs/shared/src/types/feature-flags/flags.types.ts
@@ -1,7 +1,7 @@
 /**
  * The required format for a boolean flag key.
  */
-export type IFlagKey = `IS_${Uppercase<string>}_ENABLED`;
+export type IFlagKey = `IS_${Uppercase<string>}_ENABLED` | `IS_${Uppercase<string>}_DISABLED`;
 
 /**
  * Helper function to test that enum keys and values match correct format.