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

README.md

@@ -123,7 +123,7 @@ session에 있는 role 키로 구분한다
   session.role === 'Builder'
 - teshg44 / 1234 -> 시공사\
   session.role === 'Builder'
-- partners -> Q.Partners 계정\
+- isogai@yanegiken.co.jp / password -> Q.Partners 계정\
   session.role === 'Partner'
 - 이외의 경우 -> 굳이 체크할 필요 없어보임\
   session.role === 'User'

src/app/api/auth/route.ts

@@ -57,6 +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.isLoggedIn = true
 
     if (result.data.data.userId === 'T01') {
@@ -104,6 +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: '',
       IS_LOGGED_IN: true,
       ROLE: '',
     }

src/app/api/partner/route.ts

@@ -85,6 +85,7 @@ export async function POST(request: Request) {
     session.storeLvl = null
     session.custCd = null
     session.builderNo = data[0].user_seko_id
+    session.builderNm = data[0].supplier_name
     session.isLoggedIn = true
     session.role = 'Partner'
 
@@ -123,6 +124,7 @@ export async function POST(request: Request) {
     STORE_LVL: null,
     CUST_CD: null,
     BUILDER_NO: data[0].user_seko_id,
+    BUILDER_NM: data[0].supplier_name,
     IS_LOGGED_IN: true,
     ROLE: 'Partner',
   }

src/components/popup/SurveySaleSubmitPopup.tsx

@@ -38,8 +38,8 @@ export default function SurveySaleSubmitPopup() {
 
   const [submitData, setSubmitData] = useState<SubmitFormData>({
     saleBase: null,
-    targetId: '',
-    targetNm: '',
+    targetId: session?.role === 'Builder' ? surveyDetail?.storeId ?? '' : '',
+    targetNm: session?.role === 'Builder' ? surveyDetail?.store ?? '' : '',
     sender: session?.email ?? '',
     receiver: [],
     reference: null,

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

@@ -20,7 +20,6 @@ export default function BasicForm(props: { basicInfo: SurveyBasicRequest; setBas
     setBasicInfoSelected()
   }, [])
 
-  // TODO: session 시공점 이름 추가!!!!!!!
   useEffect(() => {
     if (session?.isLoggedIn) {
       setBasicInfo({
@@ -29,7 +28,7 @@ export default function BasicForm(props: { basicInfo: SurveyBasicRequest; setBas
         representativeId: session.userId ?? null,
         store: session.storeNm ?? null,
         storeId: session.storeId ?? null,
-        constructionPoint:  null,
+        constructionPoint: session.builderNm ?? null,
         constructionPointId: session.builderNo ?? null,
       })
     }

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

@@ -6,7 +6,6 @@ import { useEffect, useState } from 'react'
 import { useParams, useRouter, useSearchParams } from 'next/navigation'
 import { requiredFields, useSurvey } from '@/hooks/useSurvey'
 import { usePopupController } from '@/store/popupController'
-import { useSpinnerStore } from '@/store/spinnerStore'
 
 export default function ButtonForm(props: {
   mode: Mode
@@ -31,7 +30,6 @@ export default function ButtonForm(props: {
     detailInfo: props.data.roof,
   })
 
-  const { setIsShow } = useSpinnerStore()
   // --------------------------------------------------------------
   // 권한
 
@@ -78,14 +76,6 @@ export default function ButtonForm(props: {
   const { deleteSurvey, updateSurvey, isDeletingSurvey, isUpdatingSurvey } = useSurvey(Number(id))
   const { validateSurveyDetail, createSurvey, isCreatingSurvey } = useSurvey()
 
-  useEffect(() => {
-    if (isCreatingSurvey || isUpdatingSurvey || isDeletingSurvey) {
-      setIsShow(true)
-    }
-    if (!isCreatingSurvey && !isUpdatingSurvey && !isDeletingSurvey) {
-      setIsShow(false)
-    }
-  }, [isCreatingSurvey, isUpdatingSurvey, isDeletingSurvey])
 
   const handleSave = (isTemporary: boolean, isSubmitProcess: boolean) => {
     const emptyField = validateSurveyDetail(props.data.roof)

src/hooks/useAxios.ts

@@ -3,21 +3,19 @@ import Config from '@/config/config.export'
 import { useSpinnerStore } from '@/store/spinnerStore'
 
 export function useAxios() {
-  // const { setIsShow } = useSpinnerStore()
-
   const requestHandler = (config: InternalAxiosRequestConfig) => {
-    // setIsShow(true)
+    useSpinnerStore.getState().setIsShow(true)
     return config
   }
 
   const responseHandler = (response: AxiosResponse) => {
-    // setIsShow(false)
+    useSpinnerStore.getState().setIsShow(false)
     response.data = transferResponse(response)
     return response
   }
 
   const errorHandler = (error: any) => {
-    // setIsShow(false)
+    useSpinnerStore.getState().setIsShow(false)
     return Promise.reject(error)
   }
 

src/providers/ReactQueryProvider.tsx

@@ -11,6 +11,7 @@ export default function ReactQueryProviders({ children }: React.PropsWithChildre
         defaultOptions: {
           queries: {
             staleTime: 60 * 1000,
+            retry: false,
           },
         },
       }),

src/types/Auth.ts

@@ -27,6 +27,7 @@ export interface SessionData {
   storeLvl: null
   custCd: null
   builderNo: null
+  builderNm: null | string
   isLoggedIn: boolean
   role: string | null
 }