Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ public record RegisterRequest(
String name,

@NotNull(message = "부모 여부는 필수 입력값입니다.")
Boolean isParent
Boolean isParent,

@NotNull(message = "프로필 이미지 ID는 필수 입력값입니다.")
Integer profileImageId

) {

Expand Down
2 changes: 2 additions & 0 deletions backend/ongi/src/main/java/ongi/user/dto/UserInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public record UserInfo(
String email,
String name,
Boolean isParent,
Integer profileImageId,
LocalDateTime createdAt,
LocalDateTime updatedAt

Expand All @@ -19,6 +20,7 @@ public UserInfo(User user){
user.getEmail(),
user.getName(),
user.getIsParent(),
user.getProfileImageId(),
user.getCreatedAt(),
user.getUpdatedAt()
);
Expand Down
3 changes: 3 additions & 0 deletions backend/ongi/src/main/java/ongi/user/entity/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions backend/ongi/src/test/java/ongi/FamilyControllerUnitTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ class GetFamilyMembersTest {
void getFamilyMembers_Success() {
// given
List<UserInfo> 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);

Expand Down
Loading