fix: 멤버 업데이트 api - memberName 누락 수정

Central-MakeUs · Aug 26, 2023 · 36f8b29 · 36f8b29
1 parent 63dc594
commit 36f8b29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cider-api/src/main/java/com/cmc/domains/member/controller/MemberController.java b/cider-api/src/main/java/com/cmc/domains/member/controller/MemberController.java
@@ -41,7 +41,7 @@ public class MemberController {
     @PatchMapping(value = "")
     public ResponseEntity<MemberUpdateResDto> updateMember(@Parameter(hidden = true) @RequestMemberId Long memberId, @Valid @RequestBody MemberUpdateReqDto request) {
 
-        Member member = memberService.updateMember(memberId, request.getMemberGender(), request.getMemberBirth(), request.getInterestChallenge());
+        Member member = memberService.updateMember(memberId, request.getMemberGender(), request.getMemberBirth(), request.getInterestChallenge(), request.getMemberName());
         return ResponseEntity.ok(MemberUpdateResDto.from(member));
     }
 

diff --git a/cider-api/src/main/java/com/cmc/domains/member/service/MemberService.java b/cider-api/src/main/java/com/cmc/domains/member/service/MemberService.java
@@ -28,11 +28,12 @@ public class MemberService {
     private final MemberLevelRepository memberLevelRepository;
 
     // 멤버 정보 업데이트
-    public Member updateMember(Long memberId, String memberGender, String memberBirth, String interestChallenge) {
+    public Member updateMember(Long memberId, String memberGender, String memberBirth, String interestChallenge, String memberName) {
 
         Member member = findMemberOrThrow(memberId);
         member.update(memberGender, memberBirth, interestChallenge);
         member.setIsUpdatedMember(true);
+        member.updateName(memberName);
         return memberRepository.save(member);
     }
 

diff --git a/cider-api/src/main/java/com/cmc/oauth/service/TokenProvider.java b/cider-api/src/main/java/com/cmc/oauth/service/TokenProvider.java
@@ -203,7 +203,10 @@ public boolean isTokenExpired(Date now, Date tokenExpiredTime) {
 
     public boolean isTokenExpired(LocalDateTime now, LocalDateTime tokenExpiredTime) {
         if (now.isAfter(tokenExpiredTime)) { // 토큰 만료된 경우
+            log.info("토큰 만료!!!!!!!!");
             return true;
+        }else {
+            log.info("토큰 만료 아님!!!!!!");
         }
         return false;
     }