diff --git a/src/main/java/org/rf/rfserver/domain/User.java b/src/main/java/org/rf/rfserver/domain/User.java index d68adf8..b74e156 100644 --- a/src/main/java/org/rf/rfserver/domain/User.java +++ b/src/main/java/org/rf/rfserver/domain/User.java @@ -78,6 +78,7 @@ public User(String loginId, String password, int entrance, University university this.userInterests = userInterests; this.lifeStyle = lifeStyle; this.userParties = new ArrayList<>(); + this.major = major; } public User updateUser(String nickName, String password, String imageFilePath, List interestingLanguages, String introduce, Mbti mbti, diff --git a/src/main/java/org/rf/rfserver/user/dto/GetUserRes.java b/src/main/java/org/rf/rfserver/user/dto/GetUserRes.java index bbad273..d701302 100644 --- a/src/main/java/org/rf/rfserver/user/dto/GetUserRes.java +++ b/src/main/java/org/rf/rfserver/user/dto/GetUserRes.java @@ -21,4 +21,5 @@ public class GetUserRes { private List interests; private LifeStyle lifeStyle; private String imageFilePath; + private Major major; } diff --git a/src/main/java/org/rf/rfserver/user/service/UserService.java b/src/main/java/org/rf/rfserver/user/service/UserService.java index 21e5682..88fe56d 100644 --- a/src/main/java/org/rf/rfserver/user/service/UserService.java +++ b/src/main/java/org/rf/rfserver/user/service/UserService.java @@ -64,7 +64,6 @@ public PostUserRes createUser(PostUserReq postUserReq) throws BaseException { String imageFilePath = s3Uploader.getImageFilePath("userDefault/defaultImage.jpg"); user.updateImageUrl(imageFilePath); userRepository.save(user); - System.out.println(imageFilePath); return new PostUserRes(user.getId()); } catch (Exception e) { throw new BaseException(DATABASE_ERROR); @@ -88,6 +87,7 @@ public GetUserRes getUser(Long userId) throws BaseException{ , user.getUserInterests() , user.getLifeStyle() , user.getImageFilePath() + , user.getMajor() ); } catch (Exception e) { throw new BaseException(DATABASE_ERROR);