feat: 지붕재적합성 상세팝업 데이터 표출 추가 및 TODO 수정 #51

Merged
swyoo merged 1 commits from feature/suitable into dev 2025-05-29 10:13:18 +09:00
6 changed files with 132 additions and 147 deletions

View File

@ -64,15 +64,21 @@ session에 있는 role 키로 구분한다
# 지붕재 적합성 TODO # 지붕재 적합성 TODO
``` ```
const suitableCheck = (value: string) => { const suitableCheckIcon = (value: string): string => {
if (value === '×') { const iconMap: Record<string, string> = {
return <i className="compliance-icon x" /> '×': '/assets/images/sub/compliance_x_icon.svg',
} else if (value === 'ー') { 'ー': '/assets/images/sub/compliance_quest_icon.svg',
return <i className="compliance-icon quest" /> default: '/assets/images/sub/compliance_check_icon.svg',
} else {
return <i className="compliance-icon check" />
}
} }
return iconMap[value] || iconMap.default
}
const suitableCheckMemo = (value: string): string => {
if (value === '○') return '設置可'
if (value === '×') return '設置不可'
if (value === 'ー') return 'お問い合わせください'
return `${value}で設置可`
}
``` ```
- 추후 지붕재 적합성 데이터 CUD 구현 시 ×, ー 데이터 관리 필요 - src/hooks/useSuitable.ts > suitableCheckIcon(), suitableCheckMemo()
- 추후 지붕재 적합성 데이터 CUD 구현 시 ×, ー 데이터 관리 필요

View File

@ -2,12 +2,15 @@ import { NextRequest, NextResponse } from 'next/server'
import { prisma } from '@/libs/prisma' import { prisma } from '@/libs/prisma'
import { Suitable } from '@/types/Suitable' import { Suitable } from '@/types/Suitable'
export async function GET(request: NextRequest) { export async function POST(request: NextRequest) {
try { try {
const searchParams = request.nextUrl.searchParams const body: Record<string, string> = await request.json()
const ids = body.ids
const detailIds = body.detailIds
const ids = searchParams.get('ids') if (ids === '' || detailIds === '') {
const detailIds = searchParams.get('subIds') return NextResponse.json({ error: '필수 파라미터가 누락되었습니다' }, { status: 400 })
}
let query = ` let query = `
SELECT SELECT
@ -29,28 +32,22 @@ export async function GET(request: NextRequest) {
, msd_json.memo , msd_json.memo
FROM ms_suitable_detail msd_json FROM ms_suitable_detail msd_json
WHERE msd.main_id = msd_json.main_id WHERE msd.main_id = msd_json.main_id
AND msd_json.id IN (:detailIds)
FOR JSON PATH FOR JSON PATH
) AS detail ) AS detail
FROM ms_suitable_detail msd FROM ms_suitable_detail msd
GROUP BY msd.main_id GROUP BY msd.main_id
) AS details ) AS details
ON msm.id = details.main_id ON msm.id = details.main_id
--ids AND details.main_id IN (:mainIds) AND details.main_id IN (:mainIds)
--detailIds AND details.id IN (:detailIds) WHERE
WHERE 1=1 msm.id IN (:mainIds)
--ids AND msm.id IN (:mainIds)
ORDER BY msm.product_name; ORDER BY msm.product_name;
` `
// 검색 조건 설정 // 검색 조건 설정
if (ids) { query = query.replaceAll(':mainIds', ids)
query = query.replaceAll('--ids ', '') query = query.replaceAll(':detailIds', detailIds)
query = query.replaceAll(':mainIds', ids)
if (detailIds) {
query = query.replaceAll('--detailIds ', '')
query = query.replaceAll(':detailIds', detailIds)
}
}
const suitable: Suitable[] = await prisma.$queryRawUnsafe(query) const suitable: Suitable[] = await prisma.$queryRawUnsafe(query)
@ -60,4 +57,3 @@ export async function GET(request: NextRequest) {
return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 }) return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 })
} }
} }

View File

@ -3,15 +3,13 @@
import Image from 'next/image' import Image from 'next/image'
import { useCallback, useEffect, useState } from 'react' import { useCallback, useEffect, useState } from 'react'
import { usePopupController } from '@/store/popupController' import { usePopupController } from '@/store/popupController'
import { useSuitableStore } from '@/store/useSuitableStore'
import SuitableDetailPopupButton from './SuitableDetailPopupButton' import SuitableDetailPopupButton from './SuitableDetailPopupButton'
import { useSuitable } from '@/hooks/useSuitable' import { useSuitable } from '@/hooks/useSuitable'
import { Suitable } from '@/types/Suitable' import { SUITABLE_HEAD_CODE, type Suitable, type SuitableDetail } from '@/types/Suitable'
export default function SuitableDetailPopup() { export default function SuitableDetailPopup() {
const popupController = usePopupController() const popupController = usePopupController()
const { getSuitableDetails, serializeSelectedItems } = useSuitable() const { getSelectedItemsData, toCodeName, toSuitableDetail, suitableCheckIcon, suitableCheckMemo } = useSuitable()
const { selectedItems } = useSuitableStore()
const [openItems, setOpenItems] = useState<Set<number>>(new Set()) const [openItems, setOpenItems] = useState<Set<number>>(new Set())
const [suitableDetails, setSuitableDetails] = useState<Suitable[]>([]) const [suitableDetails, setSuitableDetails] = useState<Suitable[]>([])
@ -25,14 +23,9 @@ export default function SuitableDetailPopup() {
}) })
}, []) }, [])
// 선택된 아이템 상세 데이터 가져오기
const getSelectedItemsData = async () => {
const serialized: Map<string, string> = serializeSelectedItems()
setSuitableDetails(await getSuitableDetails(serialized.get('ids') ?? '', serialized.get('detailIds') ?? ''))
}
useEffect(() => { useEffect(() => {
getSelectedItemsData() // TODO: 로딩 처리 필요
getSelectedItemsData().then((data) => setSuitableDetails(data))
}, []) }, [])
return ( return (
@ -52,98 +45,56 @@ export default function SuitableDetailPopup() {
</div> </div>
<div className="modal-body"> <div className="modal-body">
<div className="compliance-check-pop-wrap"> <div className="compliance-check-pop-wrap">
<div className={`compliance-check-bx ${openItems.has(1) ? 'act' : ''}`}> {suitableDetails.map((item: Suitable) => (
<div className="check-name-wrap"> <div className={`compliance-check-bx ${openItems.has(item.id) ? 'act' : ''}`} key={item.id}>
<div className="check-name"></div> <div className="check-name-wrap">
<div className="check-name-btn"> <div className="check-name">{item.productName}</div>
<button className="bx-btn" onClick={() => toggleItemOpen(1)}></button> <div className="check-name-btn">
</div> <button className="bx-btn" onClick={() => toggleItemOpen(item.id)}></button>
</div>
<div className="compliance-check-pop-contents">
<div className="check-pop-data-wrap">
<div className="check-pop-data-tit"> </div>
<div className="check-pop-data-txt"></div>
</div>
<div className="check-pop-data-wrap">
<div className="check-pop-data-tit"></div>
<div className="check-pop-data-txt"></div>
</div>
<div className="check-pop-data-wrap">
<div className="check-pop-data-tit"></div>
<div className="check-pop-data-txt"></div>
</div>
<div className="check-pop-data-table-wrap">
<div className="check-pop-data-table">
<div className="pop-data-table-head">
<div className="pop-data-table-head-name"> </div>
<div className="pop-data-table-head-icon">
<div className="compliance-icon">
<Image src={'/assets/images/sub/compliance_check_icon.svg'} width={22} height={22} alt=""></Image>
</div>
<div className="compliance-icon">
<Image src={'/assets/images/sub/compliance_tip_icon.svg'} width={22} height={22} alt=""></Image>
</div>
</div>
</div>
<div className="pop-data-table-body"></div>
<div className="pop-data-table-footer">
<div className="pop-data-table-footer-unit"></div>
<div className="pop-data-table-footer-data">
使
</div>
</div>
</div> </div>
<div className="check-pop-data-table"> </div>
<div className="pop-data-table-head"> <div className="compliance-check-pop-contents">
<div className="pop-data-table-head-name"></div> <div className="check-pop-data-wrap">
<div className="pop-data-table-head-icon"> <div className="check-pop-data-tit"> </div>
<div className="compliance-icon"> <div className="check-pop-data-txt">{toCodeName(SUITABLE_HEAD_CODE.MANU_FT_CD, item.manuFtCd)}</div>
<Image src={'/assets/images/sub/compliance_x_icon.svg'} width={22} height={22} alt=""></Image>
</div>
<div className="compliance-icon">
<Image src={'/assets/images/sub/compliance_tip_icon.svg'} width={22} height={22} alt=""></Image>
</div>
</div>
</div>
<div className="pop-data-table-body"></div>
<div className="pop-data-table-footer">
<div className="pop-data-table-footer-unit"></div>
<div className="pop-data-table-footer-data"></div>
</div>
</div> </div>
<div className="check-pop-data-table"> <div className="check-pop-data-wrap">
<div className="pop-data-table-head"> <div className="check-pop-data-tit"></div>
<div className="pop-data-table-head-name">YGアンカー</div> <div className="check-pop-data-txt">{toCodeName(SUITABLE_HEAD_CODE.ROOF_MT_CD, item.roofMtCd)}</div>
<div className="pop-data-table-head-icon">
<div className="compliance-icon">
<Image src={'/assets/images/sub/compliance_quest_icon.svg'} width={22} height={22} alt=""></Image>
</div>
</div>
</div>
<div className="pop-data-table-body"></div>
<div className="pop-data-table-footer">
<div className="pop-data-table-footer-unit"></div>
<div className="pop-data-table-footer-data"></div>
</div>
</div> </div>
<div className="check-pop-data-table"> <div className="check-pop-data-wrap">
<div className="pop-data-table-head"> <div className="check-pop-data-tit"></div>
<div className="pop-data-table-head-name"></div> <div className="check-pop-data-txt">{toCodeName(SUITABLE_HEAD_CODE.ROOF_SH_CD, item.roofShCd)}</div>
<div className="pop-data-table-head-icon"> </div>
<div className="compliance-icon"> <div className="check-pop-data-table-wrap">
<Image src={'/assets/images/sub/compliance_check_icon.svg'} width={22} height={22} alt=""></Image> {toSuitableDetail(item.detail).map((subItem: SuitableDetail) => (
<div className="check-pop-data-table" key={subItem.id}>
<div className="pop-data-table-head">
<div className="pop-data-table-head-name">{toCodeName(SUITABLE_HEAD_CODE.TRESTLE_MFPC_CD, subItem.trestleMfpcCd)}</div>
<div className="pop-data-table-head-icon">
<div className="compliance-icon">
<Image src={suitableCheckIcon(subItem.trestleManufacturerProductName)} width={22} height={22} alt="" />
</div>
{subItem.memo && (
<div className="compliance-icon">
<Image src={'/assets/images/sub/compliance_tip_icon.svg'} width={22} height={22} alt=""></Image>
</div>
)}
</div>
</div> </div>
<div className="pop-data-table-body">{suitableCheckMemo(subItem.trestleManufacturerProductName)}</div>
{subItem.memo && (
<div className="pop-data-table-footer">
<div className="pop-data-table-footer-unit"></div>
<div className="pop-data-table-footer-data">{subItem.memo}</div>
</div>
)}
</div> </div>
</div> ))}
<div className="pop-data-table-body"> () </div>
<div className="pop-data-table-footer">
<div className="pop-data-table-footer-unit"></div>
<div className="pop-data-table-footer-data"></div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> ))}
</div> </div>
<SuitableDetailPopupButton /> <SuitableDetailPopupButton />
</div> </div>

View File

@ -1,10 +1,16 @@
'use client' 'use client'
import { useRouter } from 'next/navigation'
import { usePopupController } from '@/store/popupController'
export default function SuitableDetailPopupButton() { export default function SuitableDetailPopupButton() {
const popupController = usePopupController()
const router = useRouter()
return ( return (
<div className="btn-flex-wrap com"> <div className="btn-flex-wrap com">
<div className="btn-bx"> <div className="btn-bx">
<button className="btn-frame n-blue icon"> <button className="btn-frame n-blue icon" onClick={() => popupController.setSuitableDetailPopup(false)}>
<i className="btn-arr"></i> <i className="btn-arr"></i>
</button> </button>
</div> </div>
@ -14,7 +20,13 @@ export default function SuitableDetailPopupButton() {
</button> </button>
</div> </div>
<div className="btn-bx"> <div className="btn-bx">
<button className="btn-frame n-blue icon"> <button
className="btn-frame n-blue icon"
onClick={async () => {
await popupController.setSuitableDetailPopup(false)
router.push('/inquiry/regist')
}}
>
11<i className="btn-arr"></i> 11<i className="btn-arr"></i>
</button> </button>
</div> </div>

View File

@ -9,7 +9,17 @@ import { useSuitableStore } from '@/store/useSuitableStore'
import { SUITABLE_HEAD_CODE, type Suitable, type SuitableDetail } from '@/types/Suitable' import { SUITABLE_HEAD_CODE, type Suitable, type SuitableDetail } from '@/types/Suitable'
export default function SuitableList() { export default function SuitableList() {
const { toCodeName, toSuitableDetail, toSuitableDetailIds, suitables, fetchNextPage, hasNextPage, isFetchingNextPage, isLoading } = useSuitable() const {
toCodeName,
toSuitableDetail,
toSuitableDetailIds,
suitables,
fetchNextPage,
hasNextPage,
isFetchingNextPage,
isLoading,
suitableCheckIcon,
} = useSuitable()
const { selectedItems, addSelectedItem, removeSelectedItem } = useSuitableStore() const { selectedItems, addSelectedItem, removeSelectedItem } = useSuitableStore()
const [openItems, setOpenItems] = useState<Set<number>>(new Set()) const [openItems, setOpenItems] = useState<Set<number>>(new Set())
const observerTarget = useRef<HTMLDivElement>(null) const observerTarget = useRef<HTMLDivElement>(null)
@ -52,20 +62,6 @@ export default function SuitableList() {
}) })
}, []) }, [])
// TODO: 추후 지붕재 적합성 데이터 CUD 구현 시 ×, ー 데이터 관리 필요
const suitableCheck = useCallback((value: string) => {
const iconMap: Record<string, string> = {
'×': '/assets/images/sub/compliance_x_icon.svg',
: '/assets/images/sub/compliance_quest_icon.svg',
default: '/assets/images/sub/compliance_check_icon.svg',
}
return (
<div className="compliance-icon">
<Image src={iconMap[value] || iconMap.default} width={22} height={22} alt="" />
</div>
)
}, [])
// 아이템 렌더링 // 아이템 렌더링
const renderItem = useCallback( const renderItem = useCallback(
(item: Suitable) => { (item: Suitable) => {
@ -99,7 +95,9 @@ export default function SuitableList() {
<label htmlFor={`ch${subItem.id}`}>{toCodeName(SUITABLE_HEAD_CODE.TRESTLE_MFPC_CD, subItem.trestleMfpcCd)}</label> <label htmlFor={`ch${subItem.id}`}>{toCodeName(SUITABLE_HEAD_CODE.TRESTLE_MFPC_CD, subItem.trestleMfpcCd)}</label>
</div> </div>
<div className="compliance-icon-wrap"> <div className="compliance-icon-wrap">
{suitableCheck(subItem.trestleManufacturerProductName)} <div className="compliance-icon">
<Image src={suitableCheckIcon(subItem.trestleManufacturerProductName)} width={22} height={22} alt="" />
</div>
{subItem.memo && ( {subItem.memo && (
<div className="compliance-icon"> <div className="compliance-icon">
<Image src={'/assets/images/sub/compliance_tip_icon.svg'} width={22} height={22} alt=""></Image> <Image src={'/assets/images/sub/compliance_tip_icon.svg'} width={22} height={22} alt=""></Image>
@ -113,7 +111,7 @@ export default function SuitableList() {
</div> </div>
) )
}, },
[isItemSelected, openItems, handleItemClick, toggleItemOpen, suitableCheck, toCodeName, toSuitableDetail], [isItemSelected, openItems, handleItemClick, toggleItemOpen, toCodeName, toSuitableDetail],
) )
// 아이템 리스트 // 아이템 리스트

View File

@ -62,7 +62,7 @@ export function useSuitable() {
try { try {
const params: Record<string, string> = { ids: ids } const params: Record<string, string> = { ids: ids }
if (detailIds) params.detailIds = detailIds if (detailIds) params.detailIds = detailIds
const response = await axiosInstance(null).get<Suitable[]>('/api/suitable', { params }) const response = await axiosInstance(null).post<Suitable[]>('/api/suitable', params)
return response.data return response.data
} catch (error) { } catch (error) {
console.error('지붕재 상세 데이터 로드 실패:', error) console.error('지붕재 상세 데이터 로드 실패:', error)
@ -134,17 +134,19 @@ export function useSuitable() {
enabled: selectedCategory !== '' || searchKeyword !== '', enabled: selectedCategory !== '' || searchKeyword !== '',
}) })
const serializeSelectedItems = (): Map<string, string> => { const serializeSelectedItems = (): { ids: string; detailIds: string } => {
const ids: string[] = [] const ids: string[] = []
const detailIds: string[] = [] const detailIds: string[] = []
for (const [key, value] of selectedItems) { for (const [key, value] of selectedItems) {
ids.push(String(key)) ids.push(String(key))
for (const id of value) detailIds.push(String(id)) for (const id of value) detailIds.push(String(id))
} }
return new Map<string, string>([ return { ids: ids.join(','), detailIds: detailIds.length > 0 ? detailIds.join(',') : '' }
['ids', ids.join(',')], }
['detailIds', detailIds.join(',')],
]) const getSelectedItemsData = async (): Promise<Suitable[]> => {
const { ids, detailIds } = serializeSelectedItems()
return await getSuitableDetails(ids, detailIds)
} }
const clearSuitableSearch = ({ items = false, category = false, keyword = false }: { items?: boolean; category?: boolean; keyword?: boolean }) => { const clearSuitableSearch = ({ items = false, category = false, keyword = false }: { items?: boolean; category?: boolean; keyword?: boolean }) => {
@ -153,6 +155,24 @@ export function useSuitable() {
if (keyword) clearSearchKeyword() if (keyword) clearSearchKeyword()
} }
// TODO: 추후 지붕재 적합성 데이터 CUD 구현 시 ×, ー 데이터 관리 필요
const suitableCheckIcon = (value: string): string => {
const iconMap: Record<string, string> = {
'×': '/assets/images/sub/compliance_x_icon.svg',
'ー': '/assets/images/sub/compliance_quest_icon.svg',
default: '/assets/images/sub/compliance_check_icon.svg',
}
return iconMap[value] || iconMap.default
}
// TODO: 추후 지붕재 적합성 데이터 CUD 구현 시 ○, ×, ー 데이터 관리 필요
const suitableCheckMemo = (value: string): string => {
if (value === '○') return '設置可'
if (value === '×') return '設置不可'
if (value === 'ー') return 'お問い合わせください'
return `${value}で設置可`
}
return { return {
getSuitables, getSuitables,
getSuitableIds, getSuitableIds,
@ -166,7 +186,9 @@ export function useSuitable() {
hasNextPage, hasNextPage,
isFetchingNextPage, isFetchingNextPage,
isLoading, isLoading,
serializeSelectedItems, getSelectedItemsData,
clearSuitableSearch, clearSuitableSearch,
suitableCheckIcon,
suitableCheckMemo,
} }
} }