♻️ Refactor : 코드 리뷰 내용 적용_2

Team-Shaka · Oct 10, 2023 · ec9cf80 · ec9cf80
1 parent 38d37c9
commit ec9cf80
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/briefing/member/application/MemberCommandService.java b/src/main/java/briefing/member/application/MemberCommandService.java
@@ -135,6 +135,6 @@ public Member parseRefreshToken(RefreshToken refreshToken){
     }
 
     public void deleteMember(Long memberId){
-        memberRepository.delete(memberRepository.findById(memberId).get());
+        memberRepository.deleteById(memberId);
     }
 }
diff --git a/src/main/java/briefing/member/application/MemberQueryService.java b/src/main/java/briefing/member/application/MemberQueryService.java
@@ -18,7 +18,7 @@
 public class MemberQueryService {
     private final MemberRepository memberRepository;
 
-    public Member findMember(Long memberId){
+    public Member findById(Long memberId){
         return memberRepository.findById(memberId).orElseThrow(()->new MemberException(ErrorCode.MEMBER_NOT_FOUND));
     }
 

diff --git a/src/main/java/briefing/security/handler/annotation/AuthUserArgumentResolver.java b/src/main/java/briefing/security/handler/annotation/AuthUserArgumentResolver.java
@@ -46,7 +46,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
         }
 
         UsernamePasswordAuthenticationToken authenticationToken = (UsernamePasswordAuthenticationToken) authentication;
-        Member member = memberQueryService.findMember(Long.valueOf(authenticationToken.getName()));
+        Member member = memberQueryService.findById(Long.valueOf(authenticationToken.getName()));
         return member;
     }
 }
diff --git a/src/main/java/briefing/validation/validator/CheckSameMemberValidator.java b/src/main/java/briefing/validation/validator/CheckSameMemberValidator.java
@@ -2,6 +2,7 @@
 
 import briefing.exception.ErrorCode;
 import briefing.exception.handler.MemberException;
+import briefing.member.application.MemberQueryService;
 import briefing.member.domain.Member;
 import briefing.validation.annotation.CheckSameMember;
 import jakarta.validation.ConstraintValidator;
@@ -39,7 +40,6 @@ public boolean isValid(Long value, ConstraintValidatorContext context) {
         }
 
         UsernamePasswordAuthenticationToken authenticationToken = (UsernamePasswordAuthenticationToken) authentication;
-
         // 로그인 한 사용자가 어드민인지 나중에 추가
         if(!value.equals(Long.valueOf(authenticationToken.getName()))){
             context.disableDefaultConstraintViolation();