Merge pull request #11 from NET-ZERO-FitFit/develop

[REFACTOR] 회원가입 시 계좌 생성 및 탈퇴한 회원 재가입 시 inactive_at 초기화 로직 추가

Author: simhyunmin

src/main/java/fitfit/domain/account/converter/AccountConverter.java

@@ -24,4 +24,12 @@ public static Account toAccount(Member member, RegisterOrUpdateRequest request)
                 .field(request.getField())
                 .build();
     }
-}
+
+    public static RegisterOrUpdateRequest createEmptyRegisterOrUpdateRequest() {
+        return RegisterOrUpdateRequest.builder()
+                .bank("")
+                .account("")
+                .field("")
+                .build();
+    }
+}

src/main/java/fitfit/domain/account/dto/AccountResponseDTO.java

@@ -11,7 +11,6 @@ public class AccountResponseDTO {
     @Builder
     @AllArgsConstructor
     @NoArgsConstructor
-
     public static class AccountInfoResponse {
 
         @Schema(description = "계좌 고유 ID", example = "1")

src/main/java/fitfit/domain/member/entity/Member.java

@@ -133,4 +133,8 @@ public void addPoint(Integer amount) {
         }
         this.point += amount;
     }
+
+    public void clearInactiveAt() {
+        this.inactiveAt = null;
+    }
 }

src/main/java/fitfit/domain/member/repository/MemberRepository.java

@@ -8,5 +8,4 @@
 public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findByProviderId(String sub);
     boolean existsByNickname(String nickname);
-    Long id(Long id);
 }

src/main/java/fitfit/domain/member/service/MemberCommandServiceImpl.java

@@ -1,5 +1,8 @@
 package fitfit.domain.member.service;
 
+import fitfit.domain.account.converter.AccountConverter;
+import fitfit.domain.account.dto.AccountRequestDTO;
+import fitfit.domain.account.service.AccountCommandService;
 import fitfit.domain.member.converter.MemberConverter;
 import fitfit.domain.member.dto.MemberDataDTO;
 import fitfit.domain.member.dto.MemberRequestDTO;
@@ -36,18 +39,23 @@ public class MemberCommandServiceImpl implements MemberCommandService{
     private final MemberTokenRepository memberTokenRepository;
     private final MemberTermRepository memberTermRepository;
     private final TermRepository termRepository;
+    private final AccountCommandService accountCommandService; // 의존성 추가
 
     private static final String DEFAULT_BODY_IMG_URL = "https://fitfit-profile-img.s3.ap-northeast-2.amazonaws.com/default_body_img.jpg";
 
     @Override
     @Transactional
     public Member findOrCreateMember(MemberDataDTO.MemberData memberData, Provider provider) {
         return memberRepository.findByProviderId(memberData.getSub())
+                .map(member -> {
+                    if (member.getStatus() == MemberStatus.INACTIVE) {
+                        member.clearInactiveAt();
+                    }
+                    return member;
+                })
                 .orElseGet(() -> {
                     // 새 멤버 생성
-                    Member createdMember = memberRepository.save(MemberConverter.toMember(memberData, provider));
-
-                    return createdMember;
+                    return memberRepository.save(MemberConverter.toMember(memberData, provider));
                 });
     }
 
@@ -84,6 +92,9 @@ public MemberResponseDTO.MemberSignupResponse memberSignup(String authorization,
         // 회원가입 처리
         processMemberSignup(findMember, request);
 
+        AccountRequestDTO.RegisterOrUpdateRequest emptyAccountRequest = AccountConverter.createEmptyRegisterOrUpdateRequest();
+        accountCommandService.registerOrUpdateAccount(authorization, emptyAccountRequest);
+
         // 응답 반환
         return MemberConverter.toMemberSignupResponse(findMember);
     }