14 changed files with 56 additions and 99 deletions
--- a/.env.development
+++ b/.env.development
@ -11,7 +11,6 @@ NEXT_PUBLIC_QSP_API_URL=https://jp-dev.qsalesplatform.com
 #1:1문의 api
 NEXT_PUBLIC_INQUIRY_API_URL=https://jp-dev.qsalesplatform.com

-EMAIL_TITLE_PREFIX=(System Test)

 #QPARTNER 로그인 api
 DB_HOST=202.218.61.226
--- a/.env.localhost
+++ b/.env.localhost
@ -11,8 +11,6 @@ NEXT_PUBLIC_QSP_API_URL=https://jp-dev.qsalesplatform.com
 #1:1문의 api
 NEXT_PUBLIC_INQUIRY_API_URL=https://jp-dev.qsalesplatform.com

-EMAIL_TITLE_PREFIX=
-
 #QPARTNER 로그인 api
 DB_HOST=202.218.61.226
 DB_USER=readonly
--- a/.env.production
+++ b/.env.production
@ -9,8 +9,6 @@ NEXT_PUBLIC_QSP_API_URL=https://jp.qsalesplatform.com
 #1:1문의 api
 NEXT_PUBLIC_INQUIRY_API_URL=http://172.23.4.129:8110

-EMAIL_TITLE_PREFIX=
-
 #QPARTNER 로그인 api
 DB_HOST=202.218.61.226
 DB_USER=readonly
--- a/dev.ecosystem.comfig.js
+++ b/dev.ecosystem.comfig.js
@ -1,10 +0,0 @@
-module.exports = {
-  apps: [
-    {
-      name: 'on-site-survey',
-      script: 'node_modules/next/dist/bin/next',
-      instances: 1,
-      exec_mode: 'fork',
-    },
-  ],
-}
--- a/src/app/api/auth/route.ts
+++ b/src/app/api/auth/route.ts
@ -57,7 +57,7 @@ export async function POST(request: Request) {
    session.storeLvl = result.data.data.storeLvl
    session.custCd = result.data.data.custCd
    session.builderNo = result.data.data.builderNo
-    session.builderNm = result.data.data.builderNm
+    session.builderNm = ''
    session.isLoggedIn = true

    if (result.data.data.userId === 'T01') {
@ -105,7 +105,7 @@ export async function POST(request: Request) {
      STORE_LVL: result.data.data.storeLvl,
      CUST_CD: result.data.data.custCd,
      BUILDER_NO: result.data.data.builderNo,
-      BUILDER_NM: result.data.data.builderNm,
+      BUILDER_NM: '',
      IS_LOGGED_IN: true,
      ROLE: '',
    }
--- a/src/app/api/survey-sales/[id]/route.ts
+++ b/src/app/api/survey-sales/[id]/route.ts
@ -115,6 +115,8 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
  try {
    const { id } = await params
    const body = await request.json()
+
+    if (body.targetId) {
      // @ts-ignore
      const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
        where: { ID: Number(id) },
@ -127,6 +129,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
        },
      })
      return NextResponse.json({ message: 'Survey confirmed successfully', data: survey })
+    }
  } catch (error) {
    console.error('Error updating survey:', error)
    return NextResponse.json({ error: 'Failed to update survey' }, { status: 500 })
--- a/src/app/api/survey-sales/route.ts
+++ b/src/app/api/survey-sales/route.ts
@ -11,7 +11,7 @@ type SearchParams = {
  sort?: string | null // 정렬 방식
  offset?: string | null
  role?: string | null // 회원권한한
-  storeId?: string | null // 판매점ID
+  store?: string | null // 판매점ID
  builderNo?: string | null // 시공ID
 }

@ -75,11 +75,11 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
      where.OR = [
        {
          // 같은 판매점에서 작성한 제출/제출되지 않은 매물
-          AND: [{ STORE_ID: { equals: params.storeId } }],
+          AND: [{ STORE_ID: { equals: params.store } }],
        },
        {
          // MUSUBI (시공권한 X) 가 ORDER 에 제출한 매물
-          AND: [{ SUBMISSION_TARGET_ID: { equals: params.storeId } }, { SUBMISSION_STATUS: { equals: true } }],
+          AND: [{ SUBMISSION_TARGET_ID: { equals: params.store } }, { SUBMISSION_STATUS: { equals: true } }],
        },
      ]
      break
@ -89,18 +89,18 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
        {
          // MUSUBI (시공권한 X) 같은 판매점에서 작성한 제출/제출되지 않은 매물
          AND: [
-            { STORE_ID: { equals: params.storeId } },
-            {
-              OR: [{ CONSTRUCTION_POINT_ID: { equals: null } }, { CONSTRUCTION_POINT_ID: { equals: '' } }],
-            },
+            { STORE_ID: { equals: params.store } },
+            // {
+            //   OR: [{ CONSTRUCTION_POINT: { equals: null } }, { CONSTRUCTION_POINT: { equals: '' } }],
+            // },
          ],
        },
        {
          // MUSUBI (시공권한 O) 가 MUSUBI 에 제출한 매물 + PARTNER 가 제출한 매물
          AND: [
-            { SUBMISSION_TARGET_ID: { equals: params.storeId } },
-            { CONSTRUCTION_POINT_ID: { not: null } },
-            { CONSTRUCTION_POINT_ID: { not: '' } },
+            { SUBMISSION_TARGET_ID: { equals: params.store } },
+            { CONSTRUCTION_POINT: { not: null } },
+            { CONSTRUCTION_POINT: { not: '' } },
            { SUBMISSION_STATUS: { equals: true } },
          ],
        },
@ -109,8 +109,9 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {

    case 'Builder': // MUSUBI (시공권한 O)
    case 'Partner': // PARTNER
-      // 시공ID 같은 매물
+      // 시공점이 있고 STORE_ID 가 시공ID와 같은 매물
      where.AND?.push({
+        // CONSTRUCTION_POINT: { not: null },
        CONSTRUCTION_POINT_ID: { equals: params.builderNo },
      })
      break
@ -126,7 +127,7 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
        },
        {
          STORE_ID: {
-            equals: params.storeId,
+            equals: params.store,
          },
        },
      ]
@ -153,7 +154,7 @@ export async function GET(request: Request) {
      sort: searchParams.get('sort'),
      offset: searchParams.get('offset'),
      role: searchParams.get('role'),
-      storeId: searchParams.get('storeId'), //storeId
+      store: searchParams.get('store'), //storeId
      builderNo: searchParams.get('builderNo'),
    }

--- a/src/components/pdf/SurveySaleDownloadPdf.tsx
+++ b/src/components/pdf/SurveySaleDownloadPdf.tsx
@ -10,6 +10,7 @@ import { useSpinnerStore } from '@/store/spinnerStore'
 export default function SurveySaleDownloadPdf() {
  const params = useParams()
  const id = params.id
+  const router = useRouter()

  const { surveyDetail, isLoadingSurveyDetail } = useSurvey(Number(id))
  const { setIsShow } = useSpinnerStore()
@ -49,7 +50,7 @@ export default function SurveySaleDownloadPdf() {

    generatePDF(targetRef, options).then(() => {
      setIsShow(false)
-      alert('PDFの生成が完了しました。 ポップアップウィンドウからダウンロードしてください。')
+      router.push(`/survey-sale/${id}`)
    })
  }

--- a/src/components/popup/SurveySaleSubmitPopup.tsx
+++ b/src/components/popup/SurveySaleSubmitPopup.tsx
@ -11,8 +11,8 @@ import { useSpinnerStore } from '@/store/spinnerStore'

 interface SubmitFormData {
  saleBase: string | null
-  targetId: string | null
-  targetNm: string | null
+  targetId: string
+  targetNm: string
  sender: string
  receiver: string[] | string
  reference: string | null
@ -38,12 +38,12 @@ export default function SurveySaleSubmitPopup() {

  const [submitData, setSubmitData] = useState<SubmitFormData>({
    saleBase: null,
-    targetId: null,
-    targetNm: null,
-    sender: '',
+    targetId: session?.role === 'Builder' ? surveyDetail?.storeId ?? '' : '',
+    targetNm: session?.role === 'Builder' ? surveyDetail?.store ?? '' : '',
+    sender: session?.email ?? '',
    receiver: [],
    reference: null,
-    title: '',
+    title: '[HANASYS現地調査] 調査物件が提出. (' + surveyDetail?.srlNo + ')',
    contents: '',
  })

@ -57,8 +57,6 @@ export default function SurveySaleSubmitPopup() {
    }
    setSubmitData({
      ...submitData,
-      targetId: session?.role === 'Builder' ? surveyDetail?.storeId ?? null : null,
-      targetNm: session?.role === 'Builder' ? surveyDetail?.store ?? null : null,
      sender: session?.email ?? '',
      title: '[HANASYS現地調査] 調査物件が提出. (' + surveyDetail?.srlNo + ')',
    })
@ -84,7 +82,7 @@ export default function SurveySaleSubmitPopup() {
    const requiredFields = FORM_FIELDS.filter((field) => field.required)

    for (const field of requiredFields) {
-      if (data[field.id] === '' || data[field.id] === null || data[field.id]?.length === 0) {
+      if (data[field.id]?.length === 0) {
        alert(`${field.name}は必須入力項目です。`)
        const element = document.getElementById(field.id)
        if (element) {
@ -107,17 +105,16 @@ export default function SurveySaleSubmitPopup() {
        })
          .then(() => {
            if (!isSubmittingSurvey) {
+              submitSurvey({ targetId: submitData.targetId, targetNm: submitData.targetNm })
              alert('提出が完了しました。')
-              // submitSurvey({ targetId: submitData.targetId, targetNm: submitData.targetNm })
              popupController.setSurveySaleSubmitPopup(false)
            }
          })
          .catch((error) => {
            console.error('Error sending email:', error)
-            alert('メール送信に失敗しました。 再度送信してください。')
+            alert('メール送信に失敗しました。')
          })
          .finally(() => {
-            submitSurvey({ targetId: submitData.targetId, targetNm: submitData.targetNm })
            setIsShow(false)
            popupController.setSurveySaleSubmitPopup(false)
          })
@ -140,7 +137,6 @@ export default function SurveySaleSubmitPopup() {
    if (field.id === 'targetNm' && session?.role === 'Admin') {
      return null
    }
-
    return (
      <div className="data-input-form-bx" key={field.id}>
        <div className="data-input-form-tit">
--- a/src/components/survey-sale/detail/ButtonForm.tsx
+++ b/src/components/survey-sale/detail/ButtonForm.tsx
@ -29,6 +29,7 @@ export default function ButtonForm(props: {
    ...props.data.basic,
    detailInfo: props.data.roof,
  })
+
  // --------------------------------------------------------------
  // 권한

@ -48,12 +49,12 @@ export default function ButtonForm(props: {
        // 1차 판매점(Order) + 2차 판매점(Musubi) => 같은 판매점 제출권한
        case 'Admin':
        case 'Admin_Sub':
-          setIsSubmiter(session.storeNm === props.data.basic.store && session.builderNo === props.data.basic.constructionPointId)
+          setIsSubmiter(session.storeNm === props.data.basic.store && session.builderNo === props.data.basic.constructionPoint)
          break
        // 시공권한 User(Musubi) + Partner => 같은 시공ID 제출권한
        case 'Builder':
        case 'Partner':
-          setIsSubmiter(session.builderNo === props.data.basic.constructionPointId)
+          setIsSubmiter(session.builderNo === props.data.basic.constructionPoint)
          break
        default:
          setIsSubmiter(false)
@ -75,6 +76,7 @@ export default function ButtonForm(props: {
  const { deleteSurvey, updateSurvey, isDeletingSurvey, isUpdatingSurvey } = useSurvey(Number(id))
  const { validateSurveyDetail, createSurvey, isCreatingSurvey } = useSurvey()

+
  const handleSave = (isTemporary: boolean, isSubmitProcess: boolean) => {
    const emptyField = validateSurveyDetail(props.data.roof)
    const hasEmptyField = emptyField?.trim() !== ''
@ -187,19 +189,6 @@ export default function ButtonForm(props: {
    )
  }

-  //TODO: 추가확인 필요 (T01 계정이 어떤 조사매물을 수정/삭제 할 수 있는지)
-  if (mode === 'READ' && session?.role === 'T01' && (!isSubmit || props.data.basic.submissionTargetId !== session.storeId)) {
-    return (
-      <>
-        <div className="sale-form-btn-wrap">
-          <div className="btn-flex-wrap">
-            <ListButton />
-          </div>
-        </div>
-      </>
-    )
-  }
-
  return (
    <>
      {mode === 'READ' && (
--- a/src/components/survey-sale/detail/DataTable.tsx
+++ b/src/components/survey-sale/detail/DataTable.tsx
@ -4,15 +4,12 @@ import { useSurvey } from '@/hooks/useSurvey'
 import { useParams, useRouter } from 'next/navigation'
 import { useEffect } from 'react'
 import DetailForm from './DetailForm'
-import { useSessionStore } from '@/store/session'

 export default function DataTable() {
  const params = useParams()
  const id = params.id
  const router = useRouter()

-  const { session } = useSessionStore()
-
  useEffect(() => {
    if (Number.isNaN(Number(id))) {
      alert('間違ったアプローチです。')
@ -23,25 +20,7 @@ export default function DataTable() {
  const { surveyDetail, isLoadingSurveyDetail } = useSurvey(Number(id))

  if (isLoadingSurveyDetail) {
-    return null
-  }
-
-  const submitStatus = () => {
-    const { submissionTargetNm, submissionTargetId } = surveyDetail ?? {}
-
-    if (!submissionTargetNm) {
-      return null
-    }
-
-    if (!submissionTargetId) {
-      return <div>{submissionTargetNm}</div>
-    }
-
-    return (
-      <div>
-        ({submissionTargetNm} - {submissionTargetId})
-      </div>
-    )
+    return <></>
  }

  return (
@ -77,7 +56,9 @@ export default function DataTable() {
                {surveyDetail?.submissionStatus && surveyDetail?.submissionDate ? (
                  <>
                    <div>{new Date(surveyDetail.submissionDate).toLocaleString()}</div>
-                    {submitStatus()}
+                    <div>
+                      ({surveyDetail.submissionTargetNm} - {surveyDetail.submissionTargetId})
+                    </div>
                  </>
                ) : (
                  '-'
--- a/src/hooks/useSurvey.ts
+++ b/src/hooks/useSurvey.ts
@ -66,7 +66,7 @@ export function useSurvey(id?: number): {
  createSurvey: (survey: SurveyRegistRequest) => Promise<number>
  updateSurvey: ({ survey, isTemporary, storeId }: { survey: SurveyRegistRequest; isTemporary: boolean; storeId?: string }) => void
  deleteSurvey: () => Promise<boolean>
-  submitSurvey: (params: { targetId?: string | null; targetNm?: string | null }) => void
+  submitSurvey: (params: { saveId?: number; targetId?: string; targetNm?: string; storeId?: string; srlNo?: string }) => void
  validateSurveyDetail: (surveyDetail: SurveyDetailRequest) => string
  getZipCode: (zipCode: string) => Promise<ZipCode[] | null>
  refetchSurveyList: () => void
@ -90,7 +90,7 @@ export function useSurvey(id?: number): {
          isMySurvey,
          sort,
          offset,
-          storeId: session?.storeId,
+          store: session?.storeId,
          builderNo: session?.builderNo,
          role: session?.role,
        },
@ -163,11 +163,14 @@ export function useSurvey(id?: number): {
  })

  const { mutateAsync: submitSurvey, isPending: isSubmittingSurvey } = useMutation({
-    mutationFn: async ({ targetId, targetNm }: { targetId?: string | null; targetNm?: string | null }) => {
+    mutationFn: async ({ targetId, targetNm, storeId, srlNo }: { targetId?: string; targetNm?: string; storeId?: string; srlNo?: string }) => {
      if (!id) throw new Error('id is required')
      const resp = await axiosInstance(null).patch<boolean>(`/api/survey-sales/${id}`, {
        targetId,
        targetNm,
+        storeId,
+        srlNo,
+        role: session?.role ?? null,
      })
      return resp.data
    },
--- a/src/libs/session.ts
+++ b/src/libs/session.ts
@ -45,7 +45,6 @@ export const defaultSession: SessionData = {
  storeLvl: null,
  custCd: null,
  builderNo: null,
-  builderNm: null,
  isLoggedIn: false,
  role: null,
 }
--- a/src/store/session.ts
+++ b/src/store/session.ts
@ -41,7 +41,6 @@ const initialState: InitialState = {
    storeLvl: null,
    custCd: null,
    builderNo: null,
-    builderNm: null,
    isLoggedIn: false,
    role: null,
  },