diff --git a/backend/ongi/src/main/java/ongi/auth/dto/RegisterRequest.java b/backend/ongi/src/main/java/ongi/auth/dto/RegisterRequest.java index ff116b4..e6c85ac 100644 --- a/backend/ongi/src/main/java/ongi/auth/dto/RegisterRequest.java +++ b/backend/ongi/src/main/java/ongi/auth/dto/RegisterRequest.java @@ -17,7 +17,10 @@ public record RegisterRequest( String name, @NotNull(message = "부모 여부는 필수 입력값입니다.") - Boolean isParent + Boolean isParent, + + @NotNull(message = "프로필 이미지 ID는 필수 입력값입니다.") + Integer profileImageId ) { diff --git a/backend/ongi/src/main/java/ongi/user/dto/UserInfo.java b/backend/ongi/src/main/java/ongi/user/dto/UserInfo.java index 694b7c1..b30db57 100644 --- a/backend/ongi/src/main/java/ongi/user/dto/UserInfo.java +++ b/backend/ongi/src/main/java/ongi/user/dto/UserInfo.java @@ -9,6 +9,7 @@ public record UserInfo( String email, String name, Boolean isParent, + Integer profileImageId, LocalDateTime createdAt, LocalDateTime updatedAt @@ -19,6 +20,7 @@ public UserInfo(User user){ user.getEmail(), user.getName(), user.getIsParent(), + user.getProfileImageId(), user.getCreatedAt(), user.getUpdatedAt() ); diff --git a/backend/ongi/src/main/java/ongi/user/entity/User.java b/backend/ongi/src/main/java/ongi/user/entity/User.java index cab806c..702a7cc 100644 --- a/backend/ongi/src/main/java/ongi/user/entity/User.java +++ b/backend/ongi/src/main/java/ongi/user/entity/User.java @@ -35,6 +35,9 @@ public class User { @Column(nullable = false) private Boolean isParent; + @Column(nullable = false) + private Integer profileImageId; + @CreatedDate @Column(updatable = false, nullable = false) private LocalDateTime createdAt; diff --git a/backend/ongi/src/test/java/ongi/FamilyControllerUnitTest.java b/backend/ongi/src/test/java/ongi/FamilyControllerUnitTest.java index f337466..f737f39 100644 --- a/backend/ongi/src/test/java/ongi/FamilyControllerUnitTest.java +++ b/backend/ongi/src/test/java/ongi/FamilyControllerUnitTest.java @@ -113,8 +113,8 @@ class GetFamilyMembersTest { void getFamilyMembers_Success() { // given List expectedMembers = Arrays.asList( - new UserInfo(UUID.randomUUID(), "test@example.com", "홍길동", true, LocalDateTime.now(), LocalDateTime.now()), - new UserInfo(UUID.randomUUID(), "member@example.com", "김철수", false, LocalDateTime.now(), LocalDateTime.now()) + new UserInfo(UUID.randomUUID(), "test@example.com", "홍길동", true, 1, LocalDateTime.now(), LocalDateTime.now()), + new UserInfo(UUID.randomUUID(), "member@example.com", "김철수", false, 1, LocalDateTime.now(), LocalDateTime.now()) ); given(familyService.getFamilyMembers(customUserDetails.getUser())).willReturn(expectedMembers);