Merge branch 'develop'

Author: simhyunmin

src/main/java/fitfit/domain/account/controller/AccountRestController.java

@@ -2,8 +2,8 @@
 
 import fitfit.domain.account.dto.AccountRequestDTO.RegisterOrUpdateRequest;
 import fitfit.domain.account.dto.AccountResponseDTO.AccountInfoResponse;
-import fitfit.domain.account.service.command.AccountCommandService;
-import fitfit.domain.account.service.query.AccountQueryService;
+import fitfit.domain.account.service.AccountCommandService;
+import fitfit.domain.account.service.AccountQueryService;
 import fitfit.global.apiPayload.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;

src/main/java/fitfit/domain/account/service/AccountCommandService.java

@@ -0,0 +1,8 @@
+package fitfit.domain.account.service;
+
+import fitfit.domain.account.dto.AccountRequestDTO;
+import fitfit.domain.account.dto.AccountResponseDTO;
+
+public interface AccountCommandService {
+    AccountResponseDTO.AccountInfoResponse registerOrUpdateAccount(String authorization, AccountRequestDTO.RegisterOrUpdateRequest request);
+}

src/main/java/fitfit/domain/account/service/AccountCommandServiceImpl.java

@@ -0,0 +1,57 @@
+package fitfit.domain.account.service;
+
+import fitfit.domain.account.converter.AccountConverter;
+import fitfit.domain.account.dto.AccountRequestDTO.RegisterOrUpdateRequest;
+import fitfit.domain.account.dto.AccountResponseDTO.AccountInfoResponse;
+import fitfit.domain.account.entity.Account;
+import fitfit.domain.account.repository.AccountRepository;
+import fitfit.domain.member.entity.Member;
+import fitfit.domain.member.repository.MemberRepository;
+import fitfit.domain.token.provider.JwtProvider;
+import fitfit.global.apiPayload.code.status.ErrorStatus;
+import fitfit.global.apiPayload.exception.handler.MemberHandler;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class AccountCommandServiceImpl implements AccountCommandService {
+    private final AccountRepository accountRepository;
+    private final MemberRepository memberRepository;
+    private final JwtProvider jwtProvider;
+
+    private Member getMemberById(Long memberId) {
+        return memberRepository.findById(memberId)
+                .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
+    }
+
+    @Override
+    public AccountInfoResponse registerOrUpdateAccount(String authorization, RegisterOrUpdateRequest request) {
+        Long memberId = jwtProvider.getMemberIdAndValidateToken(authorization);
+
+        //회원 엔티티 조회
+        Member member = getMemberById(memberId);
+
+        //기존 계좌 정보 확인
+        Account account = accountRepository.findByMemberId(memberId).orElse(null);
+
+        if (account == null) {
+            //계좌가 없는 경우
+            account = AccountConverter.toAccount(member, request);
+            accountRepository.save(account);
+
+            log.info("새 계좌 등록 완료: memberId={}, accountId={}", memberId, account.getId());
+        } else {
+            //계좌 있는 경우
+            account.update(request.getBank(), request.getAccount(), request.getField());
+
+            log.info("기존 계좌 수정 완료: memberId={}, accountId={}", memberId, account.getId());
+        }
+
+        return AccountConverter.toAccountInfoResponse(account);
+    }
+}

src/main/java/fitfit/domain/account/service/AccountQueryService.java

@@ -0,0 +1,7 @@
+package fitfit.domain.account.service;
+
+import fitfit.domain.account.dto.AccountResponseDTO;
+
+public interface AccountQueryService {
+    AccountResponseDTO.AccountInfoResponse getAccountInfo(String authorization);
+}

src/main/java/fitfit/domain/account/service/AccountQueryServiceImpl.java

@@ -0,0 +1,37 @@
+package fitfit.domain.account.service;
+
+import fitfit.domain.account.converter.AccountConverter;
+import fitfit.domain.account.dto.AccountResponseDTO.AccountInfoResponse;
+import fitfit.domain.account.entity.Account;
+import fitfit.domain.account.repository.AccountRepository;
+import fitfit.domain.member.repository.MemberRepository;
+import fitfit.domain.token.provider.JwtProvider;
+import fitfit.global.apiPayload.code.status.ErrorStatus;
+import fitfit.global.apiPayload.exception.handler.AccountHandler;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class AccountQueryServiceImpl implements AccountQueryService {
+    private final AccountRepository accountRepository;
+    private final MemberRepository memberRepository;
+    private final JwtProvider jwtProvider;
+
+    @Override
+    public AccountInfoResponse getAccountInfo(String authorization) {
+        Long memberId = jwtProvider.getMemberIdAndValidateToken(authorization);
+
+        //계좌 정보 조회
+        Account account = accountRepository.findByMemberId(memberId)
+                .orElseThrow(()-> new AccountHandler(ErrorStatus.ACCOUNT_NOT_FOUND));
+
+        log.info("계좌 조회 완료: memberId={}, accountId={}", memberId, account.getId());
+
+        return AccountConverter.toAccountInfoResponse(account);
+    }
+}