[MERGE] DEVELOP TO MAIN (AI 채팅, 일기, 알림 등 핵심 기능 구현)

build.gradle

@@ -54,6 +54,12 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+	// WebFlux (WebClient for streaming)
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+
+	// macOS DNS 최적화
+	runtimeOnly 'io.netty:netty-resolver-dns-native-macos:4.1.108.Final:osx-aarch_64'
+
 	//security
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	testImplementation 'org.springframework.security:spring-security-test'

src/main/java/com/divary/domain/avatar/controller/AvatarController.java

@@ -5,8 +5,13 @@
 import com.divary.domain.avatar.dto.AvatarResponseDTO;
 import com.divary.domain.avatar.entity.Avatar;
 import com.divary.domain.avatar.service.AvatarService;
+import com.divary.global.config.SwaggerConfig;
+import com.divary.global.config.security.CustomUserPrincipal;
+import com.divary.global.exception.ErrorCode;
+import io.swagger.v3.oas.annotations.Operation;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -15,15 +20,21 @@
 public class AvatarController {
     private final AvatarService avatarService;
 
-    @PatchMapping
-    public ApiResponse<String> saveAvatar(@RequestBody @Valid AvatarRequestDTO avatarRequestDTO) {
-        avatarService.patchAvatar(avatarRequestDTO);
-        return ApiResponse.success("아바타 저장에 성공했습니다.", null);
+    @PutMapping
+    @Operation(summary = "아바타 저장", description = "아바타를 저장합니다")
+    @SwaggerConfig.ApiSuccessResponse(dataType = Void.class)
+    @SwaggerConfig.ApiErrorExamples(value = {ErrorCode.AVATAR_NOT_FOUND, ErrorCode.AUTHENTICATION_REQUIRED})
+    public ApiResponse saveAvatar(@AuthenticationPrincipal CustomUserPrincipal userPrincipal, @RequestBody @Valid AvatarRequestDTO avatarRequestDTO) {
+        avatarService.upsertAvatar(userPrincipal.getId(), avatarRequestDTO);
+        return ApiResponse.success(null);
     }
 
     @GetMapping
-    public  ApiResponse<AvatarResponseDTO> getAvatar(){
-        //TODO buddypet json으로 변경할수도 있음
-        return ApiResponse.success("아바타 조회에 성공했습니다.", avatarService.getAvatar());
+    @Operation(summary = "아바타 조회", description = "아바타를 조회합니다")
+    @SwaggerConfig.ApiSuccessResponse(dataType = AvatarResponseDTO.class)
+    @SwaggerConfig.ApiErrorExamples(value = {ErrorCode.AVATAR_NOT_FOUND, ErrorCode.AUTHENTICATION_REQUIRED})
+    public ApiResponse<AvatarResponseDTO> getAvatar (@AuthenticationPrincipal CustomUserPrincipal userPrincipal) {
+        return ApiResponse.success("아바타 조회에 성공했습니다.", avatarService.getAvatar(userPrincipal.getId()));
+
     }
 }

src/main/java/com/divary/domain/avatar/dto/AvatarRequestDTO.java

@@ -3,44 +3,55 @@
 import com.divary.domain.avatar.enums.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 public class AvatarRequestDTO {
-    @Schema(description = "아바타 이름", example = "아진봇", nullable = true)
+    @Schema(description = "아바타 이름", example = "아진봇")
     @Size(max = 20, message = "이름은 최대 20자까지 입력 가능합니다.")
+    @NotBlank(message = "이름을 입력해주세요.")
     @Pattern(
-            regexp = "^(?!\\s*$)[\\p{L}\\p{N}\\p{Zs}\\p{So}]{1,20}$",
+            regexp = "[\\p{L}\\p{N}\\p{Zs}\\p{So}]{1,20}",
             message = "이름은 특수문자를 제외한 한글, 영문, 숫자, 공백, 이모지만 사용할 수 있습니다."
     )
     private String name;
 
-    @Schema(description = "탱크 색깔", example = "WHITE", nullable = true)
+    @Schema(description = "탱크 색깔", example = "YELLOW")
     private Tank tank;
 
-    @Schema(description = "몸 색상", example = "IVORY", nullable = true)
+    @Schema(description = "몸 색상", example = "IVORY")
+    @NotNull
     private BodyColor bodyColor;
 
-    @Schema(description = "버디펫", example = "AXOLOTL", nullable = true)
-    private BudyPet budyPet;
+    @Schema(description = "버디펫 정보 리스트")
+    private BuddyPetInfoDTO buddyPetInfo;
+
+
+    @Schema(description = "말풍선 텍스트", example = "Hi i'm buddy")
+    private String bubbleText;
 
-    @Schema(description = "볼 색상", example = "PINK", nullable = true)
+    @Schema(description = "볼 색상", example = "PINK")
+    @NotNull
     private CheekColor cheekColor;
 
-    @Schema(description = "말풍선 타입", example = "WHITE", nullable = true) //임시 enum 값 바꿔야 함
+    @Schema(description = "말풍선 타입", example = "OVAL_TAILED")
     private SpeechBubble speechBubble;
 
-    @Schema(description = "마스크 샐깔", example = "WHITE", nullable = true)
+    @Schema(description = "마스크 샐깔", example = "WHITE")
     private Mask mask;
 
-    @Schema(description = "핀 색깔", example = "WHITE", nullable = true)
+    @Schema(description = "핀 색깔", example = "WHITE")
     private Pin pin;
 
-    @Schema(description = "레귤레이터 색깔", example = "BLACK", nullable = true)
+    @Schema(description = "레귤레이터 색깔", example = "WHITE")
     private Regulator regulator;
 
     @Schema(description = "테마", example = "CORAL_FOREST")
+    @NotNull
     private Theme theme;
 }

src/main/java/com/divary/domain/avatar/dto/AvatarResponseDTO.java

@@ -11,8 +11,10 @@ public class AvatarResponseDTO {
     private Tank tank;
     private BodyColor bodyColor;
     private BudyPet budyPet;
+    private String bubbleText;
     private CheekColor cheekColor;
     private SpeechBubble speechBubble;
+    private BuddyPetInfoDTO buddyPetInfo;
     private Mask mask;
     private Pin pin;
     private Regulator regulator;

src/main/java/com/divary/domain/avatar/dto/BuddyPetInfoDTO.java

@@ -0,0 +1,22 @@
+package com.divary.domain.avatar.dto;
+
+import com.divary.domain.avatar.enums.BudyPet;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BuddyPetInfoDTO {
+
+    @Schema(description = "버디펫 종류", example = "AXOLOTL")
+    private BudyPet budyPet;
+
+    @Schema(description = "회전 각도 (도 단위)", example = "15.0")
+    private Double rotation;
+
+    @Schema(description = "크기 배율", example = "1.2")
+    private Double scale;
+}

src/main/java/com/divary/domain/avatar/entity/Avatar.java

@@ -1,7 +1,7 @@
 package com.divary.domain.avatar.entity;
 
 import com.divary.common.entity.BaseEntity;
-import com.divary.domain.Member.entity.Member;
+import com.divary.domain.member.entity.Member;
 import com.divary.domain.avatar.enums.*;
 import jakarta.persistence.*;
 import lombok.*;
@@ -19,45 +19,58 @@ public class Avatar extends BaseEntity {
     private Member user;
 
     @Column(length = 20)
-    private String name;
+    @Builder.Default
+    private String name = "버디";
 
     @Builder.Default
-    @Column(nullable = false, name = "body_color")
+    @Column(nullable = false,name = "body_color")
     @Enumerated(EnumType.STRING)
     private BodyColor bodyColor = BodyColor.IVORY;
 
-    @Builder.Default
-    @Column(nullable = false, name = "eye_color")
+    @Column(nullable = true, name = "buble_text")
+    private String bubbleText;
+
+
+    @Column(nullable = true, name = "speechBubble")
     @Enumerated(EnumType.STRING)
-    private SpeechBubble speechBubble = SpeechBubble.NONE;
+    private SpeechBubble speechBubble;
+
 
-    @Builder.Default
     @Column(nullable = false, name = "cheek_color")
     @Enumerated(EnumType.STRING)
-    private CheekColor cheekColor = CheekColor.NONE;
+    private CheekColor cheekColor;
+
 
-    @Builder.Default
     @Enumerated(EnumType.STRING)
-    private Mask mask = Mask.NONE;
+    @Column(nullable = true, name = "mask")
+    private Mask mask;
+
 
-    @Builder.Default
     @Enumerated(EnumType.STRING)
-    private Regulator regulator = Regulator.NONE;
+    @Column(nullable = true, name = "regulator")
+    private Regulator regulator;
 
-    @Builder.Default
     @Enumerated(EnumType.STRING)
-    private Pin pin = Pin.NONE;
+    @Column(nullable = true, name = "pin")
+    private Pin pin;
 
-    @Builder.Default
     @Enumerated(EnumType.STRING)
-    private Tank tank = Tank.NONE;
+    @Column(nullable = true, name = "tank")
+    private Tank tank;
+
 
-    @Builder.Default
     @Enumerated(EnumType.STRING)
-    @Column(name = "budy_pet")
-    private BudyPet budyPet = BudyPet.NONE;
+    @Column(nullable = true, name = "budy_pet")
+    private BudyPet budyPet;
+
+    @Column(nullable = true, name = "pet_rotation")
+    private Double petRotation;
+
+    @Column(nullable = true, name = "pet_scale")
+    private Double petScale;
 
     @Builder.Default
     @Enumerated(EnumType.STRING)
+    @Column(nullable = false, name = "theme")
     private Theme theme = Theme.CORAL_FOREST;
 }

src/main/java/com/divary/domain/avatar/enums/BudyPet.java

@@ -1,7 +1,6 @@
 package com.divary.domain.avatar.enums;
 
 public enum BudyPet {
-    NONE,           // 없음
     HERMIT_CRAB,    // 소라게
     SEAHORSE,       // 아기해마
     AXOLOTL,        // 우파루파

src/main/java/com/divary/domain/avatar/enums/CheekColor.java

@@ -1,8 +1,8 @@
 package com.divary.domain.avatar.enums;
 
 public enum CheekColor {
-    NONE,        // 없음 (기본값)
     PEACH,       // 연살구색
+    APRICOT,
     CORAL,       // 코랄 (살구보다 진함)
     SALMON,      // 연어색 (좀 더 붉은 느낌)
     PINK         // 핑크

src/main/java/com/divary/domain/avatar/enums/Mask.java

@@ -1,7 +1,6 @@
 package com.divary.domain.avatar.enums;
 
 public enum Mask {
-    NONE,
     WHITE,
     GOLD,
     GREEN

src/main/java/com/divary/domain/avatar/enums/Pin.java

@@ -1,7 +1,6 @@
 package com.divary.domain.avatar.enums;
 
 public enum Pin {
-    NONE,
     WHITE,
     YELLOW,
     PINK

src/main/java/com/divary/domain/avatar/enums/Regulator.java

@@ -1,8 +1,7 @@
 package com.divary.domain.avatar.enums;
 
 public enum Regulator {
-    NONE,
-    BLACK,
+    WHITE,
     YELLOW,
     PINK
 }

src/main/java/com/divary/domain/avatar/enums/SpeechBubble.java

@@ -1,9 +1,8 @@
 package com.divary.domain.avatar.enums;
 
 public enum SpeechBubble {
-    NONE,         // 없음 (슬래시 아이콘)
-    BLUE,         // 파란 말풍선
-    WHITE,        // 흰색 말풍선
-    GRAY,         // 회색 말풍선
-    LIGHT_GRAY    // 연회색 말풍선
+    ROUND_SQUARE,
+    ROUND_SQUARE_TAILED,
+    OVAL_TAILED,
+    OVAL_CIRCLE_TAILED
 }

src/main/java/com/divary/domain/avatar/enums/Tank.java

@@ -1,8 +1,7 @@
 package com.divary.domain.avatar.enums;
 
 public enum Tank {
-    NONE,
-    BLACK,
+    WHITE,
     YELLOW,
     PINK
 }

src/main/java/com/divary/domain/avatar/repository/AvatarRepository.java

@@ -1,13 +1,12 @@
 package com.divary.domain.avatar.repository;
 
 
-import com.divary.domain.Member.entity.Member;
+import com.divary.domain.member.entity.Member;
 import com.divary.domain.avatar.entity.Avatar;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
 import java.util.Optional;
 
 public interface AvatarRepository extends JpaRepository<Avatar, Long> {
-    Optional<Avatar> findByUser(Member user);
+    Avatar findByUserId(Long userId);
 }