From 193be72b5563ca8886082cda62154f9fd6d1c825 Mon Sep 17 00:00:00 2001 From: abdou6666 Date: Fri, 7 Feb 2025 15:53:16 +0100 Subject: [PATCH] feat: refactor playload type --- api/src/chat/schemas/types/button.ts | 7 +++++++ api/src/chat/schemas/types/message.ts | 9 +-------- api/src/chat/schemas/types/pattern.ts | 2 +- api/src/chat/schemas/types/quick-reply.ts | 5 +++-- api/src/chat/services/block.service.spec.ts | 3 ++- api/src/extensions/channels/web/base-web-channel.ts | 3 +-- api/src/extensions/channels/web/wrapper.ts | 2 +- api/src/utils/test/mocks/block.ts | 7 ++----- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/api/src/chat/schemas/types/button.ts b/api/src/chat/schemas/types/button.ts index 37bf74ee..56a150c2 100644 --- a/api/src/chat/schemas/types/button.ts +++ b/api/src/chat/schemas/types/button.ts @@ -34,3 +34,10 @@ export type PostBackButton = z.infer; export type WebUrlButton = z.infer; export type Button = z.infer; + +export enum PayloadType { + location = 'location', + attachments = 'attachments', + quick_reply = 'quick_reply', + button = 'button', +} diff --git a/api/src/chat/schemas/types/message.ts b/api/src/chat/schemas/types/message.ts index dedeea83..d86e20cd 100644 --- a/api/src/chat/schemas/types/message.ts +++ b/api/src/chat/schemas/types/message.ts @@ -21,7 +21,7 @@ import { PluginName } from '@/plugins/types'; import { Message } from '../message.schema'; import { attachmentPayloadSchema } from './attachment'; -import { buttonSchema } from './button'; +import { buttonSchema, PayloadType } from './button'; import { contentOptionsSchema } from './options'; import { QuickReplyType, stdQuickReplySchema } from './quick-reply'; @@ -85,13 +85,6 @@ export const fileTypeSchema = z.nativeEnum(FileType); export type FileTypeLiteral = z.infer; -export enum PayloadType { - location = 'location', - attachments = 'attachments', - quick_reply = 'quick_reply', - button = 'button', -} - export const payloadTypeSchema = z.nativeEnum(PayloadType); export type PayloadTypeLiteral = z.infer; diff --git a/api/src/chat/schemas/types/pattern.ts b/api/src/chat/schemas/types/pattern.ts index 7c43cf11..2c4bfc06 100644 --- a/api/src/chat/schemas/types/pattern.ts +++ b/api/src/chat/schemas/types/pattern.ts @@ -8,7 +8,7 @@ import { z } from 'zod'; -import { PayloadType } from './message'; +import { PayloadType } from './button'; export const payloadPatternSchema = z.object({ label: z.string(), diff --git a/api/src/chat/schemas/types/quick-reply.ts b/api/src/chat/schemas/types/quick-reply.ts index 95862874..6ed40bc0 100644 --- a/api/src/chat/schemas/types/quick-reply.ts +++ b/api/src/chat/schemas/types/quick-reply.ts @@ -9,6 +9,7 @@ import { z } from 'zod'; import { attachmentPayloadSchema } from './attachment'; +import { PayloadType } from './button'; export enum QuickReplyType { text = 'text', @@ -24,11 +25,11 @@ export const cordinatesSchema = z.object({ export const payloadSchema = z.discriminatedUnion('type', [ z.object({ - type: z.literal('location'), + type: z.literal(PayloadType.location), coordinates: cordinatesSchema, }), z.object({ - type: z.literal('attachments'), + type: z.literal(PayloadType.attachments), attachment: attachmentPayloadSchema, }), ]); diff --git a/api/src/chat/services/block.service.spec.ts b/api/src/chat/services/block.service.spec.ts index fc489a26..fb4ad88f 100644 --- a/api/src/chat/services/block.service.spec.ts +++ b/api/src/chat/services/block.service.spec.ts @@ -18,6 +18,7 @@ import { subscriberWithLabels, subscriberWithoutLabels, } from '@/channel/lib/__test__/subscriber.mock'; +import { PayloadType } from '@/chat/schemas/types/button'; import { ContentTypeRepository } from '@/cms/repositories/content-type.repository'; import { ContentRepository } from '@/cms/repositories/content.repository'; import { ContentTypeModel } from '@/cms/schemas/content-type.schema'; @@ -64,7 +65,7 @@ import { Category, CategoryModel } from '../schemas/category.schema'; import { LabelModel } from '../schemas/label.schema'; import { FileType } from '../schemas/types/attachment'; import { Context } from '../schemas/types/context'; -import { PayloadType, StdOutgoingListMessage } from '../schemas/types/message'; +import { StdOutgoingListMessage } from '../schemas/types/message'; import { SubscriberContext } from '../schemas/types/subscriberContext'; import { CategoryRepository } from './../repositories/category.repository'; diff --git a/api/src/extensions/channels/web/base-web-channel.ts b/api/src/extensions/channels/web/base-web-channel.ts index a2079181..6d4014b8 100644 --- a/api/src/extensions/channels/web/base-web-channel.ts +++ b/api/src/extensions/channels/web/base-web-channel.ts @@ -29,7 +29,7 @@ import { SubscriberCreateDto } from '@/chat/dto/subscriber.dto'; import { VIEW_MORE_PAYLOAD } from '@/chat/helpers/constants'; import { Subscriber, SubscriberFull } from '@/chat/schemas/subscriber.schema'; import { AttachmentRef } from '@/chat/schemas/types/attachment'; -import { Button, ButtonType } from '@/chat/schemas/types/button'; +import { Button, ButtonType, PayloadType } from '@/chat/schemas/types/button'; import { AnyMessage, ContentElement, @@ -37,7 +37,6 @@ import { IncomingMessageType, OutgoingMessage, OutgoingMessageFormat, - PayloadType, StdEventType, StdOutgoingAttachmentMessage, StdOutgoingButtonsMessage, diff --git a/api/src/extensions/channels/web/wrapper.ts b/api/src/extensions/channels/web/wrapper.ts index decb9301..7d1fd858 100644 --- a/api/src/extensions/channels/web/wrapper.ts +++ b/api/src/extensions/channels/web/wrapper.ts @@ -9,9 +9,9 @@ import { Attachment } from '@/attachment/schemas/attachment.schema'; import EventWrapper from '@/channel/lib/EventWrapper'; import { ChannelName } from '@/channel/types'; +import { PayloadType } from '@/chat/schemas/types/button'; import { IncomingMessageType, - PayloadType, StdEventType, StdIncomingMessage, } from '@/chat/schemas/types/message'; diff --git a/api/src/utils/test/mocks/block.ts b/api/src/utils/test/mocks/block.ts index 7562e327..48dcdd47 100644 --- a/api/src/utils/test/mocks/block.ts +++ b/api/src/utils/test/mocks/block.ts @@ -12,12 +12,9 @@ import { } from '@/channel/lib/__test__/label.mock'; import { BlockFull } from '@/chat/schemas/block.schema'; import { FileType } from '@/chat/schemas/types/attachment'; -import { ButtonType } from '@/chat/schemas/types/button'; +import { ButtonType, PayloadType } from '@/chat/schemas/types/button'; import { CaptureVar } from '@/chat/schemas/types/capture-var'; -import { - OutgoingMessageFormat, - PayloadType, -} from '@/chat/schemas/types/message'; +import { OutgoingMessageFormat } from '@/chat/schemas/types/message'; import { BlockOptions, ContentOptions } from '@/chat/schemas/types/options'; import { Pattern } from '@/chat/schemas/types/pattern'; import { QuickReplyType } from '@/chat/schemas/types/quick-reply';