diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index fcd6ce3..533da46 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -2,8 +2,6 @@ name: Java CI with Gradle on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] jobs: build: runs-on: ubuntu-latest diff --git a/src/main/java/sol/shinhansecuirty/sosolbe/Service/AccountService.java b/src/main/java/sol/shinhansecuirty/sosolbe/Service/AccountService.java index ae55d7d..d36806c 100644 --- a/src/main/java/sol/shinhansecuirty/sosolbe/Service/AccountService.java +++ b/src/main/java/sol/shinhansecuirty/sosolbe/Service/AccountService.java @@ -1,6 +1,7 @@ package sol.shinhansecuirty.sosolbe.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Optional; @@ -70,6 +71,7 @@ public AccountResponseDTO createSoSolInfo(AccountRequestDTO accountRequestDTO) { public HistoryResponseDTO findChangeHistory(int userId) { User user = userRepository.findById(userId).orElse(null); List historys = historyRepository.findByUser(user); + historys.sort((h1, h2) -> h2.getTradeDate().compareTo(h1.getTradeDate())); return HistoryResponseDTO.builder() .tradings(historys)