🔀Merge : Main Merge 30차 (#145)

* 🐛 Hotfix: 모델 상세 정보 조회 성능 response 추가 * 👔 탈퇴한 회원 제거 로직 추가 * 🐛 Hotfix: 모델 상세 정보 조회 성능 response 추가 * 🐛 Hotfix: 사용자 개인정보 수정 로직 수정 (#144)
Meetfolio-Project-CodeZ-Team · May 16, 2024 · 4f1ec78 · 4f1ec78
1 parent 068bf64
commit 4f1ec78
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/codez4/meetfolio/domain/member/Member.java b/src/main/java/com/codez4/meetfolio/domain/member/Member.java
@@ -83,12 +83,15 @@ public void withdraw(){
     /**
      * update
      */
-    public void update(MemberRequest.Patch request) {
-        this.password = Password.encrypt(request.getPassword(), ENCODER);
+    public void updateInfo(MemberRequest.Patch request) {
         this.major = request.getMajor();
         this.grade = Grade.convert(request.getGrade());
         this.jobKeyword = JobKeyword.convert(request.getJobKeyword());
     }
+
+    public void updatePassword(String password){
+        this.password = Password.encrypt(password, ENCODER);
+    }
 
     public void setPoint(int point){
         this.point = point;

diff --git a/src/main/java/com/codez4/meetfolio/domain/member/service/MemberCommandService.java b/src/main/java/com/codez4/meetfolio/domain/member/service/MemberCommandService.java
@@ -40,7 +40,10 @@ public MemberResponse.MemberProc post(MemberRequest.Post post) {
     }
 
     public MemberResponse.MemberProc update(Member member, MemberRequest.Patch patch) {
-        member.update(patch);
+        if(patch.getPassword()!=null){
+            member.updatePassword(patch.getPassword());
+        }
+        member.updateInfo(patch);
         return MemberResponse.toMemberProc(member);
     }