feat: add messages new api res (#5285)

* feat: add messages new api * fix: spell * fix: controller
novuhq · Mar 9, 2024 · d198dd7 · d198dd7
1 parent 06bc9e2
commit d198dd7
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 5 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -562,7 +562,19 @@
     "spyon",
     "restapi",
     "ringcentral",
-    "reshard"
+    "reshard",
+    "userid",
+    "endgroup",
+    "aliyun",
+    "azcopy",
+    "cpack",
+    "pulumi",
+    "hostedtoolcache",
+    "pyroscope",
+    "HEAY",
+    "Pyroscope",
+    "PYROSCOPE",
+    "usecases"
   ],
   "flagWords": [],
   "patterns": [

diff --git a/apps/api/src/app/messages/usecases/get-messages/get-messages.usecase.ts b/apps/api/src/app/messages/usecases/get-messages/get-messages.usecase.ts
@@ -1,13 +1,18 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { MessageEntity, MessageRepository, SubscriberEntity } from '@novu/dal';
-import { ActorTypeEnum } from '@novu/shared';
+import { ActorTypeEnum, FeatureFlagsKeysEnum } from '@novu/shared';
 
 import { GetMessagesCommand } from './get-messages.command';
 import { GetSubscriber, GetSubscriberCommand } from '../../../subscribers/usecases/get-subscriber';
+import { GetFeatureFlag, GetFeatureFlagCommand } from '@novu/application-generic';
 
 @Injectable()
 export class GetMessages {
-  constructor(private messageRepository: MessageRepository, private getSubscriberUseCase: GetSubscriber) {}
+  constructor(
+    private messageRepository: MessageRepository,
+    private getSubscriberUseCase: GetSubscriber,
+    private getFeatureFlag: GetFeatureFlag
+  ) {}
 
   async execute(command: GetMessagesCommand) {
     const LIMIT = command.limit;
@@ -53,6 +58,24 @@ export class GetMessages {
       }
     }
 
+    const isEnabled = await this.getFeatureFlag.execute(
+      GetFeatureFlagCommand.create({
+        key: FeatureFlagsKeysEnum.IS_NEW_MESSAGES_API_RESPONSE_ENABLED,
+        organizationId: command.organizationId,
+        userId: 'api',
+        environmentId: command.environmentId,
+      })
+    );
+
+    if (isEnabled) {
+      return {
+        hasMore: data?.length === command.limit,
+        page: command.page,
+        pageSize: LIMIT,
+        data,
+      };
+    }
+
     const totalCount = await this.messageRepository.count(query);
 
     const hasMore = this.getHasMore(command.page, LIMIT, data.length, totalCount);

diff --git a/apps/api/src/app/widgets/dtos/message-response.dto.ts b/apps/api/src/app/widgets/dtos/message-response.dto.ts
@@ -201,8 +201,8 @@ export class MessageResponseDto {
 }
 
 export class MessagesResponseDto {
-  @ApiProperty()
-  totalCount: number;
+  @ApiPropertyOptional()
+  totalCount?: number;
 
   @ApiProperty()
   hasMore: boolean;

diff --git a/libs/shared/src/types/feature-flags/feature-flags.ts b/libs/shared/src/types/feature-flags/feature-flags.ts
@@ -9,4 +9,5 @@ export enum FeatureFlagsKeysEnum {
   IS_API_EXECUTION_LOG_QUEUE_ENABLED = 'IS_API_EXECUTION_LOG_QUEUE_ENABLED',
   IS_BILLING_ENABLED = 'IS_BILLING_ENABLED',
   IS_IMPROVED_ONBOARDING_ENABLED = 'IS_IMPROVED_ONBOARDING_ENABLED',
+  IS_NEW_MESSAGES_API_RESPONSE_ENABLED = 'IS_NEW_MESSAGES_API_RESPONSE_ENABLED',
 }