refactor: Sort by processedAt and createdAt

BudgetBuddyDE · Dec 5, 2023 · a179dc4 · a179dc4
1 parent d49ed7b
commit a179dc4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/de/budgetbuddy/backend/transaction/TransactionController.java b/src/main/java/de/budgetbuddy/backend/transaction/TransactionController.java
@@ -123,7 +123,7 @@ public ResponseEntity<ApiResponse<List<Transaction>>> getTransactionsByUuid(@Req
             }
         }
 
-        List<Transaction> transactions = transactionRepository.findAllByOwnerOrderByProcessedAtDesc(user.get());
+        List<Transaction> transactions = transactionRepository.findAllByOwnerOrderByProcessedAtDescAndCreatedAtDesc(user.get());
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(new ApiResponse<>(transactions));

diff --git a/src/main/java/de/budgetbuddy/backend/transaction/TransactionRepository.java b/src/main/java/de/budgetbuddy/backend/transaction/TransactionRepository.java
@@ -11,7 +11,7 @@
 
 public interface TransactionRepository extends JpaRepository<Transaction, Long> {
     List<Transaction> findAllByOwner(User owner);
-    List<Transaction> findAllByOwnerOrderByProcessedAtDesc(User owner);
+    List<Transaction> findAllByOwnerOrderByProcessedAtDescAndCreatedAtDesc(User owner);
     @Query(value = "select * from f_get_daily_transactions(:start_date, :end_date, :requested_data, :user_id)", nativeQuery = true)
     List<Object[]> fetchDailyTransactions(
             @Param("start_date") LocalDate startDate,

diff --git a/src/test/java/de/budgetbuddy/backend/transaction/TransactionControllerTests.java b/src/test/java/de/budgetbuddy/backend/transaction/TransactionControllerTests.java
@@ -290,7 +290,7 @@ void testGetTransaction_WithSupportUserSuccess() throws JsonProcessingException
 
         when(userRepository.findById(uuid))
                 .thenReturn(Optional.of(owner));
-        when(transactionRepository.findAllByOwner(owner))
+        when(transactionRepository.findAllByOwnerOrderByProcessedAtDescAndCreatedAtDesc(owner))
                 .thenReturn(transactionList);
 
         ResponseEntity<ApiResponse<List<Transaction>>> response = transactionController.getTransactionsByUuid(uuid, session);
@@ -310,7 +310,7 @@ void testGetTransaction_Success() throws JsonProcessingException {
 
         when(userRepository.findById(uuid))
                 .thenReturn(Optional.of(owner));
-        when(transactionRepository.findAllByOwner(owner))
+        when(transactionRepository.findAllByOwnerOrderByProcessedAtDescAndCreatedAtDesc(owner))
                 .thenReturn(transactionList);
 
         ResponseEntity<ApiResponse<List<Transaction>>> response = transactionController.getTransactionsByUuid(uuid, session);