From 15470712d058c8d01ca7d28787ba02813c4f6776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9E=84=EC=84=B8=EC=9C=A4?= <2ne1jenna@naver.com>
Date: Fri, 20 Feb 2026 11:36:47 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=BA=A0=ED=8E=98=EC=9D=B8=20?=
 =?UTF-8?q?=EC=8B=A0=EA=B7=9C=20=EC=A0=9C=EC=95=88=ED=95=98=EA=B8=B0=20bra?=
 =?UTF-8?q?ndId=20=ED=95=98=EB=93=9C=20=EC=BD=94=EB=94=A9=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/campaign/campaign-content.tsx    | 159 ------------------
 app/routes/business/campaign/route.tsx        |   5 -
 .../campaign-detail/campaign-detail.tsx       |   2 +-
 .../chat/resuggest/resuggest-content.tsx      |  22 ++-
 .../create/create-campaign-content.tsx        |  26 ++-
 .../suggest/matching-suggest-content.tsx      |   2 +-
 6 files changed, 35 insertions(+), 181 deletions(-)
 delete mode 100644 app/routes/business/campaign/campaign-content.tsx
 delete mode 100644 app/routes/business/campaign/route.tsx

diff --git a/app/routes/business/campaign/campaign-content.tsx b/app/routes/business/campaign/campaign-content.tsx
deleted file mode 100644
index 3e87775..0000000
--- a/app/routes/business/campaign/campaign-content.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import { useState } from "react";
-//import { useCreateCampaignMutation } from "../../../hooks/queries/useCampaign";
-
-import RealmatchHeader from "../../../components/layout/RealmatchHeader";
-import CampaignBrandCard from "../components/CampaignBrandCard";
-import CampaignInfoGroup from "../components/CampaignInfoGroup";
-
-import editIcon from "../../../assets/icon-edit.svg";
-import dropdownIcon from "../../../assets/arrow-down.svg";
-import dropupIcon from "../../../assets/arrow-up.svg";
-import arrowRightIcon from "../../../assets/icon/arrow-right.svg";
-import calendarIcon from "../../../assets/icon-calender.svg";
-
-export default function CampaignContent() {
-  const [isContentOpen, setIsContentOpen] = useState(false);
-
-  const [campaignData, setCampaignData] = useState({
-    brandId: 1,
-    campaignId: null,
-    campaignName: "비플레인 클렌징 및 세럼 리뷰 콘텐츠",
-    description: "안녕하세요 크리에이터 비비 입니다! 비플레인의 가치가 제 채널에서 소개하는 뷰티 콘텐츠와 잘 맞닿아 있다고 생각되어 협찬을 제안드립니다.",
-    rewardAmount: 200000,
-    startDate: "2025-01-20",
-    endDate: "2025-01-30",
-    formats: [{ id: "32000000-0000-0000-0000-000000000000" }],
-    categories: [{ id: "31310000-0000-0000-0000-000000000000", customValue: "성분 분석 리뷰" }],
-    tones: [
-      { id: "31360000-0000-0000-0000-000000000000" },
-      { id: "31330000-0000-0000-0000-000000000000" }
-    ],
-    involvements: [{ id: "32320000-0000-0000-0000-000000000000" }],
-    usageRanges: [{ id: "32350000-0000-0000-0000-000000000000" }],
-    productId: 5
-  });
-
-  return (
-    // 전체 컨테이너를 흰색 배경으로 설정
-    <div className="flex flex-col w-full min-h-screen bg-[var(--color-bg-w)] relative">
-      <RealmatchHeader showBack={true} />
-
-      {/* 기타 협의 사항까지만 회색 배경을 씌움 */}
-      <main className="flex flex-col px-4 py-6 gap-6 bg-[var(--color-bluegray-1)]">
-        <CampaignBrandCard />
-
-        <div className="flex flex-col gap-5">
-          {/* 캠페인명 */}
-          <CampaignInfoGroup
-            label="캠페인명"
-            right={<img src={editIcon} alt="edit" className="w-4 h-4 cursor-pointer" />}
-          >
-            <input
-              type="text"
-              value={campaignData.campaignName}
-              onChange={(e) => setCampaignData({ ...campaignData, campaignName: e.target.value })}
-              className="w-full h-[36px] px-4 py-[10px] bg-[var(--color-bg-w)] border border-[var(--color-text-gray5)] rounded-[6px] text-callout1 text-[var(--color-text-gray1)] focus:outline-none focus:border-blue-400 box-border"
-            />
-          </CampaignInfoGroup>
-
-          {/* 캠페인 내용 */}
-          <CampaignInfoGroup
-            label="캠페인 내용"
-            right={
-              <button onClick={() => setIsContentOpen((prev) => !prev)}>
-                <img src={isContentOpen ? dropupIcon : dropdownIcon} alt="toggle" />
-              </button>
-            }
-          >
-            <div className="flex flex-col gap-4">
-              <div className="flex flex-col gap-2">
-                <p className="text-callout1 text-[var(--color-text-gray2)]">설명</p>
-                <textarea
-                  value={campaignData.description}
-                  onChange={(e) => setCampaignData({ ...campaignData, description: e.target.value })}
-                  className="w-full h-[68px] px-[16px] py-[10px] bg-[var(--color-bg-w)] border border-[var(--color-text-gray5)] rounded-[6px] text-callout1 text-[var(--color-text-gray1)] leading-relaxed resize-none focus:outline-none"
-                />
-              </div>
-
-              {isContentOpen && (
-                <div className="grid grid-cols-2 gap-x-[11px] gap-y-4 animate-in fade-in duration-300">
-                  <div className="col-span-2">
-                    <ContentItem label="형식" value="인스타그램 릴스" />
-                  </div>
-                  <ContentItem label="종류" value="겟레디윗미, 스토리" />
-                  <ContentItem label="톤" value="수다적인, 일상적인" />
-                  <ContentItem label="관여도" value="가이드만 제공" />
-                  <ContentItem label="활용 범위" value="크리에이터 1차 활용" />
-                </div>
-              )}
-            </div>
-          </CampaignInfoGroup>
-
-          {/* 협찬품 / 원고료 */}
-          <div className="grid grid-cols-2 gap-4">
-            <CampaignInfoGroup label="협찬품">
-              <div className="w-full h-[36px] px-4 bg-[var(--color-bg-w)] border border-[var(--color-text-gray5)] rounded-[6px] text-callout1 text-[var(--color-text-gray1)] flex justify-between items-center cursor-pointer active:bg-gray-50">
-                <span className="truncate">글로우 크림 1개</span>
-                <img src={arrowRightIcon} alt="arrow" className="w-4 h-4" />
-              </div>
-            </CampaignInfoGroup>
-
-            <CampaignInfoGroup label="원고료">
-              <div className="w-full h-[36px] px-4 bg-[var(--color-bg-w)] border border-[var(--color-text-gray5)] rounded-[6px] text-callout1 text-[var(--color-text-gray1)] flex justify-between items-center">
-                <input
-                  type="number"
-                  value={campaignData.rewardAmount}
-                  onChange={(e) => setCampaignData({ ...campaignData, rewardAmount: Number(e.target.value) })}
-                  className="w-full focus:outline-none bg-transparent"
-                />
-                <span className="shrink-0 ml-1">원</span>
-              </div>
-            </CampaignInfoGroup>
-          </div>
-
-          {/* 제작 기간 */}
-          <CampaignInfoGroup
-            label="제작 기간"
-            right={<img src={calendarIcon} alt="calendar" className="w-4 h-4" />}
-          >
-            <div className="flex items-center gap-2">
-              <div className="flex-1 h-[36px] flex items-center pl-[16px] bg-[var(--color-bg-w)] border border-[var(--color-text-gray5)] rounded-[6px] text-callout1 text-[var(--color-text-gray1)]">
-                {campaignData.startDate}
-              </div>
-              <span className="text-[var(--color-text-gray3)] text-date-separator">~</span>
-              <div className="flex-1 h-[36px] flex items-center pl-[16px] bg-[var(--color-bg-w)] border border-[var(--color-text-gray5)] rounded-[6px] text-callout1 text-[var(--color-text-gray1)]">
-                {campaignData.endDate}
-              </div>
-            </div>
-          </CampaignInfoGroup>
-
-          {/* 기타 협의 사항 */}
-          <CampaignInfoGroup
-            label="기타 협의 사항"
-            right={<img src={editIcon} alt="edit" className="w-4 h-4" />}
-          >
-            <div className="w-full h-[36px] px-4 flex items-center bg-[var(--color-bg-w)] border border-[var(--color-text-gray5)] rounded-[6px]">
-            </div>
-          </CampaignInfoGroup>
-        </div>
-      </main>
-
-      {/* 기타 협의 사항 밑으로 흰색 여백 영역 */}
-      <div className="bg-[var(--color-bg-w)] h-32 w-full" />
-    </div>
-  );
-}
-
-function ContentItem({ label, value }: { label: string; value: string }) {
-  return (
-    <div className="flex flex-col gap-2">
-      <p className="text-callout1 text-[var(--color-text-gray2)]">{label}</p>
-      <div className="w-full h-[34px] flex justify-between items-center bg-[var(--color-bg-w)] border border-[var(--color-text-gray5)] rounded-[6px] cursor-pointer active:bg-gray-50 box-border">
-        <span className="flex-1 truncate pt-[5px] pr-[4px] pb-[5px] pl-[16px] text-callout1 text-[var(--color-text-gray1)]">
-          {value}
-        </span>
-        <img src={arrowRightIcon} alt="arrow" className="w-4 h-4 shrink-0 mr-[12px]" />
-      </div>
-    </div>
-  );
-}
\ No newline at end of file
diff --git a/app/routes/business/campaign/route.tsx b/app/routes/business/campaign/route.tsx
deleted file mode 100644
index f29a7ae..0000000
--- a/app/routes/business/campaign/route.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import CampaignContent from "./campaign-content";
-
-export default function Campaign() {
-  return <CampaignContent />;
-}
diff --git a/app/routes/campaign-detail/campaign-detail.tsx b/app/routes/campaign-detail/campaign-detail.tsx
index 56754f1..040d60e 100644
--- a/app/routes/campaign-detail/campaign-detail.tsx
+++ b/app/routes/campaign-detail/campaign-detail.tsx
@@ -334,7 +334,7 @@ export default function CampaignDetailContent({
 
     if (!campaign) return;
 
-    const brandIdNum = Number(brandData.id);
+    const brandIdNum = Number(searchParams.get("brandId"));
     if (!Number.isFinite(brandIdNum) || brandIdNum < 0) return;
 
     const domainParam = searchParams.get("domain");
diff --git a/app/routes/chat/resuggest/resuggest-content.tsx b/app/routes/chat/resuggest/resuggest-content.tsx
index 1cc8663..21085ef 100644
--- a/app/routes/chat/resuggest/resuggest-content.tsx
+++ b/app/routes/chat/resuggest/resuggest-content.tsx
@@ -127,18 +127,19 @@ export default function ReSuggestContent() {
     const usageScopeOptions = USAGE_RANGE_TAGS.map((t) => ({ value: String(t.id), label: t.name }));
 
     const sponsorProductOptions = useMemo(() => {
-        const baseOptions = proposalData?.product && proposalData.product !== "0"
-            ? [{ value: proposalData.product, label: proposalData.product }]
-            : (proposalData?.products ?? [])
-                .filter((p) => p.id && p.name && String(p.id) !== "0")
-                .map((p) => ({ value: String(p.id), label: p.name }));
+        const baseOptions = (proposalData?.products ?? [])
+            .filter((p) => p.id && p.name && String(p.id) !== "0" && p.name !== "0")
+            .map((p) => ({ value: String(p.id), label: p.name }));
+
+        if (proposalData?.product && proposalData.product !== "0" && !baseOptions.find(opt => opt.label === proposalData.product)) {
+            baseOptions.unshift({ value: proposalData.product, label: proposalData.product });
+        }
 
-        // formValues.sponsorProduct 배열에 있는데 options에 없는 항목들 추가 (0 제외)
         const missingOptions = (formValues.sponsorProduct || [])
             .filter(sp => sp !== "0" && !baseOptions.find(opt => opt.value === sp))
             .map(sp => ({ value: sp, label: sp }));
 
-        return [...missingOptions, ...baseOptions];
+        return [...baseOptions, ...missingOptions];
     }, [proposalData, formValues.sponsorProduct]);
 
     // ID 배열로 label들 찾기 헬퍼 함수
@@ -171,8 +172,13 @@ export default function ReSuggestContent() {
             return;
         }
 
+        if (!proposalData?.brandId) {
+            toast.error("브랜드 정보가 없습니다. 다시 시도해주세요.");
+            return;
+        }
+
         const requestData = {
-            brandId: proposalData?.brandId || 1,
+            brandId: proposalData.brandId,
             creatorId: Number(userId),
             campaignId: proposalData?.campaignId || null,
             campaignName: formData.campaignName || "",
diff --git a/app/routes/matching/suggest/create/create-campaign-content.tsx b/app/routes/matching/suggest/create/create-campaign-content.tsx
index 7ce7452..0807374 100644
--- a/app/routes/matching/suggest/create/create-campaign-content.tsx
+++ b/app/routes/matching/suggest/create/create-campaign-content.tsx
@@ -105,7 +105,6 @@ export default function CreateCampaignContent() {
   }, []);
 
   useEffect(() => {
-    // 신규/기존 모두 폼 초기화 (기존 제안도 빈 폼으로 시작)
     reset(defaultCampaignFormValues);
   }, [type, reset]);
 
@@ -122,13 +121,21 @@ export default function CreateCampaignContent() {
   const usageScopeOptions = toOptions(USAGE_RANGE_TAGS);
 
   const sponsorProductOptions = useMemo(() => {
-    // 사용자가 직접 입력한 협찬품 항목만 표시
-    const customOptions = (formValues.sponsorProduct || [])
-      .filter(sp => sp !== "0")
+    // 이전 페이지에서 받아온 협찬품 목록 표시
+    const baseOptions = (proposalData?.products ?? [])
+      .filter((p) => p.id && p.name && String(p.id) !== "0" && p.name !== "0")
+      .map((p) => ({ value: String(p.id), label: p.name }));
+
+    if (proposalData?.product && proposalData.product !== "0" && !baseOptions.find(opt => opt.label === proposalData.product)) {
+      baseOptions.unshift({ value: proposalData.product, label: proposalData.product });
+    }
+
+    const missingOptions = (formValues.sponsorProduct || [])
+      .filter(sp => sp !== "0" && !baseOptions.find(opt => opt.value === sp))
       .map(sp => ({ value: sp, label: sp }));
 
-    return customOptions;
-  }, [formValues.sponsorProduct]);
+    return [...baseOptions, ...missingOptions];
+  }, [proposalData, formValues.sponsorProduct]);
 
   // ID 배열로 label들 찾기 헬퍼 함수
   const findLabels = (options: { value: string; label: string }[], values?: string[]) => {
@@ -161,7 +168,12 @@ export default function CreateCampaignContent() {
 
     const brandId = brandIdParam
       ? Number(brandIdParam)
-      : proposalData?.brandId || 1;
+      : proposalData?.brandId;
+
+    if (!brandId) {
+      toast.error("브랜드 정보가 없습니다. 다시 시도해주세요.");
+      return;
+    }
 
     const campaignId = type === "existing"
       ? (campaignIdParam ? Number(campaignIdParam) : (proposalData?.campaignId || null))
diff --git a/app/routes/matching/suggest/matching-suggest-content.tsx b/app/routes/matching/suggest/matching-suggest-content.tsx
index 75cce3b..20d11a9 100644
--- a/app/routes/matching/suggest/matching-suggest-content.tsx
+++ b/app/routes/matching/suggest/matching-suggest-content.tsx
@@ -30,7 +30,7 @@ export default function MatchingSuggestContent() {
   useHideBottomTab(isSheetOpen);
 
   const handleNewCampaign = () => {
-    navigate("/matching/suggest/create?type=new");
+    navigate(`/matching/suggest/create?type=new&brandId=${proposalData?.brandId}&domain=${proposalData?.domain}`);
   };
 
   const handleExistingCampaign = async () => {