Merge pull request #29 from moonjun1/hotfix/badge

fix:뱃지 부여 시 연속출석일수 함께 응답하도록 수정 완료

Author: str-leshs

src/main/java/com/thinkeep/domain/badge/controller/UserBadgeController.java

@@ -29,8 +29,15 @@ public class UserBadgeController {
     @Operation(summary = "사용자에게 뱃지 부여", description = "특정 사용자에게 뱃지를 부여합니다.")
     @ApiResponse(responseCode = "200", description = "뱃지 부여 성공")
     @PostMapping
-    public ResponseEntity<UserBadgeResponse> assignBadgeToUser(@RequestBody UserBadgeRequest request) {
-        UserBadgeResponse response = userBadgeService.assignBadgeToUser(request);
-        return ResponseEntity.ok(response);
+    //성공 -> UserBadgeResponse 반환
+    //실패 -> string 반환
+    public ResponseEntity<?> assignBadgeToUser(@RequestBody UserBadgeRequest request) {
+        try {
+            UserBadgeResponse response = userBadgeService.assignBadgeToUser(request);
+            return ResponseEntity.ok(response);
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
     }
+
 }

src/main/java/com/thinkeep/domain/badge/dto/UserBadgeResponse.java

@@ -11,4 +11,5 @@ public class UserBadgeResponse {
     private Long userNo;
     private Long badgeId;
     private LocalDateTime awardedAt;
+    private int streakCount;
 }

src/main/java/com/thinkeep/domain/badge/service/UserBadgeService.java

@@ -70,6 +70,7 @@ public UserBadgeResponse assignBadgeToUser(UserBadgeRequest request) {
                 .userNo(user.getUserNo())
                 .badgeId(badge.getBadgeId())
                 .awardedAt(userBadge.getAwardedAt())
+                .streakCount(user.getStreakCount())
                 .build();
     }