Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/survey

- Introduced a new configuration file for managing the on-site survey application.
- Defined application settings including script execution and instance management.

.env.development

@@ -11,6 +11,7 @@ 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

.env.localhost

@@ -11,6 +11,8 @@ 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

.env.production

@@ -9,6 +9,8 @@ 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

dev.ecosystem.comfig.js

@@ -0,0 +1,10 @@
+module.exports = {
+  apps: [
+    {
+      name: 'on-site-survey',
+      script: 'node_modules/next/dist/bin/next',
+      instances: 1,
+      exec_mode: 'fork',
+    },
+  ],
+}

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 = ''
+    session.builderNm = result.data.data.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: '',
+      BUILDER_NM: result.data.data.builderNm,
       IS_LOGGED_IN: true,
       ROLE: '',
     }

src/app/api/survey-sales/[id]/route.ts

@@ -115,8 +115,6 @@ 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) },
@@ -129,7 +127,6 @@ 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 })

src/app/api/survey-sales/route.ts

@@ -11,7 +11,7 @@ type SearchParams = {
   sort?: string | null // 정렬 방식
   offset?: string | null
   role?: string | null // 회원권한한
-  store?: string | null // 판매점ID
+  storeId?: string | null // 판매점ID
   builderNo?: string | null // 시공ID
 }
 
@@ -75,11 +75,11 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
       where.OR = [
         {
           // 같은 판매점에서 작성한 제출/제출되지 않은 매물
-          AND: [{ STORE_ID: { equals: params.store } }],
+          AND: [{ STORE_ID: { equals: params.storeId } }],
         },
         {
           // MUSUBI (시공권한 X) 가 ORDER 에 제출한 매물
-          AND: [{ SUBMISSION_TARGET_ID: { equals: params.store } }, { SUBMISSION_STATUS: { equals: true } }],
+          AND: [{ SUBMISSION_TARGET_ID: { equals: params.storeId } }, { SUBMISSION_STATUS: { equals: true } }],
         },
       ]
       break
@@ -89,18 +89,18 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
         {
           // MUSUBI (시공권한 X) 같은 판매점에서 작성한 제출/제출되지 않은 매물
           AND: [
-            { STORE_ID: { equals: params.store } },
+            { STORE_ID: { equals: params.storeId } },
-            // {
+            {
-            //   OR: [{ CONSTRUCTION_POINT: { equals: null } }, { CONSTRUCTION_POINT: { equals: '' } }],
+              OR: [{ CONSTRUCTION_POINT_ID: { equals: null } }, { CONSTRUCTION_POINT_ID: { equals: '' } }],
-            // },
+            },
           ],
         },
         {
           // MUSUBI (시공권한 O) 가 MUSUBI 에 제출한 매물 + PARTNER 가 제출한 매물
           AND: [
-            { SUBMISSION_TARGET_ID: { equals: params.store } },
+            { SUBMISSION_TARGET_ID: { equals: params.storeId } },
-            { CONSTRUCTION_POINT: { not: null } },
+            { CONSTRUCTION_POINT_ID: { not: null } },
-            { CONSTRUCTION_POINT: { not: '' } },
+            { CONSTRUCTION_POINT_ID: { not: '' } },
             { SUBMISSION_STATUS: { equals: true } },
           ],
         },
@@ -109,9 +109,8 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
 
     case 'Builder': // MUSUBI (시공권한 O)
     case 'Partner': // PARTNER
-      // 시공점이 있고 STORE_ID 가 시공ID와 같은 매물
+      // 시공ID 같은 매물
       where.AND?.push({
-        // CONSTRUCTION_POINT: { not: null },
         CONSTRUCTION_POINT_ID: { equals: params.builderNo },
       })
       break
@@ -127,7 +126,7 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
         },
         {
           STORE_ID: {
-            equals: params.store,
+            equals: params.storeId,
           },
         },
       ]
@@ -154,7 +153,7 @@ export async function GET(request: Request) {
       sort: searchParams.get('sort'),
       offset: searchParams.get('offset'),
       role: searchParams.get('role'),
-      store: searchParams.get('store'), //storeId
+      storeId: searchParams.get('storeId'), //storeId
       builderNo: searchParams.get('builderNo'),
     }
 

src/components/pdf/SurveySaleDownloadPdf.tsx

@@ -10,7 +10,6 @@ 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()
@@ -50,7 +49,7 @@ export default function SurveySaleDownloadPdf() {
 
     generatePDF(targetRef, options).then(() => {
       setIsShow(false)
-      router.push(`/survey-sale/${id}`)
+      alert('PDFの生成が完了しました。 ポップアップウィンドウからダウンロードしてください。')
     })
   }
 

src/components/popup/SurveySaleSubmitPopup.tsx

@@ -11,8 +11,8 @@ import { useSpinnerStore } from '@/store/spinnerStore'
 
 interface SubmitFormData {
   saleBase: string | null
-  targetId: string
+  targetId: string | null
-  targetNm: string
+  targetNm: string | null
   sender: string
   receiver: string[] | string
   reference: string | null
@@ -38,12 +38,12 @@ export default function SurveySaleSubmitPopup() {
 
   const [submitData, setSubmitData] = useState<SubmitFormData>({
     saleBase: null,
-    targetId: session?.role === 'Builder' ? surveyDetail?.storeId ?? '' : '',
+    targetId: null,
-    targetNm: session?.role === 'Builder' ? surveyDetail?.store ?? '' : '',
+    targetNm: null,
-    sender: session?.email ?? '',
+    sender: '',
     receiver: [],
     reference: null,
-    title: '[HANASYS現地調査] 調査物件が提出. (' + surveyDetail?.srlNo + ')',
+    title: '',
     contents: '',
   })
 
@@ -57,6 +57,8 @@ 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 + ')',
     })
@@ -82,7 +84,7 @@ export default function SurveySaleSubmitPopup() {
     const requiredFields = FORM_FIELDS.filter((field) => field.required)
 
     for (const field of requiredFields) {
-      if (data[field.id]?.length === 0) {
+      if (data[field.id] === '' || data[field.id] === null || data[field.id]?.length === 0) {
         alert(`${field.name}は必須入力項目です。`)
         const element = document.getElementById(field.id)
         if (element) {
@@ -105,16 +107,17 @@ 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)
           })
@@ -137,6 +140,7 @@ 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">

src/components/survey-sale/detail/ButtonForm.tsx

@@ -29,7 +29,6 @@ export default function ButtonForm(props: {
     ...props.data.basic,
     detailInfo: props.data.roof,
   })
-
   // --------------------------------------------------------------
   // 권한
 
@@ -49,12 +48,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.constructionPoint)
+          setIsSubmiter(session.storeNm === props.data.basic.store && session.builderNo === props.data.basic.constructionPointId)
           break
         // 시공권한 User(Musubi) + Partner => 같은 시공ID 제출권한
         case 'Builder':
         case 'Partner':
-          setIsSubmiter(session.builderNo === props.data.basic.constructionPoint)
+          setIsSubmiter(session.builderNo === props.data.basic.constructionPointId)
           break
         default:
           setIsSubmiter(false)
@@ -76,7 +75,6 @@ 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() !== ''
@@ -189,6 +187,19 @@ 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' && (

src/components/survey-sale/detail/DataTable.tsx

@@ -4,12 +4,15 @@ 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('間違ったアプローチです。')
@@ -20,7 +23,25 @@ export default function DataTable() {
   const { surveyDetail, isLoadingSurveyDetail } = useSurvey(Number(id))
 
   if (isLoadingSurveyDetail) {
-    return <></>
+    return null
+  }
+
+  const submitStatus = () => {
+    const { submissionTargetNm, submissionTargetId } = surveyDetail ?? {}
+
+    if (!submissionTargetNm) {
+      return null
+    }
+
+    if (!submissionTargetId) {
+      return <div>{submissionTargetNm}</div>
+    }
+
+    return (
+      <div>
+        ({submissionTargetNm} - {submissionTargetId})
+      </div>
+    )
   }
 
   return (
@@ -56,9 +77,7 @@ export default function DataTable() {
                 {surveyDetail?.submissionStatus && surveyDetail?.submissionDate ? (
                   <>
                     <div>{new Date(surveyDetail.submissionDate).toLocaleString()}</div>
-                    <div>
+                    {submitStatus()}
-                      ({surveyDetail.submissionTargetNm} - {surveyDetail.submissionTargetId})
-                    </div>
                   </>
                 ) : (
                   '-'

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: { saveId?: number; targetId?: string; targetNm?: string; storeId?: string; srlNo?: string }) => void
+  submitSurvey: (params: { targetId?: string | null; targetNm?: string | null }) => 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,
-          store: session?.storeId,
+          storeId: session?.storeId,
           builderNo: session?.builderNo,
           role: session?.role,
         },
@@ -163,14 +163,11 @@ export function useSurvey(id?: number): {
   })
 
   const { mutateAsync: submitSurvey, isPending: isSubmittingSurvey } = useMutation({
-    mutationFn: async ({ targetId, targetNm, storeId, srlNo }: { targetId?: string; targetNm?: string; storeId?: string; srlNo?: string }) => {
+    mutationFn: async ({ targetId, targetNm }: { targetId?: string | null; targetNm?: string | null }) => {
       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
     },

src/libs/session.ts

@@ -45,6 +45,7 @@ export const defaultSession: SessionData = {
   storeLvl: null,
   custCd: null,
   builderNo: null,
+  builderNm: null,
   isLoggedIn: false,
   role: null,
 }

src/store/session.ts

@@ -41,6 +41,7 @@ const initialState: InitialState = {
     storeLvl: null,
     custCd: null,
     builderNo: null,
+    builderNm: null,
     isLoggedIn: false,
     role: null,
   },