From 1dcb3add79600b9d2b023b5f0fa45b629da31354 Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Tue, 13 May 2025 16:45:47 +0900 Subject: [PATCH 1/5] fix: change Survey's form by Prisma data type changes --- src/app/api/survey-sales/[id]/route.ts | 59 ++--- src/app/api/survey-sales/route.ts | 22 +- .../survey-sale/detail/DataTable.tsx | 12 +- .../survey-sale/detail/DetailForm.tsx | 16 +- .../survey-sale/detail/RoofDetailForm.tsx | 76 +++---- .../survey-sale/detail/form/BasicForm.tsx | 78 +++---- .../survey-sale/detail/form/MultiCheckEtc.tsx | 34 ++- .../survey-sale/detail/form/RadioEtc.tsx | 102 +++++---- .../survey-sale/detail/form/RoofInfoForm.tsx | 183 ++++++++-------- .../survey-sale/detail/form/SelectBoxEtc.tsx | 121 +++++------ src/components/survey-sale/list/ListTable.tsx | 14 +- src/hooks/useSurvey.ts | 29 +-- src/types/Survey.ts | 202 +++++++++--------- 13 files changed, 482 insertions(+), 466 deletions(-) diff --git a/src/app/api/survey-sales/[id]/route.ts b/src/app/api/survey-sales/[id]/route.ts index 5e4b83e..4794a5f 100644 --- a/src/app/api/survey-sales/[id]/route.ts +++ b/src/app/api/survey-sales/[id]/route.ts @@ -3,10 +3,10 @@ import { NextResponse } from 'next/server' export async function GET(request: Request, context: { params: { id: string } }) { const { id } = await context.params // @ts-ignore - const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.findUnique({ - where: { id: Number(id) }, + const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findUnique({ + where: { ID: Number(id) }, include: { - detail_info: true, + DETAIL_INFO: true, }, }) return NextResponse.json(survey) @@ -17,8 +17,8 @@ export async function PUT(request: Request, context: { params: { id: string } }) const body = await request.json() try { // @ts-ignore - const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({ - where: { id: Number(id) }, + const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ + where: { ID: Number(id) }, data: { ...body, }, @@ -37,22 +37,22 @@ export async function DELETE(request: Request, context: { params: { id: string } //@ts-ignore await prisma.$transaction(async (tx) => { // @ts-ignore - const detailData = await tx.SD_SERVEY_SALES_BASIC_INFO.findUnique({ - where: { id: Number(id) }, + const detailData = await tx.SD_SURVEY_SALES_BASIC_INFO.findUnique({ + where: { ID: Number(id) }, select: { - detail_info: true, + DETAIL_INFO: true, }, }) console.log('detailData:: ', detailData) - if (detailData?.detail_info?.id) { + if (detailData?.DETAIL_INFO?.ID) { // @ts-ignore - await tx.SD_SERVEY_SALES_DETAIL_INFO.delete({ - where: { id: Number(detailData?.detail_info?.id) }, + await tx.SD_SURVEY_SALES_DETAIL_INFO.delete({ + where: { ID: Number(detailData?.DETAIL_INFO?.ID) }, }) } // @ts-ignore - await tx.SD_SERVEY_SALES_BASIC_INFO.delete({ - where: { id: Number(id) }, + await tx.SD_SURVEY_SALES_BASIC_INFO.delete({ + where: { ID: Number(id) }, }) }) return NextResponse.json({ message: 'Survey deleted successfully' }) @@ -65,43 +65,46 @@ export async function DELETE(request: Request, context: { params: { id: string } export async function PATCH(request: Request, context: { params: { id: string } }) { const { id } = await context.params const body = await request.json() + if (body.submit) { // @ts-ignore - const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({ - where: { id: Number(id) }, + const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ + where: { ID: Number(id) }, data: { - submission_status: true, - submission_date: new Date(), + SUBMISSION_STATUS: true, + SUBMISSION_DATE: new Date(), }, }) return NextResponse.json({ message: 'Survey confirmed successfully' }) } else { // @ts-ignore - const hasDetails = await prisma.SD_SERVEY_SALES_DETAIL_INFO.findUnique({ - where: { basic_info_id: Number(id) }, + const hasDetails = await prisma.SD_SURVEY_SALES_DETAIL_INFO.findUnique({ + where: { BASIC_INFO_ID: Number(id) }, }) + console.log('hasDetails:: ', hasDetails) if (hasDetails) { //@ts-ignore - const result = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({ - where: { id: Number(id) }, + const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ + where: { ID: Number(id) }, data: { - updated_at: new Date(), - detail_info: { - update: body.detail_info, + UPT_DT: new Date(), + DETAIL_INFO: { + update: body.DETAIL_INFO, }, }, }) return NextResponse.json(result) } else { // @ts-ignore - const survey = await prisma.SD_SERVEY_SALES_BASIC_INFO.update({ - where: { id: Number(id) }, + const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ + where: { ID: Number(id) }, data: { - detail_info: { - create: body.detail_info, + DETAIL_INFO: { + create: body.DETAIL_INFO, }, }, }) + console.log(survey) return NextResponse.json({ message: 'Survey detail created successfully' }) } } diff --git a/src/app/api/survey-sales/route.ts b/src/app/api/survey-sales/route.ts index 8c32ca6..ce6ce6f 100644 --- a/src/app/api/survey-sales/route.ts +++ b/src/app/api/survey-sales/route.ts @@ -4,7 +4,7 @@ import { prisma } from '@/libs/prisma' export async function POST(request: Request) { const body = await request.json() // @ts-ignore - const res = await prisma.SD_SERVEY_SALES_BASIC_INFO.create({ + const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({ data: body, }) return NextResponse.json(res) @@ -20,12 +20,12 @@ export async function GET(request: Request) { 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'] + const searchOptions = ['BUILDING_NAME', 'REPRESENTATIVE', 'STORE', 'CONSTRUCTION_POINT', 'CUSTOMER_NAME', 'POST_CODE', 'ADDRESS', 'ADDRESS_DETAIL'] try { const where: any = {} if (isMySurvey !== null && isMySurvey !== undefined) { - where.representative = isMySurvey + where.REPRESENTATIVE = isMySurvey } if (keyword && keyword.trim() !== '' && searchOption) { @@ -33,7 +33,7 @@ export async function GET(request: Request) { where.OR = [] if (keyword.match(/^\d+$/) || !isNaN(Number(keyword))) { where.OR.push({ - id: { + ID: { equals: Number(keyword), }, }) @@ -59,14 +59,14 @@ export async function GET(request: Request) { where.AND = [] if (store) { where.AND.push({ - store: { + STORE: { equals: store, }, }) } if (construction_point) { where.AND.push({ - construction_point: { + CONSTRUCTION_POINT: { equals: construction_point, }, }) @@ -74,16 +74,16 @@ export async function GET(request: Request) { if (offset) { // @ts-ignore - const res = await prisma.SD_SERVEY_SALES_BASIC_INFO.findMany({ + const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.findMany({ where, - orderBy: sort === 'created' ? { created_at: 'desc' } : { updated_at: 'desc' }, + orderBy: sort === 'created' ? { REG_DT: 'desc' } : { UPT_DT: 'desc' }, skip: Number(offset), take: 10, }) return NextResponse.json(res) } else { // @ts-ignore - const count = await prisma.SD_SERVEY_SALES_BASIC_INFO.count({ + const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ where, }) return NextResponse.json(count) @@ -96,9 +96,9 @@ export async function GET(request: Request) { export async function PUT(request: Request) { const body = await request.json() - const detailInfo = { ...body.detail_info, basic_info_id: body.id } + const detailInfo = { ...body.detail_info, BASIC_INFO_ID: body.id } // @ts-ignore - const res = await prisma.SD_SERVEY_SALES_DETAIL_INFO.create({ + const res = await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({ data: detailInfo, }) return NextResponse.json({ message: 'Survey sales updated successfully' }) diff --git a/src/components/survey-sale/detail/DataTable.tsx b/src/components/survey-sale/detail/DataTable.tsx index 6446be7..2ec528e 100644 --- a/src/components/survey-sale/detail/DataTable.tsx +++ b/src/components/survey-sale/detail/DataTable.tsx @@ -20,7 +20,7 @@ export default function DataTable() { const { setBasicInfoSelected, setRoofInfoSelected } = useSurveySaleTabState() useEffect(() => { - if (surveyDetail?.representative && surveyDetail?.store && surveyDetail?.construction_point) { + if (surveyDetail?.REPRESENTATIVE && surveyDetail?.STORE && surveyDetail?.CONSTRUCTION_POINT) { setIsTemporary(false) } if (tab === 'roof-info') { @@ -50,24 +50,24 @@ export default function DataTable() { 仮保存 ) : ( - {surveyDetail?.id} + {surveyDetail?.ID} )} 登録日 - {surveyDetail?.created_at ? new Date(surveyDetail?.created_at).toLocaleString() : ''} + {surveyDetail?.REG_DT ? new Date(surveyDetail?.REG_DT).toLocaleString() : ''} 更新日時 - {surveyDetail?.updated_at ? new Date(surveyDetail?.updated_at).toLocaleString() : ''} + {surveyDetail?.UPT_DT ? new Date(surveyDetail?.UPT_DT).toLocaleString() : ''} 提出可否 - {surveyDetail?.submission_status && surveyDetail?.submission_date ? ( + {surveyDetail?.SUBMISSION_STATUS && surveyDetail?.SUBMISSION_DATE ? ( <> {/* TODO: 제출한 판매점 ID 추가 필요 */} -
{new Date(surveyDetail.submission_date).toLocaleString()}
+
{new Date(surveyDetail.SUBMISSION_DATE).toLocaleString()}
販売店 ID...
) : ( diff --git a/src/components/survey-sale/detail/DetailForm.tsx b/src/components/survey-sale/detail/DetailForm.tsx index 31c33bb..469c465 100644 --- a/src/components/survey-sale/detail/DetailForm.tsx +++ b/src/components/survey-sale/detail/DetailForm.tsx @@ -14,7 +14,7 @@ export default function DetailForm({ const [isTemporary, setIsTemporary] = useState(true) useEffect(() => { - if (surveyDetail?.representative && surveyDetail?.store && surveyDetail?.construction_point) { + if (surveyDetail?.REPRESENTATIVE && surveyDetail?.STORE && surveyDetail?.CONSTRUCTION_POINT) { setIsTemporary(false) } }, [surveyDetail]) @@ -28,15 +28,15 @@ export default function DetailForm({
担当者名
- +
販売店
- +
施工店
- +
@@ -45,18 +45,18 @@ export default function DetailForm({
現地調査日
- +
建物名
- +
顧客名
- +
- + ) diff --git a/src/components/survey-sale/detail/RoofDetailForm.tsx b/src/components/survey-sale/detail/RoofDetailForm.tsx index 0291f9c..a20f48a 100644 --- a/src/components/survey-sale/detail/RoofDetailForm.tsx +++ b/src/components/survey-sale/detail/RoofDetailForm.tsx @@ -30,12 +30,12 @@ export default function RoofDetailForm({
{/* 전기 계약 용량 */}
電気契約容量
- +
{/* 전기 소매 회사 */}
電気小売会社
- +
{/* 전기 부대 설비 */}
@@ -46,7 +46,7 @@ export default function RoofDetailForm({ @@ -56,7 +56,7 @@ export default function RoofDetailForm({ @@ -68,19 +68,19 @@ export default function RoofDetailForm({ className="input-frame" placeholder="-" readOnly - value={surveyDetail?.detail_info?.supplementary_facilities_etc ?? ''} + value={surveyDetail?.DETAIL_INFO?.SUPPLEMENTARY_FACILITIES_ETC ?? ''} />
{/* 설치 희망 시스템 */}
設置希望システム
- +
{/* 건축 연수 */}
建築年数
- +
{/* 지붕재 */}
@@ -91,63 +91,63 @@ export default function RoofDetailForm({
))}
- +
- +
{/* 지붕 모양 */}
屋根の形状
- +
{/* 지붕 경사도 */}
屋根の斜面
- + 寸
{/* 주택 구조 */}
住宅構造
- +
{/* 서까래 재질 */}
垂木の材質
- +
{/* 서까래 크기 */}
垂木の大きさ
- +
{/* 서까래 피치 */}
垂木のピッチ
- +
{/* 서까래 방향 */}
垂木の方向
- +
{/* 노지판 종류 */}
路地板の種類
- +
{/* 노지판 두께 */}
@@ -158,7 +158,7 @@ export default function RoofDetailForm({ type="text" placeholder="-" readOnly - value={surveyDetail?.detail_info?.open_field_plate_thickness ?? ''} + value={surveyDetail?.DETAIL_INFO?.OPEN_FIELD_PLATE_THICKNESS ?? ''} /> mm
@@ -166,37 +166,37 @@ export default function RoofDetailForm({ {/* 누수 흔적 */}
水漏れの痕跡
- +
{/* 방수재 종류 */}
防水材の種類
- +
{/* 단열재 유무 */}
断熱材の有無
- +
{/* 구조 순서 */}
屋根構造の順序
- +
{/* 설치 가능 여부 */}
設置可能な場合
- +
{/* 메모 */}
メモ
-
diff --git a/src/components/survey-sale/detail/form/SelectBoxEtc.tsx b/src/components/survey-sale/detail/form/SelectBoxEtc.tsx index d1f1950..9469a40 100644 --- a/src/components/survey-sale/detail/form/SelectBoxEtc.tsx +++ b/src/components/survey-sale/detail/form/SelectBoxEtc.tsx @@ -2,39 +2,39 @@ import type { SurveyDetailRequest } from '@/types/Survey' import { useEffect, useState } from 'react' export type SelectBoxKeys = - | 'installation_system' - | 'construction_year' - | 'roof_shape' - | 'rafter_pitch' - | 'rafter_size' - | 'open_field_plate_kind' - | 'structure_order' - | 'installation_availability' + | 'INSTALLATION_SYSTEM' + | 'CONSTRUCTION_YEAR' + | 'ROOF_SHAPE' + | 'RAFTER_PITCH' + | 'RAFTER_SIZE' + | 'OPEN_FIELD_PLATE_KIND' + | 'STRUCTURE_ORDER' + | 'INSTALLATION_AVAILABILITY' const font: Record = { - installation_system: 'data-input-form-tit red-f', - construction_year: 'data-input-form-tit red-f', - roof_shape: 'data-input-form-tit', - rafter_pitch: 'data-input-form-tit red-f', - rafter_size: 'data-input-form-tit red-f', - open_field_plate_kind: 'data-input-form-tit', - structure_order: 'data-input-form-tit red-f', - installation_availability: 'data-input-form-tit', + INSTALLATION_SYSTEM: 'data-input-form-tit red-f', + CONSTRUCTION_YEAR: 'data-input-form-tit red-f', + ROOF_SHAPE: 'data-input-form-tit', + RAFTER_PITCH: 'data-input-form-tit red-f', + RAFTER_SIZE: 'data-input-form-tit red-f', + OPEN_FIELD_PLATE_KIND: 'data-input-form-tit', + STRUCTURE_ORDER: 'data-input-form-tit red-f', + INSTALLATION_AVAILABILITY: 'data-input-form-tit', } const translateJapanese: Record = { - installation_system: '設置希望システム', - construction_year: '建築年数', - roof_shape: '屋根の形状', - rafter_pitch: '垂木傾斜', - rafter_size: '垂木サイズ', - open_field_plate_kind: '路地板の種類', - structure_order: '屋根構造の順序', - installation_availability: '屋根製品名 設置可否確認', + INSTALLATION_SYSTEM: '設置希望システム', + CONSTRUCTION_YEAR: '建築年数', + ROOF_SHAPE: '屋根の形状', + RAFTER_PITCH: '垂木傾斜', + RAFTER_SIZE: '垂木サイズ', + OPEN_FIELD_PLATE_KIND: '路地板の種類', + STRUCTURE_ORDER: '屋根構造の順序', + INSTALLATION_AVAILABILITY: '屋根製品名 設置可否確認', } export const selectBoxOptions: Record = { - installation_system: [ + INSTALLATION_SYSTEM: [ { id: 1, name: '太陽光発電', //태양광발전 @@ -48,7 +48,7 @@ export const selectBoxOptions: Record { - if (detailInfoData[`${column}_etc` as keyof SurveyDetailRequest]) { + if (detailInfoData[`${column}_ETC` as keyof SurveyDetailRequest]) { setIsEtcSelected(true) - setEtcValue(detailInfoData[`${column}_etc` as keyof SurveyDetailRequest] as string) + setEtcValue(detailInfoData[`${column}_ETC` as keyof SurveyDetailRequest] as string) } }, [detailInfoData]) const handleSelectChange = (e: React.ChangeEvent) => { const value = e.target.value - if (column === 'installation_availability' || column === 'construction_year') { - setIsEtcSelected(value === '2') // 건축 연수 & 설치 가능 여부 컬럼 2번 선택 시 input 활성화 - setDetailInfoData({ - ...detailInfoData, - [column]: Number(value), - }) - } else if (value === 'etc') { - setIsEtcSelected(true) // 기타 선택 시 input 활성화 - setDetailInfoData({ - ...detailInfoData, - [column]: null, - }) - } else { - setIsEtcSelected(false) // 기타 선택 해제 시 input 비활성화 - setEtcValue('') - setDetailInfoData({ - ...detailInfoData, - [`${column}_etc`]: null, - [column]: Number(value), - }) + const isSpecialCase = column === 'CONSTRUCTION_YEAR' || column === 'INSTALLATION_AVAILABILITY' + const isEtc = value === 'etc' + const isSpecialEtc = isSpecialCase && value === '2' + + const updatedData: typeof detailInfoData = { + ...detailInfoData, + [column]: isEtc ? null : value, + [`${column}_ETC`]: isEtc ? '' : null, } + + // 건축연수 + 설치가능여부는 2번 선택 시 input 활성화 + if (isSpecialEtc) { + updatedData[column] = value + } + + setIsEtcSelected(isEtc || isSpecialEtc) + if (!isEtc) setEtcValue('') + setDetailInfoData(updatedData) } const handleEtcInputChange = (e: React.ChangeEvent) => { @@ -201,31 +198,31 @@ export default function SelectBoxForm({ setEtcValue(value) setDetailInfoData({ ...detailInfoData, - [`${column}_etc`]: value, + [`${column}_ETC`]: value, }) } return ( <>
-
{translateJapanese[column]}
+
{translateJapanese[column as keyof typeof translateJapanese]}
@@ -235,10 +232,10 @@ export default function SelectBoxForm({ value={etcValue ?? ''} onChange={handleEtcInputChange} disabled={ - column === 'installation_availability' + column === 'INSTALLATION_AVAILABILITY' ? !Boolean(detailInfoData[column]) - : column === 'construction_year' - ? detailInfoData[column] !== 2 // 既築(2)가 아닐 때 비활성화 + : column === 'CONSTRUCTION_YEAR' + ? detailInfoData[column] !== '2' // 既築(2)가 아닐 때 비활성화 : !isEtcSelected } /> diff --git a/src/components/survey-sale/list/ListTable.tsx b/src/components/survey-sale/list/ListTable.tsx index ade76f2..63eb41b 100644 --- a/src/components/survey-sale/list/ListTable.tsx +++ b/src/components/survey-sale/list/ListTable.tsx @@ -50,17 +50,17 @@ export default function ListTable() {
    {heldSurveyList.map((survey) => ( -
  • handleDetailClick(survey.id)}> +
  • handleDetailClick(survey.ID)}>
    -
    {survey.id}
    -
    {survey.investigation_date}
    +
    {survey.ID}
    +
    {survey.INVESTIGATION_DATE}
    -
    {survey.building_name}
    -
    {survey.customer_name}
    +
    {survey.BUILDING_NAME}
    +
    {survey.CUSTOMER_NAME}
    -
    {survey.representative}
    -
    {new Date(survey.updated_at).toLocaleString()}
    +
    {survey.REPRESENTATIVE}
    +
    {new Date(survey.UPT_DT).toLocaleString()}
    • diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts index 9ab9b47..ea04db4 100644 --- a/src/hooks/useSurvey.ts +++ b/src/hooks/useSurvey.ts @@ -77,7 +77,7 @@ export function useServey(id?: number): { const { mutateAsync: createSurvey, isPending: isCreatingSurvey } = useMutation({ mutationFn: async (survey: SurveyBasicRequest) => { 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'] }) @@ -138,28 +138,29 @@ export function useServey(id?: number): { const validateSurveyDetail = (surveyDetail: SurveyDetailRequest) => { const requiredFields = [ - 'installation_system', - 'construction_year', - 'rafter_size', - 'rafter_pitch', - 'rafter_direction', - 'waterproof_material', - 'insulation_presence', - 'structure_order', + 'INSTALLATION_SYSTEM', + 'CONSTRUCTION_YEAR', + 'RAFTER_SIZE', + 'RAFTER_PITCH', + 'RAFTER_DIRECTION', + 'WATERPROOF_MATERIAL', + 'INSULATION_PRESENCE', + 'STRUCTURE_ORDER', ] as const - const etcFields = ['installation_system', 'construction_year', 'rafter_size', 'rafter_pitch', 'waterproof_material', 'structure_order'] as const + const etcFields = ['INSTALLATION_SYSTEM', 'CONSTRUCTION_YEAR', 'RAFTER_SIZE', 'RAFTER_PITCH', 'WATERPROOF_MATERIAL', 'STRUCTURE_ORDER'] as const const emptyField = requiredFields.find((field) => { if (etcFields.includes(field as (typeof etcFields)[number])) { - return surveyDetail[field as keyof SurveyDetailRequest] === null && surveyDetail[`${field}_etc` as keyof SurveyDetailRequest] === null + return surveyDetail[field as keyof SurveyDetailRequest] === null && surveyDetail[`${field}_ETC` as keyof SurveyDetailRequest] === null + } else { + return surveyDetail[field as keyof SurveyDetailRequest] === null } - return surveyDetail[field as keyof SurveyDetailRequest] === null }) - const contractCapacity = surveyDetail.contract_capacity + const contractCapacity = surveyDetail.CONTRACT_CAPACITY if (contractCapacity && contractCapacity.trim() !== '' && contractCapacity.split(' ')?.length === 1) { - return 'contract_capacity_unit' + return 'CONTRACT_CAPACITY_UNIT' } return emptyField || '' diff --git a/src/types/Survey.ts b/src/types/Survey.ts index 1c68c42..7a3be3c 100644 --- a/src/types/Survey.ts +++ b/src/types/Survey.ts @@ -1,117 +1,117 @@ import { SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS_ENUM, SORT_OPTIONS_ENUM } from '@/store/surveyFilterStore' 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 - created_at: Date - updated_at: Date + 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 } 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: number | null - installation_system_etc: string | null - construction_year: number | null - construction_year_etc: string | null - roof_material: string | null // number 배열 - roof_material_etc: string | null - roof_shape: number | null - roof_shape_etc: string | null - roof_slope: string | null - house_structure: number | null - house_structure_etc: string | null - rafter_material: number | null - rafter_material_etc: string | null - rafter_size: number | null - rafter_size_etc: string | null - rafter_pitch: number | null - rafter_pitch_etc: string | null - rafter_direction: number | null - open_field_plate_kind: number | null - open_field_plate_kind_etc: string | null - open_field_plate_thickness: string | null - leak_trace: boolean | null - waterproof_material: number | null - waterproof_material_etc: string | null - insulation_presence: number | null - insulation_presence_etc: string | null - structure_order: number | null - structure_order_etc: string | null - installation_availability: number | null - installation_availability_etc: string | null - memo: string | null - created_at: Date - updated_at: Date + 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 } 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 + 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 } export type SurveyDetailRequest = { - contract_capacity: string | null - retail_company: string | null - supplementary_facilities: string | null // number 배열 - supplementary_facilities_etc: string | null - installation_system: number | null - installation_system_etc: string | null - construction_year: number | null - construction_year_etc: string | null - roof_material: string | null // number 배열 - roof_material_etc: string | null - roof_shape: number | null - roof_shape_etc: string | null - roof_slope: string | null - house_structure: number | null - house_structure_etc: string | null - rafter_material: number | null - rafter_material_etc: string | null - rafter_size: number | null - rafter_size_etc: string | null - rafter_pitch: number | null - rafter_pitch_etc: string | null - rafter_direction: number | null - open_field_plate_kind: number | null - open_field_plate_kind_etc: string | null - open_field_plate_thickness: string | null - leak_trace: boolean | null - waterproof_material: number | null - waterproof_material_etc: string | null - insulation_presence: number | null - insulation_presence_etc: string | null - structure_order: number | null - structure_order_etc: string | null - installation_availability: number | null - installation_availability_etc: string | null - memo: string | null + 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 } export type SurveyDetailCoverRequest = { - detail_info: SurveyDetailRequest + DETAIL_INFO: SurveyDetailRequest } From 47be6a4433c9f237c9b8f0255a6f3e48d548da3f Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Wed, 14 May 2025 09:59:12 +0900 Subject: [PATCH 2/5] feat: add conditions for read survey list on member type --- src/app/api/survey-sales/route.ts | 264 ++++++++++++------ .../survey-sale/detail/DetailButton.tsx | 12 +- .../survey-sale/detail/form/BasicForm.tsx | 16 +- src/components/survey-sale/list/ListTable.tsx | 14 +- .../survey-sale/list/SearchForm.tsx | 6 +- src/hooks/useSurvey.ts | 6 +- src/hooks/useUserType.ts | 21 +- 7 files changed, 228 insertions(+), 111 deletions(-) diff --git a/src/app/api/survey-sales/route.ts b/src/app/api/survey-sales/route.ts index ce6ce6f..1343880 100644 --- a/src/app/api/survey-sales/route.ts +++ b/src/app/api/survey-sales/route.ts @@ -1,105 +1,211 @@ import { NextResponse } from 'next/server' import { prisma } from '@/libs/prisma' +// Types +type SearchParams = { + keyword?: string | null + searchOption?: string | null + isMySurvey?: string | null + sort?: string | null + offset?: string | null + memberRole?: string | null + store?: string | null + builderNo?: string | null +} + +type WhereCondition = { + AND?: any[] + OR?: any[] + [key: string]: any +} + +// Constants +const SEARCH_OPTIONS = [ + 'BUILDING_NAME', + 'REPRESENTATIVE', + 'STORE', + 'CONSTRUCTION_POINT', + 'CUSTOMER_NAME', + 'POST_CODE', + 'ADDRESS', + 'ADDRESS_DETAIL', +] as const + +const ITEMS_PER_PAGE = 10 + +// Helper functions +const createKeywordSearchCondition = (keyword: string, searchOption: string): WhereCondition => { + const where: WhereCondition = {} + + if (searchOption === 'all') { + where.OR = [] + + // ID 검색 조건 추가 + if (keyword.match(/^\d+$/) || !isNaN(Number(keyword))) { + where.OR.push({ + ID: { equals: Number(keyword) }, + }) + } + + // 다른 필드 검색 조건 추가 + where.OR.push( + ...SEARCH_OPTIONS.map((field) => ({ + [field]: { contains: keyword }, + })), + ) + } else if (SEARCH_OPTIONS.includes(searchOption as any)) { + where[searchOption] = { contains: keyword } + } else if (searchOption === 'id') { + where.ID = { equals: Number(keyword) } + } + + return where +} + +const createMemberRoleCondition = (params: SearchParams): WhereCondition => { + const where: WhereCondition = { AND: [] } + + switch (params.memberRole) { + // 1차점: 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물 + case 'Admin': + where.OR = [ + { + AND: [ + { STORE: { equals: params.store } }, + { SUBMISSION_STATUS: { equals: false } } + ] + }, + { + AND: [ + { STORE: { endsWith: params.store } }, + { SUBMISSION_STATUS: { equals: true } } + ] + } + ] + break + + // 2차점: 같은 판매점에서 작성된 매물 + Builder에게 제출받은 매물 + case 'Admin_Sub': + where.OR = [ + { + AND: [ + { STORE: { equals: params.store } }, + { CONSTRUCTION_POINT: { equals: null } }, + { SUBMISSION_STATUS: { equals: false } } + ] + }, + { + AND: [ + { STORE: { equals: params.store } }, + { CONSTRUCTION_POINT: { not: null } }, + { SUBMISSION_STATUS: { equals: true } } + ] + } + ] + break + + // 2차점 시공권한: 같은 시공ID에서 작성된 매물 + case 'Builder': + where.AND?.push({ + CONSTRUCTION_POINT: { equals: params.builderNo }, + SUBMISSION_STATUS: { equals: false }, + }) + break + + // 시공점: 같은 시공ID에서 작성된 매물 + case 'Partner': + where.AND?.push({ + CONSTRUCTION_POINT: { equals: params.builderNo }, + SUBMISSION_STATUS: { equals: false }, + }) + break + + // 모든 매물 조회 가능 + case 'T01': + case 'User': + break + } + + return where +} + +// API Routes export async function POST(request: Request) { - const body = await request.json() - // @ts-ignore - const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({ - data: body, - }) - return NextResponse.json(res) + try { + const body = await request.json() + // @ts-ignore + const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({ + data: body, + }) + return NextResponse.json(res) + } catch (error) { + console.error('Error creating survey:', error) + return NextResponse.json({ error: 'Failed to create survey' }, { status: 500 }) + } } export async function GET(request: Request) { - const { searchParams } = new URL(request.url) - const keyword = searchParams.get('keyword') - const searchOption = searchParams.get('searchOption') - 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 { - const where: any = {} - - if (isMySurvey !== null && isMySurvey !== undefined) { - where.REPRESENTATIVE = isMySurvey + const { searchParams } = new URL(request.url) + const params: SearchParams = { + keyword: searchParams.get('keyword'), + searchOption: searchParams.get('searchOption'), + isMySurvey: searchParams.get('isMySurvey'), + sort: searchParams.get('sort'), + offset: searchParams.get('offset'), + memberRole: searchParams.get('memberRole'), + store: searchParams.get('store'), + builderNo: searchParams.get('builderNo'), } - if (keyword && keyword.trim() !== '' && searchOption) { - if (searchOption === 'all') { - where.OR = [] - if (keyword.match(/^\d+$/) || !isNaN(Number(keyword))) { - where.OR.push({ - ID: { - equals: Number(keyword), - }, - }) - } - where.OR.push( - ...searchOptions.map((field) => ({ - [field]: { - contains: keyword, - }, - })), - ) - } else if (searchOptions.includes(searchOption)) { - where[searchOption] = { - contains: keyword, - } - } else if (searchOption === 'id') { - where[searchOption] = { - equals: Number(keyword), - } - } + const where: WhereCondition = {} + + // 내가 작성한 매물 조건 + if (params.isMySurvey) { + where.REPRESENTATIVE = params.isMySurvey } - where.AND = [] - if (store) { - where.AND.push({ - STORE: { - equals: store, - }, - }) - } - if (construction_point) { - where.AND.push({ - CONSTRUCTION_POINT: { - equals: construction_point, - }, - }) + // 키워드 검색 조건 + if (params.keyword && params.searchOption) { + Object.assign(where, createKeywordSearchCondition(params.keyword, params.searchOption)) } - if (offset) { + // 회원 유형 조건 + Object.assign(where, createMemberRoleCondition(params)) + + // 데이터 조회 + if (params.offset) { // @ts-ignore const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.findMany({ where, - orderBy: sort === 'created' ? { REG_DT: 'desc' } : { UPT_DT: 'desc' }, - skip: Number(offset), - take: 10, + orderBy: params.sort === 'created' ? { REG_DT: 'desc' } : { UPT_DT: 'desc' }, + skip: Number(params.offset), + take: ITEMS_PER_PAGE, }) return NextResponse.json(res) - } else { - // @ts-ignore - const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ - where, - }) - return NextResponse.json(count) } + + // 전체 개수 조회 + // @ts-ignore + const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ where }) + return NextResponse.json(count) } catch (error) { - console.error(error) - throw error + console.error('Error fetching surveys:', error) + return NextResponse.json({ error: 'Failed to fetch surveys' }, { status: 500 }) } } export async function PUT(request: Request) { - const body = await request.json() - const detailInfo = { ...body.detail_info, BASIC_INFO_ID: body.id } - // @ts-ignore - const res = await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({ - data: detailInfo, - }) - return NextResponse.json({ message: 'Survey sales updated successfully' }) + try { + const body = await request.json() + const detailInfo = { ...body.detail_info, BASIC_INFO_ID: body.id } + // @ts-ignore + const res = await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({ + data: detailInfo, + }) + return NextResponse.json({ message: 'Survey sales updated successfully' }) + } catch (error) { + console.error('Error updating survey:', error) + return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 }) + } } diff --git a/src/components/survey-sale/detail/DetailButton.tsx b/src/components/survey-sale/detail/DetailButton.tsx index a2fc44f..d8471c9 100644 --- a/src/components/survey-sale/detail/DetailButton.tsx +++ b/src/components/survey-sale/detail/DetailButton.tsx @@ -8,20 +8,20 @@ export default function DetailButton({ isTemporary, surveyId, representative }: const router = useRouter() const { session } = useSessionStore() const { submitSurvey, deleteSurvey } = useServey(surveyId) - const [userNm, setUserNm] = useState('') + const [userId, setUserId] = useState('') useEffect(() => { if (session?.isLoggedIn) { - setUserNm(session?.userNm ?? '') + setUserId(session?.userId ?? '') } - }, [session, setUserNm]) + }, [session, setUserId]) const handleSubmit = async () => { if (isTemporary) { alert('一時保存されたデータは提出できません。') return } - if (userNm === representative) { + if (userId === representative) { if (confirm('提出しますか？？')) { if (surveyId) { // TODO: 제출 페이지 추가 @@ -34,7 +34,7 @@ export default function DetailButton({ isTemporary, surveyId, representative }: } } const handleUpdate = () => { - if (userNm === representative) { + if (userId === representative) { router.push(`/survey-sale/basic-info?id=${surveyId}&isTemp=${isTemporary}`) } else { alert('担当者のみ修正可能です。') @@ -43,7 +43,7 @@ export default function DetailButton({ isTemporary, surveyId, representative }: const handleDelete = async () => { if (confirm('削除しますか？')) { if (surveyId) { - if (userNm === representative) { + if (userId === representative) { await deleteSurvey() router.push('/survey-sale') } else { diff --git a/src/components/survey-sale/detail/form/BasicForm.tsx b/src/components/survey-sale/detail/form/BasicForm.tsx index 6ed3d28..a8dd228 100644 --- a/src/components/survey-sale/detail/form/BasicForm.tsx +++ b/src/components/survey-sale/detail/form/BasicForm.tsx @@ -37,7 +37,7 @@ export default function BasicForm() { const [basicInfoData, setBasicInfoData] = useState(defaultBasicInfoForm) const { addressData } = useAddressStore() - const { userType, store, construction_point } = useUserType() + const { memberRole, store, builderNo } = useUserType() const { session } = useSessionStore() const popupController = usePopupController() @@ -58,11 +58,13 @@ export default function BasicForm() { if (session?.isLoggedIn) { setBasicInfoData((prev) => ({ ...prev, - REPRESENTATIVE: session?.userNm ?? '', + REPRESENTATIVE: session?.userId ?? '', + STORE: store ?? '', + CONSTRUCTION_POINT: builderNo ?? '', })) } setBasicInfoSelected() - }, [surveyDetail, addressData, session?.isLoggedIn, session?.userNm]) + }, [surveyDetail, addressData, session?.isLoggedIn, session?.userNm, store, builderNo]) const focusInput = (input: keyof SurveyBasicRequest) => { const inputElement = document.getElementById(input) @@ -117,11 +119,11 @@ export default function BasicForm() { type="text" className="input-frame" id="representative" - value={session?.userNm ? session?.userNm : basicInfoData.REPRESENTATIVE} + value={session?.userId ? session?.userId : basicInfoData.REPRESENTATIVE} onChange={(e) => handleChange('REPRESENTATIVE', e.target.value)} />
- {(userType === 'order' || userType?.includes('musubi')) && ( + {(memberRole === 'Builder' || memberRole?.includes('Admin')) && ( <>
販売店
@@ -135,14 +137,14 @@ export default function BasicForm() {
)} - {(userType === 'partner' || userType === 'musubi_con') && ( + {(memberRole === 'Partner' || memberRole === 'Builder') && (
施工店
handleChange('CONSTRUCTION_POINT', e.target.value)} />
diff --git a/src/components/survey-sale/list/ListTable.tsx b/src/components/survey-sale/list/ListTable.tsx index 63eb41b..2523aaa 100644 --- a/src/components/survey-sale/list/ListTable.tsx +++ b/src/components/survey-sale/list/ListTable.tsx @@ -6,7 +6,8 @@ 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 { MemberRole } from '@/hooks/useUserType' +import { useSessionStore } from '@/store/session' export default function ListTable() { const router = useRouter() @@ -15,7 +16,9 @@ export default function ListTable() { const [heldSurveyList, setHeldSurveyList] = useState([]) const [hasMore, setHasMore] = useState(false) - const [memberType, setMemberType] = useState('hwj') + const [memberRole, setMemberRole] = useState() + + const { session } = useSessionStore() useEffect(() => { if (surveyList && surveyList.length > 0) { @@ -29,9 +32,8 @@ export default function ListTable() { } setHasMore(surveyListCount > offset + 10) } - // 회원 유형 설정 이후 변경 - setMemberType('hwj') - }, [surveyList, surveyListCount, offset]) + setMemberRole(session.role as MemberRole) + }, [surveyList, surveyListCount, offset, session]) const handleDetailClick = (id: number) => { router.push(`/survey-sale/${id}`) @@ -45,7 +47,7 @@ export default function ListTable() { return ( <> - + {heldSurveyList.length > 0 ? (
    diff --git a/src/components/survey-sale/list/SearchForm.tsx b/src/components/survey-sale/list/SearchForm.tsx index 6cd8b57..1b46349 100644 --- a/src/components/survey-sale/list/SearchForm.tsx +++ b/src/components/survey-sale/list/SearchForm.tsx @@ -1,11 +1,11 @@ 'use client' import { SEARCH_OPTIONS, SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS, useSurveyFilterStore } from '@/store/surveyFilterStore' -import { UserType } from '@/hooks/useUserType' +import { MemberRole } from '@/hooks/useUserType' import { useRouter } from 'next/navigation' import { useState } from 'react' -export default function SearchForm({ onItemsInit, memberType }: { onItemsInit: () => void; memberType: UserType }) { +export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: () => void; memberRole: MemberRole }) { const router = useRouter() const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort } = useSurveyFilterStore() const [searchKeyword, setSearchKeyword] = useState(keyword) @@ -20,7 +20,7 @@ export default function SearchForm({ onItemsInit, memberType }: { onItemsInit: ( setKeyword(searchKeyword) onItemsInit() } - const searchOptions = memberType === 'partner' ? SEARCH_OPTIONS_PARTNERS : SEARCH_OPTIONS + const searchOptions = memberRole === 'Partner' ? SEARCH_OPTIONS_PARTNERS : SEARCH_OPTIONS return (
    diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts index ea04db4..909d220 100644 --- a/src/hooks/useSurvey.ts +++ b/src/hooks/useSurvey.ts @@ -41,13 +41,13 @@ export function useServey(id?: number): { } { const queryClient = useQueryClient() const { keyword, searchOption, isMySurvey, sort, offset } = useSurveyFilterStore() - const { store, construction_point } = useUserType() + const { store, builderNo, memberRole } = 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, store, builderNo, memberRole], queryFn: async () => { const resp = await axiosInstance(null).get('/api/survey-sales', { - params: { keyword, searchOption, isMySurvey, sort, offset, store, construction_point }, + params: { keyword, searchOption, isMySurvey, sort, offset, store, builderNo, memberRole }, }) return resp.data }, diff --git a/src/hooks/useUserType.ts b/src/hooks/useUserType.ts index e8a9dcd..5f38e58 100644 --- a/src/hooks/useUserType.ts +++ b/src/hooks/useUserType.ts @@ -1,24 +1,31 @@ import { useSessionStore } from '@/store/session' import { useEffect, useState } from 'react' -export type UserType = 'hwj' | 'order' | 'musubi' | 'musubi_con' | 'partner' +export type MemberRole = 'T01' | 'Admin' | 'Admin_Sub' | 'Builder' | 'Partner' | 'User' +// TO1 - else +// Admin - 1차점, Admin_Sub - 2차점, Builder - 2차점 시공사, Partner - 파트너사, User - else // 로그인 된 회원 유형에 따라 조사 매물 목록 변경됨 export function useUserType() { const { session } = useSessionStore() - const [userType, setUserType] = useState(null) + const [memberRole, setMemberRole] = useState(null) const [store, setStore] = useState(null) - const [construction_point, setConstructionPoint] = useState(null) + const [builderNo, setBuilderNo] = useState(null) - // TODO: 회원 유형 설정 useEffect(() => { if (!session?.isLoggedIn) return - setUserType('musubi_con') + setMemberRole(session.role as MemberRole) + if (session.role === 'T01') { + setStore(null) + } else { + setStore(session.storeId) + } + setBuilderNo(session.builderNo) }, [session]) return { - userType, + memberRole, store, - construction_point, + builderNo, } } From d7aca7e2146da83239f158928b7d1bf226053042 Mon Sep 17 00:00:00 2001 From: keyy1315 Date: Thu, 15 May 2025 16:55:36 +0900 Subject: [PATCH 3/5] feat: enhance survey sales API with detailed error handling, improved search parameters, and new registration form component --- src/app/api/survey-sales/[id]/route.ts | 152 ++++++---- src/app/api/survey-sales/route.ts | 210 +++++++------ src/app/survey-sale/regist/page.tsx | 9 + src/components/popup/ZipCodePopup.tsx | 5 +- src/components/survey-sale/common/NavTab.tsx | 40 ++- .../survey-sale/detail/DataTable.tsx | 26 +- .../survey-sale/detail/DetailButton.tsx | 129 +++++--- .../survey-sale/detail/DetailForm.tsx | 11 +- .../survey-sale/detail/RoofDetailForm.tsx | 11 +- .../survey-sale/detail/form/BasicForm.tsx | 47 ++- .../survey-sale/detail/form/RoofInfoForm.tsx | 6 +- .../form/{ => etcProcess}/MultiCheckEtc.tsx | 0 .../detail/form/{ => etcProcess}/RadioEtc.tsx | 0 .../form/{ => etcProcess}/SelectBoxEtc.tsx | 0 src/components/survey-sale/list/ListTable.tsx | 7 +- .../survey-sale/list/SearchForm.tsx | 33 +- .../survey-sale/temp/basicRegist.tsx | 156 ++++++++++ .../survey-sale/temp/formButton.tsx | 92 ++++++ .../survey-sale/temp/registForm.tsx | 105 +++++++ .../survey-sale/temp/roofRegist.tsx | 284 ++++++++++++++++++ src/hooks/useSurvey.ts | 101 +++++-- src/hooks/useUserType.ts | 31 -- src/store/surveyFilterStore.ts | 6 - src/types/Survey.ts | 15 + 24 files changed, 1126 insertions(+), 350 deletions(-) create mode 100644 src/app/survey-sale/regist/page.tsx rename src/components/survey-sale/detail/form/{ => etcProcess}/MultiCheckEtc.tsx (100%) rename src/components/survey-sale/detail/form/{ => etcProcess}/RadioEtc.tsx (100%) rename src/components/survey-sale/detail/form/{ => etcProcess}/SelectBoxEtc.tsx (100%) create mode 100644 src/components/survey-sale/temp/basicRegist.tsx create mode 100644 src/components/survey-sale/temp/formButton.tsx create mode 100644 src/components/survey-sale/temp/registForm.tsx create mode 100644 src/components/survey-sale/temp/roofRegist.tsx delete mode 100644 src/hooks/useUserType.ts diff --git a/src/app/api/survey-sales/[id]/route.ts b/src/app/api/survey-sales/[id]/route.ts index 4794a5f..3da5981 100644 --- a/src/app/api/survey-sales/[id]/route.ts +++ b/src/app/api/survey-sales/[id]/route.ts @@ -1,40 +1,62 @@ import { NextResponse } from 'next/server' +import { prisma } from '@/libs/prisma' export async function GET(request: Request, context: { params: { id: string } }) { - const { id } = await context.params - // @ts-ignore - const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findUnique({ - where: { ID: Number(id) }, - include: { - DETAIL_INFO: true, - }, - }) - return NextResponse.json(survey) -} - -export async function PUT(request: Request, context: { params: { id: string } }) { - const { id } = await context.params - const body = await request.json() try { + const { id } = await context.params // @ts-ignore - const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ + const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findUnique({ where: { ID: Number(id) }, - data: { - ...body, + include: { + DETAIL_INFO: true, }, }) return NextResponse.json(survey) } catch (error) { - console.error(error) - throw error + console.error('Error fetching survey:', error) + return NextResponse.json({ error: 'Failed to fetch survey' }, { status: 500 }) + } +} + +export async function PUT(request: Request, context: { params: { id: string } }) { + try { + const { id } = await context.params + const body = await request.json() + console.log('body:: ', body) + + // DETAIL_INFO를 분리 + const { DETAIL_INFO, ...basicInfo } = body + + // @ts-ignore + const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ + where: { ID: Number(id) }, + data: { + ...basicInfo, + UPT_DT: new Date(), + DETAIL_INFO: DETAIL_INFO + ? { + upsert: { + create: DETAIL_INFO, + update: DETAIL_INFO, + }, + } + : undefined, + }, + include: { + DETAIL_INFO: true, + }, + }) + return NextResponse.json(survey) + } catch (error) { + console.error('Error updating survey:', error) + return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 }) } } export async function DELETE(request: Request, context: { params: { id: string } }) { - const { id } = await context.params - try { - //@ts-ignore + const { id } = await context.params + await prisma.$transaction(async (tx) => { // @ts-ignore const detailData = await tx.SD_SURVEY_SALES_BASIC_INFO.findUnique({ @@ -43,69 +65,75 @@ export async function DELETE(request: Request, context: { params: { id: string } DETAIL_INFO: true, }, }) - console.log('detailData:: ', detailData) + if (detailData?.DETAIL_INFO?.ID) { // @ts-ignore await tx.SD_SURVEY_SALES_DETAIL_INFO.delete({ - where: { ID: Number(detailData?.DETAIL_INFO?.ID) }, + where: { ID: Number(detailData.DETAIL_INFO.ID) }, }) } + // @ts-ignore await tx.SD_SURVEY_SALES_BASIC_INFO.delete({ where: { ID: Number(id) }, }) }) + return NextResponse.json({ message: 'Survey deleted successfully' }) } catch (error) { - console.error(error) - throw error + console.error('Error deleting survey:', error) + return NextResponse.json({ error: 'Failed to delete survey' }, { status: 500 }) } } export async function PATCH(request: Request, context: { params: { id: string } }) { - const { id } = await context.params - const body = await request.json() + try { + const { id } = await context.params + const body = await request.json() - if (body.submit) { - // @ts-ignore - const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ - where: { ID: Number(id) }, - data: { - SUBMISSION_STATUS: true, - SUBMISSION_DATE: new Date(), - }, - }) - return NextResponse.json({ message: 'Survey confirmed successfully' }) - } else { - // @ts-ignore - const hasDetails = await prisma.SD_SURVEY_SALES_DETAIL_INFO.findUnique({ - where: { BASIC_INFO_ID: Number(id) }, - }) - console.log('hasDetails:: ', hasDetails) - if (hasDetails) { - //@ts-ignore - const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ - where: { ID: Number(id) }, - data: { - UPT_DT: new Date(), - DETAIL_INFO: { - update: body.DETAIL_INFO, - }, - }, - }) - return NextResponse.json(result) - } else { + if (body.submit) { // @ts-ignore const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ where: { ID: Number(id) }, data: { - DETAIL_INFO: { - create: body.DETAIL_INFO, - }, + SUBMISSION_STATUS: true, + SUBMISSION_DATE: new Date(), }, }) - console.log(survey) - return NextResponse.json({ message: 'Survey detail created successfully' }) + return NextResponse.json({ message: 'Survey confirmed successfully' }) + } else { + // @ts-ignore + const hasDetails = await prisma.SD_SURVEY_SALES_DETAIL_INFO.findUnique({ + where: { BASIC_INFO_ID: Number(id) }, + }) + + if (hasDetails) { + //@ts-ignore + const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ + where: { ID: Number(id) }, + data: { + UPT_DT: new Date(), + DETAIL_INFO: { + update: body.DETAIL_INFO, + }, + }, + }) + return NextResponse.json(result) + } else { + // @ts-ignore + const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({ + where: { ID: Number(id) }, + data: { + DETAIL_INFO: { + create: body.DETAIL_INFO, + }, + }, + }) + return NextResponse.json({ message: 'Survey detail created successfully' }) + } } + } catch (error) { + console.error('Error updating survey:', error) + return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 }) } } diff --git a/src/app/api/survey-sales/route.ts b/src/app/api/survey-sales/route.ts index 1343880..d4b676a 100644 --- a/src/app/api/survey-sales/route.ts +++ b/src/app/api/survey-sales/route.ts @@ -1,16 +1,18 @@ import { NextResponse } from 'next/server' import { prisma } from '@/libs/prisma' -// Types +/** + * 검색 파라미터 + */ type SearchParams = { - keyword?: string | null - searchOption?: string | null - isMySurvey?: string | null - sort?: string | null + keyword?: string | null // 검색어 + searchOption?: string | null // 검색 옵션 (select 옵션) + isMySurvey?: string | null // 내가 작성한 매물 + sort?: string | null // 정렬 방식 offset?: string | null - memberRole?: string | null - store?: string | null - builderNo?: string | null + role?: string | null // 회원권한한 + store?: string | null // 판매점ID + builderNo?: string | null // 시공ID } type WhereCondition = { @@ -19,133 +21,131 @@ type WhereCondition = { [key: string]: any } -// Constants +// 검색 가능한 필드 옵션 const SEARCH_OPTIONS = [ - 'BUILDING_NAME', - 'REPRESENTATIVE', - 'STORE', - 'CONSTRUCTION_POINT', - 'CUSTOMER_NAME', - 'POST_CODE', - 'ADDRESS', - 'ADDRESS_DETAIL', + 'BUILDING_NAME', // 건물명 + 'REPRESENTATIVE', // 담당자 + 'STORE', // 판매점 + 'CONSTRUCTION_POINT', // 시공점 + 'CUSTOMER_NAME', // 고객명 + 'POST_CODE', // 우편번호 + 'ADDRESS', // 주소 + 'ADDRESS_DETAIL', // 상세주소 ] as const +// 페이지당 항목 수 const ITEMS_PER_PAGE = 10 -// Helper functions +/** + * 키워드 검색 조건 생성 함수 + * @param keyword 검색 키워드 + * @param searchOption 검색 옵션 + * @returns 검색 조건 객체 + */ const createKeywordSearchCondition = (keyword: string, searchOption: string): WhereCondition => { const where: WhereCondition = {} if (searchOption === 'all') { + // 모든 필드 검색 시 OR 조건 사용 where.OR = [] - // ID 검색 조건 추가 + // ID가 숫자인 경우 ID 검색 조건 추가 if (keyword.match(/^\d+$/) || !isNaN(Number(keyword))) { where.OR.push({ ID: { equals: Number(keyword) }, }) } - // 다른 필드 검색 조건 추가 where.OR.push( ...SEARCH_OPTIONS.map((field) => ({ [field]: { contains: keyword }, })), ) - } else if (SEARCH_OPTIONS.includes(searchOption as any)) { - where[searchOption] = { contains: keyword } + } else if (SEARCH_OPTIONS.includes(searchOption.toUpperCase() as any)) { + // 특정 필드 검색 + where[searchOption.toUpperCase()] = { contains: keyword } } else if (searchOption === 'id') { - where.ID = { equals: Number(keyword) } + // ID 검색 (숫자 변환 필요) + const number = Number(keyword) + if (!isNaN(number)) { + where.ID = { equals: number } + } else { + // 유효하지 않은 ID 검색 시 빈 결과 반환 + where.ID = { equals: null } + } } return where } +/** + * 회원 역할별 검색 조건 생성 함수 + * @param params 검색 파라미터 + * @returns 검색 조건 객체 + */ const createMemberRoleCondition = (params: SearchParams): WhereCondition => { const where: WhereCondition = { AND: [] } - switch (params.memberRole) { - // 1차점: 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물 - case 'Admin': + switch (params.role) { + case 'Admin': // 1차점 + // 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물 where.OR = [ { - AND: [ - { STORE: { equals: params.store } }, - { SUBMISSION_STATUS: { equals: false } } - ] + AND: [{ STORE: { equals: params.store } }], }, { - AND: [ - { STORE: { endsWith: params.store } }, - { SUBMISSION_STATUS: { equals: true } } - ] - } + AND: [{ STORE: { startsWith: params.store } }, { SUBMISSION_STATUS: { equals: true } }], + }, ] break - // 2차점: 같은 판매점에서 작성된 매물 + Builder에게 제출받은 매물 - case 'Admin_Sub': + case 'Admin_Sub': // 2차점 where.OR = [ { AND: [ { STORE: { equals: params.store } }, - { CONSTRUCTION_POINT: { equals: null } }, - { SUBMISSION_STATUS: { equals: false } } + { + OR: [ + { CONSTRUCTION_POINT: { equals: null } }, + { CONSTRUCTION_POINT: { equals: '' } } + ] + } ] }, { AND: [ { STORE: { equals: params.store } }, { CONSTRUCTION_POINT: { not: null } }, + { CONSTRUCTION_POINT: { not: '' } }, { SUBMISSION_STATUS: { equals: true } } ] } ] break - // 2차점 시공권한: 같은 시공ID에서 작성된 매물 - case 'Builder': + case 'Builder': // 2차점 시공권한 + case 'Partner': // Partner + // 같은 시공ID에서 작성된 매물 where.AND?.push({ CONSTRUCTION_POINT: { equals: params.builderNo }, - SUBMISSION_STATUS: { equals: false }, }) break - // 시공점: 같은 시공ID에서 작성된 매물 - case 'Partner': - where.AND?.push({ - CONSTRUCTION_POINT: { equals: params.builderNo }, - SUBMISSION_STATUS: { equals: false }, - }) - break - - // 모든 매물 조회 가능 case 'T01': case 'User': + // 모든 매물 조회 가능 (추가 조건 없음) break } return where } -// API Routes -export async function POST(request: Request) { - try { - const body = await request.json() - // @ts-ignore - const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({ - data: body, - }) - return NextResponse.json(res) - } catch (error) { - console.error('Error creating survey:', error) - return NextResponse.json({ error: 'Failed to create survey' }, { status: 500 }) - } -} - +/** + * GET 핸들러 - 설문 목록 조회 + */ export async function GET(request: Request) { try { + // URL 파라미터 파싱 const { searchParams } = new URL(request.url) const params: SearchParams = { keyword: searchParams.get('keyword'), @@ -153,59 +153,95 @@ export async function GET(request: Request) { isMySurvey: searchParams.get('isMySurvey'), sort: searchParams.get('sort'), offset: searchParams.get('offset'), - memberRole: searchParams.get('memberRole'), + role: searchParams.get('role'), store: searchParams.get('store'), builderNo: searchParams.get('builderNo'), } + // 검색 조건 구성 const where: WhereCondition = {} - // 내가 작성한 매물 조건 + // 내가 작성한 매물 조건 적용 if (params.isMySurvey) { where.REPRESENTATIVE = params.isMySurvey } - // 키워드 검색 조건 + // 키워드 검색 조건 적용 if (params.keyword && params.searchOption) { Object.assign(where, createKeywordSearchCondition(params.keyword, params.searchOption)) } - // 회원 유형 조건 + // 회원 유형 조건 적용 Object.assign(where, createMemberRoleCondition(params)) - // 데이터 조회 + // 데이터 조회 또는 카운트 if (params.offset) { - // @ts-ignore - const res = await prisma.SD_SURVEY_SALES_BASIC_INFO.findMany({ + // 페이지네이션 데이터 조회 + //@ts-ignore + const surveys = await prisma.SD_SURVEY_SALES_BASIC_INFO.findMany({ where, orderBy: params.sort === 'created' ? { REG_DT: 'desc' } : { UPT_DT: 'desc' }, skip: Number(params.offset), take: ITEMS_PER_PAGE, }) - return NextResponse.json(res) + return NextResponse.json(surveys) + } else { + // 전체 개수만 조회 + //@ts-ignore + const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ where }) + return NextResponse.json(count) } - - // 전체 개수 조회 - // @ts-ignore - const count = await prisma.SD_SURVEY_SALES_BASIC_INFO.count({ where }) - return NextResponse.json(count) } catch (error) { - console.error('Error fetching surveys:', error) - return NextResponse.json({ error: 'Failed to fetch surveys' }, { status: 500 }) + console.error(error) + return NextResponse.json({ error: 'Fail Read Survey' }, { status: 500 }) } } +/** + * PUT 핸들러 - 상세 정보 추가 + */ export async function PUT(request: Request) { try { const body = await request.json() - const detailInfo = { ...body.detail_info, BASIC_INFO_ID: body.id } - // @ts-ignore - const res = await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({ + + // 상세 정보 생성을 위한 데이터 구성 + const detailInfo = { + ...body.detail_info, + BASIC_INFO_ID: body.id, + } + + // 상세 정보 생성 + //@ts-ignore + await prisma.SD_SURVEY_SALES_DETAIL_INFO.create({ data: detailInfo, }) - return NextResponse.json({ message: 'Survey sales updated successfully' }) + + return NextResponse.json({ + message: 'Success Update Survey', + }) } catch (error) { - console.error('Error updating survey:', error) - return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 }) + console.error(error) + return NextResponse.json({ error: 'Fail Update Survey' }, { status: 500 }) + } +} + +export async function POST(request: Request) { + try { + const body = await request.json() + const { DETAIL_INFO, ...basicInfo } = body + // 기본 정보 생성 + //@ts-ignore + const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({ + data: { + ...basicInfo, + DETAIL_INFO: { + create: DETAIL_INFO, + }, + }, + }) + return NextResponse.json(result) + } catch (error) { + console.error(error) + return NextResponse.json({ error: 'Fail Create Survey' }, { status: 500 }) } } diff --git a/src/app/survey-sale/regist/page.tsx b/src/app/survey-sale/regist/page.tsx new file mode 100644 index 0000000..5090aaa --- /dev/null +++ b/src/app/survey-sale/regist/page.tsx @@ -0,0 +1,9 @@ +import RegistForm from '@/components/survey-sale/temp/registForm' + +export default function RegistPage() { + return ( + <> + + + ) +} diff --git a/src/components/popup/ZipCodePopup.tsx b/src/components/popup/ZipCodePopup.tsx index 2fec15c..4923833 100644 --- a/src/components/popup/ZipCodePopup.tsx +++ b/src/components/popup/ZipCodePopup.tsx @@ -28,10 +28,11 @@ export default function ZipCodePopup() { const popupController = usePopupController() const handleApply = () => { + console.log(addressInfo?.[0]) setAddressData({ post_code: addressInfo?.[0]?.zipcode || '', - address: addressInfo?.[0]?.prefcode || '', - address_detail: addressInfo?.[0]?.address1 + ' ' + addressInfo?.[0]?.address2 + ' ' + addressInfo?.[0]?.address3 || '', + address: addressInfo?.[0]?.address1 || '', + address_detail: addressInfo?.[0]?.address2 + ' ' + addressInfo?.[0]?.address3 || '', }) popupController.setZipCodePopup(false) } diff --git a/src/components/survey-sale/common/NavTab.tsx b/src/components/survey-sale/common/NavTab.tsx index 4131804..ffa6ea7 100644 --- a/src/components/survey-sale/common/NavTab.tsx +++ b/src/components/survey-sale/common/NavTab.tsx @@ -15,7 +15,7 @@ export default function NavTab() { const params = useParams() const detailId = params.id - const { basicInfoSelected, roofInfoSelected, reset } = useSurveySaleTabState() + const { basicInfoSelected, roofInfoSelected, reset, setBasicInfoSelected, setRoofInfoSelected } = useSurveySaleTabState() useEffect(() => { return () => { @@ -27,26 +27,36 @@ export default function NavTab() { return null } - const handleBasicInfoClick = () => { - if (id) { - router.push(`/survey-sale/basic-info?id=${id}`) - return + const scrollSection = (section: string) => { + const sectionElement = document.getElementById(section) + if (sectionElement) { + sectionElement.scrollIntoView({ behavior: 'smooth' }) } + } + + const handleBasicInfoClick = () => { + // if (id) { + // router.push(`/survey-sale/basic-info?id=${id}`) + // return + // } if (detailId) { router.push(`/survey-sale/${detailId}`) return } + scrollSection('basic-form-section') + + setBasicInfoSelected() } const handleRoofInfoClick = () => { - if (id) { - if (isTemp === 'true') { - alert('基本情報が一時保存された状態です。') - return - } - router.push(`/survey-sale/roof-info?id=${id}`) - return - } + // if (id) { + // if (isTemp === 'true') { + // alert('基本情報が一時保存された状態です。') + // return + // } + // router.push(`/survey-sale/roof-info?id=${id}`) + // return + // } if (detailId) { router.push(`/survey-sale/${detailId}?tab=roof-info`) return @@ -55,6 +65,10 @@ export default function NavTab() { alert('基本情報を先に保存してください。') return null } + // if (pathname === '/survey-sale/regist') { + scrollSection('roof-form-section') + // } + setRoofInfoSelected() } return ( diff --git a/src/components/survey-sale/detail/DataTable.tsx b/src/components/survey-sale/detail/DataTable.tsx index 2ec528e..e7ce554 100644 --- a/src/components/survey-sale/detail/DataTable.tsx +++ b/src/components/survey-sale/detail/DataTable.tsx @@ -2,10 +2,8 @@ import { useServey } from '@/hooks/useSurvey' import { useParams, useSearchParams } from 'next/navigation' -import { useEffect } from 'react' -import { useState } from 'react' +import { useEffect, useState } from 'react' import DetailForm from './DetailForm' -import { useSurveySaleTabState } from '@/store/surveySaleTabState' import RoofDetailForm from './RoofDetailForm' export default function DataTable() { @@ -14,21 +12,21 @@ export default function DataTable() { const searchParams = useSearchParams() const tab = searchParams.get('tab') + const isTemp = searchParams.get('isTemporary') const { surveyDetail, isLoadingSurveyDetail } = useServey(Number(id)) - const [isTemporary, setIsTemporary] = useState(true) - const { setBasicInfoSelected, setRoofInfoSelected } = useSurveySaleTabState() + const [isTemporary, setIsTemporary] = useState(isTemp === 'true') + + const { validateSurveyDetail } = useServey(Number(id)) useEffect(() => { - if (surveyDetail?.REPRESENTATIVE && surveyDetail?.STORE && surveyDetail?.CONSTRUCTION_POINT) { - setIsTemporary(false) + if (surveyDetail?.DETAIL_INFO) { + const validate = validateSurveyDetail(surveyDetail.DETAIL_INFO) + if (validate.trim() !== '') { + setIsTemporary(false) + } } - if (tab === 'roof-info') { - setRoofInfoSelected() - } else { - setBasicInfoSelected() - } - }, [surveyDetail, tab, setBasicInfoSelected, setRoofInfoSelected]) + }, [surveyDetail]) if (isLoadingSurveyDetail) { return
    Loading...
    @@ -68,7 +66,7 @@ export default function DataTable() { <> {/* TODO: 제출한 판매점 ID 추가 필요 */}
    {new Date(surveyDetail.SUBMISSION_DATE).toLocaleString()}
    -
    販売店 ID...
    +
    {surveyDetail.STORE}
    ) : ( '-' diff --git a/src/components/survey-sale/detail/DetailButton.tsx b/src/components/survey-sale/detail/DetailButton.tsx index d8471c9..3a871bf 100644 --- a/src/components/survey-sale/detail/DetailButton.tsx +++ b/src/components/survey-sale/detail/DetailButton.tsx @@ -1,86 +1,119 @@ 'use client' -import { useRouter } from 'next/navigation' +import { useRouter, useSearchParams } from 'next/navigation' import { useServey } from '@/hooks/useSurvey' import { useSessionStore } from '@/store/session' -import { useEffect, useState } from 'react' +import { SurveyBasicInfo } from '@/types/Survey' +import { useState } from 'react' -export default function DetailButton({ isTemporary, surveyId, representative }: { isTemporary: boolean; surveyId: number; representative: string }) { +export default function DetailButton({ surveyDetail }: { surveyDetail: SurveyBasicInfo | null }) { const router = useRouter() const { session } = useSessionStore() - const { submitSurvey, deleteSurvey } = useServey(surveyId) - const [userId, setUserId] = useState('') + const { submitSurvey, deleteSurvey } = useServey(surveyDetail?.ID ?? 0) - useEffect(() => { - if (session?.isLoggedIn) { - setUserId(session?.userId ?? '') + const searchParams = useSearchParams() + const isTemp = searchParams.get('isTemporary') + const [isTemporary, setIsTemporary] = useState(isTemp === 'true') + + const checkRole = () => { + switch (session?.role) { + case 'T01': + return session?.userNm === surveyDetail?.REPRESENTATIVE ? true : false + case 'Admin': + return session?.storeNm === surveyDetail?.STORE ? true : false + case 'Admin_Sub': + return session?.storeNm === surveyDetail?.STORE ? true : false + case 'Builder': + return session?.builderNo === surveyDetail?.CONSTRUCTION_POINT ? true : false + case 'Partner': + return session?.builderNo === surveyDetail?.CONSTRUCTION_POINT ? true : false + default: + return '' } - }, [session, setUserId]) + } const handleSubmit = async () => { - if (isTemporary) { - alert('一時保存されたデータは提出できません。') - return - } - if (userId === representative) { - if (confirm('提出しますか？？')) { - if (surveyId) { - // TODO: 제출 페이지 추가 - alert('SUBMIT POPUP!!!!!!!!!!!') - await submitSurvey() - } + const result = checkRole() + if (result) { + if (isTemporary) { + alert('一時保存されたデータは提出できません。') + return } - } else { - alert('担当者のみ提出可能です。') + window.neoConfirm( + '提出しますか？？', + async () => { + if (surveyDetail?.ID) { + // TODO: 제출 페이지 추가 + alert('SUBMIT POPUP!!!!!!!!!!!') + await submitSurvey() + } + }, + () => null, + ) } } const handleUpdate = () => { - if (userId === representative) { - router.push(`/survey-sale/basic-info?id=${surveyId}&isTemp=${isTemporary}`) + const result = checkRole() + if (result) { + // router.push(`/survey-sale/basic-info?id=${surveyDetail?.ID}&isTemp=${isTemporary}`) + router.push(`/survey-sale/regist?id=${surveyDetail?.ID}`) } else { alert('担当者のみ修正可能です。') } } const handleDelete = async () => { - if (confirm('削除しますか？')) { - if (surveyId) { - if (userId === representative) { - await deleteSurvey() - router.push('/survey-sale') - } else { - alert('担当者のみ削除可能です。') + window.neoConfirm( + '削除しますか？', + async () => { + if (surveyDetail?.ID) { + if (session.userNm === surveyDetail?.REPRESENTATIVE) { + await deleteSurvey() + alert('削除されました。') + router.push('/survey-sale') + } else { + alert('担当者のみ削除可能です。') + } } - } - } + }, + () => null, + ) } + const isSubmitter = session?.storeNm === surveyDetail?.STORE && session?.builderNo === surveyDetail?.CONSTRUCTION_POINT + return (
    - {isTemporary ? ( +
    + +
    + {isSubmitter && surveyDetail?.SUBMISSION_STATUS ? ( <> ) : ( <> + {isTemporary || surveyDetail?.SUBMISSION_STATUS ? ( + <> + ) : ( + <> +
    + +
    + + )}
    -
    -
    )} -
    - -
    -
    - -
    ) } diff --git a/src/components/survey-sale/detail/DetailForm.tsx b/src/components/survey-sale/detail/DetailForm.tsx index 469c465..73ce5c7 100644 --- a/src/components/survey-sale/detail/DetailForm.tsx +++ b/src/components/survey-sale/detail/DetailForm.tsx @@ -1,6 +1,5 @@ 'use client' -import { useEffect, useState } from 'react' import DetailButton from './DetailButton' import { SurveyBasicInfo } from '@/types/Survey' @@ -11,14 +10,6 @@ export default function DetailForm({ surveyDetail: SurveyBasicInfo | null isLoadingSurveyDetail: boolean }) { - const [isTemporary, setIsTemporary] = useState(true) - - useEffect(() => { - if (surveyDetail?.REPRESENTATIVE && surveyDetail?.STORE && surveyDetail?.CONSTRUCTION_POINT) { - setIsTemporary(false) - } - }, [surveyDetail]) - if (isLoadingSurveyDetail) { return
    Loading...
    } @@ -56,7 +47,7 @@ export default function DetailForm({
- +
) diff --git a/src/components/survey-sale/detail/RoofDetailForm.tsx b/src/components/survey-sale/detail/RoofDetailForm.tsx index a20f48a..a9a4031 100644 --- a/src/components/survey-sale/detail/RoofDetailForm.tsx +++ b/src/components/survey-sale/detail/RoofDetailForm.tsx @@ -1,8 +1,8 @@ import { SurveyBasicInfo, SurveyDetailInfo } from '@/types/Survey' import DetailButton from './DetailButton' -import { roof_material, supplementary_facilities } from './form/MultiCheckEtc' -import { selectBoxOptions } from './form/SelectBoxEtc' -import { radioEtcData } from './form/RadioEtc' +import { roof_material, supplementary_facilities } from './form/etcProcess/MultiCheckEtc' +import { selectBoxOptions } from './form/etcProcess/SelectBoxEtc' +import { radioEtcData } from './form/etcProcess/RadioEtc' export default function RoofDetailForm({ surveyDetail, @@ -196,7 +196,10 @@ export default function RoofDetailForm({
- + ) diff --git a/src/components/survey-sale/detail/form/BasicForm.tsx b/src/components/survey-sale/detail/form/BasicForm.tsx index a8dd228..1f55838 100644 --- a/src/components/survey-sale/detail/form/BasicForm.tsx +++ b/src/components/survey-sale/detail/form/BasicForm.tsx @@ -8,7 +8,7 @@ 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' +// import { useUserType } from '@/hooks/useUserType' const defaultBasicInfoForm: SurveyBasicRequest = { REPRESENTATIVE: '', @@ -37,7 +37,6 @@ export default function BasicForm() { const [basicInfoData, setBasicInfoData] = useState(defaultBasicInfoForm) const { addressData } = useAddressStore() - const { memberRole, store, builderNo } = useUserType() const { session } = useSessionStore() const popupController = usePopupController() @@ -59,12 +58,12 @@ export default function BasicForm() { setBasicInfoData((prev) => ({ ...prev, REPRESENTATIVE: session?.userId ?? '', - STORE: store ?? '', - CONSTRUCTION_POINT: builderNo ?? '', + STORE: session?.storeNm ?? '', + CONSTRUCTION_POINT: session?.builderNo ?? '', })) } setBasicInfoSelected() - }, [surveyDetail, addressData, session?.isLoggedIn, session?.userNm, store, builderNo]) + }, [surveyDetail, addressData, session?.isLoggedIn, session?.userId, session?.storeNm, session?.builderNo]) const focusInput = (input: keyof SurveyBasicRequest) => { const inputElement = document.getElementById(input) @@ -88,19 +87,19 @@ export default function BasicForm() { const handleSave = async (isTemporary: boolean) => { if (id) { - updateSurvey(basicInfoData) + // updateSurvey(basicInfoData) alert('保存しました。') - router.push(`/survey-sale/${id}?tab=basic-info`) + // router.push(`/survey-sale/${id}?tab=basic-info`) } if (isTemporary) { - const saveId = await createSurvey(basicInfoData) + // const saveId = await createSurvey(basicInfoData) alert('一時保存されました。') - router.push(`/survey-sale/${saveId}?tab=basic-info`) + // router.push(`/survey-sale/${saveId}?tab=basic-info`) } else { if (validateSurvey(basicInfoData)) { - const saveId = await createSurvey(basicInfoData) - alert('保存しました。 登録番号: ' + saveId) - router.push(`/survey-sale/${saveId}?tab=basic-info`) + // const saveId = await createSurvey(basicInfoData) + alert('保存しました。') + // router.push(`/survey-sale/${saveId}?tab=basic-info`) } } } @@ -123,7 +122,7 @@ export default function BasicForm() { onChange={(e) => handleChange('REPRESENTATIVE', e.target.value)} /> - {(memberRole === 'Builder' || memberRole?.includes('Admin')) && ( + {(session?.role === 'Builder' || session?.role?.includes('Admin')) && ( <>
販売店
@@ -131,20 +130,20 @@ export default function BasicForm() { type="text" className="input-frame" id="store" - value={store ? store : basicInfoData.STORE ?? ''} + value={session?.storeNm ? session?.storeNm : basicInfoData.STORE ?? ''} onChange={(e) => handleChange('STORE', e.target.value)} />
)} - {(memberRole === 'Partner' || memberRole === 'Builder') && ( + {(session?.role === 'Partner' || session?.role === 'Builder') && (
施工店
handleChange('CONSTRUCTION_POINT', e.target.value)} />
@@ -196,15 +195,13 @@ export default function BasicForm() {
- +
diff --git a/src/components/survey-sale/detail/form/RoofInfoForm.tsx b/src/components/survey-sale/detail/form/RoofInfoForm.tsx index 582a423..2a465d4 100644 --- a/src/components/survey-sale/detail/form/RoofInfoForm.tsx +++ b/src/components/survey-sale/detail/form/RoofInfoForm.tsx @@ -6,9 +6,9 @@ import { useServey } from '@/hooks/useSurvey' import { SurveyDetailRequest } from '@/types/Survey' import { useRouter, useSearchParams } from 'next/navigation' import { useEffect, useState } from 'react' -import MultiCheckEtc from './MultiCheckEtc' -import SelectBoxEtc from './SelectBoxEtc' -import RadioEtc from './RadioEtc' +import MultiCheckEtc from './etcProcess/MultiCheckEtc' +import SelectBoxEtc from './etcProcess/SelectBoxEtc' +import RadioEtc from './etcProcess/RadioEtc' const defaultDetailInfoForm: SurveyDetailRequest = { CONTRACT_CAPACITY: null, diff --git a/src/components/survey-sale/detail/form/MultiCheckEtc.tsx b/src/components/survey-sale/detail/form/etcProcess/MultiCheckEtc.tsx similarity index 100% rename from src/components/survey-sale/detail/form/MultiCheckEtc.tsx rename to src/components/survey-sale/detail/form/etcProcess/MultiCheckEtc.tsx diff --git a/src/components/survey-sale/detail/form/RadioEtc.tsx b/src/components/survey-sale/detail/form/etcProcess/RadioEtc.tsx similarity index 100% rename from src/components/survey-sale/detail/form/RadioEtc.tsx rename to src/components/survey-sale/detail/form/etcProcess/RadioEtc.tsx diff --git a/src/components/survey-sale/detail/form/SelectBoxEtc.tsx b/src/components/survey-sale/detail/form/etcProcess/SelectBoxEtc.tsx similarity index 100% rename from src/components/survey-sale/detail/form/SelectBoxEtc.tsx rename to src/components/survey-sale/detail/form/etcProcess/SelectBoxEtc.tsx diff --git a/src/components/survey-sale/list/ListTable.tsx b/src/components/survey-sale/list/ListTable.tsx index 2523aaa..16351b7 100644 --- a/src/components/survey-sale/list/ListTable.tsx +++ b/src/components/survey-sale/list/ListTable.tsx @@ -6,7 +6,6 @@ import { useEffect, useState } from 'react' import { useRouter } from 'next/navigation' import SearchForm from './SearchForm' import { useSurveyFilterStore } from '@/store/surveyFilterStore' -import { MemberRole } from '@/hooks/useUserType' import { useSessionStore } from '@/store/session' export default function ListTable() { @@ -16,7 +15,6 @@ export default function ListTable() { const [heldSurveyList, setHeldSurveyList] = useState([]) const [hasMore, setHasMore] = useState(false) - const [memberRole, setMemberRole] = useState() const { session } = useSessionStore() @@ -32,8 +30,7 @@ export default function ListTable() { } setHasMore(surveyListCount > offset + 10) } - setMemberRole(session.role as MemberRole) - }, [surveyList, surveyListCount, offset, session]) + }, [surveyList, surveyListCount, offset, session?.role]) const handleDetailClick = (id: number) => { router.push(`/survey-sale/${id}`) @@ -47,7 +44,7 @@ export default function ListTable() { return ( <> - + {heldSurveyList.length > 0 ? (
    diff --git a/src/components/survey-sale/list/SearchForm.tsx b/src/components/survey-sale/list/SearchForm.tsx index 1b46349..3f3d234 100644 --- a/src/components/survey-sale/list/SearchForm.tsx +++ b/src/components/survey-sale/list/SearchForm.tsx @@ -1,23 +1,22 @@ 'use client' import { SEARCH_OPTIONS, SEARCH_OPTIONS_ENUM, SEARCH_OPTIONS_PARTNERS, useSurveyFilterStore } from '@/store/surveyFilterStore' -import { MemberRole } from '@/hooks/useUserType' import { useRouter } from 'next/navigation' import { useState } from 'react' -export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: () => void; memberRole: MemberRole }) { +export default function SearchForm({ onItemsInit, memberRole, userId }: { onItemsInit: () => void; memberRole: string; userId: string }) { const router = useRouter() const { setSearchOption, setSort, setIsMySurvey, setKeyword, isMySurvey, keyword, searchOption, sort } = useSurveyFilterStore() const [searchKeyword, setSearchKeyword] = useState(keyword) - - const username = 'test' + const [option, setOption] = useState(searchOption) const handleSearch = () => { - if (searchKeyword.trim().length < 2) { + if (option !== 'id' && searchKeyword.trim().length < 2) { alert('2文字以上入力してください') return } setKeyword(searchKeyword) + setSearchOption(option) onItemsInit() } const searchOptions = memberRole === 'Partner' ? SEARCH_OPTIONS_PARTNERS : SEARCH_OPTIONS @@ -25,7 +24,7 @@ export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: ( return (
    -
    @@ -34,8 +33,18 @@ export default function SearchForm({ onItemsInit, memberRole }: { onItemsInit: ( className="select-form" name="search-option" id="search-option" - value={searchOption} - onChange={(e) => setSearchOption(e.target.value as SEARCH_OPTIONS_ENUM)} + value={option} + onChange={(e) => { + if (e.target.value === 'all') { + setKeyword('') + setSearchKeyword('') + onItemsInit() + setSearchOption('all') + setOption('all') + } else { + setOption(e.target.value as SEARCH_OPTIONS_ENUM) + } + }} > {searchOptions.map((option) => (