refactor: 메서드명 수정, 서비스 리팩토링

resolved #86
Yanabada · Jan 17, 2024 · 9b544fb · 9b544fb
1 parent 24f307f
commit 9b544fb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/YanoljaPayController.java b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/YanoljaPayController.java
@@ -1,20 +1,14 @@
 package kr.co.fastcampus.yanabada.domain.payment.controller;
 
 import jakarta.validation.Valid;
-import kr.co.fastcampus.yanabada.common.exception.MemberNotFoundException;
-import kr.co.fastcampus.yanabada.common.exception.PasswordConfirmationException;
-import kr.co.fastcampus.yanabada.common.exception.YanoljaPayNotFoundException;
 import kr.co.fastcampus.yanabada.common.response.ResponseBody;
-import kr.co.fastcampus.yanabada.domain.payment.dto.request.PayPasswordRequest;
+import kr.co.fastcampus.yanabada.domain.payment.dto.request.PayPasswordSaveRequest;
 import kr.co.fastcampus.yanabada.domain.payment.dto.response.YanoljaPayHomeResponse;
 import kr.co.fastcampus.yanabada.domain.payment.service.YanoljaPayService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,12 +26,12 @@ public ResponseBody<YanoljaPayHomeResponse> getYanoljaPay(@PathVariable Long mem
     }
 
     @PostMapping("/pay-password/{memberId}")
-    public ResponseBody<ResponseEntity<?>> setPayPassword(
+    public ResponseBody<Void> setPayPassword(
         @PathVariable("memberId") Long memberId,
-        @RequestBody @Valid PayPasswordRequest payPasswordRequest
+        @RequestBody @Valid PayPasswordSaveRequest payPasswordSaveRequest
     ) {
-        yanoljaPayService.setPayPassword(memberId, payPasswordRequest);
-        return ResponseBody.ok(ResponseEntity.ok().build());
+        yanoljaPayService.setPayPassword(memberId, payPasswordSaveRequest);
+        return ResponseBody.ok();
     }
 }
 
diff --git a/...yment/dto/request/PayPasswordRequest.java → ...t/dto/request/PayPasswordSaveRequest.java b/...yment/dto/request/PayPasswordRequest.java → ...t/dto/request/PayPasswordSaveRequest.java
@@ -5,7 +5,7 @@
 import lombok.Builder;
 
 @Builder
-public record PayPasswordRequest(
+public record PayPasswordSaveRequest(
     @NotBlank(message = "패스워드는 공백일 수 없습니다.")
     @Pattern(regexp = "\\d{6}", message = "패스워드는 6글자이어야 합니다.")
     String password,

diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/YanoljaPay.java b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/YanoljaPay.java
@@ -93,4 +93,8 @@ public static YanoljaPay create(
             balance
         );
     }
+
+    public void savePassword(String password) {
+        this.simplePassword = password;
+    }
 }
diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/YanoljaPayService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/YanoljaPayService.java
@@ -5,7 +5,7 @@
 import kr.co.fastcampus.yanabada.common.exception.YanoljaPayNotFoundException;
 import kr.co.fastcampus.yanabada.domain.member.entity.Member;
 import kr.co.fastcampus.yanabada.domain.member.repository.MemberRepository;
-import kr.co.fastcampus.yanabada.domain.payment.dto.request.PayPasswordRequest;
+import kr.co.fastcampus.yanabada.domain.payment.dto.request.PayPasswordSaveRequest;
 import kr.co.fastcampus.yanabada.domain.payment.dto.response.YanoljaPayHomeResponse;
 import kr.co.fastcampus.yanabada.domain.payment.entity.YanoljaPay;
 import kr.co.fastcampus.yanabada.domain.payment.repository.YanoljaPayRepository;
@@ -35,14 +35,15 @@ private YanoljaPayHomeResponse getYanoljaPay(Member member) {
     }
 
     @Transactional
-    public void setPayPassword(Long memberId, PayPasswordRequest payPasswordRequest) {
-        if (!payPasswordRequest.isPasswordMatch()) {
+    public void setPayPassword(Long memberId, PayPasswordSaveRequest payPasswordSaveRequest) {
+        if (!payPasswordSaveRequest.isPasswordMatch()) {
             throw new PasswordConfirmationException();
         }
 
-        Member member = memberRepository.findById(memberId)
-            .orElseThrow(MemberNotFoundException::new);
+        Member member = memberRepository.getMember(memberId);
+        YanoljaPay yanoljaPay = yanoljaPayRepository.findByMember(member)
+            .orElseThrow(YanoljaPayNotFoundException::new);
 
-        yanoljaPayRepository.updateSimplePassword(member, payPasswordRequest.password());
+        yanoljaPay.savePassword(payPasswordSaveRequest.password());
     }
 }