Compare commits

...

27 Commits

Author SHA1 Message Date
19a11783d6 fix: fix type error 2025-06-16 17:38:34 +09:00
5d5ba2e82a feat: add api logger to survey-sale api 2025-06-16 17:31:47 +09:00
a2e6c2343a Merge branch 'feature/log' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/survey 2025-06-16 17:01:46 +09:00
b783ca92d7 feat: 기 개발된 api에 api logger 적용 2025-06-16 16:49:59 +09:00
c212ed0ad6 fix: api log wrapper 수정 2025-06-16 16:03:38 +09:00
70c5af70f5 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/survey 2025-06-16 09:20:45 +09:00
ed8c6187d3 feat: api log wrapper 추가 2025-06-13 17:26:34 +09:00
7597700e7b feat: logger 날짜 분리 추가 2025-06-13 16:50:15 +09:00
8fc88f526d Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/log 2025-06-13 16:12:36 +09:00
nalpari
855dedce44 chore: update baseUrl for production environment
- Reverted baseUrl to the production server URL 'https://hanasysfield.jp' and commented out the local server IP address for production configuration.
- Ensured proper environment-specific settings for production deployment.
2025-06-13 14:13:00 +09:00
77895c220d Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/survey 2025-06-13 13:17:46 +09:00
042096c682 refactor: add an error alert conditional 2025-06-13 13:17:37 +09:00
298b563977 Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/log 2025-06-13 13:02:22 +09:00
36a06c226b Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/log 2025-06-13 13:01:28 +09:00
nalpari
96b5e39a58 chore: update baseUrl for production environment
- Commented out the previous production baseUrl and set a new baseUrl to point to the local server IP address for production configuration.
- Ensured consistency in environment-specific configurations.
2025-06-13 12:25:46 +09:00
nalpari
1af57d0965 chore: update API URLs for development and production environments
- Changed NEXT_PUBLIC_API_URL in .env.development and .env.production to point to the new development and production server URLs, respectively.
- Updated baseUrl in config.development.ts and config.production.ts to reflect the new server addresses for consistent environment configuration.
2025-06-12 18:09:08 +09:00
3eb5974414 feat: api logger 적용 2025-06-12 18:05:29 +09:00
a573d7ffb1 feat: api logger 추가 2025-06-12 18:03:24 +09:00
nalpari
420c481b84 chore: configure webpack for production optimization
- Added a webpack configuration to utilize terser-webpack-plugin for minifying JavaScript files in production builds, ensuring no comments are included in the output.
2025-06-12 17:36:45 +09:00
44d7a52790 chore: add production start script
- Introduced a new script in prod.startscript.js to execute the production server using pnpm for streamlined deployment.
2025-06-12 16:07:52 +09:00
99b37e3ac3 chore: update metadata for layout components
- Changed titles and descriptions in layout.tsx files for the main app, inquiry, suitable, and survey-sale sections to reflect the new project name "HANASYS現地調査" and its specific contexts.
2025-06-12 16:07:46 +09:00
f8d1cb54b6 chore: add development start script
- Introduced a new script in dev.startscript.js to execute the development server using pnpm for streamlined local development.
2025-06-12 15:33:28 +09:00
7c724f2430 chore: update development environment API URLs
- Changed NEXT_PUBLIC_API_URL in .env.development and baseUrl in config.development.ts to point to the new local server IP address for development purposes.
2025-06-12 15:20:25 +09:00
38ff8ce65f chore: update production database URL in .env.production
- Changed DATABASE_URL to point to the new SQL Server instance for production environment.
- Maintained existing connection settings for consistency across environments.
2025-06-12 15:06:34 +09:00
74865df3ba Merge remote-tracking branch 'origin/dev' into dev 2025-06-12 14:57:09 +09:00
15114d8da0 chore: update environment configuration for development, localhost, and production
- Added DATABASE_URL, DATABASE_CONNECTION_LIMIT, DATABASE_POOL_MIN, DATABASE_POOL_MAX, and SESSION_PASSWORD to .env, .env.development, .env.localhost, and .env.production files.
- Ensured consistent database connection settings across different environments for improved application performance.
2025-06-12 14:56:57 +09:00
907c92a546 Merge pull request 'feature/survey : 에러 해결' (#68) from feature/survey into dev
Reviewed-on: #68
2025-06-12 14:34:00 +09:00
36 changed files with 328 additions and 82 deletions

16
.env
View File

@ -1,16 +0,0 @@
# Environment variables declared in this file are automatically made available to Prisma.
# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
# DATABASE_URL="sqlserver://3team.devgrr.kr:1433;database=onsitesurvey;user=sa;password=1q2w3e4r!;encrypt=true;trustServerCertificate=true;"
DATABASE_URL="sqlserver://3team.devgrr.kr:1433;database=onsitesurvey;user=sa;password=1q2w3e4r!;encrypt=true;trustServerCertificate=true;connectionTimeout=30000;applicationName=OnSiteSurvey"
# DATABASE_URL="sqlserver://172.16.56.60:14331;database=hanwha_qcells_jp;user=qcells_jp;password=zbtpf2022!;encrypt=true;trustServerCertificate=true;applicationName=OnSiteSurvey"
# DATABASE_URL="mysql://root:root@localhost:3306/onsitesurvey"
DATABASE_CONNECTION_LIMIT=10
DATABASE_POOL_MIN=2
DATABASE_POOL_MAX=10
# SESSION_PASSWORD="QWERASDFZXCV1234567890REWQFDSAVCXZ"
SESSION_PASSWORD="This application is for mobile field research"

View File

@ -1,8 +1,17 @@
NEXT_PUBLIC_RUN_MODE=development
DATABASE_URL="sqlserver://172.16.56.60:14331;database=hanwha_qcells_jp;user=qcells_jp;password=zbtpf2022!;encrypt=true;trustServerCertificate=true;applicationName=OnSiteSurvey"
DATABASE_CONNECTION_LIMIT=10
DATABASE_POOL_MIN=2
DATABASE_POOL_MAX=10
SESSION_PASSWORD="This application is for mobile field research"
# 모바일 디바이스로 로컬 서버 확인하려면 자신 IP 주소로 변경
# 다시 로컬에서 개발할때는 localhost로 변경
#route handler
NEXT_PUBLIC_API_URL=http://localhost:3000
# NEXT_PUBLIC_API_URL=http://172.16.56.60:3000
NEXT_PUBLIC_API_URL=https://dev.hanasysfield.jp
#qsp 로그인 api
NEXT_PUBLIC_QSP_API_URL=http://121.168.9.37:8080

View File

@ -1,4 +1,12 @@
NEXT_PUBLIC_RUN_MODE=local
DATABASE_URL="sqlserver://172.16.56.60:14331;database=hanwha_qcells_jp;user=qcells_jp;password=zbtpf2022!;encrypt=true;trustServerCertificate=true;applicationName=OnSiteSurvey"
DATABASE_CONNECTION_LIMIT=10
DATABASE_POOL_MIN=2
DATABASE_POOL_MAX=10
SESSION_PASSWORD="This application is for mobile field research"
# 모바일 디바이스로 로컬 서버 확인하려면 자신 IP 주소로 변경
# 다시 로컬에서 개발할때는 localhost로 변경
#route handler

View File

@ -1,6 +1,15 @@
NEXT_PUBLIC_RUN_MODE=production
DATABASE_URL="sqlserver://172.16.56.57:14331;database=hanwha_qcells_jp;user=qcells_jp;password=zbtpf2022!;encrypt=true;trustServerCertificate=true;applicationName=OnSiteSurvey"
DATABASE_CONNECTION_LIMIT=10
DATABASE_POOL_MIN=2
DATABASE_POOL_MAX=10
SESSION_PASSWORD="This application is for mobile field research"
#route handler
NEXT_PUBLIC_API_URL=http://localhost:3000
# NEXT_PUBLIC_API_URL=http://localhost:3000
NEXT_PUBLIC_API_URL=https://hanasysfield.jp
#qsp 로그인 api
# NEXT_PUBLIC_QSP_API_URL=http://1.248.227.176:8120

6
.gitignore vendored
View File

@ -45,4 +45,8 @@ next-env.d.ts
bun.lockb
pnpm-lock.yaml
pnpm-workspace.yaml
pnpm-workspace.yaml
# logs
logs/
*.log

2
dev.startscript.js Normal file
View File

@ -0,0 +1,2 @@
var exec = require('child_process').exec
exec('pnpm run start:dev', { windowsHide: true })

View File

@ -6,7 +6,12 @@ const nextConfig: NextConfig = {
sassOptions: {
includePaths: [path.join(__dirname, './src/styles')],
},
serverExternalPackages: ['@react-pdf/renderer'],
serverExternalPackages: ['@react-pdf/renderer', 'pino'],
logging: {
fetches: {
fullUrl: true,
},
},
async rewrites() {
return [
{
@ -19,6 +24,22 @@ const nextConfig: NextConfig = {
// },
]
},
webpack: (config, { dev, isServer }) => {
if (!dev && !isServer) {
config.optimization.minimizer = config.optimization.minimizer || []
config.optimization.minimizer.push(
new (require('terser-webpack-plugin'))({
terserOptions: {
format: {
comments: false,
},
},
extractComments: false,
}),
)
}
return config
},
}
export default nextConfig

View File

@ -29,6 +29,7 @@
"next": "15.2.4",
"nodemailer": "^7.0.3",
"pdf-lib": "^1.17.1",
"pino": "^9.7.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-to-pdf": "^2.0.0",
@ -45,6 +46,7 @@
"@types/react-dom": "^19",
"prisma": "^6.7.0",
"tailwindcss": "^4",
"terser-webpack-plugin": "^5.3.14",
"typescript": "^5"
}
}

2
prod.startscript.js Normal file
View File

@ -0,0 +1,2 @@
var exec = require('child_process').exec
exec('pnpm run start:prod', { windowsHide: true })

View File

@ -1,7 +1,8 @@
import { NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
import { axiosInstance } from '@/libs/axios'
export async function POST(req: Request) {
async function setChgPwd(req: Request): Promise<NextResponse> {
const { loginId, email, pwd, chgPwd } = await req.json()
console.log('🚀 ~ POST ~ loginId:', loginId)
console.log('🚀 ~ POST ~ email:', email)
@ -19,3 +20,5 @@ export async function POST(req: Request) {
return NextResponse.json({ code: 200, data: result.data })
}
export const POST = loggerWrapper(setChgPwd)

View File

@ -1,8 +1,9 @@
import { NextRequest, NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
import { prisma } from '@/libs/prisma'
import type { CommCode } from '@/types/CommCode'
export async function GET(request: NextRequest) {
async function getCommCode(request: NextRequest): Promise<NextResponse> {
try {
const searchParams = request.nextUrl.searchParams
const headCode = searchParams.get('headCode')
@ -20,24 +21,26 @@ export async function GET(request: NextRequest) {
if (!headCd) {
return NextResponse.json({ error: `${headCode}를 찾을 수 없습니다` }, { status: 404 })
}
// @ts-ignore
const roofMaterials: CommCode[] = await prisma.BC_COMM_L.findMany({
where: {
HEAD_CD: headCd.HEAD_CD,
},
select: {
HEAD_CD: true,
CODE: true,
CODE_JP: true,
},
orderBy: {
CODE: 'asc',
},
})
if (headCode === 'SALES_OFFICE_CD') {
return getSaleOffice(headCd.HEAD_CD)
} else {
// @ts-ignore
const roofMaterials: CommCode[] = await prisma.BC_COMM_L.findMany({
where: {
HEAD_CD: headCd.HEAD_CD,
},
select: {
HEAD_CD: true,
CODE: true,
CODE_JP: true,
},
orderBy: {
CODE: 'asc',
},
})
return NextResponse.json(roofMaterials)
}
return NextResponse.json(roofMaterials)
} catch (error) {
console.error('❌ 데이터 조회 중 오류가 발생했습니다:', error)
return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 })
@ -60,3 +63,5 @@ const getSaleOffice = async (headCode: string) => {
})
return NextResponse.json(commCodeSaleOffice)
}
export const GET = loggerWrapper(getCommCode)

View File

@ -1,8 +1,9 @@
import { queryStringFormatter } from '@/utils/common-utils'
import axios from 'axios'
import { NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
export async function GET(request: Request) {
async function getQnaDetail(request: Request): Promise<NextResponse> {
const { searchParams } = new URL(request.url)
const params = {
compCd: searchParams.get('compCd'),
@ -22,3 +23,5 @@ export async function GET(request: Request) {
return NextResponse.json({ error: 'route error' }, { status: 500 })
}
}
export const GET = loggerWrapper(getQnaDetail)

View File

@ -1,5 +1,6 @@
import axios from 'axios'
import { NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
// export async function GET(request: Request) {
// const { searchParams } = new URL(request.url)
@ -38,7 +39,7 @@ import { NextResponse } from 'next/server'
// }
// }
export async function GET(request: Request) {
async function downloadFile(request: Request): Promise<NextResponse> {
const { searchParams } = new URL(request.url)
const encodeFileNo = searchParams.get('encodeFileNo')
const srcFileNm = searchParams.get('srcFileNm') || 'downloaded-file'
@ -71,3 +72,5 @@ export async function GET(request: Request) {
return NextResponse.json({ error: error.response?.data || 'Failed to download file' }, { status: 500 })
}
}
export const GET = loggerWrapper(downloadFile)

View File

@ -3,10 +3,11 @@ import { NextResponse } from 'next/server'
import { queryStringFormatter } from '@/utils/common-utils'
import { getIronSession } from 'iron-session'
import { cookies } from 'next/headers'
import { loggerWrapper } from '@/libs/api-wrapper'
import { sessionOptions } from '@/libs/session'
import { SessionData } from '@/types/Auth'
export async function GET(request: Request) {
async function getQnaList(request: Request): Promise<NextResponse> {
const cookieStore = await cookies()
const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
@ -37,3 +38,5 @@ export async function GET(request: Request) {
return NextResponse.json({ error: 'route error' }, { status: 500 })
}
}
export const GET = loggerWrapper(getQnaList)

View File

@ -1,8 +1,9 @@
import { NextResponse } from 'next/server'
import axios from 'axios'
import { CommonCode } from '@/types/Inquiry'
import { loggerWrapper } from '@/libs/api-wrapper'
export async function GET() {
async function getCommonCodeListData(request: Request): Promise<NextResponse> {
const response = await axios.get(`${process.env.NEXT_PUBLIC_INQUIRY_API_URL}/api/system/commonCodeListData`)
const codeList: CommonCode[] = []
response.data.data.apiCommCdList.forEach((item: any) => {
@ -17,3 +18,5 @@ export async function GET() {
})
return NextResponse.json({ data: codeList })
}
export const GET = loggerWrapper(getCommonCodeListData)

View File

@ -1,7 +1,8 @@
import axios from 'axios'
import { NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
export async function POST(request: Request) {
async function setQna(request: Request): Promise<NextResponse> {
const formData = await request.formData()
console.log(formData)
try {
@ -19,3 +20,5 @@ export async function POST(request: Request) {
return NextResponse.json({ error: 'Failed to save qna' }, { status: 500 })
}
}
export const POST = loggerWrapper(setQna)

View File

@ -1,5 +1,6 @@
import { prisma } from '@/libs/prisma'
import { NextRequest, NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
type AdminSubPerson = {
storeId: string
@ -7,8 +8,8 @@ type AdminSubPerson = {
eMail: string
authority: string
}
// 2차점이 자신에게 매핑 된 1차 판매점과 관리자 정보 조회
export async function GET(request: NextRequest) {
// 2차점이 자신에게 매핑 된 1차 판매점과 관리자 정보 조회
async function getSubMissionAdminSub(request: NextRequest): Promise<NextResponse> {
try {
const { searchParams } = new URL(request.url)
const id = searchParams.get('id')
@ -40,3 +41,5 @@ export async function GET(request: NextRequest) {
return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 })
}
}
export const GET = loggerWrapper(getSubMissionAdminSub)

View File

@ -1,5 +1,6 @@
import { prisma } from '@/libs/prisma'
import { NextRequest, NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
type SuperPerson = {
storeId: string
@ -8,7 +9,7 @@ type SuperPerson = {
toEmail: string
}
export async function GET(request: NextRequest) {
async function getSubmissionAdmin(request: NextRequest): Promise<NextResponse> {
try {
const { searchParams } = new URL(request.url)
const id = searchParams.get('id')
@ -44,3 +45,5 @@ export async function GET(request: NextRequest) {
return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 })
}
}
export const GET = loggerWrapper(getSubmissionAdmin)

View File

@ -1,6 +1,7 @@
import { prisma } from '@/libs/prisma'
import { SubmitTargetResponse } from '@/types/Survey'
import { NextRequest, NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
type BuilderPerson = {
agencyStoreId: string
@ -11,7 +12,7 @@ type BuilderPerson = {
// 2차점의 시공권한 user가 해당 판매점의 관리자 정보 조회
// N == 일반유저, S == 수퍼유저, B == 시공권한유저
export async function GET(request: NextRequest) {
async function getSubmissionBuilder(request: NextRequest): Promise<NextResponse> {
try {
const { searchParams } = new URL(request.url)
const id = searchParams.get('id')
@ -46,3 +47,5 @@ export async function GET(request: NextRequest) {
return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 })
}
}
export const GET = loggerWrapper(getSubmissionBuilder)

View File

@ -1,5 +1,6 @@
import { prisma } from '@/libs/prisma'
import { NextRequest, NextResponse } from 'next/server'
import { loggerWrapper } from '@/libs/api-wrapper'
type SuperPerson = {
storeId: string
@ -7,7 +8,7 @@ type SuperPerson = {
eMail: string
}
export async function GET(request: NextRequest) {
async function getSubmissionSuper(request: NextRequest): Promise<NextResponse> {
try {
const { searchParams } = new URL(request.url)
const id = searchParams.get('id')
@ -37,3 +38,5 @@ export async function GET(request: NextRequest) {
return NextResponse.json({ error: '데이터 조회 중 오류가 발생했습니다' }, { status: 500 })
}
}
export const GET = loggerWrapper(getSubmissionSuper)

View File

@ -1,4 +1,6 @@
import { NextRequest, NextResponse } from 'next/server'
import { HttpStatusCode } from 'axios'
import { loggerWrapper } from '@/libs/api-wrapper'
import { prisma } from '@/libs/prisma'
import { type Suitable } from '@/types/Suitable'
@ -41,7 +43,7 @@ import { type Suitable } from '@/types/Suitable'
* }
* ]
*/
export async function GET(request: NextRequest) {
async function getSuitableList(request: NextRequest): Promise<NextResponse> {
try {
const searchParams = request.nextUrl.searchParams
const pageNumber = parseInt(searchParams.get('pageNumber') || '0')
@ -51,7 +53,7 @@ export async function GET(request: NextRequest) {
/* 파라미터 체크 */
if (pageNumber === 0 || itemPerPage === 0) {
return NextResponse.json({ error: '페이지 번호와 페이지당 아이템 수가 필요합니다' }, { status: 400 })
return NextResponse.json({ error: '페이지 번호와 페이지당 아이템 수가 필요합니다' }, { status: HttpStatusCode.BadRequest })
}
let query = `
@ -108,9 +110,12 @@ export async function GET(request: NextRequest) {
headers: {
'spinner-state': 'true',
},
status: HttpStatusCode.Ok,
})
} catch (error) {
console.error(`데이터 조회 중 오류가 발생했습니다: ${error}`)
return NextResponse.json({ error: `데이터 조회 중 오류가 발생했습니다: ${error}` }, { status: 500 })
return NextResponse.json({ error: `데이터 조회 중 오류가 발생했습니다: ${error}` }, { status: HttpStatusCode.InternalServerError })
}
}
export const GET = loggerWrapper(getSuitableList)

View File

@ -1,7 +1,9 @@
import React from 'react'
import { NextRequest, NextResponse } from 'next/server'
import { HttpStatusCode } from 'axios'
import { pdf, Document } from '@react-pdf/renderer'
import { PDFDocument } from 'pdf-lib'
import { loggerWrapper } from '@/libs/api-wrapper'
import { prisma } from '@/libs/prisma'
import { type Suitable } from '@/types/Suitable'
import SuitablePdf from '@/components/pdf/SuitablePdf'
@ -28,7 +30,7 @@ import SuitablePdf from '@/components/pdf/SuitablePdf'
*
* @apiSuccess {File} PDF
*/
export async function POST(request: NextRequest) {
async function createSuitablePdf(request: NextRequest): Promise<NextResponse> {
const formData = await request.formData()
const ids = formData.get('ids') as string
const detailIds = formData.get('detailIds') as string
@ -36,7 +38,7 @@ export async function POST(request: NextRequest) {
/* 파라미터 체크 */
if (ids === '' || detailIds === '' || fileTitle === '') {
return NextResponse.json({ error: '필수 파라미터가 누락되었습니다' }, { status: 400 })
return NextResponse.json({ error: '필수 파라미터가 누락되었습니다' }, { status: HttpStatusCode.BadRequest })
}
try {
@ -121,7 +123,7 @@ export async function POST(request: NextRequest) {
})
} catch (error) {
console.error(`데이터 조회 중 오류가 발생했습니다: ${error}`)
return NextResponse.json({ error: `데이터 조회 중 오류가 발생했습니다: ${error}` }, { status: 500 })
return NextResponse.json({ error: `데이터 조회 중 오류가 발생했습니다: ${error}` }, { status: HttpStatusCode.InternalServerError })
}
}
@ -142,3 +144,5 @@ async function mergePdfBuffers(buffers: Uint8Array[]) {
const mergedPdfBytes = await mergedPdf.save()
return mergedPdfBytes
}
export const POST = loggerWrapper(createSuitablePdf)

View File

@ -1,23 +1,25 @@
import { NextRequest, NextResponse } from 'next/server'
import { HttpStatusCode } from 'axios'
import { loggerWrapper } from '@/libs/api-wrapper'
import { prisma } from '@/libs/prisma'
/**
* @api {get} /api/suitable/pick API
* @apiName GetSuitablePick
* @apiGroup Suitable
*
*
* @apiDescription
* main_id와 detail_id를
*
*
* @apiParam {String} [category] (: RMG001)
* @apiParam {String} [keyword]
*
*
* @apiExample {curl} Example usage:
* curl -X GET \
* -G "category=RMG001" \
* -G "keyword=검색키워드" \
* http://localhost:3000/api/suitable/pick
*
*
* @apiSuccess {Array} suitableIdSet
* @apiSuccessExample {json} Success-Response:
* [
@ -27,7 +29,7 @@ import { prisma } from '@/libs/prisma'
* }
* ]
*/
export async function GET(request: NextRequest) {
async function getSuitablePick(request: NextRequest): Promise<NextResponse> {
try {
const searchParams = request.nextUrl.searchParams
const category = searchParams.get('category')
@ -72,6 +74,8 @@ export async function GET(request: NextRequest) {
return NextResponse.json(suitableIdSet)
} catch (error) {
console.error(`데이터 조회 중 오류가 발생했습니다: ${error}`)
return NextResponse.json({ error: `데이터 조회 중 오류가 발생했습니다: ${error}` }, { status: 500 })
return NextResponse.json({ error: `데이터 조회 중 오류가 발생했습니다: ${error}` }, { status: HttpStatusCode.InternalServerError })
}
}
export const GET = loggerWrapper(getSuitablePick)

View File

@ -1,4 +1,6 @@
import { NextRequest, NextResponse } from 'next/server'
import { HttpStatusCode } from 'axios'
import { loggerWrapper } from '@/libs/api-wrapper'
import { prisma } from '@/libs/prisma'
import { Suitable } from '@/types/Suitable'
@ -40,7 +42,7 @@ import { Suitable } from '@/types/Suitable'
* }
* ]
*/
export async function POST(request: NextRequest) {
async function getSuitable(request: NextRequest): Promise<NextResponse> {
try {
const body: Record<string, string> = await request.json()
const ids = body.ids
@ -48,7 +50,7 @@ export async function POST(request: NextRequest) {
/* 파라미터 체크 */
if (ids === '') {
return NextResponse.json({ error: '필수 파라미터가 누락되었습니다' }, { status: 400 })
return NextResponse.json({ error: '필수 파라미터가 누락되었습니다' }, { status: HttpStatusCode.BadRequest })
}
let query = `
@ -96,6 +98,8 @@ export async function POST(request: NextRequest) {
return NextResponse.json(suitable)
} catch (error) {
console.error(`데이터 조회 중 오류가 발생했습니다: ${error}`)
return NextResponse.json({ error: `데이터 조회 중 오류가 발생했습니다: ${error}` }, { status: 500 })
return NextResponse.json({ error: `데이터 조회 중 오류가 발생했습니다: ${error}` }, { status: HttpStatusCode.InternalServerError })
}
}
export const POST = loggerWrapper(getSuitable)

View File

@ -6,6 +6,7 @@ import { sessionOptions } from '@/libs/session'
import { cookies } from 'next/headers'
import type { SessionData } from '@/types/Auth'
import { Prisma } from '@prisma/client'
import { loggerWrapper } from '@/libs/api-wrapper'
/**
* @description
@ -128,11 +129,11 @@ const fetchSurvey = async (id: number) => {
* ...
* }
*/
export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
async function getSurveySaleDetail(request: NextRequest): Promise<NextResponse> {
try {
const cookieStore = await cookies()
const session = await getIronSession<SessionData>(cookieStore, sessionOptions)
const { id } = await params
const id = request.nextUrl.pathname.split('/').pop() ?? ''
const { searchParams } = new URL(request.url)
const isPdf = searchParams.get('isPdf') === 'true'
@ -228,9 +229,9 @@ const getNewSrlNo = async (srlNo: string, storeId: string, role: string) => {
* ...
* }
* */
export async function PUT(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
async function updateSurveySaleDetail(request: NextRequest): Promise<NextResponse> {
try {
const { id } = await params
const id = request.nextUrl.pathname.split('/').pop() ?? ''
const body = await request.json()
const { detailInfo, ...basicInfo } = body.survey
@ -257,6 +258,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
return NextResponse.json({ error: 'データ保存に失敗しました。' }, { status: 500 })
}
}
/**
* @api {DELETE} /api/survey-sales/:id API
* @apiName DELETE /api/survey-sales/:id
@ -275,9 +277,9 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
* {
* "message": "success"
*/
export async function DELETE(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
async function deleteSurveySaleDetail(request: NextRequest): Promise<NextResponse> {
try {
const { id } = await params
const id = request.nextUrl.pathname.split('/').pop() ?? ''
await prisma.$transaction(async (tx: Prisma.TransactionClient) => {
// @ts-ignore
@ -343,9 +345,9 @@ export async function DELETE(request: NextRequest, { params }: { params: Promise
* }
* }
*/
export async function PATCH(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
async function submitSurveySaleDetail(request: NextRequest): Promise<NextResponse> {
try {
const { id } = await params
const id = request.nextUrl.pathname.split('/').pop() ?? ''
const body = await request.json()
// @ts-ignore
const survey = await prisma.SD_SURVEY_SALES_BASIC_INFO.update({
@ -364,3 +366,8 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
return NextResponse.json({ error: 'データ保存に失敗しました。' }, { status: 500 })
}
}
export const GET = loggerWrapper(getSurveySaleDetail)
export const PUT = loggerWrapper(updateSurveySaleDetail)
export const DELETE = loggerWrapper(deleteSurveySaleDetail)
export const PATCH = loggerWrapper(submitSurveySaleDetail)

View File

@ -1,6 +1,7 @@
import { NextResponse } from 'next/server'
import { prisma } from '@/libs/prisma'
import { convertToSnakeCase } from '@/utils/common-utils'
import { loggerWrapper } from '@/libs/api-wrapper'
/**
* @description
*/
@ -192,7 +193,7 @@ const checkSession = (params: SearchParams) => {
* }
*
*/
export async function GET(request: Request) {
async function getSurveySales(request: Request) {
try {
/** URL 파라미터 파싱 */
const { searchParams } = new URL(request.url)
@ -273,7 +274,7 @@ export async function GET(request: Request) {
*
* @apiError {Number} 500
*/
export async function PUT(request: Request) {
async function updateSurveySales(request: Request) {
try {
/** 요청 바디 파싱 */
const body = await request.json()
@ -335,7 +336,7 @@ export async function PUT(request: Request) {
*
* @apiError {Number} 500
*/
export async function POST(request: Request) {
async function createSurveySales(request: Request) {
try {
const body = await request.json()
@ -393,3 +394,7 @@ export async function POST(request: Request) {
return NextResponse.json({ error: 'データ保存に失敗しました。' }, { status: 500 })
}
}
export const GET = loggerWrapper(getSurveySales)
export const PUT = loggerWrapper(updateSurveySales)
export const POST = loggerWrapper(createSurveySales)

View File

@ -1,5 +1,11 @@
import { Metadata } from 'next'
import type { ReactNode } from 'react'
export const metadata: Metadata = {
title: 'HANASYS現地調査:お問い合わせ',
description: 'HANASYS現地調査:お問い合わせ',
}
export default function layout({ children }: { children: ReactNode }) {
return <div className="container">{children}</div>
}

View File

@ -13,8 +13,8 @@ import { sessionOptions } from '@/libs/session'
import '@/styles/style.scss'
export const metadata: Metadata = {
title: 'Create Next App',
description: 'Generated by create next app',
title: 'HANASYS現地調査',
description: 'HANASYS現地調査',
}
interface RootLayoutProps {

View File

@ -1,9 +1,15 @@
import { Metadata } from 'next'
import type { ReactNode } from 'react'
interface SuitableLayoutProps {
children: ReactNode
}
export const metadata: Metadata = {
title: 'HANASYS現地調査:屋根材積合成',
description: 'HANASYS現地調査:屋根材積合成',
}
export default function layout({ children }: SuitableLayoutProps) {
return (
<>

View File

@ -1,9 +1,15 @@
import { Metadata } from 'next'
import type { ReactNode } from 'react'
interface SurveySaleLayoutProps {
children: ReactNode
}
export const metadata: Metadata = {
title: 'HANASYS現地調査:調査物件',
description: 'HANASYS現地調査:調査物件',
}
export default function layout({ children }: SurveySaleLayoutProps) {
return (
<>

View File

@ -1,7 +1,8 @@
import getConfigs from '@/config/config.common'
// 환경마다 달라져야 할 변수, 값들을 정의합니다. (여기는 development 환경에 맞는 값을 지정합니다.)
const baseUrl = 'http://1.248.227.176:3000'
// const baseUrl = 'http://172.16.56.60:3000'
const baseUrl = 'https://dev.hanasysfield.jp'
const mode = 'development'
// 환경마다 달라져야 할 값들을 getConfig 함수에 전달합니다.

View File

@ -1,7 +1,8 @@
import getConfigs from '@/config/config.common'
// 환경마다 달라져야 할 변수, 값들을 정의합니다. (여기는 production 환경에 맞는 값을 지정합니다.)
const baseUrl = 'http://localhost.prod:3000'
const baseUrl = 'https://hanasysfield.jp'
// const baseUrl = 'http://172.16.56.55:3000'
const mode = 'production'
// 환경마다 달라져야 할 값들을 getConfig 함수에 전달합니다.

View File

@ -48,7 +48,9 @@ export function useInquiry(
*/
const errorRouter = (error: any) => {
const status = error.response?.status
alert(error.response?.data.error)
if (error.response?.data.error) {
alert(error.response?.data.error)
}
switch (status) {
// session 없는 경우
case 401:

View File

@ -108,7 +108,9 @@ export function useSurvey(
*/
const errorRouter = (error: any) => {
const status = error.response?.status
alert(error.response?.data.error)
if (error.response?.data.error) {
alert(error.response?.data.error)
}
switch (status) {
/** session 없는 경우 */
case 401:
@ -259,6 +261,9 @@ export function useSurvey(
queryClient.invalidateQueries({ queryKey: ['survey', id] })
queryClient.invalidateQueries({ queryKey: ['survey', 'list'] })
},
onError: (error: any) => {
alert(error.response?.data.error)
},
})
/**
@ -269,7 +274,7 @@ export function useSurvey(
*
* @example
*
*
*
*/
const { mutateAsync: deleteSurvey, isPending: isDeletingSurvey } = useMutation({
mutationFn: async () => {
@ -370,8 +375,9 @@ export function useSurvey(
`https://zipcloud.ibsnet.co.jp/api/search?${queryStringFormatter({ zipcode: zipCode.trim() })}`,
)
return data.results
} catch (e) {
console.error('Failed to fetch zipcode data:', e)
} catch (error: any) {
console.error('Failed to fetch zipcode data:', error)
alert(error.response?.data.error)
throw new Error('Failed to fetch zipcode data')
}
}

21
src/libs/api-wrapper.ts Normal file
View File

@ -0,0 +1,21 @@
import { NextRequest, NextResponse } from 'next/server'
import { writeApiLog } from './logger'
export function loggerWrapper(handler: (req: NextRequest) => Promise<NextResponse>): (req: NextRequest) => Promise<NextResponse> {
return async function (req: NextRequest) {
const reqClone = req.clone()
const response = await handler(req)
await writeApiLog(
new NextRequest(req.url, {
method: req.method,
headers: req.headers,
body: reqClone.body ? await reqClone.text() : undefined,
}),
response.status,
)
return response
}
}

92
src/libs/logger.ts Normal file
View File

@ -0,0 +1,92 @@
import { NextRequest } from 'next/server'
import { join } from 'path'
import pino from 'pino'
/* 로그 데이터 인터페이스 */
interface ApiLogData {
responseStatus: number
method: string
url: string
// headers: { [k: string]: string }
query: { [k: string]: string }
body: string | undefined
}
/* 날짜별 로그 파일 경로 생성 함수 */
const getLogFilePath = (): string => {
const today = new Date().toISOString().split('T')[0] // YYYY-MM-DD 형식
return join(process.cwd(), 'logs', `onsite-survey-${today}.log`)
}
/* 날짜별 로거 생성 클래스 */
class DailyLogger {
private currentDate: string
private logger: pino.Logger
private destination: ReturnType<typeof pino.destination>
constructor() {
this.currentDate = new Date().toISOString().split('T')[0]
this.destination = pino.destination({
dest: getLogFilePath(),
mkdir: true,
sync: false,
})
this.logger = this.createLogger()
/* kill signal 핸들러 등록 */
process.on('SIGTERM', this.handleShutdown.bind(this))
process.on('SIGINT', this.handleShutdown.bind(this))
}
private async handleShutdown(): Promise<void> {
this.destination.flushSync()
this.destination.end()
}
private createLogger(): pino.Logger {
return pino(
{
level: 'info',
timestamp: pino.stdTimeFunctions.isoTime,
},
this.destination,
)
}
public info(obj: any, msg?: string): void {
const today = new Date().toISOString().split('T')[0]
if (today !== this.currentDate) {
/* 기존 destination 종료 */
this.destination.flushSync()
this.destination.end()
/* 새로운 destination 생성 */
this.destination = pino.destination({
dest: getLogFilePath(),
mkdir: true,
sync: false,
})
this.currentDate = today
this.logger = this.createLogger()
}
this.logger.info(obj, msg)
}
}
/* 로거 인스턴스 */
const dailyLogger = new DailyLogger()
/* API 로그 기록 함수 */
export const writeApiLog = async (request: NextRequest, responseStatus: number): Promise<void> => {
const logData: ApiLogData = {
responseStatus: responseStatus,
method: request.method,
url: request.url,
// headers: Object.fromEntries(request.headers),
query: Object.fromEntries(new URL(request.url).searchParams),
body: request.body ? await request.text() : undefined,
}
dailyLogger.info(logData, 'API Request')
}