Merge pull request #90 from Palbahngmiyine/dev

fix: Kakao 스키마 타입 정의 수정 (알림톡 템플릿 code nullable, 앱버튼 링크 필수)

Author: Palbahngmiyine

package.json

@@ -1,6 +1,6 @@
 {
   "name": "solapi",
-  "version": "5.5.2",
+  "version": "5.5.3",
   "description": "SOLAPI SDK for Node.js(Server Side Only)",
   "keywords": [
     "solapi",

src/models/base/kakao/kakaoAlimtalkTemplate.ts

@@ -292,7 +292,7 @@ export interface KakaoAlimtalkTemplateInterface {
   /**
    * @description 긴급 검수를 위한 알림토 딜러사 측 템플릿 코드, commentable이 false일 때만 해당 코드가 표시됩니다.
    */
-  code?: string;
+  code?: string | null;
 
   /**
    * @description 카카오 알림톡 템플릿 상태<br><br>
@@ -332,7 +332,7 @@ export class KakaoAlimtalkTemplate implements KakaoAlimtalkTemplateInterface {
   templateId: string;
   commentable?: boolean;
   comments?: Array<KakaoAlimtalkTemplateCommentType>;
-  code?: string;
+  code?: string | null;
   status: KakaoAlimtalkTemplateStatus;
 
   /**

src/models/base/kakao/kakaoButton.ts

@@ -52,8 +52,8 @@ export const kakaoWebButtonSchema = Schema.Struct({
 export const kakaoAppButtonSchema = Schema.Struct({
   buttonName: Schema.String,
   buttonType: Schema.Literal('AL'),
-  linkAnd: Schema.optional(Schema.NullOr(Schema.String)),
-  linkIos: Schema.optional(Schema.NullOr(Schema.String)),
+  linkAnd: Schema.String,
+  linkIos: Schema.String,
 });
 
 export const kakaoDefaultButtonSchema = Schema.Struct({

test/lib/retry-utils.ts

@@ -0,0 +1,82 @@
+/**
+ * 테스트용 재시도 유틸리티
+ * API eventual consistency 문제를 해결하기 위한 재시도 로직 제공
+ */
+
+interface RetryOptions {
+  maxRetries?: number;
+  initialDelayMs?: number;
+  maxDelayMs?: number;
+  backoffMultiplier?: number;
+}
+
+const DEFAULT_OPTIONS: Required<RetryOptions> = {
+  maxRetries: 5,
+  initialDelayMs: 100,
+  maxDelayMs: 2000,
+  backoffMultiplier: 2,
+};
+
+const sleep = (ms: number): Promise<void> =>
+  new Promise(resolve => setTimeout(resolve, ms));
+
+/**
+ * 지수 백오프를 사용한 재시도 함수
+ * @param fn 실행할 비동기 함수
+ * @param options 재시도 옵션
+ * @returns 함수 실행 결과
+ */
+export async function retryWithBackoff<T>(
+  fn: () => Promise<T>,
+  options: RetryOptions = {},
+): Promise<T> {
+  const opts = {...DEFAULT_OPTIONS, ...options};
+  let lastError: Error | undefined;
+  let delay = opts.initialDelayMs;
+
+  for (let attempt = 0; attempt <= opts.maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (error) {
+      lastError = error instanceof Error ? error : new Error(String(error));
+
+      if (attempt < opts.maxRetries) {
+        await sleep(delay);
+        delay = Math.min(delay * opts.backoffMultiplier, opts.maxDelayMs);
+      }
+    }
+  }
+
+  throw lastError;
+}
+
+/**
+ * 특정 조건이 충족될 때까지 재시도
+ * @param fn 실행할 비동기 함수
+ * @param predicate 조건 검사 함수
+ * @param options 재시도 옵션
+ * @returns 조건을 충족한 결과
+ */
+export async function retryUntil<T>(
+  fn: () => Promise<T>,
+  predicate: (result: T) => boolean,
+  options: RetryOptions = {},
+): Promise<T> {
+  const opts = {...DEFAULT_OPTIONS, ...options};
+  let delay = opts.initialDelayMs;
+
+  for (let attempt = 0; attempt <= opts.maxRetries; attempt++) {
+    const result = await fn();
+
+    if (predicate(result)) {
+      return result;
+    }
+
+    if (attempt < opts.maxRetries) {
+      await sleep(delay);
+      delay = Math.min(delay * opts.backoffMultiplier, opts.maxDelayMs);
+    }
+  }
+
+  throw new Error(`Condition not met after ${opts.maxRetries + 1} attempts`);
+}

test/services/messages/groupService.e2e.test.ts

@@ -1,6 +1,7 @@
 import {RequestSendOneMessageSchema} from '@models/requests/messages/sendMessage';
 import {beforeAll, describe, expect, it} from 'vitest';
 import GroupService from '@/services/messages/groupService';
+import {retryWithBackoff} from '../../lib/retry-utils';
 
 describe('GroupService E2E', () => {
   let groupService: GroupService;
@@ -44,17 +45,21 @@ describe('GroupService E2E', () => {
     };
     await groupService.addMessagesToGroup(groupId, message);
 
-    // 3. Get the group info
-    const groupInfo = await groupService.getGroup(groupId);
+    // 3. Get the group info (retry to handle eventual consistency)
+    const groupInfo = await retryWithBackoff(
+      () => groupService.getGroup(groupId),
+      {maxRetries: 5, initialDelayMs: 200},
+    );
     expect(groupInfo.count.total).toBe(1);
 
     // 4. Delete the group
     await groupService.removeGroup(groupId);
 
-    // 5. Verify the group is deleted
-    const removedGroupStatus = await groupService
-      .getGroup(groupId)
-      .then(res => res.status);
-    await expect(removedGroupStatus).toBe('DELETED');
+    // 5. Verify the group is deleted (retry to handle eventual consistency)
+    const removedGroupInfo = await retryWithBackoff(
+      () => groupService.getGroup(groupId),
+      {maxRetries: 5, initialDelayMs: 200},
+    );
+    expect(removedGroupInfo.status).toBe('DELETED');
   });
 });