Merge pull request #157 from Soongsil-CoffeeChat/ref/#156

[REFACTOR] 개인정보 조회 DTO 필드명 변경 및 추가
Soongsil-CoffeeChat · Sep 24, 2024 · 469709a · 469709a
2 parents 9239ec1 + 8b05631
commit 469709a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/soongsil/CoffeeChat/dto/UserGetUpdateDto.java b/src/main/java/com/soongsil/CoffeeChat/dto/UserGetUpdateDto.java
@@ -17,7 +17,8 @@ public class UserGetUpdateDto {
 	private String role;
 	private PartEnum part;
 	private ClubEnum club;
-	private String image;
+	private String picture;
+	private Long mentorId;
 
 	public static UserGetUpdateDto toDto(User user) {
 		return UserGetUpdateDto.builder()
@@ -28,13 +29,14 @@ public static UserGetUpdateDto toDto(User user) {
 	}
 
 	@QueryProjection
-	public UserGetUpdateDto(String name, String email, String phoneNum, String role, PartEnum part, ClubEnum club, String image){
+	public UserGetUpdateDto(String name, String email, String phoneNum, String role, PartEnum part, ClubEnum club, String image, Long mentorId){
 		this.name=name;
 		this.email=email;
 		this.phoneNum=phoneNum;
 		this.role=role;
 		this.part=part;
 		this.club=club;
-		this.image=image;
+		this.picture=image;
+		this.mentorId=mentorId;
 	}
 }
diff --git a/src/main/java/com/soongsil/CoffeeChat/repository/User/UserRepositoryImpl.java b/src/main/java/com/soongsil/CoffeeChat/repository/User/UserRepositoryImpl.java
@@ -60,7 +60,8 @@ public UserGetUpdateDto findUserInfoByUsername(String username) {
 						roleExpression,
 						mentor.part.coalesce(mentee.part), // 멘토의 part가 없으면 멘티의 part 사용
 						mentor.club, // 멘토의 club, 멘티인 경우 null
-						user.picture
+						user.picture,
+						mentor.id
 				))
 				.from(user)
 				.leftJoin(user.mentor, mentor)