[#141] 🐛 fix merge conflict

Author: 장아영

src/app/(pages)/sign-in/page.tsx

@@ -1,8 +1,9 @@
 'use client'
 
 import { SubmitHandler, useForm } from 'react-hook-form'
-import { SignInRequest } from '@/types/api/auth.types'
 import { useSignInMutation } from 'queries/auth'
+import { SignInRequest } from '@/types/api/Auth.types'
+
 
 export default function LoginPage(): JSX.Element {
   const {

src/app/(pages)/sign-up/page.tsx

@@ -3,9 +3,11 @@
 // import { useRouter } from 'next/navigation'
 import { SubmitHandler, useForm } from 'react-hook-form'
 
-import { SignUpRequest } from '@/types/api/auth.types'
 import { useSignUpMutation } from 'queries/auth'
 
+import { SignUpRequest } from '@/types/api/Auth.types'
+
+
 export default function SignUpPage(): JSX.Element {
   // const router = useRouter()
   const {

src/app/api/auth/sign-in/route.ts

@@ -1,5 +1,7 @@
 import { NextResponse } from 'next/server'
-import { SignInRequest, SignInResponse} from '@/types/api/auth.types'
+
+
+import { SignInRequest, SignInResponse } from '@/types/api/Auth.types'
 import { HTTPError } from 'ky'
 import { backendApi } from '@/services/api'
 

src/services/auth/auth.ts

@@ -1,4 +1,4 @@
-import { SignInRequest, SignUpRequest } from '@/types/api/auth.types'
+import { SignInRequest, SignUpRequest } from '@/types/api/Auth.types'
 
 import { backendApi, proxyApi } from '@/services/api'
 

src/types/api/ApiResponse.types.d.ts

@@ -0,0 +1,12 @@
+/** 
+- isSuccess: 요청 성공 여부
+- code: 응답 코드 (예: TEAM004)
+- message: 응답 메시지 (예: "This is a deleted post.")
+- result?: 응답 데이터 (제네릭 타입)
+*/
+interface ApiResponse<T = unknown> {
+  isSuccess: boolean
+  code: string
+  message: string
+  result?: T
+}

src/types/api/apiSchema.types.d.ts src/types/api/ApiSchema.types.d.tssrc/types/api/apiSchema.types.d.ts renamed to src/types/api/ApiSchema.types.d.ts

@@ -57,6 +57,23 @@ export interface paths {
     patch?: never
     trace?: never
   }
+  '/v1/my-page/check-nickname': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    get?: never
+    put?: never
+    /** 닉네임 중복 체크 */
+    post: operations['checkNicknameDuplicate']
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
   '/v1/likes': {
     parameters: {
       query?: never
@@ -797,12 +814,6 @@ export interface components {
        *       "태그4"
        *     ] */
       tags: string[]
-      /**
-       * @description 포트폴리오 이미지 url
-       * @default default_image_url
-       * @example 이미지url
-       */
-      portImageUrl: string
       /** @description 포트폴리오 링크 리스트 */
       links?: components['schemas']['LinkRequest'][]
       /** @description 포트폴리오 학력 리스트 */
@@ -1062,6 +1073,19 @@ export interface components {
       /** @description 경력 리스트 */
       careers?: components['schemas']['CareerResponse'][]
     }
+    checkNicknameRequest: {
+      /**
+       * @description 회원 닉네임
+       * @example new_nickname
+       */
+      nickname: string
+    }
+    ApiResponseBoolean: {
+      isSuccess?: boolean
+      code?: string
+      message?: string
+      result?: boolean
+    }
     LikeRequest: {
       /**
        * Format: int64
@@ -1293,12 +1317,6 @@ export interface components {
        */
       email: string
     }
-    ApiResponseBoolean: {
-      isSuccess?: boolean
-      code?: string
-      message?: string
-      result?: boolean
-    }
     ApiResponseString: {
       isSuccess?: boolean
       code?: string
@@ -1317,11 +1335,6 @@ export interface components {
        * @example 뽀꼬
        */
       nickname?: string
-      /**
-       * @description 프로필 사진 url
-       * @example aaa.com
-       */
-      imageUrl?: string
       /**
        * @description 소개문구
        * @example 간단한 소개글을 작성해보세요!
@@ -2131,6 +2144,34 @@ export interface operations {
     }
   }
   createPortfolio: {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    requestBody?: {
+      content: {
+        'multipart/form-data': {
+          request: components['schemas']['PortfolioCreateRequest']
+          /** Format: binary */
+          portImage?: string
+        }
+      }
+    }
+    responses: {
+      /** @description OK */
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['ApiResponsePortCreateResponse']
+        }
+      }
+    }
+  }
+  checkNicknameDuplicate: {
     parameters: {
       query?: never
       header?: never
@@ -2139,7 +2180,7 @@ export interface operations {
     }
     requestBody: {
       content: {
-        'application/json': components['schemas']['PortfolioCreateRequest']
+        'application/json': components['schemas']['checkNicknameRequest']
       }
     }
     responses: {
@@ -2149,7 +2190,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          '*/*': components['schemas']['ApiResponsePortCreateResponse']
+          '*/*': components['schemas']['ApiResponseBoolean']
         }
       }
     }
@@ -2457,9 +2498,13 @@ export interface operations {
       path?: never
       cookie?: never
     }
-    requestBody: {
+    requestBody?: {
       content: {
-        'application/json': components['schemas']['ProfileUpdateRequest']
+        'multipart/form-data': {
+          request: components['schemas']['ProfileUpdateRequest']
+          /** Format: binary */
+          profileImage?: string
+        }
       }
     }
     responses: {
@@ -2469,7 +2514,7 @@ export interface operations {
           [name: string]: unknown
         }
         content: {
-          '*/*': components['schemas']['ApiResponseProfileUpdateResponse']
+          'application/json': components['schemas']['ApiResponseProfileUpdateResponse']
         }
       }
     }
@@ -2483,7 +2528,7 @@ export interface operations {
     }
     requestBody: {
       content: {
-        'application/json': components['schemas']['PasswordUpdateRequest']
+        'multipart/form-data': components['schemas']['PasswordUpdateRequest']
       }
     }
     responses: {

src/types/api/auth.types.d.ts src/types/api/Auth.types.d.tssrc/types/api/auth.types.d.ts renamed to src/types/api/Auth.types.d.ts

@@ -1,12 +1,12 @@
-/*
-path: '/v1/auth'
-GET: 로그인한 유저 조회
+/**
+- path: '/v1/auth'
+- GET: 로그인한 유저 조회
 */
 export type GetLoggedInUserResponse = User
 
-/*
-path: '/v1/auth/sign-up'
-POST: 회원가입
+/**
+- path: '/v1/auth/sign-up'
+- POST: 회원가입
 */
 export interface SignUpRequest {
   email: Email // 이메일
@@ -18,9 +18,9 @@ export interface SignUpResponse extends User {
   gitHub: GitHub // GitHub 계정 URL
 }
 
-/*
-path: '/v1/auth/sign-in'
-POST: 로그인
+/**
+- path: '/v1/auth/sign-in'
+- POST: 로그인
 */
 export interface SignInRequest {
   email: Email // 이메일
@@ -32,9 +32,9 @@ export interface SignInResponse extends User {
   refreshToken: Token // 리프레시 토큰
 }
 
-/*
-path: '/v1/auth/new-token'
-POST: 액세스 토큰 재발급
+/**
+- path: '/v1/auth/new-token'
+- POST: 액세스 토큰 재발급
 */
 export interface RefreshTokenRequest {
   oldAccessToken: Token // 기존의 access token
@@ -44,28 +44,11 @@ export interface AccessTokenResponse {
   accessToken: Token // 신규 access token
 }
 
-/*
-path: '/v1/auth/check-email'
-POST: 이메일 중복 체크
+/**
+- path: '/v1/auth/check-email'
+- POST: 이메일 중복 체크
 */
 export interface CheckEmailRequest {
   email: Email // 검사하고자 하는 이메일
 }
 export type CheckEmailResponse = boolean
-
-/*
-path: '/v1/my-page/password'
-PATCH: 마이 페이지 비밀번호 수정
-*/
-export interface PasswordUpdateRequest {
-  password: Password // 새 비밀번호
-}
-
-/*
-PasswordUpdateResponse
-{
-  "isSuccess": true,
-  "code": "COMMON200",
-  "message": "비밀번호 수정이 완료되었습니다."
-}
-*/

src/types/api/community.types.d.ts src/types/api/Community.types.d.tssrc/types/api/community.types.d.ts renamed to src/types/api/Community.types.d.ts

@@ -22,47 +22,47 @@ interface CommunityDetail extends CommunityListItem {
   isComment: boolean // 댓글 허용 여부
 }
 
-/*
-path: '/v1/community'
-GET: 커뮤니티 글 전체 조회
+/**
+- path: '/v1/community'
+- GET: 커뮤니티 글 전체 조회
 */
 export type GetCommunityListResponse = CommunityListItem[]
-/*
-POST: 커뮤니티 글 등록
+/**
+- POST: 커뮤니티 글 등록
 */
-export interface CommunityCreateRequest extends CommunityBase {
+export interface CreateCommunityRequest extends CommunityBase {
   isComment?: boolean // 댓글 허용 여부
 }
-export interface CommunityCreateResponse extends CommunityBase, TimeStamps {
+export interface CreateCommunityResponse extends CommunityBase, TimeStamps {
   id: Id // 생성된 커뮤니티 글 ID
   member: Id // 작성자 Id
   isComment: boolean // 댓글 허용 여부
 }
 
-/*
-path: '/v1/community/{id}'
-GET: 커뮤니티 글 상세 조회
+/**
+- path: '/v1/community/{id}'
+- GET: 커뮤니티 글 상세 조회
 */
 export type GetCommunityDetailResponse = CommunityDetail
 
-/*
-PATCH: 커뮤니티 글 수정
+/**
+- PATCH: 커뮤니티 글 수정
 */
-export type CommunityUpdateRequest = CommunityBase
-export type CommunityUpdateResponse = CommunityCreateResponse
+export type UpdateCommunityRequest = CommunityBase
+export type UpdateCommunityResponse = CreateCommunityResponse
 
-/*
-DELETE: 커뮤니티 글 삭제
-반환 값: 기본 ApiResponse 구조 사용
+/**
+- DELETE: 커뮤니티 글 삭제
+- 반환 값: 기본 ApiResponse 구조 사용
 {
   "isSuccess": true,
   "code": "COMMON200",
   "message": "팀 모집글이 성공적으로 삭제되었습니다."
 }
 */
 
-/*
-path: '/v1/community/top5'
-GET: 좋아요 순으로 인기 커뮤니티 Top 5 유저 조회
+/**
+- path: '/v1/community/top5'
+- GET: 좋아요 순으로 인기 커뮤니티 Top 5 유저 조회
 */
 export type GetCommunityTop5Response = CommunityTopMember[]