Skip to content

Merge To Main #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
subsub97 wants to merge 3 commits into
base: main
Choose a base branch
from
+2 −2
Open

Merge To Main #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5b777d
fix: change order setting
subsub97 Oct 29, 2024
08decdf
Merge pull request #32 from Shinhan-soSOL/fix-orderSetting
subsub97 Oct 29, 2024
477c205
chore : change deploy policy
subsub97 Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/gradle-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Java CI with Gradle
on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
jobs:
build:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/sol/shinhansecuirty/sosolbe/Service/AccountService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -70,6 +71,7 @@ public AccountResponseDTO createSoSolInfo(AccountRequestDTO accountRequestDTO) {
public HistoryResponseDTO findChangeHistory(int userId) {
User user = userRepository.findById(userId).orElse(null);
List<History> historys = historyRepository.findByUser(user);
historys.sort((h1, h2) -> h2.getTradeDate().compareTo(h1.getTradeDate()));

return HistoryResponseDTO.builder()
.tradings(historys)
Expand Down