Fix : 유저정보 수정 부분에서 유저 대표 칭호 수정 로직도 적용

fog-of-war · Oct 24, 2023 · fff2d70 · fff2d70
1 parent cd02f75
commit fff2d70
Show file tree

Hide file tree

Showing 6 changed files with 363 additions and 239 deletions.
diff --git a/send_posts.js b/send_posts.js
diff --git a/send_posts.json b/send_posts.json
@@ -1,9 +1,147 @@
 {
     "코엑스": {
+        "new_level": 1,
+        "new_badges": []
+    },
+    "일자산허브천문공원": {
         "new_level": 2,
         "new_badges": []
     },
-    "달리는커피 거제상동점": {
+    "국립4.19민주묘지": {
+        "new_badges": [
+            {
+                "badge_id": 2,
+                "badge_name": "시민",
+                "badge_category_id": 1,
+                "badge_criteria": 3,
+                "badge_points": 100,
+                "badge_image_url": "https://fog-of-war.s3.ap-northeast-2.amazonaws.com/뱃지/시민.png"
+            },
+            {
+                "badge_id": 15,
+                "badge_name": "석기시대",
+                "badge_category_id": 5,
+                "badge_criteria": 1,
+                "badge_points": 100,
+                "badge_image_url": "https://fog-of-war.s3.ap-northeast-2.amazonaws.com/뱃지/석기시대.png"
+            }
+        ]
+    },
+    "서울식물원": {
+        "new_level": 3,
+        "new_badges": []
+    },
+    "서울대학교 관악캠퍼스": {
         "new_badges": []
+    },
+    "서울어린이대공원 놀이동산": {
+        "new_badges": []
+    },
+    "신도림테크노마트": {
+        "new_badges": []
+    },
+    "금천체육공원": {
+        "new_level": 4,
+        "new_badges": [
+            {
+                "badge_id": 9,
+                "badge_name": "줄넘기",
+                "badge_category_id": 3,
+                "badge_criteria": 1,
+                "badge_points": 100,
+                "badge_image_url": "https://fog-of-war.s3.ap-northeast-2.amazonaws.com/뱃지/줄넘기.png"
+            }
+        ]
+    },
+    "경춘선숲길": {
+        "new_badges": []
+    },
+    "도봉산": {
+        "new_badges": [
+            {
+                "badge_id": 3,
+                "badge_name": "모험가",
+                "badge_category_id": 1,
+                "badge_criteria": 10,
+                "badge_points": 100,
+                "badge_image_url": "https://fog-of-war.s3.ap-northeast-2.amazonaws.com/뱃지/모험가.png"
+            }
+        ]
+    },
+    "세종대왕기념관": {
+        "new_badges": []
+    },
+    "노량진수산물도매시장": {
+        "new_badges": []
+    },
+    "월드컵공원": {
+        "new_level": 5,
+        "new_badges": []
+    },
+    "독립문": {
+        "new_badges": []
+    },
+    "예술의전당": {
+        "new_badges": []
+    },
+    "서울숲": {
+        "new_badges": []
+    },
+    "정릉": {
+        "new_badges": []
+    },
+    "롯데월드타워": {
+        "new_badges": []
+    },
+    "목동종합운동장 목동아이스링크": {
+        "new_badges": []
+    },
+    "63스퀘어": {
+        "new_badges": []
+    },
+    "남산타워": {
+        "new_badges": []
+    },
+    "진관사": {
+        "new_badges": [
+            {
+                "badge_id": 16,
+                "badge_name": "한능검",
+                "badge_category_id": 5,
+                "badge_criteria": 5,
+                "badge_points": 100,
+                "badge_image_url": "https://fog-of-war.s3.ap-northeast-2.amazonaws.com/뱃지/한능검.png"
+            }
+        ]
+    },
+    "광화문": {
+        "new_badges": []
+    },
+    "숭례문": {
+        "new_badges": []
+    },
+    "용마폭포공원": {
+        "new_level": 6,
+        "new_badges": []
+    },
+    "달리는커피 거제상동점": {
+        "new_badges": [
+            {
+                "badge_id": 6,
+                "badge_name": "냠냠이",
+                "badge_category_id": 2,
+                "badge_criteria": 1,
+                "badge_points": 100,
+                "badge_image_url": "https://fog-of-war.s3.ap-northeast-2.amazonaws.com/뱃지/냠냠이.png"
+            },
+            {
+                "badge_id": 18,
+                "badge_name": "아메리카노",
+                "badge_category_id": 6,
+                "badge_criteria": 1,
+                "badge_points": 100,
+                "badge_image_url": "https://fog-of-war.s3.ap-northeast-2.amazonaws.com/뱃지/아메리카노.png"
+            }
+        ]
     }
 }
diff --git a/src/posts/posts.controller.ts b/src/posts/posts.controller.ts
@@ -66,7 +66,6 @@ export class PostsController {
   async getPostsByUserId(@GetCurrentUserInfo() user: number) {
     const result = await this.postService.getPostsByUserId(user["sub"]);
     this.logger.log(user["user_email"], "가 자신의 게시물 호출");
-    console.log(result)
     return result;
   }
 

diff --git a/src/users/dto/edit-user.dto.ts b/src/users/dto/edit-user.dto.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from "@nestjs/swagger";
-import { IsEmail, IsOptional, IsString, IsUrl, Length } from "class-validator";
+import { IsEmail, IsNumber, IsOptional, IsString, IsUrl, Length } from "class-validator";
 
 export class EditUserDto {
   @IsString()
@@ -12,4 +12,10 @@ export class EditUserDto {
   @IsOptional()
   @ApiProperty()
   user_image_url?: string;
+
+
+  @IsNumber()
+  @IsOptional()
+  @ApiProperty()
+  user_selected_badge_id?: number;
 }
diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts
@@ -68,12 +68,12 @@ export class UsersController {
   }
   /** -------------------- */
 
-  /** "나의 정보 수정하기 / 프로필이미지, 닉네임, 변경 가능 */
+  /** "나의 정보 수정하기 / 프로필이미지, 닉네임, 대표칭호 변경 가능 */
   @Patch("me")
   @UseGuards(ATGuard)
   @ApiOperation({
     summary:
-      "나의 정보 수정하기 / 프로필이미지, 닉네임, 변경 가능",
+      "나의 정보 수정하기 / 프로필이미지, 닉네임, 대표칭호 변경 가능",
   })
   @ApiBearerAuth("access_token")
   @HttpCode(201)
@@ -95,6 +95,7 @@ export class UsersController {
       throw new UnprocessableEntityException(errorResponse);
     }
     try {
+      console.log(dto);
       await this.userService.editUser(user["sub"], dto);
       this.logger.log(`${user["user_email"]}의 회원 정보 변경`);
       return { message: "유저 정보 변경에 성공했습니다" };

diff --git a/src/users/users.service.ts b/src/users/users.service.ts
@@ -27,6 +27,7 @@ export class UsersService {
 
   /** 유저 정보 수정 */
   async editUser(userId: number, dto: EditUserDto) {
+    console.log("editUser",dto);
     const user = await this.prisma.user.update({
       where: { user_id: userId, user_is_deleted: false },
       data: { ...dto },
@@ -36,8 +37,10 @@ export class UsersService {
         user_points: true,
         user_level: true,
         user_is_admin: true,
+        user_selected_badge:true
       },
     });
+    console.log('user', user)
     return user;
   }