diff --git a/src/main/java/com/sickgyun/server/user/domain/User.java b/src/main/java/com/sickgyun/server/user/domain/User.java index 4c42975..9d1ed00 100644 --- a/src/main/java/com/sickgyun/server/user/domain/User.java +++ b/src/main/java/com/sickgyun/server/user/domain/User.java @@ -36,6 +36,10 @@ public class User { @Embedded private Contact contact; + private Boolean isGraduated; + + private Long cardinal; + @OneToOne( fetch = FetchType.LAZY, mappedBy = "writer" @@ -52,10 +56,12 @@ public User(String name, String email) { this.email = email; } - public User(String name, String email, Contact contact) { + public User(String name, String email, Contact contact, Boolean isGraduated, Long cardinal) { this.name = name; this.email = email; this.contact = contact; + this.isGraduated = isGraduated; + this.cardinal = cardinal; } public void update(User user) { @@ -67,5 +73,7 @@ public void updateUser(User user) { this.email = user.getEmail(); this.name = user.getName(); this.contact = user.getContact(); + this.isGraduated = user.getIsGraduated(); + this.cardinal = user.getCardinal(); } } diff --git a/src/main/java/com/sickgyun/server/user/presentation/dto/UserRequest.java b/src/main/java/com/sickgyun/server/user/presentation/dto/UserRequest.java index a9ac065..652b1ee 100644 --- a/src/main/java/com/sickgyun/server/user/presentation/dto/UserRequest.java +++ b/src/main/java/com/sickgyun/server/user/presentation/dto/UserRequest.java @@ -6,10 +6,12 @@ public record UserRequest( String name, String email, - Contact contact + Contact contact, + Long cardinal, + Boolean isGraduated ) { public User toEntity() { - return new User(name, email, contact); + return new User(name, email, contact, isGraduated, cardinal); } } diff --git a/src/main/java/com/sickgyun/server/user/presentation/dto/UserResponse.java b/src/main/java/com/sickgyun/server/user/presentation/dto/UserResponse.java index f68b6c6..7bd7024 100644 --- a/src/main/java/com/sickgyun/server/user/presentation/dto/UserResponse.java +++ b/src/main/java/com/sickgyun/server/user/presentation/dto/UserResponse.java @@ -1,16 +1,18 @@ package com.sickgyun.server.user.presentation.dto; import com.sickgyun.server.user.domain.User; -import com.sickgyun.server.user.domain.value.Contact; public record UserResponse( Long id, String name, String email, - Contact contact + String phoneNumber, + Boolean isGraduated, + Long cardinal ) { public static UserResponse from(User user) { - return new UserResponse(user.getId(), user.getName(), user.getEmail(), user.getContact()); + return new UserResponse(user.getId(), user.getName(), user.getEmail(), user.getContact().getPhone(), + user.getIsGraduated(), user.getCardinal()); } } diff --git a/src/main/java/com/sickgyun/server/user/service/implementation/UserUpdater.java b/src/main/java/com/sickgyun/server/user/service/implementation/UserUpdater.java index 217725e..b68bbec 100644 --- a/src/main/java/com/sickgyun/server/user/service/implementation/UserUpdater.java +++ b/src/main/java/com/sickgyun/server/user/service/implementation/UserUpdater.java @@ -24,5 +24,6 @@ public User updateUser(User user) { public void update(User updatableUser, User user) { updatableUser.updateUser(user); + userRepository.save(updatableUser); } }