Merge pull request #129 from Team-Shaka/refactor/127

♻️ Refactor: 프로필에 전화번호 추가 2
Team-Shaka · Sep 12, 2024 · 3d64046 · 3d64046
2 parents c1a304c + 1f5ebd2
commit 3d64046
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/treehouse/server/api/member/business/MemberMapper.java b/src/main/java/treehouse/server/api/member/business/MemberMapper.java
@@ -57,7 +57,7 @@ public static MemberResponseDTO.getProfile toGetProfile(List<Branch> branches, M
                 .memberId(member.getId())
                 .memberName(member.getName())
                 .userName(member.getUser().getName())
-                .phone(member.getUser().getPhone())
+                .phone(targetMember.getUser().getPhone())
                 .closestMemberCount(BranchUtil.countClosestMembers(branches, targetMember.getId())) // ClosestMember 기능 개발 이후 변경 예정
                 .treehouseCount(member.getUser().getMemberList().size()) // TreehouseCount 기능 개발 이후 변경 예정
                 .fromMe(BranchUtil.calculateBranchDegree(branches, member.getId(), targetMember.getId()))
@@ -71,6 +71,7 @@ public static MemberResponseDTO.getProfile toGetMemberProfile(List<Branch> branc
                 .memberId(targetMember.getId())
                 .memberName(targetMember.getName())
                 .userName(targetMember.getUser().getName())
+                .phone(targetMember.getUser().getPhone())
                 .closestMemberCount(BranchUtil.countClosestMembers(branches, targetMember.getId())) // ClosestMember 기능 개발 이후 변경 예정
                 .treehouseCount(targetMember.getUser().getMemberList().size()) // TreehouseCount 기능 개발 이후 변경 예정
                 .fromMe(BranchUtil.calculateBranchDegree(branches, member.getId(), targetMember.getId()))

diff --git a/src/main/java/treehouse/server/global/entity/User/User.java b/src/main/java/treehouse/server/global/entity/User/User.java
@@ -27,8 +27,10 @@ public class User extends BaseDateTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+
     @Column(unique = true)
     private String phone;
+
     private String name; //고유 문자열 아이디(인스타그램 st.)
     private String bio;