diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/controller/TransactionLogController.java b/aconnect/src/main/java/com/mfsys/aconnect/client/controller/TransactionLogController.java index 73add57..00dece5 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/controller/TransactionLogController.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/controller/TransactionLogController.java @@ -3,10 +3,13 @@ package com.mfsys.aconnect.client.controller; import com.mfsys.aconnect.client.model.TransactionLog; import com.mfsys.aconnect.client.service.TransactionLogService; import com.mfsys.common.configuration.constant.AconnectURI; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDate; import java.util.List; @RestController() @@ -20,7 +23,12 @@ public class TransactionLogController { } @GetMapping(AconnectURI.LOGS) - public List getAllTransactionLogs() { - return transactionLogService.getAllTransactionLogs(); + public List getTransactionLogs( + @RequestParam @DateTimeFormat(pattern = "dd-MM-yyyy") LocalDate fromDate, + @RequestParam @DateTimeFormat(pattern = "dd-MM-yyyy") LocalDate toDate + ) { + return transactionLogService.getTransactionLogsByDate(fromDate, toDate); } + + } diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/repository/TransactionLogRepository.java b/aconnect/src/main/java/com/mfsys/aconnect/client/repository/TransactionLogRepository.java index 28aae38..cf83512 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/repository/TransactionLogRepository.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/repository/TransactionLogRepository.java @@ -2,6 +2,18 @@ package com.mfsys.aconnect.client.repository; import com.mfsys.aconnect.client.model.TransactionLog; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.time.LocalDate; +import java.util.List; public interface TransactionLogRepository extends JpaRepository { + TransactionLog findByTransactionId(String transactionId); + + @Query(value = "SELECT t FROM TBL_AC_TRANSACTION_LOGS t WHERE t.sgt_gntrdate BETWEEN :from AND :to", nativeQuery = true) + List getTransactionLogByDate( + @Param("from") LocalDate fromDate, + @Param("to") LocalDate toDate + ); } diff --git a/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionLogService.java b/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionLogService.java index cd22545..d0e679a 100644 --- a/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionLogService.java +++ b/aconnect/src/main/java/com/mfsys/aconnect/client/service/TransactionLogService.java @@ -26,6 +26,10 @@ public class TransactionLogService { return transactionLogRepository.findAll(); } + public List getTransactionLogsByDate(LocalDate fromDate, LocalDate toDate) { + return transactionLogRepository.getTransactionLogByDate(fromDate,toDate ); + } + public TransactionLog createTransactionLog(AccountGLTransactionRequest accountGLTransactionRequest, String URI) { TransactionLog transactionLog = new TransactionLog(); transactionLog.setPorOrgacode(accountGLTransactionRequest.getPorOrgacode());