23 changed files with 109 additions and 317 deletions
--- a/src/app/@header/default.tsx
+++ b/src/app/@header/default.tsx
@ -1,5 +1,5 @@
 import Header from '@/components/ui/common/Header'

 export default async function page() {
-  return <Header />
+  return <Header name={'調査物件一覧'} />
 }
--- a/src/app/api/survey-sales/route.ts
+++ b/src/app/api/survey-sales/route.ts
@ -17,8 +17,6 @@ export async function GET(request: Request) {
  const isMySurvey = searchParams.get('isMySurvey')
  const sort = searchParams.get('sort')
  const offset = searchParams.get('offset')
-  const store = searchParams.get('store')
-  const construction_point = searchParams.get('construction_point')

  const searchOptions = ['building_name', 'representative', 'store', 'construction_point', 'customer_name', 'post_code', 'address', 'address_detail']
  try {
@ -56,22 +54,6 @@ export async function GET(request: Request) {
      }
    }

-    where.AND = []
-    if (store) {
-      where.AND.push({
-        store: {
-          equals: store,
-        },
-      })
-    }
-    if (construction_point) {
-      where.AND.push({
-        construction_point: {
-          equals: construction_point,
-        },
-      })
-    }
-
    if (offset) {
      // @ts-ignore
      const res = await prisma.SD_SERVEY_SALES_BASIC_INFO.findMany({
--- a/src/app/inquiry/layout.tsx
+++ b/src/app/inquiry/layout.tsx
@ -1,5 +1,3 @@
-import type { ReactNode } from 'react'
-
-export default function layout({ children }: { children: ReactNode }) {
+export default function layout({ children }: { children: React.ReactNode }) {
  return <div className="container">{children}</div>
 }
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@ -1,17 +1,13 @@
-import type { ReactNode } from 'react'
 import type { Metadata } from 'next'
-import type { SessionData } from '@/types/Auth'

 import ReactQueryProviders from '@/providers/ReactQueryProvider'
 import EdgeProvider from '@/providers/EdgeProvider'
 import PopupController from '@/components/ui/PopupController'

-import { cookies } from 'next/headers'
-import { getIronSession } from 'iron-session'
-import { sessionOptions } from '@/libs/session'
-
 import '@/styles/style.scss'

+import type { ReactNode } from 'react'
+
 export const metadata: Metadata = {
  title: 'Create Next App',
  description: 'Generated by create next app',
@ -25,14 +21,9 @@ interface RootLayoutProps {
 }6

 export default async function RootLayout({ children, header, footer, floatBtn }: RootLayoutProps): Promise<ReactNode> {
-  const cookieStore = await cookies()
-  const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
-
-  const sessionData = JSON.stringify(session)
-
  return (
    <ReactQueryProviders>
-      <EdgeProvider sessionData={sessionData}>
+      <EdgeProvider>
        <html lang="ja" suppressHydrationWarning>
          <body>
            <div className="wrap">
--- a/src/app/pw-reset/layout.tsx
+++ b/src/app/pw-reset/layout.tsx
@ -1,23 +0,0 @@
-import type { ReactNode } from 'react'
-
-interface PwResetLayoutProps {
-  children: ReactNode
-}
-
-export default function layout({ children }: PwResetLayoutProps) {
-  return (
-    <>
-      <div className="container">
-        <div className="sale-contents">
-          <div className="border-frame">
-            <div className="pw-guide">
-              <div className="pw-guide-tit">パスワードをリセットする</div>
-              <div className="pw-guide-txt">新しいパスワードを入力してください.</div>
-            </div>
-          </div>
-          {children}
-        </div>
-      </div>
-    </>
-  )
-}
--- a/src/app/pw-reset/page.tsx
+++ b/src/app/pw-reset/page.tsx
@ -1,9 +0,0 @@
-import PwResetForm from '@/components/pw-reset/PwResetForm'
-
-export default function page() {
-  return (
-    <>
-      <PwResetForm />
-    </>
-  )
-}
--- a/src/app/suitable/layout.tsx
+++ b/src/app/suitable/layout.tsx
@ -1,4 +1,4 @@
-import type { ReactNode } from 'react'
+import { ReactNode } from 'react'

 interface SuitableLayoutProps {
  children: ReactNode
--- a/src/app/survey-sale/layout.tsx
+++ b/src/app/survey-sale/layout.tsx
@ -1,4 +1,4 @@
-import type { ReactNode } from 'react'
+import { ReactNode } from 'react'

 interface SurveySaleLayoutProps {
  children: ReactNode
--- a/src/components/pw-reset/PwResetForm.tsx
+++ b/src/components/pw-reset/PwResetForm.tsx
@ -1,59 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { useRouter } from 'next/navigation'
-
-export default function PwResetForm() {
-  const [pwShow01, setPwShow01] = useState(false) //비밀번호 확인 보이기 숨기기
-  const [pwShow02, setPwShow02] = useState(false) //비밀번호 재확인 보이기 숨기기
-  const router = useRouter()
-
-  return (
-    <>
-      <div className="border-frame">
-        <div className="data-form-wrap">
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">
-              新規パスワード再入力 <i className="import">*</i>
-            </div>
-            <div className="data-input">
-              <div className="login-input pw change">
-                <input type={`${pwShow01 ? 'text' : 'password'}`} className="login-frame" placeholder="●●●●" />
-                <button className={`login-icon ${pwShow01 ? 'act' : ''}`} onClick={() => setPwShow01(!pwShow01)}>
-                  <i className="show-icon"></i>
-                </button>
-              </div>
-            </div>
-            <div className="data-input-guide">10文字以内</div>
-          </div>
-          <div className="data-input-form-bx">
-            <div className="data-input-form-tit">
-              新規パスワード入力 <i className="import">*</i>
-            </div>
-            <div className="data-input">
-              <div className="login-input pw change">
-                <input type={`${pwShow02 ? 'text' : 'password'}`} className="login-frame" placeholder="●●●●" />
-                <button className={`login-icon ${pwShow02 ? 'act' : ''}`} onClick={() => setPwShow02(!pwShow02)}>
-                  <i className="show-icon"></i>
-                </button>
-              </div>
-            </div>
-            <div className="data-input-guide">10文字以内</div>
-          </div>
-        </div>
-        <div className="btn-flex-wrap">
-          <div className="btn-bx">
-            <button className="btn-frame n-blue icon" onClick={() => router.back()}>
-              戻る<i className="btn-arr"></i>
-            </button>
-          </div>
-          <div className="btn-bx">
-            <button className="btn-frame red icon">
-              リセットする<i className="btn-arr"></i>
-            </button>
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}
--- a/src/components/survey-sale/detail/DetailButton.tsx
+++ b/src/components/survey-sale/detail/DetailButton.tsx
@ -1,54 +1,33 @@
 'use client'
 import { useRouter } from 'next/navigation'
 import { useServey } from '@/hooks/useSurvey'
-import { useSessionStore } from '@/store/session'
-import { useEffect, useState } from 'react'

-export default function DetailButton({ isTemporary, surveyId, representative }: { isTemporary: boolean; surveyId: number; representative: string }) {
+export default function DetailButton({ isTemporary, surveyId }: { isTemporary: boolean; surveyId: number }) {
  const router = useRouter()
-  const { session } = useSessionStore()
-  const { submitSurvey, deleteSurvey } = useServey(surveyId)
-  const [userNm, setUserNm] = useState('')

-  useEffect(() => {
-    if (session?.isLoggedIn) {
-      setUserNm(session?.userNm ?? '')
-    }
-  }, [session, setUserNm])
+  const { submitSurvey, deleteSurvey } = useServey(surveyId)

  const handleSubmit = async () => {
    if (isTemporary) {
      alert('一時保存されたデータは提出できません。')
      return
    }
-    if (userNm === representative) {
-      if (confirm('提出しますか？？')) {
-        if (surveyId) {
-          // TODO: 제출 페이지 추가
-          alert('SUBMIT POPUP!!!!!!!!!!!')
-          await submitSurvey()
-        }
+    if (confirm('提出しますか？？')) {
+      if (surveyId) {
+        // TODO: 제출 페이지 추가
+        alert('SUBMIT POPUP!!!!!!!!!!!')
+        await submitSurvey()
      }
-    } else {
-      alert('担当者のみ提出可能です。')
    }
  }
  const handleUpdate = () => {
-    if (userNm === representative) {
-      router.push(`/survey-sale/basic-info?id=${surveyId}&isTemp=${isTemporary}`)
-    } else {
-      alert('担当者のみ修正可能です。')
-    }
+    router.push(`/survey-sale/basic-info?id=${surveyId}&isTemp=${isTemporary}`)
  }
  const handleDelete = async () => {
    if (confirm('削除しますか？')) {
      if (surveyId) {
-        if (userNm === representative) {
-          await deleteSurvey()
-          router.push('/survey-sale')
-        } else {
-          alert('担当者のみ削除可能です。')
-        }
+        await deleteSurvey()
+        router.push('/survey-sale')
      }
    }
  }
--- a/src/components/survey-sale/detail/DetailForm.tsx
+++ b/src/components/survey-sale/detail/DetailForm.tsx
@ -56,7 +56,7 @@ export default function DetailForm({
            <input type="text" className="input-frame" disabled defaultValue={surveyDetail?.customer_name ?? ''} />
          </div>
        </div>
-        <DetailButton isTemporary={isTemporary} surveyId={Number(surveyDetail?.id)} representative={surveyDetail?.representative ?? ''} />
+        <DetailButton isTemporary={isTemporary} surveyId={Number(surveyDetail?.id)} />
      </div>
    </>
  )
--- a/src/components/survey-sale/detail/RoofDetailForm.tsx
+++ b/src/components/survey-sale/detail/RoofDetailForm.tsx
@ -196,7 +196,7 @@ export default function RoofDetailForm({
            </div>
          </div>
        </div>
-        <DetailButton isTemporary={false} surveyId={Number(surveyDetail?.id)} representative={surveyDetail?.representative ?? ''} />
+        <DetailButton isTemporary={false} surveyId={Number(surveyDetail?.id)} />
      </div>
    </>
  )
--- a/src/components/survey-sale/detail/form/BasicForm.tsx
+++ b/src/components/survey-sale/detail/form/BasicForm.tsx
@ -8,7 +8,6 @@ import { useSurveySaleTabState } from '@/store/surveySaleTabState'
 import { usePopupController } from '@/store/popupController'
 import { useAddressStore } from '@/store/addressStore'
 import { useSessionStore } from '@/store/session'
-import { useUserType } from '@/hooks/useUserType'

 const defaultBasicInfoForm: SurveyBasicRequest = {
  representative: '',
@ -24,7 +23,7 @@ const defaultBasicInfoForm: SurveyBasicRequest = {
  submission_date: null,
 }

-const REQUIRED_FIELDS: (keyof SurveyBasicRequest)[] = ['representative', 'building_name', 'customer_name']
+const REQUIRED_FIELDS: (keyof SurveyBasicRequest)[] = ['representative', 'store', 'construction_point']

 export default function BasicForm() {
  const searchParams = useSearchParams()
@ -37,8 +36,6 @@ export default function BasicForm() {
  const [basicInfoData, setBasicInfoData] = useState<SurveyBasicRequest>(defaultBasicInfoForm)

  const { addressData } = useAddressStore()
-  const { userType, store, construction_point } = useUserType()
-  const { session } = useSessionStore()

  const popupController = usePopupController()

@ -55,14 +52,8 @@ export default function BasicForm() {
        address_detail: addressData.address_detail,
      })
    }
-    if (session?.isLoggedIn) {
-      setBasicInfoData((prev) => ({
-        ...prev,
-        representative: session?.userNm ?? '',
-      }))
-    }
    setBasicInfoSelected()
-  }, [surveyDetail, addressData, session?.isLoggedIn, session?.userNm])
+  }, [surveyDetail, addressData])

  const focusInput = (input: keyof SurveyBasicRequest) => {
    const inputElement = document.getElementById(input)
@ -73,6 +64,7 @@ export default function BasicForm() {

  const validateSurvey = (basicInfoData: SurveyBasicRequest) => {
    const emptyField = REQUIRED_FIELDS.find((field) => !basicInfoData[field])
+
    if (emptyField) {
      focusInput(emptyField)
      return false
@ -117,36 +109,30 @@ export default function BasicForm() {
              type="text"
              className="input-frame"
              id="representative"
-              value={session?.userNm ? session?.userNm : basicInfoData.representative}
+              value={basicInfoData.representative}
              onChange={(e) => handleChange('representative', e.target.value)}
            />
          </div>
-          {(userType === 'order' || userType?.includes('musubi')) && (
-            <>
-              <div className="data-input-form-bx">
-                <div className="data-input-form-tit">販売店</div>
-                <input
-                  type="text"
-                  className="input-frame"
-                  id="store"
-                  value={store ? store : basicInfoData.store ?? ''}
-                  onChange={(e) => handleChange('store', e.target.value)}
-                />
-              </div>
-            </>
-          )}
-          {(userType === 'partner' || userType === 'musubi_con') && (
-            <div className="data-input-form-bx">
-              <div className="data-input-form-tit">施工店</div>
-              <input
-                type="text"
-                className="input-frame"
-                id="construction_point"
-                value={construction_point ? construction_point : basicInfoData.construction_point ?? ''}
-                onChange={(e) => handleChange('construction_point', e.target.value)}
-              />
-            </div>
-          )}
+          <div className="data-input-form-bx">
+            <div className="data-input-form-tit">販売店</div>
+            <input
+              type="text"
+              className="input-frame"
+              id="store"
+              value={basicInfoData.store ?? ''}
+              onChange={(e) => handleChange('store', e.target.value)}
+            />
+          </div>
+          <div className="data-input-form-bx">
+            <div className="data-input-form-tit">施工店</div>
+            <input
+              type="text"
+              className="input-frame"
+              id="construction_point"
+              value={basicInfoData.construction_point ?? ''}
+              onChange={(e) => handleChange('construction_point', e.target.value)}
+            />
+          </div>
        </div>
      </div>

@ -202,6 +188,10 @@ export default function BasicForm() {
                  onChange={(e) => handleChange('address', e.target.value)}
                >
                  <option value="">東京都</option>
+                  <option value="">東京都</option>
+                  <option value="">東京都</option>
+                  <option value="">東京都</option>
+                  <option value="">東京都</option>
                </select>
              </div>
            </div>
--- a/src/components/survey-sale/list/ListTable.tsx
+++ b/src/components/survey-sale/list/ListTable.tsx
@ -6,7 +6,7 @@ import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import SearchForm from './SearchForm'
 import { useSurveyFilterStore } from '@/store/surveyFilterStore'
-import { UserType } from '@/hooks/useUserType'
+import { useSessionStore } from '@/store/session'

 export default function ListTable() {
  const router = useRouter()
@ -15,7 +15,9 @@ export default function ListTable() {

  const [heldSurveyList, setHeldSurveyList] = useState<typeof surveyList>([])
  const [hasMore, setHasMore] = useState(false)
-  const [memberType, setMemberType] = useState<UserType>('hwj')
+
+  const { session } = useSessionStore()
+  console.log('session:: ', session)

  useEffect(() => {
    if (surveyList && surveyList.length > 0) {
@ -29,8 +31,6 @@ export default function ListTable() {
      }
      setHasMore(surveyListCount > offset + 10)
    }
-    // 회원 유형 설정 이후 변경
-    setMemberType('hwj')
  }, [surveyList, surveyListCount, offset])

  const handleDetailClick = (id: number) => {
@ -45,7 +45,7 @@ export default function ListTable() {

  return (
    <>
-      <SearchForm onItemsInit={handleItemsInit} memberType={memberType} />
+      <SearchForm onItemsInit={handleItemsInit} />
      {heldSurveyList.length > 0 ? (
        <div className="sale-frame">
          <ul className="sale-list-wrap">
--- a/src/components/survey-sale/list/SearchForm.tsx
+++ b/src/components/survey-sale/list/SearchForm.tsx
@ -1,11 +1,10 @@
 'use client'

-import { SEARCH_OPTIONS, SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS, useSurveyFilterStore } from '@/store/surveyFilterStore'
-import { UserType } from '@/hooks/useUserType'
+import { SEARCH_OPTIONS, SEARCH_OPTIONS_ENUM, useSurveyFilterStore } from '@/store/surveyFilterStore'
 import { useRouter } from 'next/navigation'
 import { useState } from 'react'

-export default function SearchForm({ onItemsInit, memberType }: { onItemsInit: () => void; memberType: UserType }) {
+export default function SearchForm({ onItemsInit }: { onItemsInit: () => void }) {
  const router = useRouter()
  const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort } = useSurveyFilterStore()
  const [searchKeyword, setSearchKeyword] = useState(keyword)
@ -20,7 +19,6 @@ export default function SearchForm({ onItemsInit, memberType }: { onItemsInit: (
    setKeyword(searchKeyword)
    onItemsInit()
  }
-  const searchOptions = memberType === 'partner' ? SEARCH_OPTIONS_PARTNERS : SEARCH_OPTIONS

  return (
    <div className="sale-frame">
@ -37,7 +35,7 @@ export default function SearchForm({ onItemsInit, memberType }: { onItemsInit: (
          value={searchOption}
          onChange={(e) => setSearchOption(e.target.value as SEARCH_OPTIONS_ENUM)}
        >
-          {searchOptions.map((option) => (
+          {SEARCH_OPTIONS.map((option) => (
            <option key={option.id} value={option.id}>
              {option.label}
            </option>
--- a/src/components/ui/common/Header.tsx
+++ b/src/components/ui/common/Header.tsx
@ -4,23 +4,27 @@ import Link from 'next/link'
 import { usePathname, useRouter } from 'next/navigation'

 import { Swiper, SwiperSlide } from 'swiper/react'
-import { useQueryClient } from '@tanstack/react-query'

 import { useSideNavState } from '@/store/sideNavState'
 import { useHeaderStore } from '@/store/header'
-import { useSessionStore } from '@/store/session'
-import { useTitle } from '@/hooks/useTitle'

-import { axiosInstance } from '@/libs/axios'
+import type { HeaderProps } from '@/types/Header'

 import 'swiper/css'
+import { axiosInstance } from '@/libs/axios'
+import { useSessionStore } from '@/store/session'
+import { useQueryClient } from '@tanstack/react-query'

-export default function Header() {
+// type HeaderProps = {
+//   name: string //header 이름
+//   backBtn: boolean // 뒤로가기 버튼 유무
+// }
+
+export default function Header({ name }: HeaderProps) {
  const router = useRouter()
  const pathname = usePathname()
  const { sideNavIsOpen, setSideNavIsOpen } = useSideNavState()
  const { backBtn } = useHeaderStore()
-  const { getTitle } = useTitle()

  const { session, reset } = useSessionStore()
  const queryClient = useQueryClient()
@ -49,7 +53,7 @@ export default function Header() {
              </div>
            )}
            <h2 className="logo">
-              <Link href={'/'}>{getTitle(pathname)}</Link>
+              <Link href={'/'}>{name}</Link>
            </h2>
            <div className="side-button-wrap">
              <button className="side-button" onClick={() => setSideNavIsOpen(true)}></button>
@ -108,7 +112,7 @@ export default function Header() {
                    <button onClick={() => router.push('/inquiry/regist')}>1:1お問い合わせ登録</button>
                  </li>
                  <li className="side-nav-item">
-                    <button onClick={() => router.push('/pw-reset')}>パスワードリセット</button>
+                    <button>パスワードリセット</button>
                  </li>
                </ul>
              </nav>
--- a/src/hooks/useSurvey.ts
+++ b/src/hooks/useSurvey.ts
@ -3,7 +3,6 @@ import type { SurveyBasicInfo, SurveyBasicRequest, SurveyDetailInfo, SurveyDetai
 import { axiosInstance } from '@/libs/axios'
 import { useSurveyFilterStore } from '@/store/surveyFilterStore'
 import { queryStringFormatter } from '@/utils/common-utils'
-
 interface ZipCodeResponse {
  status: number
  message: string | null
@ -20,8 +19,6 @@ type ZipCode = {
  kana2: string
  kana3: string
 }
-import { useUserType } from './useUserType'
-
 export function useServey(id?: number): {
  surveyList: SurveyBasicInfo[] | []
  surveyDetail: SurveyBasicInfo | null
@ -41,13 +38,12 @@ export function useServey(id?: number): {
 } {
  const queryClient = useQueryClient()
  const { keyword, searchOption, isMySurvey, sort, offset } = useSurveyFilterStore()
-  const { store, construction_point } = useUserType()

  const { data: surveyList, isLoading: isLoadingSurveyList } = useQuery({
-    queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, offset, store, construction_point],
+    queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, offset],
    queryFn: async () => {
      const resp = await axiosInstance(null).get<SurveyBasicInfo[]>('/api/survey-sales', {
-        params: { keyword, searchOption, isMySurvey, sort, offset, store, construction_point },
+        params: { keyword, searchOption, isMySurvey, sort, offset },
      })
      return resp.data
    },
--- a/src/hooks/useTitle.ts
+++ b/src/hooks/useTitle.ts
@ -1,37 +0,0 @@
-export const useTitle = () => {
-  const getTitle = (pathname: string) => {
-    // Handle dynamic routes first
-    if (pathname.startsWith('/survey-sale/') && pathname !== '/survey-sale/basic-info' && pathname !== '/survey-sale/roof-info') {
-      return '調査物件一覧'
-    }
-
-    if (pathname.startsWith('/inquiry/') && pathname !== '/inquiry/list' && pathname !== '/inquiry/regist') {
-      return '1:1お問い合わせ詳細'
-    }
-
-    // Handle static routes
-    switch (pathname) {
-      case '/':
-        return 'Hanasys 現地調査'
-      case '/suitable':
-        return '屋根材適合性の確認'
-      case '/survey-sale':
-        return '調査物件一覧'
-      case '/survey-sale/basic-info':
-        return '調査物件登録'
-      case '/survey-sale/roof-info':
-        return '調査物件新規登録'
-      case '/inquiry/list':
-        return '1:1お問い合わせ'
-      case '/inquiry/regist':
-        return '1:1お問い合わせ'
-      case '/pw-reset':
-        return 'パスワードリセット'
-
-      default:
-        return 'Hanasys 現地調査'
-    }
-  }
-
-  return { getTitle }
-}
--- a/src/hooks/useUserType.ts
+++ b/src/hooks/useUserType.ts
@ -1,24 +0,0 @@
-import { useSessionStore } from '@/store/session'
-import { useEffect, useState } from 'react'
-
-export type UserType = 'hwj' | 'order' | 'musubi' | 'musubi_con' | 'partner'
-
-// 로그인 된 회원 유형에 따라 조사 매물 목록 변경됨
-export function useUserType() {
-  const { session } = useSessionStore()
-  const [userType, setUserType] = useState<UserType | null>(null)
-  const [store, setStore] = useState<string | null>(null)
-  const [construction_point, setConstructionPoint] = useState<string | null>(null)
-
-  // TODO: 회원 유형 설정
-  useEffect(() => {
-    if (!session?.isLoggedIn) return
-    setUserType('musubi_con')
-  }, [session])
-
-  return {
-    userType,
-    store,
-    construction_point,
-  }
-}
--- a/src/providers/EdgeProvider.tsx
+++ b/src/providers/EdgeProvider.tsx
@ -1,29 +1,25 @@
 'use client'

+import { useAlertSwitch } from '@/store/alertSwitch'
 import { useHeaderStore } from '@/store/header'
 import { usePopupController } from '@/store/popupController'
 import { useSideNavState } from '@/store/sideNavState'
 import { usePathname } from 'next/navigation'
 import { useEffect } from 'react'
-import { useSessionStore } from '@/store/session'

-interface EdgeProviderProps {
-  children: React.ReactNode
-  sessionData: string
+declare global {
+  interface Window {
+    alert2: (msg: string, alert2BtnYes?: () => void, alert2BtnNo?: () => void) => void
+  }
 }

-export default function EdgeProvider({ children, sessionData }: EdgeProviderProps) {
+export default function EdgeProvider({ children }: React.PropsWithChildren) {
  const pathname = usePathname()
  const { setBackBtn } = useHeaderStore()
  const { reset } = useSideNavState()
  const { setAlertMsg, setAlertBtn, setAlert, setAlert2, setAlert2BtnYes, setAlert2BtnNo } = usePopupController()
-  const { session, setSession } = useSessionStore()
+  const { alertKind } = useAlertSwitch()

-  /**
-   * alert 함수 - window.alert 함수 대체
-   * @param msg
-   * @param alertBtn
-   */
  const alertFunc = (msg: string, alertBtn: Function) => {
    console.log('🚀 ~ alertFunc ~ msg:', msg)
    setAlertMsg(msg)
@ -31,7 +27,7 @@ export default function EdgeProvider({ children, sessionData }: EdgeProviderProp
    setAlert(true)
  }
  /**
-   * alert2 함수 - window.confirm 함수 대체
+   * alert2 함수
   * @param msg alert 메시지
   * @param alertBtn2Yes alert 확인 버튼 클릭시 실행되는 함수
   * @param alertBtn2No alert 취소 버튼 클릭시 실행되는 함수
@ -46,28 +42,16 @@ export default function EdgeProvider({ children, sessionData }: EdgeProviderProp

  //alert 함수 변경해서 바인딩
  useEffect(() => {
-    window.alert = function (msg, alertBtn = () => setAlert(false)) {
-      alertFunc(msg, alertBtn)
+    if (alertKind === 'single') {
+      window.alert = function (msg, alertBtn = () => setAlert(false)) {
+        alertFunc(msg, alertBtn)
+      }
+    } else if (alertKind === 'multi') {
+      window.alert = function (msg, alert2BtnYes = () => setAlert2(false), alert2BtnNo = () => setAlert2(false)) {
+        alertFunc2(msg, alert2BtnYes, alert2BtnNo)
+      }
    }
-    window.confirm = function (msg = '', alert2BtnYes = () => setAlert2(false), alert2BtnNo = () => setAlert2(false)) {
-      alertFunc2(
-        msg,
-        () => {
-          alert2BtnYes()
-          return true
-        },
-        () => {
-          alert2BtnNo()
-          return false
-        },
-      )
-      return false
-    }
-    setSession({
-      ...session,
-      ...JSON.parse(sessionData),
-    })
-  }, [])
+  }, [alertKind])

  /**
   * 헤더 뒤로가기 버튼 컨트롤
--- a/src/store/alertSwitch.ts
+++ b/src/store/alertSwitch.ts
@ -0,0 +1,21 @@
+import { create } from 'zustand'
+
+type AlertSwitchState = {
+  alertKind: string
+  setAlertKind: (value: string) => void
+  reset: () => void
+}
+
+type InitialState = {
+  alertKind: string
+}
+
+const initialState: InitialState = {
+  alertKind: 'single',
+}
+
+export const useAlertSwitch = create<AlertSwitchState>((set) => ({
+  ...initialState,
+  setAlertKind: (value: string) => set((state) => ({ ...state, alertKind: value })),
+  reset: () => set(initialState),
+}))
--- a/src/store/surveyFilterStore.ts
+++ b/src/store/surveyFilterStore.ts
@ -60,6 +60,7 @@ export const SEARCH_OPTIONS_PARTNERS = [
  },
 ]

+export type MEMBER_TYPE = 'hwj' | 'order' | 'musubi' | 'partner'
 export type SEARCH_OPTIONS_ENUM = (typeof SEARCH_OPTIONS)[number]['id']
 export type SEARCH_OPTIONS_PARTNERS_ENUM = (typeof SEARCH_OPTIONS_PARTNERS)[number]['id']
 export type SORT_OPTIONS_ENUM = 'created' | 'updated'
--- a/src/types/Survey.ts
+++ b/src/types/Survey.ts
@ -1,4 +1,4 @@
-import { SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS_ENUM, SORT_OPTIONS_ENUM } from '@/store/surveyFilterStore'
+import { SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS_ENUM, SORT_OPTIONS_ENUM } from "@/store/surveyFilterStore"

 export type SurveyBasicInfo = {
  id: number