Skip to content
Open
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
1 change: 1 addition & 0 deletions src/main/java/org/rf/rfserver/domain/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Language> interestingLanguages, String introduce, Mbti mbti,
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/rf/rfserver/user/dto/GetUserRes.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ public class GetUserRes {
private List<Interest> interests;
private LifeStyle lifeStyle;
private String imageFilePath;
private Major major;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down