From f693062d969fe601b11e4b18822555fde4aaa673 Mon Sep 17 00:00:00 2001
From: keyy1315 <lovelina1315@gmail.com>
Date: Wed, 2 Jul 2025 10:31:13 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EB=82=B4=EA=B0=80=20=EC=9E=91=EC=84=B1?=
 =?UTF-8?q?=ED=95=9C=20=EB=A7=A4=EB=AC=BC/=EB=AC=B8=EC=9D=98=20=EA=B2=BD?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=84=20=EC=A0=81=EC=9A=A9=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 메인 화면에서 진입 시 내가 작성한 매물/문의 해제
- 사이드바에서 진입 시 내가 작성환 매물/문의 체크
---
 src/components/inquiry/RegistForm.tsx         | 11 +++++--
 src/components/inquiry/list/ListForm.tsx      | 15 +++++++---
 src/components/inquiry/list/ListTable.tsx     | 29 ++++++++++++-------
 src/components/survey-sale/list/ListTable.tsx | 22 ++++++++++----
 .../survey-sale/list/SearchForm.tsx           | 13 ++++++---
 src/components/ui/Main.tsx                    |  4 +--
 src/components/ui/common/Header.tsx           | 11 ++-----
 src/hooks/useInquiry.ts                       |  6 ++--
 src/store/inquiryFilterStore.ts               | 13 +++++----
 src/types/Inquiry.ts                          |  2 --
 10 files changed, 79 insertions(+), 47 deletions(-)

diff --git a/src/components/inquiry/RegistForm.tsx b/src/components/inquiry/RegistForm.tsx
index 21e4e61..e44dd82 100644
--- a/src/components/inquiry/RegistForm.tsx
+++ b/src/components/inquiry/RegistForm.tsx
@@ -6,13 +6,14 @@ import { InquiryRequest } from '@/types/Inquiry'
 import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import { CONFIRM_MESSAGE, SUCCESS_MESSAGE, useAlertMsg, WARNING_MESSAGE } from '@/hooks/useAlertMsg'
+import { useInquiryFilterStore } from '@/store/inquiryFilterStore'
 
 export default function RegistForm() {
   const { saveInquiry, isSavingInquiry, commonCodeList } = useInquiry(undefined, false)
   const { showErrorAlert, showSuccessAlert, showConfirm } = useAlertMsg()
   const { session } = useSessionStore()
   const router = useRouter()
-
+  const { setIsMyInquiry } = useInquiryFilterStore()
   const [inquiryRequest, setInquiryRequest] = useState<InquiryRequest>({
     compCd: '5200',
     siteTpCd: 'QC',
@@ -301,7 +302,13 @@ export default function RegistForm() {
             </ul>
           </div>
           <div className="btn-flex-wrap">
-            <button className="btn-frame n-blue icon" onClick={() => router.push('/inquiry/list')}>
+            <button
+              className="btn-frame n-blue icon"
+              onClick={() => {
+                setIsMyInquiry(session?.userId ?? null)
+                router.push('/inquiry/list')
+              }}
+            >
               リスト<i className="btn-arr"></i>
             </button>
             <button className="btn-frame n-blue icon" onClick={handleSubmit} disabled={isSavingInquiry}>
diff --git a/src/components/inquiry/list/ListForm.tsx b/src/components/inquiry/list/ListForm.tsx
index 94eb8f5..995cfa4 100644
--- a/src/components/inquiry/list/ListForm.tsx
+++ b/src/components/inquiry/list/ListForm.tsx
@@ -1,18 +1,25 @@
 'use client'
 import { useInquiryFilterStore } from '@/store/inquiryFilterStore'
-import { useRouter } from 'next/navigation'
-import { useState } from 'react'
+import { useRouter, useSearchParams } from 'next/navigation'
+import { useEffect, useState } from 'react'
 import { useAlertMsg, WARNING_MESSAGE } from '@/hooks/useAlertMsg'
 
 export default function ListForm() {
   const router = useRouter()
-  const { inquiryListRequest, setInquiryListRequest, reset, setOffset } = useInquiryFilterStore()
+  const { inquiryListRequest, setInquiryListRequest, setOffset } = useInquiryFilterStore()
   const { showErrorAlert } = useAlertMsg()
   const [searchKeyword, setSearchKeyword] = useState(inquiryListRequest.schTitle ?? '')
+  const searchParams = useSearchParams()
+
+  useEffect(() => {
+    if (searchParams.get('isMyInquiry') === 'false') {
+      setSearchKeyword('')
+      setInquiryListRequest({ ...inquiryListRequest, schTitle: null })
+    }
+  }, [searchParams])
 
   const handleSearch = () => {
     if (searchKeyword.length >= 2) {
-      reset()
       setInquiryListRequest({ ...inquiryListRequest, schTitle: searchKeyword })
     } else {
       showErrorAlert(WARNING_MESSAGE.KEYWORD_MINIMUM_LENGTH)
diff --git a/src/components/inquiry/list/ListTable.tsx b/src/components/inquiry/list/ListTable.tsx
index ca7264a..0c38199 100644
--- a/src/components/inquiry/list/ListTable.tsx
+++ b/src/components/inquiry/list/ListTable.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'
 import LoadMoreButton from '../../LoadMoreButton'
 import { useInquiry } from '@/hooks/useInquiry'
 import { InquiryList } from '@/types/Inquiry'
-import { usePathname, useRouter } from 'next/navigation'
+import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import { useInquiryFilterStore } from '@/store/inquiryFilterStore'
 import { useSessionStore } from '@/store/session'
 import ListForm from './ListForm'
@@ -26,27 +26,37 @@ export default function ListTable() {
   const pathname = usePathname()
 
   const { inquiryList, isLoadingInquiryList } = useInquiry(undefined, true)
-  const { inquiryListRequest, setInquiryListRequest, reset, offset, setOffset } = useInquiryFilterStore()
+  const { inquiryListRequest, setInquiryListRequest, reset, offset, setOffset, isMyInquiry, setIsMyInquiry } = useInquiryFilterStore()
 
   const [hasMore, setHasMore] = useState(false)
 
   const [heldInquiryList, setHeldInquiryList] = useState<InquiryList[]>([])
 
   const { session } = useSessionStore()
+  const searchParams = useSearchParams()
 
   useEffect(() => {
     setOffset(1)
     setHeldInquiryList([])
-  }, [pathname])
+  }, [pathname, searchParams])
 
   useEffect(() => {
     if (!session.isLoggedIn || isLoadingInquiryList) return
     if (session.isLoggedIn) {
       setInquiryListRequest({ ...inquiryListRequest, storeId: session.storeId ?? '', loginId: session.userId ?? '' })
     }
+
+    if (searchParams.get('isMyInquiry') === 'true') {
+      setIsMyInquiry(session.userId)
+      router.replace('/inquiry/list')
+    } else if (searchParams.get('isMyInquiry') === 'false') {
+      reset()
+      router.replace('/inquiry/list')
+    }
+
     if (inquiryList.length > 0 && inquiryList[0].totCnt > 0) {
       if (offset > 1) {
-        setHeldInquiryList([...heldInquiryList, ...inquiryList])
+        setHeldInquiryList((prev) => [...prev, ...inquiryList])
       } else {
         setHeldInquiryList(inquiryList)
       }
@@ -55,15 +65,12 @@ export default function ListTable() {
       setHeldInquiryList([])
       setHasMore(false)
     }
-  }, [session, inquiryList])
+  }, [session, inquiryList, searchParams])
 
   /** 내 문의 필터 처리 - 체크 시 자신의 문의 목록만 조회 */
   const handleMyInquiry = () => {
     setOffset(1)
-    setInquiryListRequest({
-      ...inquiryListRequest,
-      schRegId: inquiryListRequest.schRegId ? null : session.userId,
-    })
+    setIsMyInquiry(isMyInquiry ? null : session.userId)
   }
 
   /** 답변 여부 필터 처리리 */
@@ -76,7 +83,7 @@ export default function ListTable() {
         setInquiryListRequest({ ...inquiryListRequest, schAnswerYn: 'Y' })
         break
       default:
-        reset()
+        setInquiryListRequest({ ...inquiryListRequest, schAnswerYn: null })
         break
     }
   }
@@ -88,7 +95,7 @@ export default function ListTable() {
         <div className="inquiry-table-filter">
           <div className="filter-check">
             <div className="check-form-box">
-              <input type="checkbox" id="ch01" onChange={handleMyInquiry} checked={inquiryListRequest.schRegId === session.userId} />
+              <input type="checkbox" id="ch01" onChange={handleMyInquiry} checked={isMyInquiry === session.userId} />
               <label htmlFor="ch01">私が書いたお問い合わせ</label>
             </div>
           </div>
diff --git a/src/components/survey-sale/list/ListTable.tsx b/src/components/survey-sale/list/ListTable.tsx
index 12088fe..b99c864 100644
--- a/src/components/survey-sale/list/ListTable.tsx
+++ b/src/components/survey-sale/list/ListTable.tsx
@@ -3,7 +3,7 @@
 import LoadMoreButton from '@/components/LoadMoreButton'
 import { useSurvey } from '@/hooks/useSurvey'
 import { useEffect, useState } from 'react'
-import { useRouter, usePathname } from 'next/navigation'
+import { useRouter, usePathname, useSearchParams } from 'next/navigation'
 import SearchForm from './SearchForm'
 import { useSurveyFilterStore } from '@/store/surveyFilterStore'
 import { useSessionStore } from '@/store/session'
@@ -14,20 +14,32 @@ export default function ListTable() {
   const pathname = usePathname()
 
   const { surveyList, isLoadingSurveyList } = useSurvey()
-  const { offset, setOffset } = useSurveyFilterStore()
+  const { offset, setOffset, setIsMySurvey, reset } = useSurveyFilterStore()
 
   const { session } = useSessionStore()
 
   const [heldSurveyList, setHeldSurveyList] = useState<SurveyBasicInfo[]>([])
   const [hasMore, setHasMore] = useState(false)
 
+  const searchParams = useSearchParams()
   useEffect(() => {
     setOffset(0)
     setHeldSurveyList([])
-  }, [pathname])
+  }, [pathname, searchParams])
 
   useEffect(() => {
-    if (isLoadingSurveyList) return
+    if (searchParams.get('isMySurvey') === 'true') {
+      setIsMySurvey(session.userId)
+      router.replace('/survey-sale')
+    } else if (searchParams.get('isMySurvey') === 'false') {
+      reset()
+      router.replace('/survey-sale')
+    }
+  }, [searchParams])
+
+  useEffect(() => {
+    if (isLoadingSurveyList || !session.isLoggedIn) return
+
     if ('count' in surveyList && surveyList.count > 0) {
       if (offset > 0) {
         setHeldSurveyList((prev) => [...prev, ...surveyList.data])
@@ -39,7 +51,7 @@ export default function ListTable() {
       setHeldSurveyList([])
       setHasMore(false)
     }
-  }, [surveyList, offset, isLoadingSurveyList])
+  }, [surveyList, offset, isLoadingSurveyList, searchParams])
 
   const handleDetailClick = (id: number) => {
     router.push(`/survey-sale/${id}`)
diff --git a/src/components/survey-sale/list/SearchForm.tsx b/src/components/survey-sale/list/SearchForm.tsx
index 66bf38e..6a42ae1 100644
--- a/src/components/survey-sale/list/SearchForm.tsx
+++ b/src/components/survey-sale/list/SearchForm.tsx
@@ -1,8 +1,8 @@
 'use client'
 
 import { SEARCH_OPTIONS, SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS, useSurveyFilterStore } from '@/store/surveyFilterStore'
-import { useRouter } from 'next/navigation'
-import { useState } from 'react'
+import { useRouter, useSearchParams } from 'next/navigation'
+import { useEffect, useState } from 'react'
 import { useAlertMsg, WARNING_MESSAGE } from '@/hooks/useAlertMsg'
 
 export default function SearchForm({ memberRole, userId }: { memberRole: string; userId: string }) {
@@ -11,6 +11,13 @@ export default function SearchForm({ memberRole, userId }: { memberRole: string;
   const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort, setOffset } = useSurveyFilterStore()
   const [searchKeyword, setSearchKeyword] = useState(keyword)
   const [option, setOption] = useState(searchOption)
+  const searchParams = useSearchParams()
+
+  useEffect(() => {
+    if (searchParams.get('isMySurvey') === 'false') {
+      setSearchKeyword('')
+    }
+  }, [searchParams])
 
   const handleSearch = () => {
     if (option !== 'id' && searchKeyword.trim().length < 2) {
@@ -39,8 +46,6 @@ export default function SearchForm({ memberRole, userId }: { memberRole: string;
           value={option}
           onChange={(e) => {
             if (e.target.value === 'all') {
-              setKeyword('')
-              setSearchKeyword('')
               setSearchOption('all')
               setOption('all')
             } else {
diff --git a/src/components/ui/Main.tsx b/src/components/ui/Main.tsx
index 24db4a9..098d3c6 100644
--- a/src/components/ui/Main.tsx
+++ b/src/components/ui/Main.tsx
@@ -22,7 +22,7 @@ export default function Main() {
               <div className="main-bx-icon">
                 <img src="/assets/images/main/main_icon01.svg" alt="" />
               </div>
-              <button className="main-bx-arr" onClick={() => router.push('/survey-sale')}></button>
+              <button className="main-bx-arr" onClick={() => router.push('/survey-sale?isMySurvey=false')}></button>
             </div>
             <div className="grid-bx-body">
               <div className="grid-bx-body-tit">調査物件一覧</div>
@@ -46,7 +46,7 @@ export default function Main() {
               <div className="main-bx-icon">
                 <img src="/assets/images/main/main_icon03.svg" alt="" />
               </div>
-              <button className="main-bx-arr" onClick={() => router.push('/inquiry/list')}></button>
+              <button className="main-bx-arr" onClick={() => router.push('/inquiry/list?isMyInquiry=false')}></button>
             </div>
             <div className="grid-bx-body">
               <div className="grid-bx-body-tit">1:1お問い合わせ リスト</div>
diff --git a/src/components/ui/common/Header.tsx b/src/components/ui/common/Header.tsx
index 3c146cb..dc741de 100644
--- a/src/components/ui/common/Header.tsx
+++ b/src/components/ui/common/Header.tsx
@@ -11,8 +11,6 @@ import { useSideNavState } from '@/store/sideNavState'
 import { useHeaderStore } from '@/store/header'
 import { useSessionStore } from '@/store/session'
 import { usePopupController } from '@/store/popupController'
-import { useSurveyFilterStore } from '@/store/surveyFilterStore'
-import { useInquiryFilterStore } from '@/store/inquiryFilterStore'
 
 import { useTitle } from '@/hooks/useTitle'
 import { useAxios } from '@/hooks/useAxios'
@@ -32,9 +30,6 @@ export default function Header() {
 
   const popupController = usePopupController()
 
-  const { setIsMySurvey } = useSurveyFilterStore()
-  const { setInquiryListRequest, inquiryListRequest } = useInquiryFilterStore()
-
   if (pathname === '/login') {
     return null
   }
@@ -88,8 +83,7 @@ export default function Header() {
                     <div
                       className="side-swiper-card"
                       onClick={() => {
-                        setIsMySurvey(session?.userId)
-                        router.push('/survey-sale')
+                        router.push('/survey-sale?isMySurvey=true')
                         setSideNavIsOpen(false)
                       }}
                     >
@@ -101,8 +95,7 @@ export default function Header() {
                     <div
                       className="side-swiper-card"
                       onClick={() => {
-                        setInquiryListRequest({ ...inquiryListRequest, schRegId: session?.userId })
-                        router.push('/inquiry/list')
+                        router.push('/inquiry/list?isMyInquiry=true')
                         setSideNavIsOpen(false)
                       }}
                     >
diff --git a/src/hooks/useInquiry.ts b/src/hooks/useInquiry.ts
index 3533084..6525638 100644
--- a/src/hooks/useInquiry.ts
+++ b/src/hooks/useInquiry.ts
@@ -35,7 +35,7 @@ export function useInquiry(
   commonCodeList: CommonCode[]
 } {
   const queryClient = useQueryClient()
-  const { inquiryListRequest, offset } = useInquiryFilterStore()
+  const { inquiryListRequest, offset, isMyInquiry } = useInquiryFilterStore()
   const { axiosInstance } = useAxios()
   const router = useRouter()
   const { showErrorAlert } = useAlertMsg()
@@ -104,7 +104,7 @@ export function useInquiry(
    * @returns {boolean} isLoading - 문의사항 목록 로딩 상태
    */
   const { data: inquiryList, isLoading: isLoadingInquiryList } = useQuery({
-    queryKey: ['inquiryList', inquiryListRequest, offset],
+    queryKey: ['inquiryList', inquiryListRequest.loginId, inquiryListRequest.schTitle, inquiryListRequest.schAnswerYn, offset, isMyInquiry],
     queryFn: async () => {
       const isListQuery = true
       const shouldThrowError = false
@@ -112,7 +112,7 @@ export function useInquiry(
       const resp = await tryFunction(
         () =>
           axiosInstance(null).get<{ data: InquiryList[] }>(`/api/qna/list`, {
-            params: { inquiryListRequest, startRow: offset, endRow: offset + 9 },
+            params: { inquiryListRequest, startRow: offset, endRow: offset + 9, schRegId: isMyInquiry },
           }),
         isListQuery,
         shouldThrowError,
diff --git a/src/store/inquiryFilterStore.ts b/src/store/inquiryFilterStore.ts
index 6a3f676..47fea1e 100644
--- a/src/store/inquiryFilterStore.ts
+++ b/src/store/inquiryFilterStore.ts
@@ -10,6 +10,8 @@ type InquiryFilterState = {
   reset: () => void
   offset: number
   setOffset: (offset: number) => void
+  isMyInquiry: string | null
+  setIsMyInquiry: (isMyInquiry: string | null) => void
 }
 
 /**
@@ -28,7 +30,6 @@ export const useInquiryFilterStore = create<InquiryFilterState>((set) => ({
     storeId: '',
     siteTpCd: 'QC',
     schTitle: null,
-    schRegId: null,
     schFromDt: null,
     schToDt: null,
     schAnswerYn: null,
@@ -42,15 +43,17 @@ export const useInquiryFilterStore = create<InquiryFilterState>((set) => ({
         langCd: 'JA',
         storeId: '',
         siteTpCd: 'QC',
-        schTitle: '',
-        schRegId: '',
-        schFromDt: '',
-        schToDt: '',
+        schTitle: null,
+        schFromDt: null,
+        schToDt: null,
         schAnswerYn: null,
         loginId: '',
       },
       offset: 1,
+      isMyInquiry: null,
     }),
   offset: 1,
   setOffset: (offset) => set({ offset }),
+  isMyInquiry: null,
+  setIsMyInquiry: (isMyInquiry) => set({ isMyInquiry }),
 }))
diff --git a/src/types/Inquiry.ts b/src/types/Inquiry.ts
index 646cce7..ee2cfe9 100644
--- a/src/types/Inquiry.ts
+++ b/src/types/Inquiry.ts
@@ -12,8 +12,6 @@ export type InquiryListRequest = {
   siteTpCd: string 
   /* 검색 제목 */
   schTitle: string | null 
-  /* 검색 등록자 ID */
-  schRegId: string | null 
   /* 검색 시작 일자 */
   schFromDt: string | null 
   /* 검색 종료 일자 */