🚀 [Deploy] - 백로그 타임라인 API 수정 사항 반영 (#172)

* 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 <[email protected]>
9oormthon-univ · Apr 1, 2024 · 17fc76c · 17fc76c
1 parent bd71e78
commit 17fc76c
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,54 @@
-# 2024_BEOTKKOTTHON_TEAM_28_BE
+<div align="center">
+  <a href="https://client.startupvalley.site">
+    <img width="150px" src="https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/fb3c2fc1-38d0-4185-a09c-ff8839427643" alt="스타트업 밸리로 이동하기"/>
+  </a>
+
+### 🍀 사이드 프로젝트 협업 툴 🌟
+# 스타트업 밸리
+</div>
+
+## 🖥️ 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
+<div align="center">
+<table>
+  <tr>
+    <td align="center"> 백엔드</td>
+    <td align="center"> 백엔드</td>
+  </tr>
+  <tr>
+    <td align="center" width="120px">
+      <a href="https://github.com/JeongHeumChoi" target="_blank">
+        <img src="https://avatars.githubusercontent.com/u/79458446?v=4" alt="최정흠 프로필" />
+      </a>
+    </td>
+    <td align="center" width="120px">
+      <a href="https://github.com/dlawjddn" target="_blank">
+        <img src="https://avatars.githubusercontent.com/u/103355883?v=4" alt="임정우 프로필" />
+      </a>
+    </td>
+  </tr>
+  <tr>
+    <td align="center">
+      <a href="https://github.com/JeongHeumChoi" target="_blank">
+        최정흠
+      </a>
+    </td>
+     <td align="center">
+      <a href="https://github.com/dlawjddn" target="_blank">
+       임정우
+      </a>
+  </tr>
+</table>
+</div>
+
+## ⚙️ Infra
+<img src='https://github.com/goormthon-Univ/2024_BEOTKKOTTHON_TEAM_28_BE/assets/79458446/9979d3e7-c00a-4d94-ae1f-9d0b3fb92186'  alt="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
@@ -14,6 +14,7 @@
 public interface ScrumRepository extends JpaRepository<Scrum, Long> {
     Optional<Scrum> findByWorkerAndStatus(Member worker, EScrumStatus status);
     List<Scrum> findAllByWorkerAndStatusOrderByEndAtDesc(Member worker, EScrumStatus status);
+    List<Scrum> 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
@@ -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<ScrumDto> scrumDtoList = new ArrayList<>();
         for (Member tempMember : memberList) {
             List<Scrum> 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);
     }