[fix] 목록조회 API update

GO-SOPT-SOLSOL · May 24, 2023 · 19c483c · 19c483c
1 parent 347bb4b
commit 19c483c
Showing 1 changed file with 24 additions and 13 deletions.
diff --git a/src/main/java/com/sopt/solsol/service/TransferService.java b/src/main/java/com/sopt/solsol/service/TransferService.java
@@ -15,6 +15,7 @@
 import javax.persistence.EntityNotFoundException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,20 +72,30 @@ public void delete(Long transferId, Long memberId ) {
 
     @Transactional(readOnly = true)
     public List<TransferResponseDTO> getTransferList(Long memberId) {
-        return transferRepository.findAllByMemberIdOrderByCreatedAtDesc(memberId)
-                .stream()
-                .map(transfer -> TransferResponseDTO.builder()
-                        .id(transfer.getId())
-                        .accountsId(transfer.getAccounts().getId())
-                        .accountNumber(transfer.getAccounts().getNumber())
-                        .bank(transfer.getAccounts().getBank().toString())
-                        .name(transfer.getAccounts().getMember().getName())
-                        .price(transfer.getPrice())
-                        .createdAt(changeFormat(transfer.getCreatedAt()))
-                        .build())
-                .collect(Collectors.toList());
+        List<Long> accountNumberList = new ArrayList<>();
+        List<Transfer> transferList = transferRepository.findAllByMemberIdOrderByCreatedAtDesc(memberId);
+
+        List<TransferResponseDTO> transferResponseDTOList = new ArrayList<>();
+        for (Transfer transfer: transferList) {
+            if( accountNumberList.contains(transfer.getAccounts().getId())) {
+                continue;
+            } else {
+                transferResponseDTOList.add(
+                        TransferResponseDTO.builder()
+                                .id(transfer.getId())
+                                .accountsId(transfer.getAccounts().getId())
+                                .accountNumber(transfer.getAccounts().getNumber())
+                                .bank(transfer.getAccounts().getBank().toString())
+                                .name(transfer.getAccounts().getMember().getName())
+                                .price(transfer.getPrice())
+                                .createdAt(changeFormat(transfer.getCreatedAt()))
+                                .build()
+                );
+                accountNumberList.add(transfer.getAccounts().getId());
+            }
+        }
+        return transferResponseDTOList;
     }
-
     private String changeFormat(LocalDateTime localDateTime) {
          DateTimeFormatter formatter =  DateTimeFormatter.ofPattern("yyyy.MM.dd");
             return localDateTime.format(formatter).toString();