Merge pull request #150 from phuuthanh-dev/develop

pull

Author: phuuthanh-dev

src/main/java/vn/webapp/backend/auction/controller/TransactionController.java

@@ -57,22 +57,20 @@ public ResponseEntity<Page<Transaction>> getAuctionHistoryByUsername(
 
     @GetMapping("/get-by-type-state")
     public ResponseEntity<Page<Transaction>> getTransactionByTypeAndState(
-            @RequestParam(defaultValue = "createDate") String sortBy,
+            @RequestParam(defaultValue = "state") String sortBy,
             @RequestParam(defaultValue = "PAYMENT_TO_WINNER") TransactionType type,
             @RequestParam(required = false) String userName,
             @RequestParam(defaultValue = "5") int size,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "SUCCEED") String state,
-            @RequestParam(defaultValue = "desc") String sortOrder) {
+            @RequestParam(defaultValue = "asc") String sortOrder) {
         TransactionState transactionState = resolveTransactionState(state);
         Sort.Direction direction = sortOrder.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC;
         Pageable pageable = PageRequest.of(page, size, Sort.by(direction, sortBy));
         Page<Transaction> transactions = transactionService.getTransactionByTypeAndState(type, userName, transactionState, pageable);
         return ResponseEntity.ok(transactions);
     }
 
-
-
     @GetMapping("/get-handover")
     public ResponseEntity<Page<Transaction>> getTransactionHandOver(
             @RequestParam(required = false) String jewelryName,
@@ -116,6 +114,16 @@ public ResponseEntity<Transaction> setState(@PathVariable Integer id, @RequestPa
         return ResponseEntity.ok().build();
     }
 
+    @PutMapping("/set-state-with-code/{id}")
+    public ResponseEntity<Transaction> setStateTransactionWithCode(
+            @PathVariable Integer id,
+            @RequestParam String state,
+            @RequestParam String transactionCode,
+            @RequestParam String bankCode) {
+        transactionService.setTransactionStateWithCode(id, state, transactionCode, bankCode);
+        return ResponseEntity.ok().build();
+    }
+
     @PutMapping("/set-method/{id}")
     public ResponseEntity<Transaction> setMethod(@PathVariable Integer id, @RequestParam String method) {
         transactionService.setTransactionMethod(id, method);

src/main/java/vn/webapp/backend/auction/repository/UserRepository.java

@@ -44,7 +44,7 @@ public interface UserRepository extends JpaRepository<User, Integer>  {
             "AND ah.time = (SELECT MAX(ah2.time) FROM AuctionHistory ah2 WHERE ah2.auction.id = :auctionId AND ah2.state='ACTIVE')")
     Optional<User> findLatestUserInAuctionHistoryByAuctionId(@Param("auctionId") Integer auctionId);
 
-    @Query("SELECT a.user " +
+    @Query("SELECT a.jewelry.user " +
             "FROM Auction a " +
             "WHERE a.id = :auctionId ")
     Optional<User> findOwnerByAuctionId(@Param("auctionId") Integer auctionId);

src/main/java/vn/webapp/backend/auction/service/transaction/TransactionService.java

@@ -19,6 +19,9 @@ public interface TransactionService {
 
     void setTransactionState(Integer id, String state);
 
+    void setTransactionStateWithCode(Integer id, String state, String transactionCode, String bankCode);
+
+
     void setTransactionMethod(Integer id, String method);
 
     Page<Transaction> getTransactionsByUsername (String username, String assetName, Pageable pageable);

src/main/java/vn/webapp/backend/auction/service/transaction/TransactionServiceImpl.java

@@ -102,6 +102,17 @@ public void setTransactionState(Integer id, String state) {
         existingTransaction.setPaymentTime(Timestamp.from(Instant.now()));
     }
 
+    @Override
+    @Transactional
+    public void setTransactionStateWithCode(Integer id, String state, String transactionCode, String bankCode) {
+        var existingTransaction = transactionRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException(ErrorMessages.AUCTION_NOT_FOUND));
+        existingTransaction.setState(TransactionState.valueOf(state));
+        existingTransaction.setPaymentTime(Timestamp.from(Instant.now()));
+        existingTransaction.setTransactionCode(transactionCode);
+        existingTransaction.setBankCode(bankCode);
+    }
+
     @Override
     @Transactional
     public void setTransactionMethod(Integer id, String method) {
@@ -184,8 +195,8 @@ public User createTransactionForSeller(Integer auctionId) {
                     .feesIncurred(0.0)
                     .createDate(Timestamp.from(Instant.now()))
                     .type(TransactionType.PAYMENT_TO_SELLER)
+                    .paymentMethod(PaymentMethod.BANKING)
                     .build();
-
             transactionRepository.save(sellerTransaction);
         }
         return userSeller;