Skip to content

Commit 71d1a9b

Browse files
authored
Merge pull request #67 from Team-SWAcademy/refactor/#65
[refactor/#65] 홈화면 다회용기 이용 내역 조회 최신순으로 변경
2 parents 0fc2706 + 8a99d74 commit 71d1a9b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/main/java/carbonneutral/academy/api/service/use/UseServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class UseServiceImpl implements UseService {
4747

4848
@Override
4949
public GetHomeRes getInUsesMultipleTimeContainers(User user) {
50-
List<GetUseRes> useResList = useJpaRepository.findByUserIdAndStatus(user.getId(), USING).stream()
50+
List<GetUseRes> useResList = useJpaRepository.findByUserIdAndStatusOrderByUseAtDesc(user.getId(), USING).stream()
5151
.map(use -> {
5252
Location location = locationJpaRepository.findById(use.getRentalLocation().getId()).orElseThrow(() -> new BaseException(NOT_FIND_LOCATION));
5353
MultiUseContainer multiUseContainer = multiUseContainerJpaRepository.findById(use.getMultiUseContainerId()).orElseThrow(() -> new BaseException(NOT_FIND_MULTI_USE_CONTAINER));

src/main/java/carbonneutral/academy/domain/use/repository/UseJpaRepository.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
import java.util.Optional;
1414

1515
public interface UseJpaRepository extends JpaRepository<Use, LocalDateTime> {
16-
List<Use> findByUserIdAndStatus(int userId, UseStatus status);
16+
//최신순
17+
List<Use> findByUserIdAndStatusOrderByUseAtDesc(int userId, UseStatus status);
1718
Optional<Use> findByUserIdAndUseAtBetweenAndStatus(int userId, LocalDateTime startRange, LocalDateTime endRange, UseStatus status);
1819

1920
Slice<Use> findByUserIdAndStatus(int userId, UseStatus status, Pageable pageable);

0 commit comments

Comments
 (0)