🔨 fix(member): 회원가입 관련 로직 변경

src/main/java/com/tikitaka/naechinso/domain/member/MemberController.java

@@ -84,7 +84,7 @@ public CommonApiResponse<MemberLoginResponseDTO> forceLogin(
 
     @PostMapping("/reissue")
     @ApiOperation(value = "리프레시 토큰을 통해 새로운 토큰을 발급받는다 (RefreshToken)")
-    public CommonApiResponse<TokenResponseDTO> reissue(
+    public CommonApiResponse<MemberReissueResponseDTO> reissue(
             @RequestHeader("Authorization") String accessToken,
             @RequestHeader("Refresh") String refreshToken
     ) {

src/main/java/com/tikitaka/naechinso/domain/member/MemberService.java

@@ -10,6 +10,8 @@
 import com.tikitaka.naechinso.domain.pending.constant.PendingType;
 import com.tikitaka.naechinso.domain.pending.dto.PendingFindResponseDTO;
 import com.tikitaka.naechinso.domain.pending.dto.PendingUpdateMemberImageRequestDTO;
+import com.tikitaka.naechinso.domain.recommend.RecommendRepository;
+import com.tikitaka.naechinso.domain.recommend.dto.RecommendReceiverDTO;
 import com.tikitaka.naechinso.domain.recommend.entity.Recommend;
 import com.tikitaka.naechinso.global.common.request.TokenRequestDTO;
 import com.tikitaka.naechinso.global.common.response.TokenResponseDTO;
@@ -34,6 +36,7 @@
 public class MemberService {
     private final JwtTokenProvider jwtTokenProvider;
     private final PendingService pendingService;
+    private final RecommendRepository recommendRepository;
     private final MemberRepository memberRepository;
     private final MemberDetailRepository memberDetailRepository;
 
@@ -91,7 +94,7 @@ public MemberLoginResponseDTO logout(Member authMember) {
      * 로그인 -> Fcm Token DB에 등록한다
      * @// TODO: 2022/10/30 노션에 정리
      * */
-    public TokenResponseDTO reissue(String accessToken, String refreshToken) {
+    public MemberReissueResponseDTO reissue(String accessToken, String refreshToken) {
         String phone;
 
         if (!jwtTokenProvider.validateTokenExceptExpiration(accessToken)){
@@ -105,8 +108,33 @@ public TokenResponseDTO reissue(String accessToken, String refreshToken) {
         }
 
         Member authMember = findByPhone(phone);
+
+        //가입 여부 (detail == null) 확인 후 받은 추천서 꺼내옴
+        final Boolean hasDetail = authMember.getDetail() != null;
+
+        //만약 정회원이 아니라면 받은 추천 목록을 가져옴
+        List<RecommendReceiverDTO> recommendReceived;
+        if (!hasDetail) {
+            recommendReceived = recommendRepository.findAllByReceiverPhoneAndSenderNotNull(phone)
+                    .stream().map(RecommendReceiverDTO::of).collect(Collectors.toList());
+        } else {
+            recommendReceived = null;
+        }
+
+        //유저 밴 여부 가져오기
+        final Boolean isBanned = false;
+
         jwtTokenProvider.validateRefreshToken(phone, refreshToken);
-        return jwtTokenProvider.generateToken(new JwtDTO(phone, authMember.getRole().toString()));
+
+        TokenResponseDTO tokenResponseDTO = jwtTokenProvider.generateToken(new JwtDTO(phone, authMember.getRole().toString()));
+
+        return MemberReissueResponseDTO.builder()
+                .accessToken(tokenResponseDTO.getAccessToken())
+                .refreshToken(tokenResponseDTO.getRefreshToken())
+                .recommendReceived(recommendReceived)
+                .isActive(hasDetail)
+                .isBanned(isBanned)
+                .build();
     }
 
 
@@ -145,6 +173,11 @@ public MemberDetailResponseDTO readDetail(Member member) {
         return MemberDetailResponseDTO.of(member);
     }
 
+
+    /**
+     *  추천사를 받은 유저의 세부 회원 가입
+     * @// TODO: 2022/11/05 기본 정보도 추가로 수정
+     **/
     public MemberDetailResponseDTO createDetail(Member authMember, MemberDetailJoinRequestDTO dto) {
         //영속성 유지를 위한 fetch
         Member member = findByMember(authMember);
@@ -167,6 +200,9 @@ public MemberDetailResponseDTO createDetail(Member authMember, MemberDetailJoinR
 
             //받은 추천사 중 한명이라도 인증이 완료된 상태면 정회원 가입 실행
             if (recommend.getSender().getJobAccepted() || recommend.getSender().getEduAccepted()) {
+                member.updateCommonInfo(dto);
+                memberRepository.save(member);
+
                 MemberDetail detail = MemberDetail.of(member, dto);
                 memberDetailRepository.save(detail);
 

src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberCommonJoinRequestDTO.java

@@ -26,9 +26,9 @@ public class MemberCommonJoinRequestDTO {
     @Enum(enumClass = Gender.class, message = "성별 입력이 올바르지 않습니다. M 또는 W가 필요합니다")
     private Gender gender;
 
-    @ApiModelProperty(example = "25")
-    @Min(value = 25, message = "25-35세까지만 가입 가능합니다")
-    @Max(value = 35, message = "25-35세까지만 가입 가능합니다")
+    @ApiModelProperty(example = "1998")
+    @Min(value = 1988, message = "1988-1998 년생까지만 가입 가능합니다")
+    @Max(value = 1998, message = "1988-1998 년생까지만 가입 가능합니다")
     private int age;
 
     @NotNull(message = "서비스 이용약관 동의가 필요합니다")

src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberDetailJoinRequestDTO.java

@@ -28,9 +28,9 @@ public class MemberDetailJoinRequestDTO {
     @Enum(enumClass = Gender.class, message = "성별 입력이 올바르지 않습니다. M 또는 W가 필요합니다")
     private Gender gender;
 
-    @ApiModelProperty(example = "25")
-    @Min(value = 25, message = "25-35세까지만 가입 가능합니다")
-    @Max(value = 35, message = "25-35세까지만 가입 가능합니다")
+    @ApiModelProperty(example = "1998")
+    @Min(value = 1988, message = "1988-1998 년생까지만 가입 가능합니다")
+    @Max(value = 1998, message = "1988-1998 년생까지만 가입 가능합니다")
     private int age;
 
     @ApiModelProperty(example = "180")
@@ -57,10 +57,6 @@ public class MemberDetailJoinRequestDTO {
     @Length(max = 4, message = "올바른 MBTI 정보를 입력하세요")
     private String mbti;
 
-//    @ApiModelProperty(example = "직관적")
-//    @NotBlank(message = "성격 정보를 입력해야 합니다")
-//    private String personality;
-
     @ApiModelProperty(example = "[\"열정적인 \uD83D\uDD25\", \"지적인 \uD83E\uDDD0\", \"상냥한 ☺️\"]")
     @Size(min = 3, max = 3, message = "성격 키워드 3개를 입력해야 합니다")
     @NotNull

src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberReissueResponseDTO.java

@@ -0,0 +1,29 @@
+package com.tikitaka.naechinso.domain.member.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.tikitaka.naechinso.domain.recommend.dto.RecommendReceiverDTO;
+import lombok.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 토큰 재발급을 담당하는 응답 DTO
+ * */
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Builder
+@ToString
+@JsonInclude(JsonInclude.Include.NON_NULL) //NULL 필드 가림
+public class MemberReissueResponseDTO {
+    private String accessToken;
+    private String refreshToken;
+
+    //내 번호로 추천받은 정보 리스트
+    private List<RecommendReceiverDTO> recommendReceived;
+    //가입 완료했는지 여부, detail 정보가 있으면 true
+    private Boolean isActive = false;
+    //서버로부터 차단 당했는지 여부
+    private Boolean isBanned = false;
+}

src/main/java/com/tikitaka/naechinso/domain/member/dto/MemberUpdateCommonRequestDTO.java

@@ -23,8 +23,8 @@ public class MemberUpdateCommonRequestDTO {
     @Enum(enumClass = Gender.class, message = "성별 입력이 올바르지 않습니다. M 또는 W가 필요합니다")
     private Gender gender;
 
-    @ApiModelProperty(example = "25")
-    @Min(value = 25, message = "25-35세까지만 가입 가능합니다")
-    @Max(value = 35, message = "25-35세까지만 가입 가능합니다")
+    @ApiModelProperty(example = "1998")
+    @Min(value = 1988, message = "1988-1998 년생까지만 가입 가능합니다")
+    @Max(value = 1998, message = "1988-1998 년생까지만 가입 가능합니다")
     private int age;
 }

src/main/java/com/tikitaka/naechinso/domain/member/entity/Member.java

@@ -5,10 +5,7 @@
 import com.tikitaka.naechinso.domain.match.entity.Match;
 import com.tikitaka.naechinso.domain.member.constant.Gender;
 import com.tikitaka.naechinso.domain.member.constant.Role;
-import com.tikitaka.naechinso.domain.member.dto.MemberUpdateAcceptsRequestDTO;
-import com.tikitaka.naechinso.domain.member.dto.MemberUpdateCommonRequestDTO;
-import com.tikitaka.naechinso.domain.member.dto.MemberUpdateEduRequestDTO;
-import com.tikitaka.naechinso.domain.member.dto.MemberUpdateJobRequestDTO;
+import com.tikitaka.naechinso.domain.member.dto.*;
 import com.tikitaka.naechinso.domain.pending.entity.Pending;
 import com.tikitaka.naechinso.domain.point.constant.PointType;
 import com.tikitaka.naechinso.domain.point.entity.Point;
@@ -202,6 +199,12 @@ public void setDetail(MemberDetail memberDetail) {
         this.detail = memberDetail;
     }
 
+    public void updateCommonInfo(MemberDetailJoinRequestDTO requestDTO) {
+        this.name = requestDTO.getName();
+        this.age = requestDTO.getAge();
+        this.gender = requestDTO.getGender();
+    }
+
     public void updateAccepts(MemberUpdateAcceptsRequestDTO requestDTO) {
         this.acceptsMarketing = requestDTO.isAcceptsMarketing();
         this.acceptsPush = requestDTO.isAcceptsPush();