Merge pull request #96 from Leets-Official/feat/#94/계좌-조회,수정-응답형식변경

Feat/#94/계좌 조회,수정 응답형식변경

src/main/java/com/gachtaxi/domain/members/controller/AccountController.java

@@ -6,6 +6,7 @@
 
 import com.gachtaxi.domain.members.dto.request.AccountPostRequest;
 import com.gachtaxi.domain.members.dto.response.AccountGetResponse;
+import com.gachtaxi.domain.members.dto.response.AccountPostResponse;
 import com.gachtaxi.domain.members.service.AccountService;
 import com.gachtaxi.global.auth.jwt.annotation.CurrentMemberId;
 import com.gachtaxi.global.common.response.ApiResponse;
@@ -28,15 +29,15 @@ public class AccountController {
   public ApiResponse<AccountGetResponse> getAccount(
       @CurrentMemberId Long memberId
   ) {
-    return ApiResponse.response(OK, ACCOUNT_GET_SUCCESS.getMessage(), AccountGetResponse.of(this.accountService.getAccount(memberId)));
+    return ApiResponse.response(OK, ACCOUNT_GET_SUCCESS.getMessage(), this.accountService.getAccount(memberId));
   }
 
   @PostMapping
-  public ApiResponse<Void> updateAccount(
+  public ApiResponse<AccountPostResponse> updateAccount(
       @CurrentMemberId Long memberId,
       @RequestBody @Valid AccountPostRequest accountPostRequest
   ) {
-    this.accountService.updateAccount(memberId, accountPostRequest.accountNumber());
-    return ApiResponse.response(OK, ACCOUNT_UPDATE_SUCCESS.getMessage());
+    return ApiResponse.response(OK, ACCOUNT_UPDATE_SUCCESS.getMessage(),
+        this.accountService.updateAccount(memberId, accountPostRequest.accountNumber()));
   }
 }

src/main/java/com/gachtaxi/domain/members/dto/response/AccountGetResponse.java

@@ -1,10 +1,32 @@
 package com.gachtaxi.domain.members.dto.response;
 
+import com.gachtaxi.domain.members.entity.Members;
+import lombok.Builder;
+
+@Builder
 public record AccountGetResponse(
+    Long userId,
+    Long studentNumber,
+    String nickName,
+    String realName,
+    String profilePicture,
+    String email,
+    String role,
+    String gender,
     String accountNumber
 ) {
 
-  public static AccountGetResponse of(String accountNumber) {
-    return new AccountGetResponse(accountNumber);
+  public static AccountGetResponse of(Members members) {
+    return AccountGetResponse.builder()
+        .userId(members.getId())
+        .studentNumber(members.getStudentNumber())
+        .nickName(members.getNickname())
+        .realName(members.getRealName())
+        .profilePicture(members.getProfilePicture())
+        .email(members.getEmail())
+        .role(members.getRole().name())
+        .gender(members.getGender().name())
+        .accountNumber(members.getAccountNumber())
+        .build();
   }
 }

src/main/java/com/gachtaxi/domain/members/dto/response/AccountPostResponse.java

@@ -0,0 +1,32 @@
+package com.gachtaxi.domain.members.dto.response;
+
+import com.gachtaxi.domain.members.entity.Members;
+import lombok.Builder;
+
+@Builder
+public record AccountPostResponse(
+    Long userId,
+    Long studentNumber,
+    String nickName,
+    String realName,
+    String profilePicture,
+    String email,
+    String role,
+    String gender,
+    String accountNumber
+) {
+
+  public static AccountPostResponse of(Members members) {
+    return AccountPostResponse.builder()
+        .userId(members.getId())
+        .studentNumber(members.getStudentNumber())
+        .nickName(members.getNickname())
+        .realName(members.getRealName())
+        .profilePicture(members.getProfilePicture())
+        .email(members.getEmail())
+        .role(members.getRole().name())
+        .gender(members.getGender().name())
+        .accountNumber(members.getAccountNumber())
+        .build();
+  }
+}

src/main/java/com/gachtaxi/domain/members/service/AccountService.java

@@ -1,9 +1,12 @@
 package com.gachtaxi.domain.members.service;
 
+import com.gachtaxi.domain.members.dto.response.AccountGetResponse;
+import com.gachtaxi.domain.members.dto.response.AccountPostResponse;
 import com.gachtaxi.domain.members.entity.Members;
 import com.gachtaxi.domain.members.repository.MemberRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -14,15 +17,19 @@ public class AccountService {
 
   private final MemberRepository memberRepository;
 
-  public String getAccount(Long memberId) {
-    return this.memberService.findById(memberId).getAccountNumber();
+  public AccountGetResponse getAccount(Long memberId) {
+    Members members = this.memberService.findById(memberId);
+
+    return AccountGetResponse.of(members);
   }
 
   @Transactional
-  public void updateAccount(Long memberId, String accountNumber) {
+  public AccountPostResponse updateAccount(Long memberId, String accountNumber) {
     Members member = this.memberService.findById(memberId);
 
     member.setAccountNumber(accountNumber);
     this.memberRepository.save(member);
+
+    return AccountPostResponse.of(member);
   }
 }