FE-27 🔨 충돌오류 수정

epigram5-9 · Jul 30, 2024 · f75383f · f75383f
1 parent 0c7471d
commit f75383f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/schema/user.ts b/src/schema/user.ts
@@ -30,7 +30,7 @@ export const PostPresignedUrlResponse = z.object({
   url: z.string().url(),
 });
 
-export type GetUserReponseType = z.infer<typeof GetUserReponse>;
+export type GetUserResponseType = z.infer<typeof GetUserReponse>;
 export type GetUserRequestType = z.infer<typeof GetUserRequest>;
 export type PatchMeRequestType = z.infer<typeof PatchMeRequest>;
 

diff --git a/src/types/emotion.ts b/src/types/emotion.ts
@@ -10,7 +10,7 @@ export type EmotionTypeEN = 'MOVED' | 'HAPPY' | 'WORRIED' | 'SAD' | 'ANGRY';
 export interface EmotionLog {
   id: number;
   userId: number;
-  emotion: EmotionType;
+  emotion: EmotionTypeEN;
   createdAt: Date;
 }