Fix comment

asein-sinch · asein-sinch · commit a9a98809a954 · 2025-12-22T18:00:25.000+01:00
diff --git a/packages/conversation/src/models/v1/channel-specific-message/channel-specific-message.ts b/packages/conversation/src/models/v1/channel-specific-message/channel-specific-message.ts
@@ -1,8 +1,8 @@
 import { WhatsAppFlow } from '../whatsapp-flow';
 import { WhatsAppPaymentOrderDetails } from '../whatsapp-payment-order-details';
 import { WhatsAppPaymentOrderStatus } from '../whatsapp-payment-order-status';
-import { KakaoTalkCommerceMessageContent } from '../kakaotalk-commerce-message-content';
-import { KakaoTalkCarouselCommerceMessageContent } from '../kakaotalk-carousel-commerce-message-content';
+import { KakaoTalkCommerce } from '../kakaotalk-commerce';
+import { KakaoTalkCarouselCommerce } from '../kakaotalk-carousel-commerce';
 
 /**
  * A message containing a channel specific message (not supported by OMNI types).
@@ -37,13 +37,13 @@ export interface WhatsAppPaymentOrderStatusMessage {
 export interface KakaoTalkCommerceMessage {
   /** The type of the channel specific message. */
   message_type: 'COMMERCE';
-  /** @see KakaoTalkCommerceMessageContent */
-  message: KakaoTalkCommerceMessageContent;
+  /** @see KakaoTalkCommerce */
+  message: KakaoTalkCommerce;
 }
 
 export interface KakaoTalkCarouselCommerceMessage {
   /** The type of the channel specific message. */
   message_type: 'CAROUSEL_COMMERCE';
-  /** @see KakaoTalkCarouselCommerceMessageContent */
-  message: KakaoTalkCarouselCommerceMessageContent;
+  /** @see KakaoTalkCarouselCommerce */
+  message: KakaoTalkCarouselCommerce;
 }
diff --git a/packages/conversation/src/models/v1/index.ts b/packages/conversation/src/models/v1/index.ts
@@ -61,11 +61,12 @@ export * from './inject-event-response';
 export * from './inject-message-request';
 export * from './kakaotalk-button';
 export * from './kakaotalk-carousel';
-export * from './kakaotalk-carousel-commerce-message-content';
+export * from './kakaotalk-carousel-commerce';
 export * from './kakaotalk-commerce';
-export * from './kakaotalk-commerce-message-content';
 export * from './kakaotalk-coupon';
 export * from './kakaotalk-image';
+export * from './kakaotalk-message';
+export * from './kakaotalk-pricing';
 export * from './list-apps-response';
 export * from './list-message';
 export * from './list-section';
diff --git a/packages/conversation/src/models/v1/kakaotalk-carousel-commerce-message-content/index.ts b/packages/conversation/src/models/v1/kakaotalk-carousel-commerce-message-content/index.ts
diff --git a/packages/conversation/src/models/v1/kakaotalk-carousel-commerce/index.ts b/packages/conversation/src/models/v1/kakaotalk-carousel-commerce/index.ts
@@ -0,0 +1 @@
+export type { KakaoTalkCarouselCommerce } from './kakaotalk-carousel-commerce';
diff --git a/packages/conversation/src/models/v1/kakaotalk-carousel-commerce/kakaotalk-carousel-commerce.ts b/packages/conversation/src/models/v1/kakaotalk-carousel-commerce/kakaotalk-carousel-commerce.ts
@@ -3,7 +3,7 @@ import { KakaoTalkCarousel } from '../kakaotalk-carousel';
 /**
  * Carousel content
  */
-export interface KakaoTalkCarouselCommerceMessageContent {
+export interface KakaoTalkCarouselCommerce {
   /** Set to `true` if a push alarm should be sent to a device. */
   push_alarm?: boolean;
   /** Set to `true` if a message contains adult content. Set to `false` by default. */
diff --git a/packages/conversation/src/models/v1/kakaotalk-carousel/index.ts b/packages/conversation/src/models/v1/kakaotalk-carousel/index.ts
@@ -1,6 +1,5 @@
 export type {
   KakaoTalkCarousel,
   KakaoTalkCarouselHead,
-  KakaoTalkCarouselList,
   KakaoTalkCarouselTail,
 } from './kakaotalk-carousel';
diff --git a/packages/conversation/src/models/v1/kakaotalk-carousel/kakaotalk-carousel.ts b/packages/conversation/src/models/v1/kakaotalk-carousel/kakaotalk-carousel.ts
@@ -1,7 +1,4 @@
-import { KakaoTalkCommerce } from '../kakaotalk-commerce';
-import { KakaoTalkButton } from '../kakaotalk-button';
-import { KakaoTalkCoupon } from '../kakaotalk-coupon';
-import { KakaoTalkImage } from '../kakaotalk-image';
+import { KakaoTalkMessage } from '../kakaotalk-message';
 
 /**
  * Carousel content
@@ -10,7 +7,7 @@ export interface KakaoTalkCarousel {
   /** Carousel introduction */
   head?: KakaoTalkCarouselHead;
   /** List of carousel cards */
-  list: KakaoTalkCarouselList[];
+  list: KakaoTalkMessage[];
   /** "More" button */
   tail?: KakaoTalkCarouselTail;
 }
@@ -42,16 +39,3 @@ export interface KakaoTalkCarouselTail {
   /** App link opened on an Android device (e.g. `tel://PHONE_NUMBER`) */
   scheme_android?: string;
 }
-
-export interface KakaoTalkCarouselList {
-  /** Additional information */
-  additional_content?: string;
-  /** @see KakaoTalkCommerceImage */
-  image: KakaoTalkImage;
-  /** Product information */
-  commerce?: KakaoTalkCommerce;
-  /** Buttons list */
-  buttons: KakaoTalkButton[];
-  /** Discount coupon */
-  coupon?: KakaoTalkCoupon;
-}
diff --git a/packages/conversation/src/models/v1/kakaotalk-commerce-message-content/index.ts b/packages/conversation/src/models/v1/kakaotalk-commerce-message-content/index.ts
diff --git a/packages/conversation/src/models/v1/kakaotalk-commerce-message-content/kakaotalk-commerce-message-content.ts b/packages/conversation/src/models/v1/kakaotalk-commerce-message-content/kakaotalk-commerce-message-content.ts
diff --git a/packages/conversation/src/models/v1/kakaotalk-commerce/index.ts b/packages/conversation/src/models/v1/kakaotalk-commerce/index.ts
@@ -1,6 +1 @@
-export type {
-  KakaoTalkCommerce,
-  KakaoTalkRegularPriceCommerce,
-  KakaoTalkDiscountFixedCommerce,
-  KakaoTalkDiscountRateCommerce,
-} from './kakaotalk-commerce';
+export type { KakaoTalkCommerce } from './kakaotalk-commerce';
diff --git a/packages/conversation/src/models/v1/kakaotalk-commerce/kakaotalk-commerce.ts b/packages/conversation/src/models/v1/kakaotalk-commerce/kakaotalk-commerce.ts
@@ -1,39 +1,8 @@
-export type KakaoTalkCommerce
-  = KakaoTalkRegularPriceCommerce
-  | KakaoTalkDiscountFixedCommerce
-  | KakaoTalkDiscountRateCommerce;
+import { KakaoTalkMessage } from '../kakaotalk-message';
 
-export interface KakaoTalkRegularPriceCommerce {
-  /** Commerce with regular price */
-  type: 'REGULAR_PRICE_COMMERCE';
-  /** Product title */
-  title: string;
-  /** Regular price of the product */
-  regular_price: number;
-}
-
-export interface KakaoTalkDiscountFixedCommerce {
-  /** Commerce with fixed discount */
-  type: 'FIXED_DISCOUNT_COMMERCE';
-  /** Product title */
-  title: string;
-  /** Regular price of the product */
-  regular_price: number;
-  /** Discounted price of the product */
-  discount_price: number;
-  /** Fixed discount */
-  discount_fixed: number;
-}
-
-export interface KakaoTalkDiscountRateCommerce {
-  /** Commerce with percentage discount */
-  type: 'PERCENTAGE_DISCOUNT_COMMERCE';
-  /** Product title */
-  title: string;
-  /** Regular price of the product */
-  regular_price: number;
-  /** Discounted price of the product */
-  discount_price: number;
-  /** Discount rate (%) */
-  discount_rate: number;
+export interface KakaoTalkCommerce extends KakaoTalkMessage{
+  /** Set to `true` if a push alarm should be sent to a device. */
+  push_alarm?: boolean;
+  /** Set to `true` if a message contains adult content. Set to `false` by default. */
+  adult?: boolean;
 }
diff --git a/packages/conversation/src/models/v1/kakaotalk-message/index.ts b/packages/conversation/src/models/v1/kakaotalk-message/index.ts
@@ -0,0 +1 @@
+export type { KakaoTalkMessage } from './kakaotalk-message';
diff --git a/packages/conversation/src/models/v1/kakaotalk-message/kakaotalk-message.ts b/packages/conversation/src/models/v1/kakaotalk-message/kakaotalk-message.ts
@@ -0,0 +1,17 @@
+import { KakaoTalkImage } from '../kakaotalk-image';
+import { KakaoTalkPricing } from '../kakaotalk-pricing';
+import { KakaoTalkButton } from '../kakaotalk-button';
+import { KakaoTalkCoupon } from '../kakaotalk-coupon';
+
+export interface KakaoTalkMessage {
+  /** Additional information */
+  additional_content?: string;
+  /** @see KakaoTalkCommerceImage */
+  image: KakaoTalkImage;
+  /** Product information */
+  commerce?: KakaoTalkPricing;
+  /** Buttons list */
+  buttons: KakaoTalkButton[];
+  /** Discount coupon */
+  coupon?: KakaoTalkCoupon;
+}
diff --git a/packages/conversation/src/models/v1/kakaotalk-pricing/index.ts b/packages/conversation/src/models/v1/kakaotalk-pricing/index.ts
@@ -0,0 +1,6 @@
+export type {
+  KakaoTalkPricing,
+  KakaoTalkRegularPriceCommerce,
+  KakaoTalkDiscountFixedCommerce,
+  KakaoTalkDiscountRateCommerce,
+} from './kakao-talk-pricing';
diff --git a/packages/conversation/src/models/v1/kakaotalk-pricing/kakao-talk-pricing.ts b/packages/conversation/src/models/v1/kakaotalk-pricing/kakao-talk-pricing.ts
@@ -0,0 +1,39 @@
+export type KakaoTalkPricing
+  = KakaoTalkRegularPriceCommerce
+  | KakaoTalkDiscountFixedCommerce
+  | KakaoTalkDiscountRateCommerce;
+
+export interface KakaoTalkRegularPriceCommerce {
+  /** Commerce with regular price */
+  type: 'REGULAR_PRICE_COMMERCE';
+  /** Product title */
+  title: string;
+  /** Regular price of the product */
+  regular_price: number;
+}
+
+export interface KakaoTalkDiscountFixedCommerce {
+  /** Commerce with fixed discount */
+  type: 'FIXED_DISCOUNT_COMMERCE';
+  /** Product title */
+  title: string;
+  /** Regular price of the product */
+  regular_price: number;
+  /** Discounted price of the product */
+  discount_price: number;
+  /** Fixed discount */
+  discount_fixed: number;
+}
+
+export interface KakaoTalkDiscountRateCommerce {
+  /** Commerce with percentage discount */
+  type: 'PERCENTAGE_DISCOUNT_COMMERCE';
+  /** Product title */
+  title: string;
+  /** Regular price of the product */
+  regular_price: number;
+  /** Discounted price of the product */
+  discount_price: number;
+  /** Discount rate (%) */
+  discount_rate: number;
+}
diff --git a/packages/conversation/tests/models/v1/kakaotalk-carousel-commerce.ts b/packages/conversation/tests/models/v1/kakaotalk-carousel-commerce.ts
@@ -1,8 +1,8 @@
-import { KakaoTalkCarouselCommerceMessageContent } from '../../../src/models';
+import { KakaoTalkCarouselCommerce } from '../../../src/models';
 import { kakaotalkCarousel } from './kakaotalk-carousel';
 
 export const kakaotalkCarouselCommerceMessageContent = {
   push_alarm: false,
   adult: false,
   carousel: kakaotalkCarousel,
-} satisfies KakaoTalkCarouselCommerceMessageContent;
+} satisfies KakaoTalkCarouselCommerce;
diff --git a/packages/conversation/tests/models/v1/kakaotalk-carousel.ts b/packages/conversation/tests/models/v1/kakaotalk-carousel.ts
@@ -1,11 +1,11 @@
 import {
   KakaoTalkCarousel,
   KakaoTalkCarouselHead,
-  KakaoTalkCarouselList,
   KakaoTalkCarouselTail,
+  KakaoTalkMessage,
 } from '../../../src/models';
 import { kakaotalkAppLinkButton, kakaotalkWebLinkButton } from './kakaotalk-button';
-import { kakaoTalkRegularPriceCommerce } from './kakaotalk-commerce';
+import { kakaoTalkRegularPriceCommerce } from './kakaotalk-pricing';
 import { kakaoTalkFixedDiscountCoupon } from './kakaotalk-coupon';
 
 export const kakaoTalkCarouselHead = {
@@ -37,7 +37,7 @@ export const kakaotalkCarouselListItem1 = {
     kakaotalkAppLinkButton,
   ],
   coupon: kakaoTalkFixedDiscountCoupon,
-} satisfies KakaoTalkCarouselList;
+} satisfies KakaoTalkMessage;
 
 export const kakaotalkCarousel = {
   head: kakaoTalkCarouselHead,
diff --git a/packages/conversation/tests/models/v1/kakaotalk-commerce-message-content.ts b/packages/conversation/tests/models/v1/kakaotalk-commerce-message-content.ts
diff --git a/packages/conversation/tests/models/v1/kakaotalk-commerce.ts b/packages/conversation/tests/models/v1/kakaotalk-commerce.ts
@@ -1,27 +1,18 @@
-import {
-  KakaoTalkRegularPriceCommerce,
-  KakaoTalkDiscountFixedCommerce,
-  KakaoTalkDiscountRateCommerce,
-} from '../../../src/models';
+import { KakaoTalkCommerce } from '../../../src/models';
+import { kakaotalkAppLinkButton, kakaotalkWebLinkButton } from './kakaotalk-button';
+import { kakaoTalkDiscountFixedCommerce } from './kakaotalk-pricing';
+import { kakaoTalkDiscountRateCoupon } from './kakaotalk-coupon';
+import { kakaoTalkImage } from './kakaotalk-image';
 
-export const kakaoTalkRegularPriceCommerce = {
-  type: 'REGULAR_PRICE_COMMERCE',
-  title: 'title',
-  regular_price: 1000,
-} satisfies KakaoTalkRegularPriceCommerce;
-
-export const kakaoTalkDiscountFixedCommerce = {
-  type: 'FIXED_DISCOUNT_COMMERCE',
-  title: 'title',
-  regular_price: 1000,
-  discount_price: 500,
-  discount_fixed: 500,
-} satisfies KakaoTalkDiscountFixedCommerce;
-
-export const kakaoTalkDiscountRateCommerce = {
-  type: 'PERCENTAGE_DISCOUNT_COMMERCE',
-  title: 'title',
-  regular_price: 1000,
-  discount_price: 500,
-  discount_rate: 50,
-} satisfies KakaoTalkDiscountRateCommerce;
+export const kakaotalkCommerceMessageContent = {
+  push_alarm: false,
+  adult: false,
+  buttons: [
+    kakaotalkWebLinkButton,
+    kakaotalkAppLinkButton,
+  ],
+  additional_content: 'additional content',
+  image: kakaoTalkImage,
+  commerce: kakaoTalkDiscountFixedCommerce,
+  coupon: kakaoTalkDiscountRateCoupon,
+} satisfies KakaoTalkCommerce;
diff --git a/packages/conversation/tests/models/v1/kakaotalk-pricing.ts b/packages/conversation/tests/models/v1/kakaotalk-pricing.ts
@@ -0,0 +1,27 @@
+import {
+  KakaoTalkRegularPriceCommerce,
+  KakaoTalkDiscountFixedCommerce,
+  KakaoTalkDiscountRateCommerce,
+} from '../../../src/models';
+
+export const kakaoTalkRegularPriceCommerce = {
+  type: 'REGULAR_PRICE_COMMERCE',
+  title: 'title',
+  regular_price: 1000,
+} satisfies KakaoTalkRegularPriceCommerce;
+
+export const kakaoTalkDiscountFixedCommerce = {
+  type: 'FIXED_DISCOUNT_COMMERCE',
+  title: 'title',
+  regular_price: 1000,
+  discount_price: 500,
+  discount_fixed: 500,
+} satisfies KakaoTalkDiscountFixedCommerce;
+
+export const kakaoTalkDiscountRateCommerce = {
+  type: 'PERCENTAGE_DISCOUNT_COMMERCE',
+  title: 'title',
+  regular_price: 1000,
+  discount_price: 500,
+  discount_rate: 50,
+} satisfies KakaoTalkDiscountRateCommerce;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export type { KakaoTalkCarouselCommerce } from './kakaotalk-carousel-commerce';`