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

- 제출 대상 판매점 ID, 일련번호 컬럼 추가
- 임시 저장 시 일련번호에 '임시저장000' 으로 저장
- 조사매물 목록 조회 필터링 조건 수정
- url 에러 핸들링

README.md

@@ -54,12 +54,13 @@ session에 있는 role 키로 구분한다
   session.role === 'Admin_Sub'
 - constA03_01 / 1234 -> 시공사\
   session.role === 'Builder'
+- teshg44 / 1234 -> 시공사\
+  session.role === 'Builder'
 - partners -> Q.Partners 계정\
   session.role === 'Partner'
 - 이외의 경우 -> 굳이 체크할 필요 없어보임\
   session.role === 'User'
 
-
 # 지붕재 적합성 TODO
 
 ```

prisma/schema.prisma

@@ -7,18 +7,6 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
-model User {
-  id         Int      @id @default(autoincrement())
-  username   String   @unique
-  phone      String?
-  email      String?
-  password   String?
-  kakao_id   String?
-  avatar     String?
-  created_at DateTime @default(now())
-  updated_at DateTime @updatedAt
-}
-
 model MS_SUITABLE {
   id                                        Int      @id @default(autoincrement())
   product_name                              String   @db.VarChar(200)
@@ -58,21 +46,23 @@ model MS_SUITABLE {
 }
 
 model SD_SURVEY_SALES_BASIC_INFO {
-  ID                 Int                          @id @default(autoincrement())
+  ID                   Int                          @id @default(autoincrement())
-  REPRESENTATIVE     String                       @db.VarChar(200)
+  SRL_NO               String                       @db.VarChar(20)
-  STORE              String?                      @db.VarChar(200)
+  REPRESENTATIVE       String                       @db.VarChar(200)
-  CONSTRUCTION_POINT String?                      @db.VarChar(200)
+  STORE                String?                      @db.VarChar(200)
-  INVESTIGATION_DATE String?                      @db.VarChar(10)
+  CONSTRUCTION_POINT   String?                      @db.VarChar(200)
-  BUILDING_NAME      String?                      @db.VarChar(200)
+  INVESTIGATION_DATE   String?                      @db.VarChar(10)
-  CUSTOMER_NAME      String?                      @db.VarChar(200)
+  BUILDING_NAME        String?                      @db.VarChar(200)
-  POST_CODE          String?                      @db.VarChar(10)
+  CUSTOMER_NAME        String?                      @db.VarChar(200)
-  ADDRESS            String?                      @db.VarChar(200)
+  POST_CODE            String?                      @db.VarChar(10)
-  ADDRESS_DETAIL     String?                      @db.VarChar(300)
+  ADDRESS              String?                      @db.VarChar(200)
-  SUBMISSION_STATUS  Boolean                      @default(false)
+  ADDRESS_DETAIL       String?                      @db.VarChar(300)
-  SUBMISSION_DATE    DateTime?                    @db.Date
+  SUBMISSION_STATUS    Boolean                      @default(false)
-  REG_DT             DateTime                     @default(now())
+  SUBMISSION_DATE      DateTime?                    @db.Date
-  UPT_DT             DateTime                     @updatedAt
+  SUBMISSION_TARGET_ID String?                      @db.VarChar(200)
-  DETAIL_INFO        SD_SURVEY_SALES_DETAIL_INFO?
+  REG_DT               DateTime                     @default(now())
+  UPT_DT               DateTime                     @updatedAt
+  DETAIL_INFO          SD_SURVEY_SALES_DETAIL_INFO?
 }
 
 model SD_SURVEY_SALES_DETAIL_INFO {
@@ -120,28 +110,28 @@ model SD_SURVEY_SALES_DETAIL_INFO {
 
 model BC_COMM_H {
   HEAD_CD    String      @id(map: "PK_BC_COMM_H") @db.NVarChar(6)
-  HEAD_ID    String      @db.NVarChar(100)
+  HEAD_ID    String?     @db.NVarChar(100)
-  HEAD_NM    String      @db.NVarChar(100)
+  HEAD_NM    String?     @db.NVarChar(100)
-  HEAD_JP    String      @db.NVarChar(100)
+  HEAD_JP    String?     @db.NVarChar(100)
-  HEAD_4TH   String      @db.NVarChar(100)
+  HEAD_4TH   String?     @db.NVarChar(100)
-  REF_CHR1   String      @db.NVarChar(100)
+  REF_CHR1   String?     @db.NVarChar(100)
-  REF_CHR2   String      @db.NVarChar(100)
+  REF_CHR2   String?     @db.NVarChar(100)
-  REF_CHR3   String      @db.NVarChar(100)
+  REF_CHR3   String?     @db.NVarChar(100)
-  REF_CHR4   String      @db.NVarChar(100)
+  REF_CHR4   String?     @db.NVarChar(100)
-  REF_CHR5   String      @db.NVarChar(100)
+  REF_CHR5   String?     @db.NVarChar(100)
-  REF_NUM1   String      @db.NVarChar(100)
+  REF_NUM1   String?     @db.NVarChar(100)
-  REF_NUM2   String      @db.NVarChar(100)
+  REF_NUM2   String?     @db.NVarChar(100)
-  REF_NUM3   String      @db.NVarChar(100)
+  REF_NUM3   String?     @db.NVarChar(100)
-  REF_NUM4   String      @db.NVarChar(100)
+  REF_NUM4   String?     @db.NVarChar(100)
-  REF_NUM5   String      @db.NVarChar(100)
+  REF_NUM5   String?     @db.NVarChar(100)
-  REMARKS    String      @db.NVarChar(200)
+  REMARKS    String?     @db.NVarChar(200)
-  SAP_YN     String      @db.NVarChar(1)
+  SAP_YN     String?     @db.NVarChar(1)
-  STAT_CD    String      @db.NVarChar(1)
+  STAT_CD    String?     @db.NVarChar(1)
-  DEL_YN     String      @db.NVarChar(1)
+  DEL_YN     String?     @db.NVarChar(1)
   REG_DT     DateTime?   @db.DateTime
-  REG_ID     String      @db.NVarChar(50)
+  REG_ID     String?     @db.NVarChar(50)
   UPT_DT     DateTime?   @db.DateTime
-  UPT_ID     String      @db.NVarChar(50)
+  UPT_ID     String?     @db.NVarChar(50)
   QC_COMM_YN String?     @default("N", map: "DF__BC_COMM_H__QC_CO__48CFD27E") @db.NVarChar(1)
   BC_COMM_L  BC_COMM_L[]
 
@@ -179,11 +169,11 @@ model BC_COMM_L {
 }
 
 model MS_SUITABLE_ROOF_MATERIAL_GROUP {
-  ID                  Int      @id @default(autoincrement())
+  ID                  Int       @id @default(autoincrement())
-  ROOF_MATERIAL_GROUP String   @db.VarChar(200)
+  ROOF_MATERIAL_GROUP String    @db.VarChar(200)
-  ROOF_MT_CD          String   @db.VarChar(200)
+  ROOF_MT_CD          String    @db.VarChar(200)
-  REG_DT              DateTime @default(now(), map: "DF__MS_SUITAB__creat__4F7CD00D")
+  REG_DT              DateTime  @default(now(), map: "DF__MS_SUITAB__creat__4F7CD00D")
-  UPT_DT              DateTime
+  UPT_DT              DateTime?
 }
 
 model MS_SUITABLE_DETAIL {

src/app/api/auth/logout/route.ts

@@ -3,11 +3,18 @@ import { cookies } from 'next/headers'
 import { NextResponse } from 'next/server'
 import { getIronSession } from 'iron-session'
 import { sessionOptions } from '@/libs/session'
+import { tracking } from '@/libs/tracking'
 
 export async function GET(request: Request) {
   const cookieStore = await cookies()
   const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
 
+  tracking({
+    url: '/api/auth/logout',
+    data: JSON.stringify({
+      userId: session.userId,
+    }),
+  })
   session.destroy()
   // return redirect('/login')
 

src/app/api/auth/route.ts

@@ -4,6 +4,7 @@ import { NextResponse } from 'next/server'
 import { getIronSession } from 'iron-session'
 import { axiosInstance } from '@/libs/axios'
 import { sessionOptions } from '@/libs/session'
+import { tracking } from '@/libs/tracking'
 
 export async function POST(request: Request) {
   const { loginId, pwd } = await request.json()
@@ -12,9 +13,16 @@ export async function POST(request: Request) {
     loginId,
     pwd,
   })
-  // console.log('🚀 ~ result ~ result:', result)
+  console.log('🚀 ~ result ~ result:', result.data)
 
   if (result.data.result.code === 200) {
+    tracking({
+      url: `/api/auth/login`,
+      data: JSON.stringify({
+        loginId,
+        pwd,
+      }),
+    })
     const cookieStore = await cookies()
     const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
 
@@ -57,8 +65,6 @@ export async function POST(request: Request) {
       session.role = 'Admin_Sub'
     } else if (result.data.data.groupId === '70000' && result.data.data.builderNo !== null) {
       session.role = 'Builder'
-    } else if (result.data.data.groupId === '90000' && result.data.data.builderNo !== null) {
-      session.role = 'Partner'
     } else {
       session.role = 'User'
     }
@@ -68,5 +74,50 @@ export async function POST(request: Request) {
     await session.save()
   }
 
-  return NextResponse.json({ code: 200, message: 'Login is Succecss!!', result: result.data.data })
+  const resultForSession = {
+    LANG_CD: result.data.data.langCd,
+    CURR_PAGE: result.data.data.currPage,
+    ROW_COUNT: result.data.data.rowCount,
+    START_ROW: result.data.data.startRow,
+    END_ROW: result.data.data.endRow,
+    COMP_CD: result.data.data.compCd,
+    AGENCY_STORE_ID: result.data.data.agencyStoreId,
+    STORE_ID: result.data.data.storeId,
+    STORE_NM: result.data.data.storeNm,
+    USER_ID: result.data.data.userId,
+    CATEGORY: result.data.data.category,
+    USER_NM: result.data.data.userNm,
+    USER_NM_KANA: result.data.data.userNmKana,
+    TEL_NO: result.data.data.telNo,
+    FAX: result.data.data.fax,
+    EMAIL: result.data.data.email,
+    LAST_EDIT_USER: result.data.data.lastEditUser,
+    STORE_GUBUN: result.data.data.storeGubun,
+    PW_CURR: result.data.data.pwCurr,
+    PWD_INIT_YN: result.data.data.pwdInitYn,
+    APPR_STAT_CD: result.data.data.apprStatCd,
+    LOGIN_FAIL_CNT: result.data.data.loginFailCnt,
+    LOGIN_FAIL_MIN_YN: result.data.data.loginFailMinYn,
+    PRICE_VIEW_STAT_CD: result.data.data.priceViewStatCd,
+    GROUP_ID: result.data.data.groupId,
+    STORE_LVL: result.data.data.storeLvl,
+    CUST_CD: result.data.data.custCd,
+    BUILDER_NO: result.data.data.builderNo,
+    IS_LOGGED_IN: true,
+    ROLE: '',
+  }
+
+  if (result.data.data.userId === 'T01') {
+    resultForSession.ROLE = 'T01'
+  } else if (result.data.data.groupId === '60000') {
+    resultForSession.ROLE = 'Admin'
+  } else if (result.data.data.groupId === '70000' && result.data.data.builderNo === null) {
+    resultForSession.ROLE = 'Admin_Sub'
+  } else if (result.data.data.groupId === '70000' && result.data.data.builderNo !== null) {
+    resultForSession.ROLE = 'Builder'
+  } else {
+    resultForSession.ROLE = 'User'
+  }
+
+  return NextResponse.json({ code: 200, message: 'Login is Succecss!!', result: resultForSession })
 }

src/app/api/partner/route.ts

@@ -123,6 +123,8 @@ export async function POST(request: Request) {
     STORE_LVL: null,
     CUST_CD: null,
     BUILDER_NO: data[0].user_seko_id,
+    IS_LOGGED_IN: true,
+    ROLE: 'Partner',
   }
 
   return NextResponse.json({ code: 200, message: 'Partner Login is Succecss!!', result })

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

@@ -19,25 +19,54 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
   }
 }
 
+const getNewSrlNo = async (srlNo: string, storeId: string) => {
+  let newSrlNo = srlNo
+  console.log('srlNo:: ', srlNo)
+  if (srlNo.startsWith('一時保存')) {
+    //@ts-ignore
+    const lastSurvey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findFirst({
+      where: {
+        SRL_NO: {
+          startsWith: storeId,
+        },
+      },
+      orderBy: {
+        ID: 'desc',
+      },
+    })
+    const lastNo = lastSurvey ? parseInt(lastSurvey.SRL_NO.slice(-3)) : 0
+    newSrlNo =
+      storeId +
+      new Date().getFullYear().toString().slice(-2) +
+      (new Date().getMonth() + 1).toString().padStart(2, '0') +
+      new Date().getDate().toString().padStart(2, '0') +
+      (lastNo + 1).toString().padStart(3, '0')
+  }
+  return newSrlNo
+}
+
 export async function PUT(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
   try {
     const { id } = await params
     const body = await request.json()
-    const { detailInfo, ...basicInfo } = body
+    const { detailInfo, ...basicInfo } = body.survey
 
+    // PUT 요청 시 임시저장 여부 확인 후 임시저장 시 기존 SRL_NO 사용, 기본 저장 시 새로운 SRL_NO 생성
+    const newSrlNo = body.isTemporary ? body.survey.srlNo : await getNewSrlNo(body.survey.srlNo, body.storeId)
     // @ts-ignore
     const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
       where: { ID: Number(id) },
       data: {
         ...convertToSnakeCase(basicInfo),
+        SRL_NO: newSrlNo,
         UPT_DT: new Date(),
         DETAIL_INFO: {
-          update: convertToSnakeCase(detailInfo)
+          update: convertToSnakeCase(detailInfo),
-        }
+        },
       },
       include: {
-        DETAIL_INFO: true
+        DETAIL_INFO: true,
-      }
+      },
     })
     return NextResponse.json(survey)
   } catch (error) {
@@ -84,49 +113,24 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
     const { id } = await params
     const body = await request.json()
 
-    if (body.submit) {
+    // 제출 시 기존 SRL_NO 확인 후 '임시저장'으로 시작하면 새로운 SRL_NO 생성
+    const newSrlNo = await getNewSrlNo(body.srlNo, body.storeId)
+
+    if (body.targetId) {
       // @ts-ignore
       const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
         where: { ID: Number(id) },
         data: {
           SUBMISSION_STATUS: true,
           SUBMISSION_DATE: new Date(),
+          SUBMISSION_TARGET_ID: body.targetId,
           UPT_DT: new Date(),
+          SRL_NO: newSrlNo,
         },
       })
+      console.log(survey)
       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: convertToSnakeCase(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: convertToSnakeCase(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 })

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

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { prisma } from '@/libs/prisma'
 import { convertToSnakeCase } from '@/utils/common-utils'
+import { equal } from 'assert'
 /**
  * 검색 파라미터
  */
@@ -77,6 +78,29 @@ const createKeywordSearchCondition = (keyword: string, searchOption: string): Wh
   return where
 }
 
+// 임시저장 데이터 필터링 - T01 만 적용
+const filterTempData = () => {
+  const requiredFields = [
+    'INSTALLATION_SYSTEM',
+    'CONSTRUCTION_YEAR',
+    'RAFTER_SIZE',
+    'RAFTER_PITCH',
+    'WATERPROOF_MATERIAL',
+    'INSULATION_PRESENCE',
+    'STRUCTURE_ORDER',
+  ]
+
+  return {
+    DETAIL_INFO: {
+      is: {
+        AND: requiredFields.map((field: string) => ({
+          OR: [{ [field]: { not: null } }, { [`${field}_ETC`]: { not: null } }],
+        })),
+      },
+    },
+  }
+}
+
 /**
  * 회원 역할별 검색 조건 생성 함수
  * @param params 검색 파라미터
@@ -87,13 +111,14 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
 
   switch (params.role) {
     case 'Admin': // 1차점
-      // 같은 판매점에서 작성된 매물 + 2차점에서 제출받은 매물
       where.OR = [
         {
+          // 같은 판매점에서 작성한 제출/제출되지 않은 매물
           AND: [{ STORE: { equals: params.store } }],
         },
         {
-          AND: [{ STORE: { startsWith: params.store } }, { SUBMISSION_STATUS: { equals: true } }],
+          // MUSUBI (시공권한 X) 가 ORDER 에 제출한 매물
+          AND: [{ SUBMISSION_TARGET_ID: { equals: params.store } }, { SUBMISSION_STATUS: { equals: true } }],
         },
       ]
       break
@@ -101,6 +126,7 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
     case 'Admin_Sub': // 2차점
       where.OR = [
         {
+          // MUSUBI (시공권한 X) 같은 판매점에서 작성한 제출/제출되지 않은 매물
           AND: [
             { STORE: { equals: params.store } },
             {
@@ -109,8 +135,9 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
           ],
         },
         {
+          // MUSUBI (시공권한 O) 가 MUSUBI 에 제출한 매물 + PARTNER 가 제출한 매물
           AND: [
-            { STORE: { equals: params.store } },
+            { SUBMISSION_TARGET_ID: { equals: params.store } },
             { CONSTRUCTION_POINT: { not: null } },
             { CONSTRUCTION_POINT: { not: '' } },
             { SUBMISSION_STATUS: { equals: true } },
@@ -119,8 +146,8 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
       ]
       break
 
-    case 'Builder': // 2차점 시공권한
+    case 'Builder': // MUSUBI (시공권한 O)
-    case 'Partner': // Partner
+    case 'Partner': // PARTNER
       // 같은 시공ID에서 작성된 매물
       where.AND?.push({
         CONSTRUCTION_POINT: { equals: params.builderNo },
@@ -128,6 +155,15 @@ const createMemberRoleCondition = (params: SearchParams): WhereCondition => {
       break
 
     case 'T01':
+      // where.AND.push(filterTempData())
+      where.AND?.push({
+        NOT: {
+          SRL_NO: {
+            startsWith: '一時保存',
+          },
+        },
+      })
+      break
     case 'User':
       // 모든 매물 조회 가능 (추가 조건 없음)
       break
@@ -222,21 +258,45 @@ export async function PUT(request: Request) {
 export async function POST(request: Request) {
   try {
     const body = await request.json()
-    console.log('body:: ', body)
 
-    const { detailInfo, ...basicInfo } = body
+    // 임시 저장 시 임시저장 + 000 으로 저장
+    // 기본 저장 시 판매점ID + yyMMdd + 000 으로 저장
+    const baseSrlNo =
+      body.survey.srlNo ??
+      body.storeId +
+        new Date().getFullYear().toString().slice(-2) +
+        (new Date().getMonth() + 1).toString().padStart(2, '0') +
+        new Date().getDate().toString().padStart(2, '0')
 
-    // 기본 정보 생성
+    // @ts-ignore
-    //@ts-ignore
+    const lastSurvey = await prisma.SD_SURVEY_SALES_BASIC_INFO.findFirst({
+      where: {
+        SRL_NO: {
+          startsWith: body.storeId,
+        },
+      },
+      orderBy: {
+        SRL_NO: 'desc',
+      },
+    })
+
+    // 마지막 번호 추출
+    const lastNumber = lastSurvey ? parseInt(lastSurvey.SRL_NO.slice(-3)) : 0
+
+    // 새로운 srlNo 생성
+    const newSrlNo = baseSrlNo + (lastNumber + 1).toString().padStart(3, '0')
+
+    const { detailInfo, ...basicInfo } = body.survey
+    // @ts-ignore
     const result = await prisma.SD_SURVEY_SALES_BASIC_INFO.create({
       data: {
         ...convertToSnakeCase(basicInfo),
+        SRL_NO: newSrlNo,
         DETAIL_INFO: {
-          create: convertToSnakeCase(detailInfo)
+          create: convertToSnakeCase(detailInfo),
-        }
+        },
-      }
+      },
     })
-    console.log('result:: ', result)
     return NextResponse.json(result)
   } catch (error) {
     console.error(error)

src/app/api/tracking/route.ts

@@ -1,17 +1,25 @@
 import type { SessionData } from '@/types/Auth'
 import { NextResponse } from 'next/server'
 import { cookies } from 'next/headers'
-import { Prisma } from '@prisma/client'
+import { prisma } from '@/libs/prisma'
 import { getIronSession } from 'iron-session'
 import { sessionOptions } from '@/libs/session'
 
-export const POST = async (request: Request) => {
+export async function POST(request: Request) {
   const { url, data } = await request.json()
 
   const cookieStore = await cookies()
   const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
 
-  let owner = session.userId
+  let owner = ''
+  if (url === '/api/auth/login') {
+    owner = 'Login'
+  } else if (url === '/api/auth/logout') {
+    owner = 'Logout'
+  } else {
+    owner = session.userId ?? 'Direct'
+  }
+
   let type = ''
   if (url.includes('api')) {
     type = 'api'
@@ -20,12 +28,12 @@ export const POST = async (request: Request) => {
   }
 
   // @ts-ignore
-  const result = await Prisma.MS_USR_TRK.create({
+  const result = await prisma.MS_USR_TRK.create({
     data: {
-      owner,
+      OWNER: owner,
-      type,
+      TYPE: type,
-      url,
+      URL: url,
-      data: JSON.stringify(data),
+      DATA: JSON.stringify(data),
     },
   })
 

src/app/api/user/create/route.ts

@@ -1,23 +0,0 @@
-import { NextResponse } from 'next/server'
-import { prisma } from '@/libs/prisma'
-
-export async function POST(request: Request) {
-  try {
-    const body = await request.json()
-    const { username, email, password } = body
-
-    const user = await prisma.user.create({
-      data: {
-        username,
-        email,
-        password,
-        updated_at: new Date(),
-      },
-    })
-
-    return NextResponse.json(user)
-  } catch (error) {
-    console.error('Error creating user:', error)
-    return NextResponse.json({ error: 'Error creating user' }, { status: 500 })
-  }
-}

src/app/api/user/list/route.ts

@@ -1,7 +0,0 @@
-import { NextResponse } from 'next/server'
-import { prisma } from '@/libs/prisma'
-
-export const GET = async () => {
-  const users = await prisma.user.findMany()
-  return NextResponse.json(users)
-}

src/app/api/user/route.ts

@@ -1,38 +0,0 @@
-import { NextResponse } from 'next/server'
-import { prisma } from '@/libs/prisma'
-import { getIronSession } from 'iron-session'
-import { cookies } from 'next/headers'
-import { sessionOptions } from '@/libs/session'
-import type { SessionData } from '@/types/Auth'
-
-export async function POST(request: Request) {
-  const { username, password } = await request.json()
-
-  console.log('🚀 ~ POST ~ username:', username)
-  console.log('🚀 ~ POST ~ password:', password)
-
-  const user = await prisma.user.findFirst({
-    where: {
-      username: username,
-      password: password,
-    },
-  })
-  console.log('🚀 ~ POST ~ user:', user)
-
-  if (!user) {
-    return NextResponse.json({ error: 'User not found' }, { status: 404 })
-  }
-
-  const cookieStore = await cookies()
-  const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
-  console.log('start session edit!')
-  // session.username = user.username!
-  // session.email = user.email!
-  session.isLoggedIn = true
-  console.log('end session edit!')
-  await session.save()
-  console.log('🚀 ~ POST ~ session:', session)
-
-  // return NextResponse.redirect(new URL(process.env.NEXT_PUBLIC_URL!, request.url))
-  return NextResponse.json(user)
-}

src/components/DownloadPDF.tsx

@@ -35,7 +35,7 @@ export default function DownloadPdf() {
     <>
       <button onClick={handleDownPdf}>down</button>
       <div ref={targetRef} style={{ boxSizing: 'border-box' }}>
-        <div style={{ margin: '0 auto', padding: 0, maxWidth: '800px' }}>
+        <div style={{ margin: '0 auto', padding: 0, maxWidth: '800px', minWidth: '800px' }}>
           <div style={{ padding: '20px 20px 50px', borderBottom: '2px solid #2E3A59' }}>
             <div style={{ float: 'left', verticalAlign: 'middle', fontSize: '18px', color: '#101010', fontWeight: 600, fontFamily: 'M-Gothic' }}>
               HWJ 現地調査シート1/2

src/components/Login.tsx

@@ -3,10 +3,8 @@
 import type { SessionData } from '@/types/Auth'
 import { useEffect, useReducer, useState } from 'react'
 import { useRouter } from 'next/navigation'
-
 import { useLocalStorage } from 'usehooks-ts'
 import { useQuery } from '@tanstack/react-query'
-
 import { axiosInstance } from '@/libs/axios'
 import { useSessionStore } from '@/store/session'
 
@@ -35,6 +33,11 @@ export default function Login() {
     pwd: '',
   })
 
+  const isValidEmail = (email: string) => {
+    const emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
+    return emailRegex.test(email)
+  }
+
   interface LoginData {
     code: number
     message: string | null
@@ -84,6 +87,14 @@ export default function Login() {
     }
   }, [loginData])
 
+  useEffect(() => {
+    if (isValidEmail(account.loginId)) {
+      setIsPartners(true)
+    } else {
+      setIsPartners(false)
+    }
+  }, [account.loginId])
+
   return (
     <>
       <div className="login-form-wrap">
@@ -96,7 +107,7 @@ export default function Login() {
               value={account.loginId}
               onChange={(e) => setAccount({ loginId: e.target.value })}
             />
-            <button className="login-icon">
+            <button className="login-icon" onClick={() => setAccount({ loginId: '' })}>
               <i className="del-icon"></i>
             </button>
           </div>

src/components/popup/MemberInformationPopup.tsx

@@ -57,9 +57,11 @@ export default function MemberInformationPopup() {
                 <input type="text" className="input-frame" defaultValue={session.builderNo ?? ''} disabled />
               </div>
             </div>
-            <button className="btn-frame n-blue icon" onClick={handlePwReset}>
+            {session.role !== 'Partner' && (
-              パスワードリセット<i className="btn-arr"></i>
+              <button className="btn-frame n-blue icon" onClick={handlePwReset}>
-            </button>
+                パスワードリセット<i className="btn-arr"></i>
+              </button>
+            )}
           </div>
         </div>
       </div>

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

@@ -25,7 +25,7 @@ export default function BasicForm(props: { basicInfo: SurveyBasicRequest; setBas
       setBasicInfo({
         ...basicInfo,
         representative: session.userNm ?? '',
-        store: session.storeNm ?? null,
+        store: session.role === 'Partner' ? null : session.storeNm ?? null,
         constructionPoint: session.builderNo ?? null,
       })
     }

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

@@ -23,11 +23,13 @@ export default function ButtonForm(props: {
   const routeId = params.id
 
   // ------------------------------------------------------------
-  const [isSubmitProcess, setIsSubmitProcess] = useState(false)
   const [saveData, setSaveData] = useState({
     ...props.data.basic,
     detailInfo: props.data.roof,
   })
+
+  // !!!!!!!!!!
+  const [tempTargetId, setTempTargetId] = useState('')
   // --------------------------------------------------------------
   // 권한
 
@@ -39,7 +41,26 @@ export default function ButtonForm(props: {
 
   useEffect(() => {
     if (session?.isLoggedIn) {
-      setIsSubmiter(session.storeNm === props.data.basic.store && session.builderNo === props.data.basic.constructionPoint)
+      switch (session?.role) {
+        // T01 제출권한 없음
+        case 'T01':
+          setIsSubmiter(false)
+          break
+        // 1차 판매점(Order) + 2차 판매점(Musubi) => 같은 판매점 제출권한
+        case 'Admin':
+        case 'Admin_Sub':
+          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.constructionPoint)
+          break
+        default:
+          setIsSubmiter(false)
+          break
+      }
+
       setIsWriter(session.userNm === props.data.basic.representative)
     }
     setSaveData({
@@ -50,27 +71,33 @@ export default function ButtonForm(props: {
 
   // ------------------------------------------------------------
   // 저장/임시저장/수정
+  const id = Number(routeId) ? Number(routeId) : Number(idParam)
 
-  const id = routeId ? Number(routeId) : Number(idParam)
   const { deleteSurvey, submitSurvey, updateSurvey } = useServey(Number(id))
   const { validateSurveyDetail, createSurvey } = useServey()
 
-  const handleSave = (isTemporary: boolean, isSubmitProcess?: boolean) => {
+  const handleSave = (isTemporary: boolean, isSubmitProcess = false) => {
     const emptyField = validateSurveyDetail(props.data.roof)
+    const hasEmptyField = emptyField?.trim() !== ''
+
     if (isTemporary) {
-      tempSaveProcess()
+      hasEmptyField ? tempSaveProcess() : saveProcess(emptyField, false)
     } else {
-      saveProcess(emptyField, isSubmitProcess ?? false)
+      saveProcess(emptyField, isSubmitProcess)
     }
   }
 
   const tempSaveProcess = async () => {
     if (idParam) {
-      await updateSurvey(saveData)
+      await updateSurvey({ survey: saveData, isTemporary: true })
-      router.push(`/survey-sale/detail?id=${idParam}&isTemporary=true`)
+      router.push(`/survey-sale/${idParam}`)
     } else {
-      const id = await createSurvey(saveData)
+      const updatedData = {
-      router.push(`/survey-sale/detail?id=${id}&isTemporary=true`)
+        ...saveData,
+        srlNo: '一時保存',
+      }
+      const id = await createSurvey(updatedData)
+      router.push(`/survey-sale/${id}`)
     }
     alert('一時保存されました。')
   }
@@ -90,11 +117,12 @@ export default function ButtonForm(props: {
             ...saveData,
             submissionStatus: true,
             submissionDate: new Date().toISOString(),
+            submissionTargetId: tempTargetId,
           }
-          await updateSurvey(updatedData)
+          await updateSurvey({ survey: updatedData, isTemporary: false, storeId: session.storeId ?? '' })
           router.push(`/survey-sale/${idParam}`)
         } else {
-          await updateSurvey(saveData)
+          await updateSurvey({ survey: saveData, isTemporary: false, storeId: session.storeId ?? '' })
           router.push(`/survey-sale/${idParam}`)
         }
       } else {
@@ -103,6 +131,7 @@ export default function ButtonForm(props: {
             ...saveData,
             submissionStatus: true,
             submissionDate: new Date().toISOString(),
+            submissionTargetId: tempTargetId,
           }
           const id = await createSurvey(updatedData)
           submitProcess(id)
@@ -135,6 +164,14 @@ export default function ButtonForm(props: {
   }
 
   const handleSubmit = async () => {
+    if (props.data.basic.srlNo?.startsWith('一時保存')) {
+      alert('一時保存されたデータは提出できません。')
+      return
+    }
+    if (tempTargetId.trim() === '') {
+      alert('提出対象店舗を入力してください。')
+      return
+    }
     window.neoConfirm('提出しますか？', async () => {
       if (Number(routeId)) {
         submitProcess()
@@ -143,8 +180,9 @@ export default function ButtonForm(props: {
       }
     })
   }
+
   const submitProcess = async (saveId?: number) => {
-    await submitSurvey(saveId)
+    await submitSurvey({ saveId: saveId, targetId: tempTargetId, storeId: session.storeId ?? '', srlNo: '一時保存' })
     alert('提出されました。')
     router.push('/survey-sale')
   }
@@ -170,7 +208,7 @@ export default function ButtonForm(props: {
             <ListButton />
             <EditButton setMode={setMode} id={id.toString()} mode={mode} />
             {(isWriter || !isSubmiter) && <DeleteButton handleDelete={handleDelete} />}
-            {!isSubmit && isSubmiter && <SubmitButton handleSubmit={handleSubmit} />}
+            {!isSubmit && isSubmiter && <SubmitButton handleSubmit={handleSubmit} setTempTargetId={setTempTargetId} />}
           </div>
         </div>
       )}
@@ -181,7 +219,7 @@ export default function ButtonForm(props: {
             <ListButton />
             <TempButton setMode={setMode} handleSave={handleSave} />
             <SaveButton handleSave={handleSave} />
-            <SubmitButton handleSubmit={handleSubmit} />
+            <SubmitButton handleSubmit={handleSubmit} setTempTargetId={setTempTargetId} />
           </div>
         </div>
       )}
@@ -221,15 +259,20 @@ function EditButton(props: { setMode: (mode: Mode) => void; id: string; mode: Mo
   )
 }
 
-function SubmitButton(props: { handleSubmit: () => void }) {
+function SubmitButton(props: { handleSubmit: () => void; setTempTargetId: (targetId: string) => void }) {
-  const { handleSubmit } = props
+  const { handleSubmit, setTempTargetId } = props
   return (
-    <div className="btn-bx">
+    <>
-      {/* 제출 */}
+      <div className="btn-bx">
-      <button className="btn-frame red icon" onClick={handleSubmit}>
+        {/* 제출 */}
-        提出<i className="btn-arr"></i>
+        <button className="btn-frame red icon" onClick={handleSubmit}>
-      </button>
+          提出<i className="btn-arr"></i>
-    </div>
+        </button>
+      </div>
+      <div>
+        <input type="text" placeholder="temp target id" onChange={(e) => setTempTargetId(e.target.value)} />
+      </div>
+    </>
   )
 }
 
@@ -267,7 +310,6 @@ function TempButton(props: { setMode: (mode: Mode) => void; handleSave: (isTempo
       <button
         className="btn-frame n-blue icon"
         onClick={() => {
-          setMode('TEMP')
           handleSave(true)
         }}
       >

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

@@ -1,31 +1,22 @@
 'use client'
 
 import { useServey } from '@/hooks/useSurvey'
-import { useParams, useSearchParams } from 'next/navigation'
+import { useParams } from 'next/navigation'
-import { useEffect, useState } from 'react'
+import { useEffect } from 'react'
 import DetailForm from './DetailForm'
-import type { SurveyBasicInfo } from '@/types/Survey'
 
 export default function DataTable() {
   const params = useParams()
   const id = params.id
 
-  const searchParams = useSearchParams()
+  useEffect(() => {
-  const isTemp = searchParams.get('isTemporary')
+    if (Number.isNaN(Number(id))) {
+      alert('間違ったアプローチです。')
+      window.location.href = '/survey-sale'
+    }
+  }, [id])
 
   const { surveyDetail, isLoadingSurveyDetail } = useServey(Number(id))
-  const [isTemporary, setIsTemporary] = useState(isTemp === 'true')
-
-  const { validateSurveyDetail } = useServey(Number(id))
-
-  useEffect(() => {
-    if (surveyDetail?.detailInfo) {
-      const validate = validateSurveyDetail(surveyDetail.detailInfo)
-      if (validate.trim() !== '') {
-        setIsTemporary(false)
-      }
-    }
-  }, [surveyDetail])
 
   if (isLoadingSurveyDetail) {
     return <div>Loading...</div>
@@ -42,12 +33,12 @@ export default function DataTable() {
           <tbody>
             <tr>
               <th>登録番号</th>
-              {isTemporary ? (
+              {surveyDetail?.srlNo?.startsWith('一時保存') ? (
                 <td>
                   <span className="text-red-500">仮保存</span>
                 </td>
               ) : (
-                <td>{surveyDetail?.id}</td>
+                <td>{surveyDetail?.srlNo}</td>
               )}
             </tr>
             <tr>

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

@@ -5,7 +5,7 @@ import { useEffect, useState } from 'react'
 import ButtonForm from './ButtonForm'
 import BasicForm from './BasicForm'
 import RoofForm from './RoofForm'
-import { useParams, useSearchParams } from 'next/navigation'
+import { useParams, useRouter, useSearchParams } from 'next/navigation'
 import { useServey } from '@/hooks/useSurvey'
 
 const roofInfoForm: SurveyDetailRequest = {
@@ -58,35 +58,40 @@ const basicInfoForm: SurveyBasicRequest = {
   addressDetail: null,
   submissionStatus: false,
   submissionDate: null,
+  submissionTargetId: null,
+  srlNo: null,
 }
 
 export default function DetailForm() {
   const idParam = useSearchParams().get('id')
   const routeId = useParams().id
 
-  const id = idParam ?? routeId
+  const modeset = Number(routeId) ? 'READ' : idParam ? 'EDIT' : 'CREATE'
+  const id = Number(routeId) ? Number(routeId) : Number(idParam)
 
-  const { surveyDetail } = useServey(Number(id))
+  const { surveyDetail, validateSurveyDetail } = useServey(Number(id))
 
-  const [mode, setMode] = useState<Mode>(idParam ? 'EDIT' : routeId ? 'READ' : 'CREATE')
+  const [mode, setMode] = useState<Mode>(modeset)
   const [basicInfoData, setBasicInfoData] = useState<SurveyBasicRequest>(basicInfoForm)
   const [roofInfoData, setRoofInfoData] = useState<SurveyDetailRequest>(roofInfoForm)
 
   useEffect(() => {
+    if (Number(idParam) !== 0 && surveyDetail === null) {
+      alert('データが見つかりません。')
+      window.location.href = '/survey-sale'
+    }
+
     if (surveyDetail && (mode === 'EDIT' || mode === 'READ')) {
       const { id, uptDt, regDt, detailInfo, ...rest } = surveyDetail
       setBasicInfoData(rest)
       if (detailInfo) {
         const { id, uptDt, regDt, basicInfoId, ...rest } = detailInfo
         setRoofInfoData(rest)
+        if (validateSurveyDetail(rest).trim() !== '') {
+        }
       }
     }
-  }, [surveyDetail])
+  }, [surveyDetail, id])
-
-  // console.log('mode:: ', mode)
-  // console.log('surveyDetail:: ', surveyDetail)
-  // console.log('basicInfoData:: ', basicInfoData)
-  console.log('roofInfoData:: ', roofInfoData)
 
   const data = {
     basic: basicInfoData,

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

@@ -230,6 +230,14 @@ export default function RoofForm(props: {
         }
       }
     }
+    if (key === 'contractCapacity') {
+      const remainValue = roofInfo.contractCapacity?.split(' ')[1] ?? roofInfo.contractCapacity
+      if (Number.isNaN(Number(remainValue))) {
+        setRoofInfo({ ...roofInfo, [key]: value + ' ' + remainValue })
+        return
+      }
+      setRoofInfo({ ...roofInfo, [key]: value.toString() })
+    }
     setRoofInfo({ ...roofInfo, [key]: value.toString() })
   }
 
@@ -237,7 +245,7 @@ export default function RoofForm(props: {
     const numericValue = roofInfo.contractCapacity?.replace(/[^0-9.]/g, '') || ''
     setRoofInfo({
       ...roofInfo,
-      contractCapacity: numericValue ? `${numericValue} ${value}` : value,
+      contractCapacity: numericValue ? `${numericValue} ${value}` : '0 ' + value,
     })
   }
 
@@ -261,7 +269,7 @@ export default function RoofForm(props: {
               {mode !== 'READ' && (
                 <div className="data-input mb5">
                   <input
-                    type="text"
+                    type="number"
                     id="contractCapacity"
                     className="input-frame"
                     value={roofInfo?.contractCapacity?.split(' ')[0] ?? ''}
@@ -525,15 +533,16 @@ const SelectedBox = ({
           選択してください
         </option>
       </select>
-      <div className="data-input">
+      <div className={`data-input ${column === 'constructionYear' ? 'flex' : ''}`}>
         <input
-          type="text"
+          type={column === 'constructionYear' ? 'number' : 'text'}
           className="input-frame"
           placeholder="-"
           value={detailInfoData[`${column}Etc` as keyof SurveyDetailInfo]?.toString() ?? ''}
           onChange={handleEtcInputChange}
           disabled={isInputDisabled()}
         />
+        {column === 'constructionYear' && <span>年</span>}
       </div>
     </>
   )
@@ -553,9 +562,8 @@ const RadioSelected = ({
   const etcValue = detailInfoData?.[`${column}Etc` as keyof SurveyDetailInfo]
   const [etcChecked, setEtcChecked] = useState<boolean>(Boolean(etcValue))
 
-  const selectedId = column === 'leakTrace' 
+  const selectedId =
-    ? Number(detailInfoData?.[column as keyof SurveyDetailInfo]) || 2
+    column === 'leakTrace' ? Number(detailInfoData?.[column as keyof SurveyDetailInfo]) || 2 : detailInfoData?.[column as keyof SurveyDetailInfo]
-    : detailInfoData?.[column as keyof SurveyDetailInfo]
 
   const isSpecialColumn = column === 'rafterDirection' || column === 'leakTrace' || column === 'insulationPresence'
   const showEtcOption = !isSpecialColumn
@@ -582,7 +590,7 @@ const RadioSelected = ({
     setRoofInfo({
       ...detailInfoData,
       [column]: value,
-      [`${column}Etc`]: isRafterDirection ? detailInfoData[`${column}Etc` as keyof SurveyDetailInfo] : null
+      [`${column}Etc`]: isRafterDirection ? detailInfoData[`${column}Etc` as keyof SurveyDetailInfo] : null,
     })
   }
 
@@ -696,7 +704,7 @@ const MultiCheck = ({
     // 기타 선택 해제 시 값도 null로 설정
     setRoofInfo({
       ...roofInfo,
-      [`${column}Etc`]: newIsOtherCheck ? '' : null 
+      [`${column}Etc`]: newIsOtherCheck ? '' : null,
     })
   }
 

src/components/survey-sale/list/ListTable.tsx

@@ -30,7 +30,7 @@ export default function ListTable() {
     if (!session.isLoggedIn || !('data' in surveyList)) return
     if ('count' in surveyList && surveyList.count > 0) {
       if (offset > 0) {
-        setHeldSurveyList(prev => [...prev, ...surveyList.data])
+        setHeldSurveyList((prev) => [...prev, ...surveyList.data])
       } else {
         setHeldSurveyList(surveyList.data)
       }
@@ -50,14 +50,14 @@ export default function ListTable() {
   return (
     <>
       <SearchForm memberRole={session?.role ?? ''} userNm={session?.userNm ?? ''} />
-      {heldSurveyList.length > 0 ? (
         <div className="sale-frame">
-          <ul className="sale-list-wrap">
+          {heldSurveyList.length > 0 ? (
+            <ul className="sale-list-wrap">
             {heldSurveyList.map((survey) => (
               <li className="sale-list-item cursor-pointer" key={survey.id} onClick={() => handleDetailClick(survey.id)}>
                 <div className="sale-item-bx">
                   <div className="sale-item-date-bx">
-                    <div className="sale-item-num">{survey.id}</div>
+                    <div className="sale-item-num">{survey.srlNo}</div>
                     <div className="sale-item-date">{survey.investigationDate}</div>
                   </div>
                   <div className="sale-item-tit">{survey.buildingName}</div>
@@ -67,18 +67,18 @@ export default function ListTable() {
                     <div className="sale-item-update">{new Date(survey.uptDt).toLocaleString()}</div>
                   </div>
                 </div>
-              </li>
+                </li>
-            ))}
+              ))}
-          </ul>
+            </ul>
+          ) : (
+            <div className="compliace-nosearch">
+              <span className="mb10">作成された物件はありません。</span>
+            </div>
+          )}
           <div className="sale-edit-btn">
             <LoadMoreButton hasMore={hasMore} onLoadMore={() => setOffset(offset + 10)} />
           </div>
         </div>
-      ) : (
-        <div>
-          <p>作成された物件はありません。</p>
-        </div>
-      )}
     </>
   )
 }

src/components/ui/Main.tsx

@@ -34,7 +34,7 @@ export default function Main() {
               <div className="main-bx-icon">
                 <img src="/assets/images/main/main_icon02.svg" alt="" />
               </div>
-              <button className="main-bx-arr" onClick={() => router.push('/survey-sale/basic-info')}></button>
+              <button className="main-bx-arr" onClick={() => router.push('/survey-sale/regist')}></button>
             </div>
             <div className="grid-bx-body">
               <div className="grid-bx-body-tit">調査物件登録</div>

src/components/ui/common/Header.tsx

@@ -71,7 +71,7 @@ export default function Header() {
                   </div>
                   <div className="profile-group">
                     <div className="profile-name">{session.userNm}</div>
-                    <div className="profile-company">{session.category}</div>
+                    <div className="profile-company">{session.storeNm}</div>
                   </div>
                 </div>
                 <div className="side-close-wrap">
@@ -114,9 +114,11 @@ export default function Header() {
                   <li className="side-nav-item">
                     <button onClick={() => router.push('/inquiry/regist')}>1:1お問い合わせ登録</button>
                   </li>
-                  <li className="side-nav-item">
+                  {session.role !== 'Partner' && (
-                    <button onClick={() => router.push('/pw-reset')}>パスワードリセット</button>
+                    <li className="side-nav-item">
-                  </li>
+                      <button onClick={() => router.push('/pw-reset')}>パスワードリセット</button>
+                    </li>
+                  )}
                 </ul>
               </nav>
               <div className="side-nav-footer">

src/hooks/useSurvey.ts

@@ -65,9 +65,9 @@ export function useServey(id?: number): {
   isDeletingSurvey: boolean
   createSurvey: (survey: SurveyRegistRequest) => Promise<number>
   createSurveyDetail: (params: { surveyId: number; surveyDetail: SurveyDetailCoverRequest }) => void
-  updateSurvey: (survey: SurveyRegistRequest) => void
+  updateSurvey: ({ survey, isTemporary, storeId }: { survey: SurveyRegistRequest; isTemporary: boolean; storeId?: string }) => void
   deleteSurvey: () => Promise<boolean>
-  submitSurvey: (saveId?: number) => void
+  submitSurvey: (params: { saveId?: number; targetId?: string; storeId?: string; srlNo?: string }) => void
   validateSurveyDetail: (surveyDetail: SurveyDetailRequest) => string
   getZipCode: (zipCode: string) => Promise<ZipCode[] | null>
   refetchSurveyList: () => void
@@ -119,7 +119,7 @@ export function useServey(id?: number): {
 
   const { mutateAsync: createSurvey, isPending: isCreatingSurvey } = useMutation({
     mutationFn: async (survey: SurveyRegistRequest) => {
-      const resp = await axiosInstance(null).post<SurveyBasicInfo>('/api/survey-sales', survey)
+      const resp = await axiosInstance(null).post<SurveyBasicInfo>('/api/survey-sales', { survey: survey, storeId: session?.storeId ?? null })
       return resp.data.id ?? 0
     },
     onSuccess: (data) => {
@@ -130,10 +130,14 @@ export function useServey(id?: number): {
   })
 
   const { mutate: updateSurvey, isPending: isUpdatingSurvey } = useMutation({
-    mutationFn: async (survey: SurveyRegistRequest) => {
+    mutationFn: async ({ survey, isTemporary, storeId }: { survey: SurveyRegistRequest; isTemporary: boolean; storeId?: string }) => {
       console.log('updateSurvey, survey:: ', survey)
       if (id === undefined) throw new Error('id is required')
-      const resp = await axiosInstance(null).put<SurveyRegistRequest>(`/api/survey-sales/${id}`, survey)
+      const resp = await axiosInstance(null).put<SurveyRegistRequest>(`/api/survey-sales/${id}`, {
+        survey: survey,
+        isTemporary: isTemporary,
+        storeId: storeId,
+      })
       return resp.data
     },
     onSuccess: () => {
@@ -166,11 +170,13 @@ export function useServey(id?: number): {
   })
 
   const { mutateAsync: submitSurvey } = useMutation({
-    mutationFn: async (saveId?: number) => {
+    mutationFn: async ({ saveId, targetId, storeId, srlNo }: { saveId?: number; targetId?: string; storeId?: string; srlNo?: string }) => {
       const submitId = saveId ?? id
       if (!submitId) throw new Error('id is required')
       const resp = await axiosInstance(null).patch<boolean>(`/api/survey-sales/${submitId}`, {
-        submit: true,
+        targetId,
+        storeId,
+        srlNo,
       })
       return resp.data
     },

src/libs/axios.ts

@@ -1,5 +1,4 @@
 import axios from 'axios'
-import { tracking } from './tracking'
 
 export const axiosInstance = (url: string | null | undefined) => {
   const baseURL = url || process.env.NEXT_PUBLIC_API_URL
@@ -12,7 +11,7 @@ export const axiosInstance = (url: string | null | undefined) => {
 
   instance.interceptors.request.use(
     (config) => {
-      console.log('🚀 ~ config:', config)
+      // console.log('🚀 ~ config:', config)
       return config
     },
     (error) => {
@@ -75,8 +74,20 @@ export const transformObjectKeys = (obj: any): any => {
 
   if (obj !== null && typeof obj === 'object') {
     return Object.keys(obj).reduce((acc: any, key: string) => {
-      const camelKey = snakeToCamel(key)
+      let transformedKey = key
-      acc[camelKey] = transformObjectKeys(obj[key])
+
+      // Handle uppercase snake_case (e.g., USER_NAME -> userName)
+      // Handle lowercase snake_case (e.g., user_name -> userName)
+      if (/^[A-Z_]+$/.test(key) || /^[a-z_]+$/.test(key)) {
+        transformedKey = snakeToCamel(key)
+      }
+      // Handle single uppercase word (e.g., ROLE -> role)
+      else if (/^[A-Z]+$/.test(key)) {
+        transformedKey = key.toLowerCase()
+      }
+      // Preserve existing camelCase
+
+      acc[transformedKey] = transformObjectKeys(obj[key])
       return acc
     }, {})
   }

src/libs/tracking.ts

@@ -6,5 +6,4 @@ export const tracking = async (params: { url: string; data: string }) => {
     url,
     data,
   })
-  console.log('🚀 ~ result ~ result:', result)
 }

src/middleware.ts

@@ -10,9 +10,9 @@ export async function middleware(request: NextRequest) {
   const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
 
   // todo: 로그인 기능 추가 시 주석 해제
-  // if (!session.isLoggedIn) {
+  if (!session.isLoggedIn) {
-  //   return NextResponse.redirect(new URL('/login', request.url))
+    return NextResponse.redirect(new URL('/login', request.url))
-  // }
+  }
 
   return NextResponse.next()
 }

src/providers/EdgeProvider.tsx

@@ -108,7 +108,7 @@ export default function EdgeProvider({ children, sessionData }: EdgeProviderProp
     //사이드바 초기화
     reset()
     // 페이지 이벤트 트래킹
-    // handlePageEvent(pathname)
+    handlePageEvent(pathname)
   }, [pathname])
 
   return <>{children}</>

src/types/Survey.ts

@@ -14,6 +14,8 @@ export type SurveyBasicInfo = {
   detailInfo: SurveyDetailInfo | null
   regDt: Date
   uptDt: Date
+  submissionTargetId: string | null
+  srlNo: string | null //판매점IDyyMMdd000
 }
 
 export type SurveyDetailInfo = {
@@ -70,6 +72,8 @@ export type SurveyBasicRequest = {
   addressDetail: string | null
   submissionStatus: boolean
   submissionDate: string | null
+  submissionTargetId: string | null
+  srlNo: string | null //판매점IDyyMMdd000
 }
 
 export type SurveyDetailRequest = {
@@ -127,6 +131,8 @@ export type SurveyRegistRequest = {
   submissionStatus: boolean
   submissionDate: string | null
   detailInfo: SurveyDetailRequest | null
+  submissionTargetId: string | null
+  srlNo: string | null //판매점IDyyMMdd000
 }
 
 export type Mode = 'CREATE' | 'EDIT' | 'READ' | 'TEMP' // 등록 | 수정 | 상세 | 임시저장