diff --git a/src/app/api/survey-sales/[id]/route.ts b/src/app/api/survey-sales/[id]/route.ts index aa8d2a5..c1a76bc 100644 --- a/src/app/api/survey-sales/[id]/route.ts +++ b/src/app/api/survey-sales/[id]/route.ts @@ -6,6 +6,7 @@ import { sessionOptions } from '@/libs/session' import { cookies } from 'next/headers' import type { SessionData } from '@/types/Auth' import { Prisma } from '@prisma/client' +import { loggerWrapper } from '@/libs/api-wrapper' /** * @description 조사 매물 조회 에러 메시지 @@ -128,11 +129,11 @@ const fetchSurvey = async (id: number) => { * ... * } */ -export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) { +async function getSurveySaleDetail(request: NextRequest): Promise { try { const cookieStore = await cookies() const session = await getIronSession(cookieStore, sessionOptions) - const { id } = await params + const id = request.nextUrl.pathname.split('/').pop() ?? '' const { searchParams } = new URL(request.url) const isPdf = searchParams.get('isPdf') === 'true' @@ -228,9 +229,9 @@ const getNewSrlNo = async (srlNo: string, storeId: string, role: string) => { * ... * } * */ -export async function PUT(request: NextRequest, { params }: { params: Promise<{ id: string }> }) { +async function updateSurveySaleDetail(request: NextRequest): Promise { try { - const { id } = await params + const id = request.nextUrl.pathname.split('/').pop() ?? '' const body = await request.json() const { detailInfo, ...basicInfo } = body.survey @@ -257,6 +258,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{ return NextResponse.json({ error: 'データ保存に失敗しました。' }, { status: 500 }) } } + /** * @api {DELETE} /api/survey-sales/:id 조사 매물 삭제 API * @apiName DELETE /api/survey-sales/:id @@ -275,9 +277,9 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{ * { * "message": "success" */ -export async function DELETE(request: NextRequest, { params }: { params: Promise<{ id: string }> }) { +async function deleteSurveySaleDetail(request: NextRequest): Promise { try { - const { id } = await params + const id = request.nextUrl.pathname.split('/').pop() ?? '' await prisma.$transaction(async (tx: Prisma.TransactionClient) => { // @ts-ignore @@ -343,9 +345,9 @@ export async function DELETE(request: NextRequest, { params }: { params: Promise * } * } */ -export async function PATCH(request: NextRequest, { params }: { params: Promise<{ id: string }> }) { +async function submitSurveySaleDetail(request: NextRequest): Promise { try { - const { id } = await params + const id = request.nextUrl.pathname.split('/').pop() ?? '' const body = await request.json() // @ts-ignore const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ @@ -364,3 +366,8 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise< return NextResponse.json({ error: 'データ保存に失敗しました。' }, { status: 500 }) } } + +export const GET = loggerWrapper(getSurveySaleDetail) +export const PUT = loggerWrapper(updateSurveySaleDetail) +export const DELETE = loggerWrapper(deleteSurveySaleDetail) +export const PATCH = loggerWrapper(submitSurveySaleDetail) diff --git a/src/app/api/survey-sales/route.ts b/src/app/api/survey-sales/route.ts index c257b05..1f2cfdb 100644 --- a/src/app/api/survey-sales/route.ts +++ b/src/app/api/survey-sales/route.ts @@ -1,6 +1,7 @@ import { NextResponse } from 'next/server' import { prisma } from '@/libs/prisma' import { convertToSnakeCase } from '@/utils/common-utils' +import { loggerWrapper } from '@/libs/api-wrapper' /** * @description 검색 파라미터 타입 */ @@ -192,7 +193,7 @@ const checkSession = (params: SearchParams) => { * } * */ -export async function GET(request: Request) { +async function getSurveySales(request: Request) { try { /** URL 파라미터 파싱 */ const { searchParams } = new URL(request.url) @@ -273,7 +274,7 @@ export async function GET(request: Request) { * * @apiError {Number} 500 서버 오류 */ -export async function PUT(request: Request) { +async function updateSurveySales(request: Request) { try { /** 요청 바디 파싱 */ const body = await request.json() @@ -335,7 +336,7 @@ export async function PUT(request: Request) { * * @apiError {Number} 500 서버 오류 */ -export async function POST(request: Request) { +async function createSurveySales(request: Request) { try { const body = await request.json() @@ -393,3 +394,7 @@ export async function POST(request: Request) { return NextResponse.json({ error: 'データ保存に失敗しました。' }, { status: 500 }) } } + +export const GET = loggerWrapper(getSurveySales) +export const PUT = loggerWrapper(updateSurveySales) +export const POST = loggerWrapper(createSurveySales) \ No newline at end of file diff --git a/src/components/survey-sale/detail/ButtonForm.tsx b/src/components/survey-sale/detail/ButtonForm.tsx index b7d1e5d..c806139 100644 --- a/src/components/survey-sale/detail/ButtonForm.tsx +++ b/src/components/survey-sale/detail/ButtonForm.tsx @@ -90,10 +90,9 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) { /** 저장 로직 */ const handleSave = (isTemporary: boolean, isSubmitProcess: boolean) => { const emptyField = validateSurveyDetail(data.roof) - const hasEmptyField = emptyField?.trim() !== '' if (isTemporary) { - hasEmptyField ? tempSaveProcess() : saveProcess(emptyField, false) + tempSaveProcess() } else { saveProcess(emptyField, isSubmitProcess) } diff --git a/src/components/survey-sale/detail/DetailForm.tsx b/src/components/survey-sale/detail/DetailForm.tsx index 06511c2..313a650 100644 --- a/src/components/survey-sale/detail/DetailForm.tsx +++ b/src/components/survey-sale/detail/DetailForm.tsx @@ -94,6 +94,14 @@ export default function DetailForm() { })) const [roofInfoData, setRoofInfoData] = useState(roofInfoForm) + /** route 에러 처리 - 잘못된 URL 접근 시 생성 페이지로 리다이렉트 */ + useEffect(() => { + if (modeset === 'CREATE' && pathname !== '/survey-sale/regist') { + router.replace('/survey-sale/regist') + } + return + }, [modeset, id, pathname]) + /** 제출 팝업 처리 - createSurvey 이후 popup 처리 시 노드 삽입 오류로 인해 별도 처리 */ useEffect(() => { const show = searchParams.get('show') diff --git a/src/hooks/useInquiry.ts b/src/hooks/useInquiry.ts index cd32c87..707b0e0 100644 --- a/src/hooks/useInquiry.ts +++ b/src/hooks/useInquiry.ts @@ -48,7 +48,9 @@ export function useInquiry( */ const errorRouter = (error: any) => { const status = error.response?.status - alert(error.response?.data.error) + if (error.response?.data.error) { + alert(error.response?.data.error) + } switch (status) { // session 없는 경우 case 401: diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts index 84f6cfa..bee304a 100644 --- a/src/hooks/useSurvey.ts +++ b/src/hooks/useSurvey.ts @@ -108,7 +108,9 @@ export function useSurvey( */ const errorRouter = (error: any) => { const status = error.response?.status - alert(error.response?.data.error) + if (error.response?.data.error) { + alert(error.response?.data.error) + } switch (status) { /** session 없는 경우 */ case 401: @@ -259,6 +261,9 @@ export function useSurvey( queryClient.invalidateQueries({ queryKey: ['survey', id] }) queryClient.invalidateQueries({ queryKey: ['survey', 'list'] }) }, + onError: (error: any) => { + alert(error.response?.data.error) + }, }) /** @@ -269,7 +274,7 @@ export function useSurvey( * * @example * - * + * */ const { mutateAsync: deleteSurvey, isPending: isDeletingSurvey } = useMutation({ mutationFn: async () => { @@ -370,8 +375,9 @@ export function useSurvey( `https://zipcloud.ibsnet.co.jp/api/search?${queryStringFormatter({ zipcode: zipCode.trim() })}`, ) return data.results - } catch (e) { - console.error('Failed to fetch zipcode data:', e) + } catch (error: any) { + console.error('Failed to fetch zipcode data:', error) + alert(error.response?.data.error) throw new Error('Failed to fetch zipcode data') } } diff --git a/src/hooks/useTitle.ts b/src/hooks/useTitle.ts index d2f2aa0..f738e7f 100644 --- a/src/hooks/useTitle.ts +++ b/src/hooks/useTitle.ts @@ -1,8 +1,8 @@ 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('/survey-sale/') && pathname !== '/survey-sale/regist') { + return '調査物件詳細' } if (pathname.startsWith('/inquiry/') && pathname !== '/inquiry/list' && pathname !== '/inquiry/regist') { @@ -17,10 +17,8 @@ export const useTitle = () => { return '屋根材適合性の確認' case '/survey-sale': return '調査物件一覧' - case '/survey-sale/basic-info': + case '/survey-sale/regist': return '調査物件登録' - case '/survey-sale/roof-info': - return '調査物件新規登録' case '/inquiry/list': return '1:1お問い合わせ' case '/inquiry/regist':