From 17fc76c11236f9914a8007964ab0f06b8494ce53 Mon Sep 17 00:00:00 2001 From: JeongHeumChoi <79458446+JeongHeumChoi@users.noreply.github.com> Date: Tue, 2 Apr 2024 02:01:38 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20[Deploy]=20-=20=EB=B0=B1?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=ED=83=80=EC=9E=84=EB=9D=BC=EC=9D=B8=20API?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= =?UTF-8?q?=20(#172)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 코드 스타일 수정 (#154) * Chore: 불필요한 부분 삭제 (#157) * 🐛 [Fix] - 작업 목록 API 수정 (#158) * refactor: 코드 스타일 수정 * fix: Work 생성 날짜 기준으로 내림차순 설정 * 🐛 [Fix] - PeerReview 단계 예외처리 (#160) * refactor: 코드 스타일 수정 * fix: Work 생성 날짜 기준으로 내림차순 설정 * fix: PeerReview일 경우 추가 * Chore: discord command 이름 변경 (#163) * Hotfix: 비밀번호 인증 로직 추가 (#165) * 🖊️ [Chore] - README 수정 (#168) * refactor: 코드 스타일 수정 * fix: Work 생성 날짜 기준으로 내림차순 설정 * fix: PeerReview일 경우 추가 * Chore: 프로젝트 readme 꾸미기 * 🖊️ [Chore] - README 수정 (#169) * refactor: 코드 스타일 수정 * fix: Work 생성 날짜 기준으로 내림차순 설정 * fix: PeerReview일 경우 추가 * Chore: 프로젝트 readme 꾸미기 * chore: README 수정 * 🐛 [Fix] - 백로그 타임라인 API (#171) * refactor: 코드 스타일 수정 * fix: Work 생성 날짜 기준으로 내림차순 설정 * fix: PeerReview일 경우 추가 * Chore: 프로젝트 readme 꾸미기 * chore: README 수정 * fix: R&R 정렬 오류 해결 --------- Co-authored-by: Lim jeong woo --- README.md | 55 ++++++++++++++++++- .../repository/ScrumRepository.java | 1 + .../startup_valley/service/ScrumService.java | 6 +- 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dc0bf47..ed40c95 100644 --- a/README.md +++ b/README.md @@ -1 +1,54 @@ -# 2024_BEOTKKOTTHON_TEAM_28_BE \ No newline at end of file +
+ + 스타트업 밸리로 이동하기 + + +### 🍀 사이드 프로젝트 협업 툴 🌟 +# 스타트업 밸리 +
+ +## 🖥️ Introduction +![1](https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/fda618b3-fde5-4694-886d-e11dd48d27b1) +![발표 1](https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/71a6e62b-bf64-445d-b452-c61ba47079bb) +![발표 2](https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/19edaeb4-8e92-4608-8d41-917e6eed0904) +![솔루션](https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/aea64d33-1433-42f4-9527-eb62f07a50a6) +![발표4](https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/cd8a9222-a386-4b01-bae5-d4749a67b7a1) +![발표5](https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/88d571d6-e0a3-4a42-819f-9642383888b1) +![발표6](https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/d4a078ed-c324-4cd2-8f79-1f8fbea1a0a0) + +## 😎 Member +
+ + + + + + + + + + + + +
백엔드 백엔드
+ + 최정흠 프로필 + + + + 임정우 프로필 + +
+ + 최정흠 + + + + 임정우 + +
+
+ +## ⚙️ Infra +Infra + diff --git a/src/main/java/goormthon/team28/startup_valley/repository/ScrumRepository.java b/src/main/java/goormthon/team28/startup_valley/repository/ScrumRepository.java index 6861c71..6384f1c 100644 --- a/src/main/java/goormthon/team28/startup_valley/repository/ScrumRepository.java +++ b/src/main/java/goormthon/team28/startup_valley/repository/ScrumRepository.java @@ -14,6 +14,7 @@ public interface ScrumRepository extends JpaRepository { Optional findByWorkerAndStatus(Member worker, EScrumStatus status); List findAllByWorkerAndStatusOrderByEndAtDesc(Member worker, EScrumStatus status); + List findAllByWorkerAndStatus(Member worker, EScrumStatus status); @Modifying(clearAutomatically = true) @Query("update Scrum s set s.endAt = :end, s.status = :status, s.summary = :summary where s.id = :scrumId") void updateScrumAfterOver(Long scrumId, String summary, EScrumStatus status, LocalDate end); diff --git a/src/main/java/goormthon/team28/startup_valley/service/ScrumService.java b/src/main/java/goormthon/team28/startup_valley/service/ScrumService.java index 6177487..bcbc64b 100644 --- a/src/main/java/goormthon/team28/startup_valley/service/ScrumService.java +++ b/src/main/java/goormthon/team28/startup_valley/service/ScrumService.java @@ -19,6 +19,7 @@ import java.time.LocalDate; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Optional; @@ -74,7 +75,7 @@ public ScrumListDto listScrum(Long userId, Long teamsId, Long target) { List scrumDtoList = new ArrayList<>(); for (Member tempMember : memberList) { List scrumList = scrumRepository - .findAllByWorkerAndStatusOrderByEndAtDesc(tempMember, EScrumStatus.FINISH); + .findAllByWorkerAndStatus(tempMember, EScrumStatus.FINISH); scrumDtoList.addAll( scrumList.stream() .map(scrum -> ScrumDto.of( @@ -93,6 +94,9 @@ public ScrumListDto listScrum(Long userId, Long teamsId, Long target) { .toList() ); } + scrumDtoList = scrumDtoList.stream() + .sorted(Comparator.comparing(ScrumDto::endAt).reversed()) + .toList(); return ScrumListDto.of(scrumDtoList); }