Revert "fix(mission): 추천 생성 복귀 흐름 안정화 (#251) (#252)"

This reverts commit dbafc03.

Author: jongse7

apps/native/src/bridge.ts

@@ -37,8 +37,7 @@ const handlers = {
   clearGuestTokens: () => guestAuth.clearGuestTokens(),
   savePendingMissionGeneration: (job) => pendingMissionGeneration.savePendingMissionGeneration(job),
   getPendingMissionGeneration: () => pendingMissionGeneration.getPendingMissionGeneration(),
-  clearPendingMissionGeneration: (jobId) =>
-    pendingMissionGeneration.clearPendingMissionGeneration(jobId),
+  clearPendingMissionGeneration: () => pendingMissionGeneration.clearPendingMissionGeneration(),
   hasStartedMissionCreation: () => missionCreationHistory.hasStartedMissionCreation(),
   getMissionCreationStartDate: () => missionCreationHistory.getMissionCreationStartDate(),
   markMissionCreationStarted: () => missionCreationHistory.markMissionCreationStarted(),

apps/native/src/mission-generation/pending-job.test.ts

@@ -2,18 +2,12 @@ import type { PendingMissionGeneration } from "@repo/bridge/types";
 import * as SecureStore from "expo-secure-store";
 
 const PENDING_MISSION_GENERATION_KEY = "pending_mission_generation";
-let pendingOperation = Promise.resolve();
 
-function serializePendingOperation<T>(operation: () => Promise<T>): Promise<T> {
-  const result = pendingOperation.then(operation, operation);
-  pendingOperation = result.then(
-    () => undefined,
-    () => undefined,
-  );
-  return result;
+export async function savePendingMissionGeneration(job: PendingMissionGeneration): Promise<void> {
+  await SecureStore.setItemAsync(PENDING_MISSION_GENERATION_KEY, JSON.stringify(job));
 }
 
-async function readPendingMissionGeneration(): Promise<PendingMissionGeneration | null> {
+export async function getPendingMissionGeneration(): Promise<PendingMissionGeneration | null> {
   const stored = await SecureStore.getItemAsync(PENDING_MISSION_GENERATION_KEY);
   if (!stored) return null;
   try {
@@ -31,22 +25,6 @@ async function readPendingMissionGeneration(): Promise<PendingMissionGeneration
   }
 }
 
-export function savePendingMissionGeneration(job: PendingMissionGeneration): Promise<void> {
-  return serializePendingOperation(() =>
-    SecureStore.setItemAsync(PENDING_MISSION_GENERATION_KEY, JSON.stringify(job)),
-  );
-}
-
-export function getPendingMissionGeneration(): Promise<PendingMissionGeneration | null> {
-  return serializePendingOperation(readPendingMissionGeneration);
-}
-
-export function clearPendingMissionGeneration(jobId?: string): Promise<void> {
-  return serializePendingOperation(async () => {
-    if (jobId !== undefined) {
-      const pendingJob = await readPendingMissionGeneration();
-      if (pendingJob?.jobId !== jobId) return;
-    }
-    await SecureStore.deleteItemAsync(PENDING_MISSION_GENERATION_KEY);
-  });
+export function clearPendingMissionGeneration(): Promise<void> {
+  return SecureStore.deleteItemAsync(PENDING_MISSION_GENERATION_KEY);
 }

apps/native/src/mission-generation/pending-job.ts

@@ -1,53 +1,20 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import { fireEvent, render, screen, waitFor } from "@/lib/test/react";
-
-const mocks = vi.hoisted(() => ({
-  getPendingMissionGeneration: vi.fn(),
-  isNativeApp: vi.fn(),
-  push: vi.fn(),
-}));
-
-vi.mock("@repo/bridge", () => ({
-  bridge: {
-    clearPendingMissionGeneration: vi.fn(),
-    getPendingMissionGeneration: mocks.getPendingMissionGeneration,
-  },
-  isNativeApp: mocks.isNativeApp,
-}));
-
-vi.mock("next/navigation", () => ({ useRouter: () => ({ push: mocks.push }) }));
-
+import { describe, expect, it, vi } from "vitest";
+import { render, screen } from "@/lib/test/react";
 import { MissionAddMenu } from "./mission-add-menu";
 
 describe("MissionAddMenu", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mocks.isNativeApp.mockReturnValue(true);
-  });
+  it("플로팅 버튼 영역 밖의 미션 카드를 가로채지 않는다", () => {
+    render(<MissionAddMenu isOpen={false} onToggle={vi.fn()} />);
 
-  it("진행 중인 추천 job이 있으면 채팅 화면을 거치지 않고 로딩으로 이동한다", async () => {
-    mocks.getPendingMissionGeneration.mockResolvedValue({
-      createdAt: Date.now(),
-      expiresAt: null,
-      jobId: "job-1",
-    });
-    render(<MissionAddMenu isOpen onToggle={vi.fn()} />);
-
-    fireEvent.click(screen.getByRole("link", { name: "추천받기" }));
-
-    await waitFor(() =>
-      expect(mocks.push).toHaveBeenCalledWith("/mission/new/loading?jobId=job-1"),
-    );
+    const addButton = screen.getByRole("button", { name: "미션 추가 메뉴 열기" });
+    expect(addButton.parentElement).toHaveClass("pointer-events-none");
+    expect(addButton).toHaveClass("pointer-events-auto");
+    expect(document.getElementById("mission-add-menu")).toHaveClass("pointer-events-none");
   });
 
-  it("구 버전 네이티브 브릿지에서는 기존 채팅 화면으로 이동한다", async () => {
-    mocks.getPendingMissionGeneration.mockImplementation(() => {
-      throw new Error("Method is not defined");
-    });
+  it("열린 메뉴의 선택지는 클릭을 받는다", () => {
     render(<MissionAddMenu isOpen onToggle={vi.fn()} />);
 
-    fireEvent.click(screen.getByRole("link", { name: "추천받기" }));
-
-    await waitFor(() => expect(mocks.push).toHaveBeenCalledWith("/mission/new"));
+    expect(document.getElementById("mission-add-menu")).toHaveClass("pointer-events-auto");
   });
 });

apps/web/app/(tabs)/mission/_components/mission-add-menu.test.tsx

@@ -1,9 +1,6 @@
-import { bridge, isNativeApp } from "@repo/bridge";
 import { cn } from "@repo/ui";
 import { Plus } from "lucide-react";
 import Link from "next/link";
-import { useRouter } from "next/navigation";
-import { buildMissionLoadingHref } from "@/app/mission/constants/mission-creation";
 
 interface MissionAddMenuProps {
   isOpen: boolean;
@@ -13,26 +10,6 @@ interface MissionAddMenuProps {
 const MENU_ID = "mission-add-menu";
 
 export function MissionAddMenu({ isOpen, onToggle }: MissionAddMenuProps) {
-  const router = useRouter();
-
-  function handleRecommendationClick(event: React.MouseEvent<HTMLAnchorElement>) {
-    if (!isNativeApp()) return;
-
-    event.preventDefault();
-    void Promise.resolve()
-      .then(() => bridge.getPendingMissionGeneration())
-      .then((job) => {
-        if (job && (!job.expiresAt || Date.parse(job.expiresAt) > Date.now())) {
-          router.push(buildMissionLoadingHref(job.jobId));
-          return;
-        }
-        if (job) void bridge.clearPendingMissionGeneration(job.jobId).catch(() => {});
-        router.push("/mission/new");
-      })
-      // 구 버전 네이티브 앱은 이 브릿지 메서드가 없다. 이 경우에는 기존 생성 화면으로 간다.
-      .catch(() => router.push("/mission/new"));
-  }
-
   return (
     <div className="pointer-events-none fixed inset-x-0 bottom-24 z-10 mx-auto flex w-full max-w-md flex-col items-end gap-3 px-5">
       <div
@@ -49,7 +26,6 @@ export function MissionAddMenu({ isOpen, onToggle }: MissionAddMenuProps) {
         <Link
           className="w-full px-4 py-1 text-left text-body-b1-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
           href="/mission/new"
-          onClick={handleRecommendationClick}
         >
           추천받기
         </Link>

apps/web/app/(tabs)/mission/_components/mission-add-menu.tsx

@@ -46,8 +46,6 @@ vi.mock("@/api/mission", () => ({
   fetchMissions: vi.fn(),
 }));
 
-vi.mock("next/navigation", () => ({ useRouter: () => ({ push: vi.fn() }) }));
-
 vi.mock("@/app/(tabs)/_components/pigbox-progress-gauge", () => ({
   PigboxProgressGauge: ({ playRequest, progress }: { playRequest?: number; progress: number }) => (
     <div data-pigbox-play-request={playRequest} data-pigbox-progress={Math.round(progress)} />

apps/web/app/(tabs)/mission/page.test.tsx

@@ -107,16 +107,11 @@ describe("PendingMissionGenerationRecovery", () => {
     const { client, rerender } = renderRecovery();
 
     await vi.waitFor(() => expect(getPendingMissionGeneration).toHaveBeenCalled());
-    const requestsBeforeReturningToMission = getPendingMissionGeneration.mock.calls.length;
     fetchGenerationJobStatus.mockResolvedValue(SUCCEEDED_JOB);
     pathname.mockReturnValue("/mission");
     rerender(<RecoveryWithClient client={client} />);
 
-    await vi.waitFor(() =>
-      expect(getPendingMissionGeneration.mock.calls.length).toBeGreaterThan(
-        requestsBeforeReturningToMission,
-      ),
-    );
+    await vi.waitFor(() => expect(getPendingMissionGeneration).toHaveBeenCalledTimes(2));
     expect(screen.queryByText("미션이 생성됐어요.")).toBeNull();
   });
 
@@ -150,14 +145,4 @@ describe("PendingMissionGenerationRecovery", () => {
     await vi.waitFor(() => expect(clearPendingMissionGeneration).toHaveBeenCalled());
     expect(replace).not.toHaveBeenCalled();
   });
-
-  it("구 버전 네이티브 브릿지에 복구 메서드가 없어도 전역 오류를 내지 않는다", async () => {
-    getPendingMissionGeneration.mockImplementation(() => {
-      throw new Error("Method is not defined");
-    });
-    renderRecovery();
-
-    await vi.waitFor(() => expect(getPendingMissionGeneration).toHaveBeenCalled());
-    expect(replace).not.toHaveBeenCalled();
-  });
 });

apps/web/app/_components/pending-mission-generation-recovery.test.tsx

@@ -53,32 +53,26 @@ export function PendingMissionGenerationRecovery() {
 
     let cancelled = false;
     const recoverPendingJob = () => {
-      void Promise.resolve()
-        .then(() => bridge.getPendingMissionGeneration())
-        .then((job) => {
-          if (cancelled) return;
-          if (!job) {
-            setPendingJob(undefined);
-            return;
-          }
-          if (job.expiresAt && Date.parse(job.expiresAt) <= Date.now()) {
-            setPendingJob(undefined);
-            void bridge.clearPendingMissionGeneration();
-            return;
-          }
-          if (completedJobId.current === job.jobId) {
-            setPendingJob(undefined);
-            return;
-          }
-          setPendingJob(job);
-          if (pathname === "/mission/new") {
-            router.replace(buildMissionLoadingHref(job.jobId));
-          }
-        })
-        // 웹 배포가 먼저 나간 경우, 구 버전 네이티브에는 해당 브릿지 메서드가 없다.
-        .catch(() => {
-          if (!cancelled) setPendingJob(undefined);
-        });
+      void bridge.getPendingMissionGeneration().then((job) => {
+        if (cancelled) return;
+        if (!job) {
+          setPendingJob(undefined);
+          return;
+        }
+        if (job.expiresAt && Date.parse(job.expiresAt) <= Date.now()) {
+          setPendingJob(undefined);
+          void bridge.clearPendingMissionGeneration();
+          return;
+        }
+        if (completedJobId.current === job.jobId) {
+          setPendingJob(undefined);
+          return;
+        }
+        setPendingJob(job);
+        if (pathname === "/mission/new") {
+          router.replace(buildMissionLoadingHref(job.jobId));
+        }
+      });
     };
 
     recoverPendingJob();

apps/web/app/_components/pending-mission-generation-recovery.tsx

@@ -56,7 +56,7 @@ export function MissionCreationResult({ jobId }: MissionCreationResultProps) {
   const [selectedDraftIds, setSelectedDraftIds] = useState<string[]>([]);
 
   useEffect(() => {
-    void clearPendingMissionGeneration(jobId);
+    void clearPendingMissionGeneration();
   }, [jobId]);
 
   function toggleDraft(id: string, pressed: boolean) {

apps/web/app/mission/_components/mission-creation-result.tsx

@@ -159,11 +159,11 @@ export function MissionCreationChat() {
     setSubmitError(undefined);
     requestJob.mutate(request, {
       onError: () => setSubmitError("미션 생성을 시작하지 못했어요. 잠시 후 다시 시도해 주세요."),
-      onSuccess: (job) => {
+      onSuccess: async (job) => {
         // 생성 이력은 홈 CTA만 바꾸는 부가 상태다. 구 버전 네이티브 브릿지의 응답을
         // 기다리다가 실제 생성 job의 로딩 화면 진입까지 늦추면 안 된다.
         void markMissionCreationStarted();
-        void savePendingMissionGeneration({
+        await savePendingMissionGeneration({
           createdAt: Date.now(),
           expiresAt: job.expiresAt,
           jobId: job.jobId,