Merge pull request #100 from YAPP-Github/develop

fix: Resolve conflicts.
YAPP-Github · Feb 20, 2024 · 8438b2e · 8438b2e
2 parents a89d467 + 96846a4
commit 8438b2e
Show file tree

Hide file tree

Showing 15 changed files with 87 additions and 35 deletions.
diff --git a/src/main/java/com/fullcar/core/response/ErrorCode.java b/src/main/java/com/fullcar/core/response/ErrorCode.java
@@ -23,7 +23,6 @@ public enum ErrorCode {
     CANNOT_CLOSE_CARPOOL(BAD_REQUEST, "카풀마감 권한이 없습니다."),
     CANNOT_DELETE_CARPOOL(BAD_REQUEST, "카풀삭제 권한이 없습니다."),
     INVALID_FORM_STATE(BAD_REQUEST, "유효하지 않은 신청서 상태입니다."),
-    EXISTED_CODE_IN_MAIL(BAD_REQUEST, "이미 인증번호를 보냈습니다."),
     NOT_MATCHED_CODE(BAD_REQUEST, "인증번호가 일치하지 않습니다."),
     ALREADY_CLOSED(BAD_REQUEST, "이미 마감된 카풀입니다."),
     CANNOT_DELETE_OPEN_CARPOOL(BAD_REQUEST, "모집중인 카풀은 삭제할 수 없습니다."),

diff --git a/src/main/java/com/fullcar/core/response/SuccessCode.java b/src/main/java/com/fullcar/core/response/SuccessCode.java
@@ -21,7 +21,8 @@ public enum SuccessCode {
     AVAILABLE_NICKNAME(OK, "사용 가능한 닉네임"),
     UPDATE_SUCCESS(OK, "수정 성공"),
     CODE_VERIFICATION_SUCCESS(OK, "인증 성공"),
-    WITHDRAW_SUCCESS(OK, "탈퇴 성공");
+    WITHDRAW_SUCCESS(OK, "탈퇴 성공"),
+    SAVE_DEVICE_TOKEN_SUCCESS(OK, "디바이스 토큰 등록 성공");
 
     private final HttpStatus status;
     private final String message;

diff --git a/src/main/java/com/fullcar/member/application/auth/AppleAuthService.java b/src/main/java/com/fullcar/member/application/auth/AppleAuthService.java
@@ -66,7 +66,6 @@ public class AppleAuthService {
 
     @Transactional
     public SocialInfoResponseDto getMemberInfo(AppleAuthRequestDto appleAuthRequestDto) throws IOException {
-        String deviceToken = appleAuthRequestDto.getDeviceToken();
         String idToken = appleAuthRequestDto.getIdToken();
         String appleRefreshToken = requestAppleAuthToken(appleAuthRequestDto.getAuthCode()).getRefreshToken();
 
@@ -84,9 +83,9 @@ public SocialInfoResponseDto getMemberInfo(AppleAuthRequestDto appleAuthRequestD
         if (memberRepository.existsBySocialId(socialId)) {
             Member member = memberRepository.findBySocialId(socialId);
             member.saveAppleRefreshToken(appleRefreshToken);
-            member.loginMember(deviceToken, refreshToken);
+            member.loginMember(refreshToken);
         }
-        else createMember(socialId, appleRefreshToken, deviceToken, refreshToken);
+        else createMember(socialId, appleRefreshToken, refreshToken);
 
         return SocialInfoResponseDto.builder()
                 .socialId(socialId)
@@ -95,8 +94,8 @@ public SocialInfoResponseDto getMemberInfo(AppleAuthRequestDto appleAuthRequestD
     }
 
     // 새로운 멤버 생성
-    private void createMember(SocialId socialId, String authCode, String deviceToken, String refreshToken) {
-        Member member = memberMapper.toAppleLoginEntity(socialId, authCode, deviceToken, refreshToken);
+    private void createMember(SocialId socialId, String authCode, String refreshToken) {
+        Member member = memberMapper.toAppleLoginEntity(socialId, authCode, refreshToken);
         memberRepository.saveAndFlush(member);
     }
 

diff --git a/src/main/java/com/fullcar/member/application/auth/KakaoAuthService.java b/src/main/java/com/fullcar/member/application/auth/KakaoAuthService.java
@@ -42,12 +42,11 @@ public class KakaoAuthService {
 
     @Transactional
     public SocialInfoResponseDto getMemberInfo(KakaoAuthRequestDto kakaoAuthRequestDto) {
-        String deviceToken = kakaoAuthRequestDto.getDeviceToken();
         SocialId socialId = socialIdService.generateSocialId(getKakaoData(kakaoAuthRequestDto.getToken()));
         String refreshToken = jwtTokenProvider.generateRefreshToken();
 
-        if (memberRepository.existsBySocialId(socialId)) memberRepository.findBySocialId(socialId).loginMember(deviceToken, refreshToken);
-        else createMember(socialId, deviceToken, refreshToken);
+        if (memberRepository.existsBySocialId(socialId)) memberRepository.findBySocialId(socialId).loginMember(refreshToken);
+        else createMember(socialId, refreshToken);
 
         return SocialInfoResponseDto.builder()
                 .socialId(socialId)
@@ -87,8 +86,8 @@ private static String getKakaoData(String kakaoToken) {
     }
 
     // 새로운 멤버 생성
-    private void createMember(SocialId socialId, String deviceToken, String refreshToken) {
-        Member member = memberMapper.toKakaoLoginEntity(socialId, deviceToken, refreshToken);
+    private void createMember(SocialId socialId, String refreshToken) {
+        Member member = memberMapper.toKakaoLoginEntity(socialId, refreshToken);
         memberRepository.saveAndFlush(member);
     }
 
@@ -99,11 +98,11 @@ public void revoke(Member member) {
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
         headers.set("Authorization", "KakaoAK " + adminKey);
 
-        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
         map.add("target_id_type", "user_id");
-        map.add("target_id", member.getSocialId().toString());
+        map.add("target_id", Long.valueOf(member.getSocialId().getSocialId()));
 
-        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
+        HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(map, headers);
 
         try {
             restTemplate.exchange(

diff --git a/src/main/java/com/fullcar/member/application/member/MemberMapper.java b/src/main/java/com/fullcar/member/application/member/MemberMapper.java
@@ -54,22 +54,20 @@ public Member toEntity(OnBoardingRequestDto onboardingRequestDto) {
                 .build();
     }
 
-    public Member toKakaoLoginEntity(SocialId socialId, String deviceToken, String refreshToken) {
+    public Member toKakaoLoginEntity(SocialId socialId, String refreshToken) {
         return Member.builder()
                 .id(memberIdService.nextId())
                 .socialId(socialId)
-                .deviceToken(deviceToken)
                 .refreshToken(refreshToken)
                 .socialType(SocialType.KAKAO)
                 .build();
     }
 
-    public Member toAppleLoginEntity(SocialId socialId, String appleRefreshToken, String deviceToken, String refreshToken) {
+    public Member toAppleLoginEntity(SocialId socialId, String appleRefreshToken, String refreshToken) {
         return Member.builder()
                 .id(memberIdService.nextId())
                 .socialId(socialId)
                 .appleRefreshToken(appleRefreshToken)
-                .deviceToken(deviceToken)
                 .refreshToken(refreshToken)
                 .socialType(SocialType.APPLE)
                 .build();

diff --git a/src/main/java/com/fullcar/member/application/member/MemberService.java b/src/main/java/com/fullcar/member/application/member/MemberService.java
@@ -3,13 +3,11 @@
 import com.fullcar.core.exception.CustomException;
 import com.fullcar.core.exception.NotFoundException;
 import com.fullcar.core.response.ErrorCode;
-import com.fullcar.member.application.auth.AppleAuthService;
-import com.fullcar.member.application.auth.KakaoAuthService;
-import com.fullcar.member.domain.car.CarRepository;
-import com.fullcar.member.domain.mail.MailRepository;
 import com.fullcar.member.domain.member.*;
+import com.fullcar.member.presentation.member.dto.request.DeviceTokenRequestDto;
 import com.fullcar.member.presentation.member.dto.request.NicknameRequestDto;
 import com.fullcar.member.presentation.member.dto.request.OnBoardingRequestDto;
+import com.fullcar.member.presentation.member.dto.response.DeviceTokenResponseDto;
 import com.fullcar.member.presentation.member.dto.response.MemberGetResponseDto;
 import com.fullcar.member.presentation.member.dto.response.NicknameResponseDto;
 import com.fullcar.member.presentation.member.dto.response.OnBoardingResponseDto;
@@ -41,7 +39,7 @@ public Member findByMemberId(MemberId memberId) {
     public OnBoardingResponseDto registerOnBoarding(Member member, OnBoardingRequestDto onboardingRequestDto) {
         Member updatedMember = findByMemberId(member.getId()).saveOnBoardingInfo(memberMapper.toEntity(onboardingRequestDto));
         memberRepository.saveAndFlush(updatedMember);
-        return memberMapper.toOnBoardingDto(member);
+        return memberMapper.toOnBoardingDto(updatedMember);
     }
 
     @Transactional(readOnly = true)
@@ -59,4 +57,13 @@ public NicknameResponseDto checkNicknameDuplication(NicknameRequestDto nicknameR
                     .build();
         }
     }
+
+    @Transactional
+    public DeviceTokenResponseDto postDeviceToken(Member member, DeviceTokenRequestDto deviceTokenRequestDto) {
+        memberRepository.saveAndFlush(member.saveDeviceToken(deviceTokenRequestDto));
+
+        return DeviceTokenResponseDto.builder()
+                .deviceToken(deviceTokenRequestDto.getDeviceToken())
+                .build();
+    }
 }
diff --git a/src/main/java/com/fullcar/member/domain/auth/SocialId.java b/src/main/java/com/fullcar/member/domain/auth/SocialId.java
@@ -3,12 +3,14 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 
 import static lombok.AccessLevel.PROTECTED;
 
 @Embeddable
+@Getter
 @NoArgsConstructor(access = PROTECTED)
 @AllArgsConstructor
 public class SocialId {

diff --git a/src/main/java/com/fullcar/member/domain/mail/Mail.java b/src/main/java/com/fullcar/member/domain/mail/Mail.java
@@ -25,4 +25,8 @@ public class Mail {
     private MemberId memberId;
 
     private Integer code;
+
+    public void updateEmailCode(Integer code) {
+        this.code = code;
+    }
 }
diff --git a/src/main/java/com/fullcar/member/domain/member/Member.java b/src/main/java/com/fullcar/member/domain/member/Member.java
@@ -2,6 +2,7 @@
 
 import com.fullcar.member.domain.car.CarId;
 import com.fullcar.member.domain.auth.SocialId;
+import com.fullcar.member.presentation.member.dto.request.DeviceTokenRequestDto;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -74,9 +75,8 @@ public void saveAppleRefreshToken(String appleRefreshToken) {
         this.appleRefreshToken = appleRefreshToken;
     }
 
-    public void loginMember(String deviceToken, String refreshToken) {
+    public void loginMember(String refreshToken) {
         this.isDeleted = false;
-        this.deviceToken = deviceToken;
         this.refreshToken = refreshToken;
     }
 
@@ -108,4 +108,9 @@ public Member deleted() {
         this.gender = null;
         return this;
     }
+
+    public Member saveDeviceToken(DeviceTokenRequestDto deviceTokenRequestDto) {
+        this.deviceToken = deviceTokenRequestDto.getDeviceToken();
+        return this;
+    }
 }
diff --git a/src/main/java/com/fullcar/member/infra/MailClient.java b/src/main/java/com/fullcar/member/infra/MailClient.java
@@ -26,6 +26,7 @@
 import java.util.Random;
 
 @Service
+//@Component
 @RequiredArgsConstructor
 public class MailClient implements MailService {
     private final BlacklistRepository blacklistRepository;
@@ -41,10 +42,13 @@ public void sendMail(Member member, EmailRequestDto emailRequestDto) {
         String emailDomain = email.substring(email.lastIndexOf("@")+1);
         blacklistRepository.findByEmailThrow(emailDomain);
 
-        if (mailRepository.findByMemberId(member.getId()) != null) {
-            throw new CustomException(ErrorCode.EXISTED_CODE_IN_MAIL);
+        Mail mail = mailRepository.findByMemberId(member.getId());
+        if (mail != null) {
+            mail.updateEmailCode(authNum);
+        }
+        else {
+            mailRepository.saveAndFlush(mailMapper.toEntity(member, authNum));
         }
-        mailRepository.saveAndFlush(mailMapper.toEntity(member, authNum));
 
         EmailMessage emailMessage = mailMapper.toMessageEntity(emailRequestDto);
         MimeMessage mimeMessage = javaMailSender.createMimeMessage();

diff --git a/src/main/java/com/fullcar/member/presentation/auth/dto/request/AppleAuthRequestDto.java b/src/main/java/com/fullcar/member/presentation/auth/dto/request/AppleAuthRequestDto.java
@@ -16,7 +16,4 @@ public class AppleAuthRequestDto {
 
     @Schema(description = "id_token", example = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3MDUyMzQ2NjMsImV4cCI6MTcwNTIzNDg0MywibWVtYmVySWQiOiJjb20uZnVsbGNhci5tZW1iZXIuZG9tYWluLk1lbWJlcklkQDQ5ODRlODM3In0.Qf8uXvaWR9K_pD4jgZlnkFpcx2-zlRKENXJhGXkMGSs")
     private String idToken;
-
-    @Schema(description = "디바이스 토큰")
-    private String deviceToken;
 }
diff --git a/src/main/java/com/fullcar/member/presentation/auth/dto/request/KakaoAuthRequestDto.java b/src/main/java/com/fullcar/member/presentation/auth/dto/request/KakaoAuthRequestDto.java
@@ -14,7 +14,4 @@ public class KakaoAuthRequestDto {
 
     @Schema(description = "카카오에서 받은 액세스 토큰", example = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3MDUyMzQ2NjMsImV4cCI6MTcwNTIzNDg0MywibWVtYmVySWQiOiJjb20uZnVsbGNhci5tZW1iZXIuZG9tYWluLk1lbWJlcklkQDQ5ODRlODM3In0.Qf8uXvaWR9K_pD4jgZlnkFpcx2-zlRKENXJhGXkMGSs")
     private String token;
-
-    @Schema(description = "디바이스 토큰")
-    private String deviceToken;
 }
diff --git a/src/main/java/com/fullcar/member/presentation/member/MemberController.java b/src/main/java/com/fullcar/member/presentation/member/MemberController.java
@@ -7,6 +7,7 @@
 import com.fullcar.member.domain.member.Member;
 import com.fullcar.member.domain.member.service.MailService;
 import com.fullcar.member.presentation.member.dto.request.*;
+import com.fullcar.member.presentation.member.dto.response.DeviceTokenResponseDto;
 import com.fullcar.member.presentation.member.dto.response.MemberGetResponseDto;
 import com.fullcar.member.presentation.member.dto.response.NicknameResponseDto;
 import com.fullcar.member.presentation.member.dto.response.OnBoardingResponseDto;
@@ -84,4 +85,15 @@ public ApiResponse<Object> checkMailAuthenticationCode(@CurrentMember Member mem
         mailService.checkMailAuthenticationCode(member, codeRequestDto);
         return ApiResponse.success(SuccessCode.CODE_VERIFICATION_SUCCESS);
     }
+
+    @Operation(summary = "디바이스 토큰 등록 API")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "디바이스 토큰 등록 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 내부 오류", content = @Content)
+    })
+    @PostMapping("/device-token")
+    public ApiResponse<DeviceTokenResponseDto> postDeviceToken(@CurrentMember Member member, @RequestBody DeviceTokenRequestDto deviceTokenRequestDto) {
+        DeviceTokenResponseDto responseDto = memberService.postDeviceToken(member, deviceTokenRequestDto);
+        return ApiResponse.success(SuccessCode.SAVE_DEVICE_TOKEN_SUCCESS, responseDto);
+    }
 }
diff --git a/src/main/java/com/fullcar/member/presentation/member/dto/request/DeviceTokenRequestDto.java b/src/main/java/com/fullcar/member/presentation/member/dto/request/DeviceTokenRequestDto.java
@@ -0,0 +1,15 @@
+package com.fullcar.member.presentation.member.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class DeviceTokenRequestDto {
+    @Schema(description = "디바이스 토큰", example = "123")
+    private String deviceToken;
+}
diff --git a/...main/java/com/fullcar/member/presentation/member/dto/response/DeviceTokenResponseDto.java b/...main/java/com/fullcar/member/presentation/member/dto/response/DeviceTokenResponseDto.java
@@ -0,0 +1,13 @@
+package com.fullcar.member.presentation.member.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Getter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class DeviceTokenResponseDto {
+    @Schema(description = "디바이스 토큰", example = "123")
+    private String deviceToken;
+}