@@ -114,9 +114,11 @@ export default function Header() {
-
-
-
+ {session.role !== 'Partner' && (
+
+
+
+ )}
diff --git a/src/hooks/useCommCode.ts b/src/hooks/useCommCode.ts
new file mode 100644
index 0000000..bb50240
--- /dev/null
+++ b/src/hooks/useCommCode.ts
@@ -0,0 +1,18 @@
+import { axiosInstance } from '@/libs/axios'
+import type { CommCode } from '@/types/CommCode'
+
+export function useCommCode() {
+ const getCommCode = async (headCode: string): Promise => {
+ try {
+ const response = await axiosInstance(null).get('/api/comm-code', { params: { headCode: headCode } })
+ return response.data
+ } catch (error) {
+ console.error(`common code (${headCode}) load failed:`, error)
+ return []
+ }
+ }
+
+ return {
+ getCommCode,
+ }
+}
diff --git a/src/hooks/useSuitable.ts b/src/hooks/useSuitable.ts
index c3f0dde..4bdd9b2 100644
--- a/src/hooks/useSuitable.ts
+++ b/src/hooks/useSuitable.ts
@@ -1,30 +1,107 @@
-import { suitableApi } from '@/api/suitable'
+import { useQuery } from '@tanstack/react-query'
+import { axiosInstance, transformObjectKeys } from '@/libs/axios'
+import { useSuitableStore } from '@/store/useSuitableStore'
+import { useCommCode } from './useCommCode'
+import { SUITABLE_HEAD_CODE, type SuitableDetailGroup, type SuitableMain, type Suitable, type SuitableDetail } from '@/types/Suitable'
export function useSuitable() {
- const getCategories = async () => {
+ const { getCommCode } = useCommCode()
+ const { selectedCategory, searchValue, suitableCommCode, setSuitableCommCode, isSearch } = useSuitableStore()
+
+ const getSuitables = async (): Promise => {
try {
- // return await suitableApi.getCategory()
+ const response = await axiosInstance(null).get('/api/suitable/list')
+ return response.data
} catch (error) {
- console.error('카테고리 데이터 로드 실패:', error)
+ console.error('지붕재 데이터 로드 실패:', error)
+ return { suitable: [], detail: [] }
+ }
+ }
+
+ // const updateSearchResults = async (selectedCategory: string | undefined, searchValue: string | undefined): Promise => {
+ // try {
+ // const response = await axiosInstance(null).get('/api/suitable/list', { params: { selectedCategory, searchValue } })
+ // return response.data
+ // } catch (error) {
+ // console.error('지붕재 데이터 검색 실패:', error)
+ // return []
+ // }
+ // }
+
+ const getSuitableCommCode = () => {
+ const headCodes = Object.values(SUITABLE_HEAD_CODE) as SUITABLE_HEAD_CODE[]
+ for (const code of headCodes) {
+ getCommCode(code).then((res) => {
+ setSuitableCommCode(code, res)
+ })
+ }
+ }
+
+ const toCodeName = (headCode: string, code: string): string => {
+ const commCode = suitableCommCode.get(headCode)
+ return commCode?.find((item) => item.code === code)?.codeJp || ''
+ }
+
+ const toSuitableDetail = (mainId: number): SuitableDetail[] => {
+ try {
+ const suitableDetailString = suitableList?.detail.find((item) => item.mainId === mainId)?.detail
+ if (!suitableDetailString) {
+ return []
+ }
+ const suitableDetailArray = transformObjectKeys(JSON.parse(suitableDetailString)) as SuitableDetail[]
+ if (!Array.isArray(suitableDetailArray)) {
+ throw new Error('suitableDetailArray is not an array')
+ }
+ return suitableDetailArray
+ } catch (error) {
+ console.error('지붕재 데이터 파싱 실패:', error)
return []
}
}
- const getSuitables = async () => {
- try {
- // return await suitableApi.getList()
- } catch (error) {
- console.error('지붕재 데이터 로드 실패:', error)
- }
- }
+ const { data: suitableList, isLoading: isInitialLoading } = useQuery({
+ queryKey: ['suitables', 'list'],
+ queryFn: async () => await getSuitables(),
+ staleTime: 1000 * 60 * 10, // 10분
+ gcTime: 1000 * 60 * 10, // 10분
+ })
- const updateSearchResults = async (selectedCategory: string | undefined, searchValue: string | undefined) => {
- try {
- // return await suitableApi.getList(selectedCategory, searchValue)
- } catch (error) {
- console.error('지붕재 데이터 검색 실패:', error)
- }
- }
+ const {
+ data: suitableSearchResults,
+ refetch: refetchBySearch,
+ isLoading: isSearchLoading,
+ } = useQuery({
+ queryKey: ['suitables', 'search', selectedCategory, isSearch],
+ queryFn: async () => {
+ if (!isSearch && !selectedCategory) {
+ // 검색 상태가 아니면 초기 데이터 반환 임시처리
+ return isInitialLoading ? await getSuitables() : suitableList ?? { suitable: [], detail: [] }
+ } else {
+ const filteredSuitable = suitableList?.suitable.filter((item: SuitableMain) => {
+ const categoryMatch = !selectedCategory || item.roofMtCd === selectedCategory
+ const searchMatch = !searchValue || item.productName.includes(searchValue)
+ return categoryMatch && searchMatch
+ }) ?? []
+ const mainIds = filteredSuitable.map((item: SuitableMain) => item.id)
+ const filteredDetail = suitableList?.detail.filter((item: SuitableDetailGroup) => {
+ return mainIds.includes(item.mainId)
+ }) ?? []
+ return { suitable: filteredSuitable, detail: filteredDetail }
+ }
+ },
+ staleTime: 1000 * 60 * 10,
+ gcTime: 1000 * 60 * 10,
+ enabled: true,
+ })
- return { getCategories, getSuitables, updateSearchResults }
+ return {
+ getSuitables,
+ getSuitableCommCode,
+ toCodeName,
+ toSuitableDetail,
+ suitableList,
+ suitableSearchResults,
+ refetchBySearch,
+ isSearchLoading,
+ }
}
diff --git a/src/hooks/useSuitableRaw.ts b/src/hooks/useSuitableRaw.ts
new file mode 100644
index 0000000..a962244
--- /dev/null
+++ b/src/hooks/useSuitableRaw.ts
@@ -0,0 +1,109 @@
+import { useQuery } from '@tanstack/react-query'
+import { axiosInstance, transformObjectKeys } from '@/libs/axios'
+import { useSuitableStore } from '@/store/useSuitableStore'
+import { useCommCode } from './useCommCode'
+import { SUITABLE_HEAD_CODE, type SuitableDetail } from '@/types/Suitable'
+
+export type Suitable = {
+ id: number
+ productName: string
+ manuFtCd: string
+ roofMtCd: string
+ roofShCd: string
+ detail: string
+}
+
+export function useSuitableRaw() {
+ const { getCommCode } = useCommCode()
+ const { selectedCategory, searchValue, suitableCommCode, setSuitableCommCode, isSearch } = useSuitableStore()
+
+ const getSuitables = async (): Promise => {
+ try {
+ const response = await axiosInstance(null).get('/api/suitable/list/test')
+ return response.data
+ } catch (error) {
+ console.error('지붕재 데이터 로드 실패:', error)
+ return []
+ }
+ }
+
+ // const updateSearchResults = async (selectedCategory: string | undefined, searchValue: string | undefined): Promise => {
+ // try {
+ // const response = await axiosInstance(null).get('/api/suitable/list', { params: { selectedCategory, searchValue } })
+ // return response.data
+ // } catch (error) {
+ // console.error('지붕재 데이터 검색 실패:', error)
+ // return []
+ // }
+ // }
+
+ const getSuitableCommCode = () => {
+ const headCodes = Object.values(SUITABLE_HEAD_CODE) as SUITABLE_HEAD_CODE[]
+ for (const code of headCodes) {
+ getCommCode(code).then((res) => {
+ setSuitableCommCode(code, res)
+ })
+ }
+ }
+
+ const toCodeName = (headCode: string, code: string): string => {
+ const commCode = suitableCommCode.get(headCode)
+ return commCode?.find((item) => item.code === code)?.codeJp || ''
+ }
+
+ const toSuitableDetail = (suitableDetailString: string): SuitableDetail[] => {
+ try {
+ const suitableDetailArray = transformObjectKeys(JSON.parse(suitableDetailString)) as SuitableDetail[]
+ if (!Array.isArray(suitableDetailArray)) {
+ throw new Error('suitableDetailArray is not an array')
+ }
+ return suitableDetailArray
+ } catch (error) {
+ console.error('지붕재 데이터 파싱 실패:', error)
+ return []
+ }
+ }
+
+ const { data: suitableList, isLoading: isInitialLoading } = useQuery({
+ queryKey: ['suitables', 'list'],
+ queryFn: async () => await getSuitables(),
+ staleTime: 1000 * 60 * 10, // 10분
+ gcTime: 1000 * 60 * 10, // 10분
+ })
+
+ const {
+ data: suitableSearchResults,
+ refetch: refetchBySearch,
+ isLoading: isSearchLoading,
+ // } = useQuery({
+ } = useQuery({
+ queryKey: ['suitables', 'search', selectedCategory, isSearch],
+ queryFn: async () => {
+ if (!isSearch && !selectedCategory) {
+ return isInitialLoading ? await getSuitables() : suitableList ?? [] // 검색 상태가 아니면 초기 데이터 반환 임시처리
+ } else {
+ return (
+ suitableList?.filter((item: Suitable) => {
+ const categoryMatch = !selectedCategory || item.roofMtCd === selectedCategory
+ const searchMatch = !searchValue || item.productName.includes(searchValue)
+ return categoryMatch && searchMatch
+ }) ?? []
+ )
+ }
+ },
+ staleTime: 1000 * 60 * 10,
+ gcTime: 1000 * 60 * 10,
+ enabled: true,
+ })
+
+ return {
+ getSuitables,
+ getSuitableCommCode,
+ toCodeName,
+ toSuitableDetail,
+ suitableList,
+ suitableSearchResults,
+ refetchBySearch,
+ isSearchLoading,
+ }
+}
diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts
index a047706..043cfce 100644
--- a/src/hooks/useSurvey.ts
+++ b/src/hooks/useSurvey.ts
@@ -1,43 +1,39 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import type {
- SurveyBasicInfo,
- SurveyDetailInfo,
- SurveyDetailRequest,
- SurveyDetailCoverRequest,
- SurveyRegistRequest,
-} from '@/types/Survey'
+import type { SurveyBasicInfo, SurveyDetailInfo, SurveyDetailRequest, SurveyDetailCoverRequest, SurveyRegistRequest } from '@/types/Survey'
import { axiosInstance } from '@/libs/axios'
import { useSurveyFilterStore } from '@/store/surveyFilterStore'
import { queryStringFormatter } from '@/utils/common-utils'
import { useSessionStore } from '@/store/session'
+import { useMemo } from 'react'
+import { AxiosResponse } from 'axios'
-const requiredFields = [
+export const requiredFields = [
{
- field: 'INSTALLATION_SYSTEM',
+ field: 'installationSystem',
name: '設置希望システム',
},
{
- field: 'CONSTRUCTION_YEAR',
+ field: 'constructionYear',
name: '建築年数',
},
{
- field: 'RAFTER_SIZE',
+ field: 'rafterSize',
name: '垂木サイズ',
},
{
- field: 'RAFTER_PITCH',
+ field: 'rafterPitch',
name: '垂木傾斜',
},
{
- field: 'WATERPROOF_MATERIAL',
+ field: 'waterproofMaterial',
name: '防水材',
},
{
- field: 'INSULATION_PRESENCE',
+ field: 'insulationPresence',
name: '断熱材有無',
},
{
- field: 'STRUCTURE_ORDER',
+ field: 'structureOrder',
name: '屋根構造の順序',
},
]
@@ -60,9 +56,8 @@ type ZipCode = {
}
export function useServey(id?: number): {
- surveyList: SurveyBasicInfo[] | []
+ surveyList: { data: SurveyBasicInfo[]; count: number } | {}
surveyDetail: SurveyBasicInfo | null
- surveyListCount: number
isLoadingSurveyList: boolean
isLoadingSurveyDetail: boolean
isCreatingSurvey: boolean
@@ -72,18 +67,23 @@ export function useServey(id?: number): {
createSurveyDetail: (params: { surveyId: number; surveyDetail: SurveyDetailCoverRequest }) => void
updateSurvey: (survey: SurveyRegistRequest) => void
deleteSurvey: () => Promise
- submitSurvey: () => void
+ submitSurvey: (saveId?: number) => void
validateSurveyDetail: (surveyDetail: SurveyDetailRequest) => string
getZipCode: (zipCode: string) => Promise
+ refetchSurveyList: () => void
} {
const queryClient = useQueryClient()
const { keyword, searchOption, isMySurvey, sort, offset } = useSurveyFilterStore()
const { session } = useSessionStore()
- const { data: surveyList, isLoading: isLoadingSurveyList } = useQuery({
+ const {
+ data: surveyListData,
+ isLoading: isLoadingSurveyList,
+ refetch: refetchSurveyList,
+ } = useQuery({
queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, offset, session?.storeNm, session?.builderNo, session?.role],
queryFn: async () => {
- const resp = await axiosInstance(null).get('/api/survey-sales', {
+ const resp = await axiosInstance(null).get<{ data: SurveyBasicInfo[]; count: number }>('/api/survey-sales', {
params: {
keyword,
searchOption,
@@ -97,41 +97,30 @@ export function useServey(id?: number): {
})
return resp.data
},
+ enabled: session?.isLoggedIn,
})
+ const surveyData = useMemo(() => {
+ if (!surveyListData) return { count: 0, data: [] }
+ return {
+ ...surveyListData,
+ }
+ }, [surveyListData])
const { data: surveyDetail, isLoading: isLoadingSurveyDetail } = useQuery({
queryKey: ['survey', id],
queryFn: async () => {
if (id === undefined) throw new Error('id is required')
- if (id === null) return null
+ if (id === null || isNaN(id)) return null
const resp = await axiosInstance(null).get(`/api/survey-sales/${id}`)
return resp.data
},
enabled: id !== undefined,
})
- const { data: surveyListCount } = useQuery({
- queryKey: ['survey', 'list', keyword, searchOption, isMySurvey, sort, session?.builderNo, session?.storeNm, session?.role],
- queryFn: async () => {
- const resp = await axiosInstance(null).get('/api/survey-sales', {
- params: {
- keyword,
- searchOption,
- isMySurvey,
- sort,
- builderNo: session?.builderNo,
- store: session?.storeNm,
- role: session?.role,
- },
- })
- return resp.data
- },
- })
-
const { mutateAsync: createSurvey, isPending: isCreatingSurvey } = useMutation({
mutationFn: async (survey: SurveyRegistRequest) => {
const resp = await axiosInstance(null).post('/api/survey-sales', survey)
- return resp.data.ID ?? 0
+ return resp.data.id ?? 0
},
onSuccess: (data) => {
queryClient.invalidateQueries({ queryKey: ['survey', 'list'] })
@@ -142,6 +131,7 @@ export function useServey(id?: number): {
const { mutate: updateSurvey, isPending: isUpdatingSurvey } = useMutation({
mutationFn: async (survey: SurveyRegistRequest) => {
+ console.log('updateSurvey, survey:: ', survey)
if (id === undefined) throw new Error('id is required')
const resp = await axiosInstance(null).put(`/api/survey-sales/${id}`, survey)
return resp.data
@@ -176,9 +166,10 @@ export function useServey(id?: number): {
})
const { mutateAsync: submitSurvey } = useMutation({
- mutationFn: async () => {
- if (id === undefined) throw new Error('id is required')
- const resp = await axiosInstance(null).patch(`/api/survey-sales/${id}`, {
+ mutationFn: async (saveId?: number) => {
+ const submitId = saveId ?? id
+ if (!submitId) throw new Error('id is required')
+ const resp = await axiosInstance(null).patch(`/api/survey-sales/${submitId}`, {
submit: true,
})
return resp.data
@@ -190,24 +181,34 @@ export function useServey(id?: number): {
})
const validateSurveyDetail = (surveyDetail: SurveyDetailRequest) => {
- const etcFields = ['INSTALLATION_SYSTEM', 'CONSTRUCTION_YEAR', 'RAFTER_SIZE', 'RAFTER_PITCH', 'WATERPROOF_MATERIAL', 'STRUCTURE_ORDER'] as const
+ const etcFields = [
+ 'installationSystem',
+ 'constructionYear',
+ 'rafterSize',
+ 'rafterPitch',
+ 'waterproofMaterial',
+ 'structureOrder',
+ 'insulationPresence',
+ ] as const
const emptyField = requiredFields.find((field) => {
if (etcFields.includes(field.field as (typeof etcFields)[number])) {
return (
- surveyDetail[field.field as keyof SurveyDetailRequest] === null && surveyDetail[`${field.field}_ETC` as keyof SurveyDetailRequest] === ''
+ surveyDetail[field.field as keyof SurveyDetailRequest] === null &&
+ (surveyDetail[`${field.field}Etc` as keyof SurveyDetailRequest] === null ||
+ surveyDetail[`${field.field}Etc` as keyof SurveyDetailRequest]?.toString().trim() === '')
)
} else {
return surveyDetail[field.field as keyof SurveyDetailRequest] === null
}
})
- const contractCapacity = surveyDetail.CONTRACT_CAPACITY
+ const contractCapacity = surveyDetail.contractCapacity
if (contractCapacity && contractCapacity.trim() !== '' && contractCapacity.split(' ')?.length === 1) {
- return 'CONTRACT_CAPACITY_UNIT'
+ return 'contractCapacityUnit'
}
- return emptyField?.name || ''
+ return emptyField?.field || ''
}
const getZipCode = async (zipCode: string): Promise => {
@@ -223,9 +224,8 @@ export function useServey(id?: number): {
}
return {
- surveyList: surveyList || [],
- surveyDetail: surveyDetail || null,
- surveyListCount: surveyListCount || 0,
+ surveyList: surveyData.data,
+ surveyDetail: surveyDetail as SurveyBasicInfo | null,
isLoadingSurveyList,
isLoadingSurveyDetail,
isCreatingSurvey,
@@ -238,5 +238,6 @@ export function useServey(id?: number): {
submitSurvey,
validateSurveyDetail,
getZipCode,
+ refetchSurveyList,
}
}
diff --git a/src/libs/axios.ts b/src/libs/axios.ts
index 5f1b076..0abc6ab 100644
--- a/src/libs/axios.ts
+++ b/src/libs/axios.ts
@@ -2,37 +2,59 @@ import axios from 'axios'
export const axiosInstance = (url: string | null | undefined) => {
const baseURL = url || process.env.NEXT_PUBLIC_API_URL
-
- return axios.create({
+ const instance = axios.create({
baseURL,
headers: {
Accept: 'application/json',
},
})
+
+ instance.interceptors.request.use(
+ (config) => {
+ // console.log('🚀 ~ config:', config)
+ return config
+ },
+ (error) => {
+ return Promise.reject(error)
+ },
+ )
+
+ instance.interceptors.response.use(
+ (response) => {
+ response.data = transferResponse(response)
+ return response
+ },
+ (error) => {
+ // 에러 처리 로직
+ return Promise.reject(error)
+ },
+ )
+
+ return instance
}
// Request interceptor
-axios.interceptors.request.use(
- (config) => {
- // 여기에 토큰 추가 등의 공통 로직을 넣을 수 있습니다
- return config
- },
- (error) => {
- return Promise.reject(error)
- },
-)
+// axios.interceptors.request.use(
+// (config) => {
+// // 여기에 토큰 추가 등의 공통 로직을 넣을 수 있습니다
+// return config
+// },
+// (error) => {
+// return Promise.reject(error)
+// },
+// )
// Response interceptor
-axios.interceptors.response.use(
- (response) => transferResponse(response),
- (error) => {
- // 에러 처리 로직
- return Promise.reject(error)
- },
-)
+// axios.interceptors.response.use(
+// (response) => transferResponse(response),
+// (error) => {
+// // 에러 처리 로직
+// return Promise.reject(error)
+// },
+// )
// response데이터가 array, object에 따라 분기하여 키 변환
-const transferResponse = (response: any) => {
+export const transferResponse = (response: any) => {
if (!response.data) return response.data
// 배열인 경우 각 객체의 키를 변환
@@ -45,22 +67,34 @@ const transferResponse = (response: any) => {
}
// camel case object 반환
-const transformObjectKeys = (obj: any): any => {
+export const transformObjectKeys = (obj: any): any => {
if (Array.isArray(obj)) {
return obj.map(transformObjectKeys)
}
if (obj !== null && typeof obj === 'object') {
return Object.keys(obj).reduce((acc: any, key: string) => {
- const camelKey = snakeToCamel(key)
- acc[camelKey] = transformObjectKeys(obj[key])
+ let transformedKey = key
+
+ // Handle uppercase snake_case (e.g., USER_NAME -> userName)
+ // Handle lowercase snake_case (e.g., user_name -> userName)
+ if (/^[A-Z_]+$/.test(key) || /^[a-z_]+$/.test(key)) {
+ transformedKey = snakeToCamel(key)
+ }
+ // Handle single uppercase word (e.g., ROLE -> role)
+ else if (/^[A-Z]+$/.test(key)) {
+ transformedKey = key.toLowerCase()
+ }
+ // Preserve existing camelCase
+
+ acc[transformedKey] = transformObjectKeys(obj[key])
return acc
}, {})
}
return obj
}
-// snake case to camel case
+
const snakeToCamel = (str: string): string => {
- return str.replace(/([-_][a-z])/g, (group) => group.toUpperCase().replace('-', '').replace('_', ''))
+ return str.toLowerCase().replace(/([-_][a-z])/g, (group) => group.toUpperCase().replace('-', '').replace('_', ''))
}
diff --git a/src/libs/partner.ts b/src/libs/partner.ts
new file mode 100644
index 0000000..2b17677
--- /dev/null
+++ b/src/libs/partner.ts
@@ -0,0 +1,38 @@
+import { createPool } from 'mysql2'
+
+const pool = createPool({
+ host: process.env.DB_HOST as string,
+ user: process.env.DB_USER as string,
+ password: process.env.DB_PASSWORD as string,
+ database: process.env.DB_DATABASE as string,
+ port: Number(process.env.DB_PORT),
+ waitForConnections: true,
+ connectionLimit: 10,
+ queueLimit: 0,
+})
+
+pool.getConnection((err, conn) => {
+ if (err) console.log('Error connecting to db...')
+ else console.log('Connected to db...!')
+ conn.release()
+})
+
+const executeQuery = (query: string, arrParams: any[]) => {
+ return new Promise((resolve, reject) => {
+ try {
+ pool.query(query, arrParams, (err, data) => {
+ if (err) {
+ console.log('🚀 ~ pool.query ~ err:', err)
+ reject(err)
+ }
+ console.log('🚀 ~ pool.query ~ data:', data)
+ resolve(data)
+ })
+ } catch (err) {
+ console.log('🚀 ~ returnnewPromise ~ err:', err)
+ reject(err)
+ }
+ })
+}
+
+export default executeQuery
diff --git a/src/libs/tracking.ts b/src/libs/tracking.ts
new file mode 100644
index 0000000..2f8833f
--- /dev/null
+++ b/src/libs/tracking.ts
@@ -0,0 +1,9 @@
+import { axiosInstance } from './axios'
+
+export const tracking = async (params: { url: string; data: string }) => {
+ const { url, data } = params
+ const result = await axiosInstance(null).post('/api/tracking', {
+ url,
+ data,
+ })
+}
diff --git a/src/middleware.ts b/src/middleware.ts
index 1bcfd96..115fd8a 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -10,9 +10,9 @@ export async function middleware(request: NextRequest) {
const session = await getIronSession(cookieStore, sessionOptions)
// todo: 로그인 기능 추가 시 주석 해제
- // if (!session.isLoggedIn) {
- // return NextResponse.redirect(new URL('/login', request.url))
- // }
+ if (!session.isLoggedIn) {
+ return NextResponse.redirect(new URL('/login', request.url))
+ }
return NextResponse.next()
}
diff --git a/src/providers/EdgeProvider.tsx b/src/providers/EdgeProvider.tsx
index 4cfd67e..7bba179 100644
--- a/src/providers/EdgeProvider.tsx
+++ b/src/providers/EdgeProvider.tsx
@@ -1,12 +1,13 @@
'use client'
import { useEffect } from 'react'
-import { usePathname } from 'next/navigation'
+import { usePathname, useRouter } from 'next/navigation'
import { useHeaderStore } from '@/store/header'
import { usePopupController } from '@/store/popupController'
import { useSideNavState } from '@/store/sideNavState'
import { useSessionStore } from '@/store/session'
+import { tracking } from '@/libs/tracking'
declare global {
interface Window {
@@ -21,12 +22,30 @@ interface EdgeProviderProps {
}
export default function EdgeProvider({ children, sessionData }: EdgeProviderProps) {
+ const router = useRouter()
const pathname = usePathname()
const { setBackBtn } = useHeaderStore()
const { reset } = useSideNavState()
const { setAlertMsg, setAlertBtn, setAlert, setAlert2, setAlert2BtnYes, setAlert2BtnNo } = usePopupController()
const { session, setSession } = useSessionStore()
+ if (pathname === '/login') {
+ if (session?.isLoggedIn) {
+ router.push('/')
+ }
+ }
+
+ /**
+ * 사용자 이벤트 트래킹 처리
+ *
+ */
+ const handlePageEvent = (path: string) => {
+ tracking({
+ url: path,
+ data: '',
+ })
+ }
+
/**
* alert 함수 - window.alert 함수 대체
* @param msg
@@ -88,6 +107,8 @@ export default function EdgeProvider({ children, sessionData }: EdgeProviderProp
}
//사이드바 초기화
reset()
+ // 페이지 이벤트 트래킹
+ handlePageEvent(pathname)
}, [pathname])
return <>{children}
diff --git a/src/store/useSuitableStore.ts b/src/store/useSuitableStore.ts
index 17b88c5..5fa4cd0 100644
--- a/src/store/useSuitableStore.ts
+++ b/src/store/useSuitableStore.ts
@@ -1,68 +1,71 @@
import { create } from 'zustand'
-import { Suitable, suitableApi } from '@/api/suitable'
+import type { CommCode } from '@/types/CommCode'
interface SuitableState {
- // // 검색 결과 리스트
- // searchResults: Suitable[]
- // // 초기 데이터 로드
- // fetchInitializeData: () => Promise
- // // 검색 결과 설정
- // setSearchResults: (results: Suitable[]) => void
- // // 검색 결과 초기화
- // resetSearchResults: () => void
+ /* 공통코드 */
+ suitableCommCode: Map
+ /* 공통코드 설정 */
+ setSuitableCommCode: (headCode: string, commCode: CommCode[]) => void
- // 선택된 아이템 리스트
- selectedItems: Suitable[]
- // 선택된 아이템 추가
- addSelectedItem: (item: Suitable) => void
- // 선택된 아이템 제거
+ /* 검색 상태 */
+ isSearch: boolean
+ /* 검색 상태 설정 */
+ setIsSearch: (isSearch: boolean) => void
+
+ /* 선택된 카테고리 */
+ selectedCategory: string
+ /* 선택된 카테고리 설정 */
+ setSelectedCategory: (category: string) => void
+
+ /* 검색 값 */
+ searchValue: string
+ /* 검색 값 설정 */
+ setSearchValue: (value: string) => void
+
+ /* 선택된 아이템 리스트 */
+ selectedItems: number[]
+ /* 선택된 아이템 추가 */
+ addSelectedItem: (itemId: number) => void
+ /* 선택된 아이템 제거 */
removeSelectedItem: (itemId: number) => void
- // 선택된 아이템 모두 제거
+ /* 선택된 아이템 모두 제거 */
clearSelectedItems: () => void
}
export const useSuitableStore = create((set) => ({
- // // 초기 상태
- // searchResults: [],
+ suitableCommCode: new Map() as Map,
+ isSearch: false as boolean,
+ selectedCategory: '' as string,
+ searchValue: '' as string,
+ selectedItems: [] as number[],
- // // 초기 데이터 로드
- // fetchInitializeData: async () => {
- // const suitables = await fetchInitialSuitablee()
- // set({ searchResults: suitables })
- // },
-
- // // 검색 결과 설정
- // setSearchResults: (results) => set({ searchResults: results }),
-
- // // 검색 결과 초기화
- // resetSearchResults: () => set({ searchResults: [] }),
-
- // 초기 상태
- selectedItems: [],
-
- // 선택된 아이템 추가 (중복 방지)
- addSelectedItem: (item) =>
+ /* 공통코드 설정 */
+ setSuitableCommCode: (headCode: string, commCode: CommCode[]) =>
set((state) => ({
- selectedItems: state.selectedItems.some((i) => i.id === item.id) ? state.selectedItems : [...state.selectedItems, item],
+ suitableCommCode: new Map(state.suitableCommCode).set(headCode, commCode),
})),
- // 선택된 아이템 제거
- removeSelectedItem: (itemId) =>
+ /* 검색 상태 설정 */
+ setIsSearch: (isSearch: boolean) => set({ isSearch }),
+
+ /* 선택된 카테고리 설정 */
+ setSelectedCategory: (category: string) => set({ selectedCategory: category }),
+
+ /* 검색 값 설정 */
+ setSearchValue: (value: string) => set({ searchValue: value }),
+
+ /* 선택된 아이템 추가 */
+ addSelectedItem: (itemId: number) =>
set((state) => ({
- selectedItems: state.selectedItems.filter((item) => item.id !== itemId),
+ selectedItems: state.selectedItems.some((i) => i === itemId) ? state.selectedItems : [...state.selectedItems, itemId],
})),
- // 선택된 아이템 모두 제거
+ /* 선택된 아이템 제거 */
+ removeSelectedItem: (itemId: number) =>
+ set((state) => ({
+ selectedItems: state.selectedItems.filter((i) => i !== itemId),
+ })),
+
+ /* 선택된 아이템 모두 제거 */
clearSelectedItems: () => set({ selectedItems: [] }),
}))
-
-// // 전체 데이터 초기화 함수
-// async function fetchInitialSuitablee() {
-// try {
-// const suitable = await suitableApi.getList()
-// return suitable
-// } catch (error) {
-// console.error('초기 데이터 로드 실패:', error)
-// return []
-// }
-// }
diff --git a/src/types/CommCode.ts b/src/types/CommCode.ts
new file mode 100644
index 0000000..5847047
--- /dev/null
+++ b/src/types/CommCode.ts
@@ -0,0 +1,5 @@
+export type CommCode = {
+ headCd: string
+ code: string
+ codeJp: string
+}
diff --git a/src/types/Suitable.ts b/src/types/Suitable.ts
new file mode 100644
index 0000000..2e3563b
--- /dev/null
+++ b/src/types/Suitable.ts
@@ -0,0 +1,44 @@
+export enum SUITABLE_HEAD_CODE {
+ /* 지붕재 제조사명 */
+ MANU_FT_CD = 'MANU_FT_CD',
+ /* 지붕재 종류 */
+ ROOF_MT_CD = 'ROOF_MT_CD',
+ /* 마운팅 브래킷 종류 */
+ ROOF_SH_CD = 'ROOF_SH_CD',
+ /* 마운팅 브래킷 제조사명 및 제품코드드 */
+ TRESTLE_MFPC_CD = 'TRESTLE_MFPC_CD',
+}
+
+export type SuitableMain = {
+ id: number
+ productName: string
+ manuFtCd: string
+ roofMtCd: string
+ roofShCd: string
+}
+
+export type SuitableDetail = {
+ id: number
+ mainId: number
+ trestleMfpcCd: string
+ trestleManufacturerProductName: string
+ memo: string
+}
+
+// export type Suitable = {
+// id: number
+// productName: string
+// manuFtCd: string
+// roofMtCd: string
+// roofShCd: string
+// detail: string
+// }
+
+export type SuitableDetailGroup = {
+ mainId: number
+ detail: string
+}
+export type Suitable = {
+ suitable: SuitableMain[]
+ detail: SuitableDetailGroup[]
+}
\ No newline at end of file
diff --git a/src/types/Survey.ts b/src/types/Survey.ts
index 2cfbbec..36e7aa5 100644
--- a/src/types/Survey.ts
+++ b/src/types/Survey.ts
@@ -1,130 +1,132 @@
export type SurveyBasicInfo = {
- ID: number
- REPRESENTATIVE: string
- STORE: string | null
- CONSTRUCTION_POINT: string | null
- INVESTIGATION_DATE: string | null
- BUILDING_NAME: string | null
- CUSTOMER_NAME: string | null
- POST_CODE: string | null
- ADDRESS: string | null
- ADDRESS_DETAIL: string | null
- SUBMISSION_STATUS: boolean
- SUBMISSION_DATE: string | null
- DETAIL_INFO: SurveyDetailInfo | null
- REG_DT: Date
- UPT_DT: Date
+ id: number
+ representative: string
+ store: string | null
+ constructionPoint: string | null
+ investigationDate: string | null
+ buildingName: string | null
+ customerName: string | null
+ postCode: string | null
+ address: string | null
+ addressDetail: string | null
+ submissionStatus: boolean
+ submissionDate: string | null
+ detailInfo: SurveyDetailInfo | null
+ regDt: Date
+ uptDt: Date
}
export type SurveyDetailInfo = {
- ID: number
- BASIC_INFO_ID: number
- CONTRACT_CAPACITY: string | null
- RETAIL_COMPANY: string | null
- SUPPLEMENTARY_FACILITIES: string | null // number 배열
- SUPPLEMENTARY_FACILITIES_ETC: string | null
- INSTALLATION_SYSTEM: string | null
- INSTALLATION_SYSTEM_ETC: string | null
- CONSTRUCTION_YEAR: string | null
- CONSTRUCTION_YEAR_ETC: string | null
- ROOF_MATERIAL: string | null // number 배열
- ROOF_MATERIAL_ETC: string | null
- ROOF_SHAPE: string | null
- ROOF_SHAPE_ETC: string | null
- ROOF_SLOPE: string | null
- HOUSE_STRUCTURE: string | null
- HOUSE_STRUCTURE_ETC: string | null
- RAFTER_MATERIAL: string | null
- RAFTER_MATERIAL_ETC: string | null
- RAFTER_SIZE: string | null
- RAFTER_SIZE_ETC: string | null
- RAFTER_PITCH: string | null
- RAFTER_PITCH_ETC: string | null
- RAFTER_DIRECTION: string | null
- OPEN_FIELD_PLATE_KIND: string | null
- OPEN_FIELD_PLATE_KIND_ETC: string | null
- OPEN_FIELD_PLATE_THICKNESS: string | null
- LEAK_TRACE: boolean | null
- WATERPROOF_MATERIAL: string | null
- WATERPROOF_MATERIAL_ETC: string | null
- INSULATION_PRESENCE: string | null
- INSULATION_PRESENCE_ETC: string | null
- STRUCTURE_ORDER: string | null
- STRUCTURE_ORDER_ETC: string | null
- INSTALLATION_AVAILABILITY: string | null
- INSTALLATION_AVAILABILITY_ETC: string | null
- MEMO: string | null
- REG_DT: Date
- UPT_DT: Date
+ id: number
+ basicInfoId: number
+ contractCapacity: string | null
+ retailCompany: string | null
+ supplementaryFacilities: string | null // number 배열
+ supplementaryFacilitiesEtc: string | null
+ installationSystem: string | null
+ installationSystemEtc: string | null
+ constructionYear: string | null
+ constructionYearEtc: string | null
+ roofMaterial: string | null // number 배열
+ roofMaterialEtc: string | null
+ roofShape: string | null
+ roofShapeEtc: string | null
+ roofSlope: string | null
+ houseStructure: string | null
+ houseStructureEtc: string | null
+ rafterMaterial: string | null
+ rafterMaterialEtc: string | null
+ rafterSize: string | null
+ rafterSizeEtc: string | null
+ rafterPitch: string | null
+ rafterPitchEtc: string | null
+ rafterDirection: string | null
+ openFieldPlateKind: string | null
+ openFieldPlateKindEtc: string | null
+ openFieldPlateThickness: string | null
+ leakTrace: boolean | null
+ waterproofMaterial: string | null
+ waterproofMaterialEtc: string | null
+ insulationPresence: string | null
+ insulationPresenceEtc: string | null
+ structureOrder: string | null
+ structureOrderEtc: string | null
+ installationAvailability: string | null
+ installationAvailabilityEtc: string | null
+ memo: string | null
+ regDt: Date
+ uptDt: Date
}
export type SurveyBasicRequest = {
- REPRESENTATIVE: string
- STORE: string | null
- CONSTRUCTION_POINT: string | null
- INVESTIGATION_DATE: string | null
- BUILDING_NAME: string | null
- CUSTOMER_NAME: string | null
- POST_CODE: string | null
- ADDRESS: string | null
- ADDRESS_DETAIL: string | null
- SUBMISSION_STATUS: boolean
- SUBMISSION_DATE: string | null
+ representative: string
+ store: string | null
+ constructionPoint: string | null
+ investigationDate: string | null
+ buildingName: string | null
+ customerName: string | null
+ postCode: string | null
+ address: string | null
+ addressDetail: string | null
+ submissionStatus: boolean
+ submissionDate: string | null
}
export type SurveyDetailRequest = {
- CONTRACT_CAPACITY: string | null
- RETAIL_COMPANY: string | null
- SUPPLEMENTARY_FACILITIES: string | null // number 배열
- SUPPLEMENTARY_FACILITIES_ETC: string | null
- INSTALLATION_SYSTEM: string | null
- INSTALLATION_SYSTEM_ETC: string | null
- CONSTRUCTION_YEAR: string | null
- CONSTRUCTION_YEAR_ETC: string | null
- ROOF_MATERIAL: string | null // number 배열
- ROOF_MATERIAL_ETC: string | null
- ROOF_SHAPE: string | null
- ROOF_SHAPE_ETC: string | null
- ROOF_SLOPE: string | null
- HOUSE_STRUCTURE: string | null
- HOUSE_STRUCTURE_ETC: string | null
- RAFTER_MATERIAL: string | null
- RAFTER_MATERIAL_ETC: string | null
- RAFTER_SIZE: string | null
- RAFTER_SIZE_ETC: string | null
- RAFTER_PITCH: string | null
- RAFTER_PITCH_ETC: string | null
- RAFTER_DIRECTION: string | null
- OPEN_FIELD_PLATE_KIND: string | null
- OPEN_FIELD_PLATE_KIND_ETC: string | null
- OPEN_FIELD_PLATE_THICKNESS: string | null
- LEAK_TRACE: boolean | null
- WATERPROOF_MATERIAL: string | null
- WATERPROOF_MATERIAL_ETC: string | null
- INSULATION_PRESENCE: string | null
- INSULATION_PRESENCE_ETC: string | null
- STRUCTURE_ORDER: string | null
- STRUCTURE_ORDER_ETC: string | null
- INSTALLATION_AVAILABILITY: string | null
- INSTALLATION_AVAILABILITY_ETC: string | null
- MEMO: string | null
+ contractCapacity: string | null
+ retailCompany: string | null
+ supplementaryFacilities: string | null // number 배열
+ supplementaryFacilitiesEtc: string | null
+ installationSystem: string | null
+ installationSystemEtc: string | null
+ constructionYear: string | null
+ constructionYearEtc: string | null
+ roofMaterial: string | null // number 배열
+ roofMaterialEtc: string | null
+ roofShape: string | null
+ roofShapeEtc: string | null
+ roofSlope: string | null
+ houseStructure: string | null
+ houseStructureEtc: string | null
+ rafterMaterial: string | null
+ rafterMaterialEtc: string | null
+ rafterSize: string | null
+ rafterSizeEtc: string | null
+ rafterPitch: string | null
+ rafterPitchEtc: string | null
+ rafterDirection: string | null
+ openFieldPlateKind: string | null
+ openFieldPlateKindEtc: string | null
+ openFieldPlateThickness: string | null
+ leakTrace: boolean | null
+ waterproofMaterial: string | null
+ waterproofMaterialEtc: string | null
+ insulationPresence: string | null
+ insulationPresenceEtc: string | null
+ structureOrder: string | null
+ structureOrderEtc: string | null
+ installationAvailability: string | null
+ installationAvailabilityEtc: string | null
+ memo: string | null
}
export type SurveyDetailCoverRequest = {
- DETAIL_INFO: SurveyDetailRequest
+ detailInfo: SurveyDetailRequest
}
export type SurveyRegistRequest = {
- REPRESENTATIVE: string
- STORE: string | null
- CONSTRUCTION_POINT: string | null
- INVESTIGATION_DATE: string | null
- BUILDING_NAME: string | null
- CUSTOMER_NAME: string | null
- POST_CODE: string | null
- ADDRESS: string | null
- ADDRESS_DETAIL: string | null
- SUBMISSION_STATUS: boolean
- SUBMISSION_DATE: string | null
- DETAIL_INFO: SurveyDetailRequest | null
+ representative: string
+ store: string | null
+ constructionPoint: string | null
+ investigationDate: string | null
+ buildingName: string | null
+ customerName: string | null
+ postCode: string | null
+ address: string | null
+ addressDetail: string | null
+ submissionStatus: boolean
+ submissionDate: string | null
+ detailInfo: SurveyDetailRequest | null
}
+
+export type Mode = 'CREATE' | 'EDIT' | 'READ' | 'TEMP' // 등록 | 수정 | 상세 | 임시저장
diff --git a/src/utils/common-utils.js b/src/utils/common-utils.js
index 0a1265f..d0c7f65 100644
--- a/src/utils/common-utils.js
+++ b/src/utils/common-utils.js
@@ -185,3 +185,28 @@ export const isEqualObjects = (obj1, obj2) => {
function isObject(value) {
return value !== null && typeof value === 'object'
}
+
+
+// 카멜케이스를 스네이크케이스로 변환하는 함수
+export const toSnakeCase = (str) => {
+ return str.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
+}
+
+// 객체의 키를 스네이크케이스로 변환하는 함수
+export const convertToSnakeCase = (obj) => {
+ if (obj === null || obj === undefined) return obj;
+
+ if (Array.isArray(obj)) {
+ return obj.map((item) => convertToSnakeCase(item))
+ }
+
+ if (typeof obj === 'object') {
+ return Object.keys(obj).reduce((acc, key) => {
+ const snakeKey = toSnakeCase(key).toUpperCase();
+ acc[snakeKey] = convertToSnakeCase(obj[key]);
+ return acc;
+ }, {});
+ }
+
+ return obj;
+}