Merge pull request #48 from soma-lighthouse/enhance/filtering-LH-197

[LH-197] patch api 수정 (#43)
soma-lighthouse · Sep 25, 2023 · e2f0859 · e2f0859
2 parents eac403f + 6aa9e00
commit e2f0859
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/com/lighthouse/lingoswap/member/entity/Member.java b/src/main/java/com/lighthouse/lingoswap/member/entity/Member.java
@@ -56,12 +56,12 @@ public int calculateAge() {
     }
 
     public void updateMember(LocalDate birthday, String name, String description, String profileImageUri, Gender gender, Country region) {
-        this.birthday = birthday;
-        this.name = name;
-        this.description = description;
-        this.profileImageUri = profileImageUri;
-        this.gender = gender;
-        this.region = region;
+        if (birthday != null) this.birthday = birthday;
+        if (name != null) this.name = name;
+        if (description != null) this.description = description;
+        if (profileImageUri != null) this.profileImageUri = profileImageUri;
+        if (gender != null) this.gender = gender;
+        if (region != null) this.region = region;
     }
 
     public void patchDescription(String description) {

diff --git a/src/main/java/com/lighthouse/lingoswap/member/service/MemberManager.java b/src/main/java/com/lighthouse/lingoswap/member/service/MemberManager.java
@@ -209,8 +209,13 @@ public ResponseDto<LanguageFormResponse> readLanguageForm() {
 
     public ResponseDto<Object> patch(final String uuid, final MemberRequest memberRequest) {
         Member member = memberService.findByUuid(uuid);
-        member.updateMember(memberRequest.birthday(), memberRequest.name(), memberRequest.description(), memberRequest.profileImageUri(),
-                memberRequest.gender(), countryService.findCountryByCode(memberRequest.region()));
+        if (memberRequest.region() == null) {
+            member.updateMember(memberRequest.birthday(), memberRequest.name(), memberRequest.description(), memberRequest.profileImageUri(),
+                    memberRequest.gender(), null);
+        } else {
+            member.updateMember(memberRequest.birthday(), memberRequest.name(), memberRequest.description(), memberRequest.profileImageUri(),
+                    memberRequest.gender(), countryService.findCountryByCode(memberRequest.region()));
+        }
         memberService.save(member);
         return ResponseDto.success(null);
     }