Feat(#54): rename field for resolve rebase conflict

Team-NumberOne · Nov 15, 2023 · 7ceadaf · 7ceadaf
1 parent cb7659b
commit 7ceadaf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/main/java/com/numberone/backend/domain/member/entity/Member.java b/src/main/java/com/numberone/backend/domain/member/entity/Member.java
@@ -11,7 +11,6 @@
 import com.numberone.backend.domain.notificationdisaster.entity.NotificationDisaster;
 import com.numberone.backend.domain.notificationregion.entity.NotificationRegion;
 import com.numberone.backend.domain.support.entity.Support;
-import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -84,8 +83,8 @@ public void updateProfileImageUrl(String imageUrl) {
         this.profileImageUrl = imageUrl;
     }
 
-    public void updateNickname(String nickname) {
-        this.nickName = nickname;
+    public void updateNickName(String nickName) {
+        this.nickName = nickName;
     }
 
     public void plusHeart(int heart) {

diff --git a/src/main/java/com/numberone/backend/domain/member/service/MemberService.java b/src/main/java/com/numberone/backend/domain/member/service/MemberService.java
@@ -18,7 +18,6 @@
 import com.numberone.backend.support.s3.S3Provider;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -39,15 +38,15 @@ public Member findByEmail(String email) {
     }
 
     @Transactional
-    public void create(String email, String realname) {
-        memberRepository.save(Member.of(email, realname));
+    public void create(String email, String realName) {
+        memberRepository.save(Member.of(email, realName));
     }
 
     @Transactional
     public void initMemberData(String email, OnboardingRequest onboardingRequest) {
         Member member = memberRepository.findByEmail(email)
                 .orElseThrow(NotFoundMemberException::new);
-        member.updateNickname(onboardingRequest.getNickname());
+        member.updateNickName(onboardingRequest.getNickname());
         notificationDisasterRepository.deleteAllByMemberId(member.getId());
         notificationRegionRepository.deleteAllByMemberId(member.getId());
         for (OnboardingAddress address : onboardingRequest.getAddresses()) {