diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 0e808749..878fd40a 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/assets/domesticrelatedinfo.json b/app/src/main/assets/domesticrelatedinfo.json index 4a32e323..d90d4161 100644 --- a/app/src/main/assets/domesticrelatedinfo.json +++ b/app/src/main/assets/domesticrelatedinfo.json @@ -1,53 +1,53 @@ { "accounts" : [ { - "BankCode" : null, - "UserCi" : null, - "AccountNum" : null, - "BankName" : "신한은행", - "WalletName" : null, - "AutoDebit" : null, - "Type" : null, - "FintechUseNo" : null, - "AccountNumMasked" : "110223458***", - "FullAccountName" : null, - "IsApproved" : null, - "AccHolderInfoType" : null, - "Scope" : null, - "UserSeqNo" : null, - "KftcAccountId" : "IUgUkVvizgTGwzYtJ+qIZw==", - "CustomerId" : null, - "BankCodeStd" : null, - "IsShowRefresh" : "N", - "AccessToken" : null, - "AccHolderInfo" : null, - "AccountName" : null, - "TokenType" : null - }, - { - "BankCode" : null, - "UserCi" : null, - "AccountNum" : null, - "BankName" : "KB국민은행", - "WalletName" : null, - "AutoDebit" : null, - "Type" : null, - "FintechUseNo" : null, - "AccountNumMasked" : "40790204056***", - "FullAccountName" : null, - "IsApproved" : null, - "AccHolderInfoType" : null, - "Scope" : null, - "UserSeqNo" : null, - "KftcAccountId" : "zy5wvuekamf9soEMhw5trA==", - "CustomerId" : null, - "BankCodeStd" : null, - "IsShowRefresh" : "N", - "AccessToken" : null, - "AccHolderInfo" : null, - "AccountName" : null, - "TokenType" : null - } + "BankCode" : "034", + "UserCi" : "234234", + "AccountNum" : "140121001768", + "BankName" : "KB국민은행", + "WalletName" : "2341234", + "AutoDebit" : "123234", + "Type" : "1234234", + "FintechUseNo" : "101055699969776524847629", + "AccountNumMasked" : "40790204056***", + "FullAccountName" : "2341234", + "IsApproved" : "345234", + "AccHolderInfoType" : "534535", + "Scope" : "345345", + "UserSeqNo" : "6743234", + "KftcAccountId" : "zy5wvuekamf9soEMhw5trA==", + "CustomerId" : "456234234", + "BankCodeStd" : "78656456", + "IsShowRefresh" : "N", + "AccessToken" : "345345", + "AccHolderInfo" : "6878756", + "AccountName" : "123123", + "TokenType" : "345345" + }, + { + "BankCode" : "034", + "UserCi" : "234234", + "AccountNum" : "140121001768", + "BankName" : "KB국민은행", + "WalletName" : "2341234", + "AutoDebit" : "123234", + "Type" : "1234234", + "FintechUseNo" : "101055699969776524847629", + "AccountNumMasked" : "40790204056***", + "FullAccountName" : "2341234", + "IsApproved" : "345234", + "AccHolderInfoType" : "534535", + "Scope" : "345345", + "UserSeqNo" : "6743234", + "KftcAccountId" : "zy5wvuekamf9soEMhw5trA==", + "CustomerId" : "456234234", + "BankCodeStd" : "78656456", + "IsShowRefresh" : "N", + "AccessToken" : "345345", + "AccHolderInfo" : "6878756", + "AccountName" : "123123", + "TokenType" : "345345" + } ], "banks" : [ diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/adapter/DomesticRemitRecipientHistoryRvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/adapter/DomesticRemitRecipientHistoryRvAdapter.java index 026ebadc..3e3c8f9a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/adapter/DomesticRemitRecipientHistoryRvAdapter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/adapter/DomesticRemitRecipientHistoryRvAdapter.java @@ -12,6 +12,7 @@ import com.gmeremit.online.gmeremittance_native.customwidgets.exchangecountrylis import com.gmeremit.online.gmeremittance_native.domesticremit.recenthistory.model.DomesticReciepientHistoryDetailDTO; import com.gmeremit.online.gmeremittance_native.domesticremit.recenthistory.view.DomesticRemitRecipientHistoryRvAdapterViewHolder; +import java.util.ArrayList; import java.util.List; public class DomesticRemitRecipientHistoryRvAdapter extends RecyclerView.Adapter { @@ -21,6 +22,7 @@ public class DomesticRemitRecipientHistoryRvAdapter extends RecyclerView.Adapter public DomesticRemitRecipientHistoryRvAdapter(DomesticRemitRecipientHistoryListener listener) { this.listener=listener; + transactionHistoryItemModels=new ArrayList<>(); } @NonNull diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/presenter/DomesticRemitRecipientHistoryPresenterImpl.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/presenter/DomesticRemitRecipientHistoryPresenterImpl.java index 0762ed18..e1fb4a3a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/presenter/DomesticRemitRecipientHistoryPresenterImpl.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/presenter/DomesticRemitRecipientHistoryPresenterImpl.java @@ -1,5 +1,6 @@ package com.gmeremit.online.gmeremittance_native.domesticremit.recenthistory.presenter; +import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BasePresenter; import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; import com.gmeremit.online.gmeremittance_native.domesticremit.recenthistory.model.DomesticReciepientHistoryDetailDTO; @@ -11,7 +12,9 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; +import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.schedulers.Schedulers; public class DomesticRemitRecipientHistoryPresenterImpl extends BasePresenter implements DomesticRemitRecipientHistoryPresenterInterface { @@ -35,15 +38,15 @@ public class DomesticRemitRecipientHistoryPresenterImpl extends BasePresenter im startDate = ""; if (endDate == null) endDate = ""; -// compositeObservable.add( -// this.gateway.getRecentHistory(this.gateway.getAuth(),this.gateway.getUserID(), startDate, endDate) -// .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) -// .doFinally(() -> view.showProgressBar(false, "")) -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .subscribeWith(new TransactionListingObserver())); - - mockTransactionHistory(); + compositeObservable.add( + this.gateway.getRecentHistory(this.gateway.getAuth(),this.gateway.getUserID(), startDate, endDate) + .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) + .doFinally(() -> view.showProgressBar(false, "")) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribeWith(new TransactionListingObserver())); + +// mockTransactionHistory(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticRemitTxnRequestBody.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticRemitTxnRequestBody.java index 5122846f..9c99e643 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticRemitTxnRequestBody.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticRemitTxnRequestBody.java @@ -28,7 +28,7 @@ public class DomesticRemitTxnRequestBody { private String recipientPhone; @SerializedName("isUseBiometric") @Expose - private String isUseBiometric; + private boolean isUseBiometric; @SerializedName("txnPassword") @Expose private String txnPassword; @@ -92,11 +92,11 @@ public class DomesticRemitTxnRequestBody { this.recipientPhone = recipientPhone; } - public String getIsUseBiometric() { + public boolean getIsUseBiometric() { return isUseBiometric; } - public void setIsUseBiometric(String isUseBiometric) { + public void setIsUseBiometric(boolean isUseBiometric) { this.isUseBiometric = isUseBiometric; } @@ -115,4 +115,20 @@ public class DomesticRemitTxnRequestBody { public void setKftcAccountId(String kftcAccountId) { this.kftcAccountId = kftcAccountId; } + + @Override + public String toString() { + return "DomesticRemitTxnRequestBody{" + + "customerId='" + customerId + '\'' + + ", fintechUseNo='" + fintechUseNo + '\'' + + ", sentAmount='" + sentAmount + '\'' + + ", recipientBankCode='" + recipientBankCode + '\'' + + ", recipientAccountNo='" + recipientAccountNo + '\'' + + ", recipientName='" + recipientName + '\'' + + ", recipientPhone='" + recipientPhone + '\'' + + ", isUseBiometric=" + isUseBiometric + + ", txnPassword='" + txnPassword + '\'' + + ", kftcAccountId='" + kftcAccountId + '\'' + + '}'; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java index 5d18831f..474e7725 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java @@ -106,14 +106,27 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti private void performSendMoneyTransaction(String password, boolean isBioMetricUsed) { DomesticRemitTxnRequestBody remitTxnRequestBody = new DomesticRemitTxnRequestBody(); - compositeDisposable.add( - this.gateway.doDomesticTransaction(gateway.getAuth(), remitTxnRequestBody) - .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .doFinally(() -> view.showProgressBar(false, "")) - .subscribeWith(new DomesticRemitTxnObserverDomesticRemitTxnObserver()) - ); + remitTxnRequestBody.setCustomerId(gateway.getUserID()); + remitTxnRequestBody.setFintechUseNo(domesticRemitDataValidator.selectedSenderAccount.getFintechUseNo()); + remitTxnRequestBody.setSentAmount(domesticRemitDataValidator.sendAmount); + remitTxnRequestBody.setRecipientBankCode(domesticRemitDataValidator.selectedRecipientBank.getBankCode()); + remitTxnRequestBody.setRecipientAccountNo(domesticRemitDataValidator.bankAcNo); + remitTxnRequestBody.setRecipientName(domesticRemitDataValidator.recipientFullName); + remitTxnRequestBody.setRecipientPhone(domesticRemitDataValidator.recipientMobileNumber); + remitTxnRequestBody.setIsUseBiometric(isBioMetricUsed); + remitTxnRequestBody.setTxnPassword(password); + remitTxnRequestBody.setKftcAccountId(domesticRemitDataValidator.selectedSenderAccount.getKftcAccountId()); + + Log.d(this.getClass().getSimpleName(),remitTxnRequestBody.toString()); +// +// compositeDisposable.add( +// this.gateway.doDomesticTransaction(gateway.getAuth(), remitTxnRequestBody) +// .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) +// .subscribeOn(Schedulers.io()) +// .observeOn(AndroidSchedulers.mainThread()) +// .doFinally(() -> view.showProgressBar(false, "")) +// .subscribeWith(new DomesticRemitTxnObserverDomesticRemitTxnObserver()) +// ); } @@ -226,15 +239,15 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti @Override public void checkBalance() { -// compositeDisposable.add( -// this.gateway.checkAutoDebitBalance(gateway.getAuth(), gateway.getUserID(),domesticRemitDataValidator.selectedSenderAccount.getKftcAccountId()) -// .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .doFinally(() -> view.showProgressBar(false, "")) -// .subscribeWith(new KFTCAccountBalanceObserver()) -// ); - mockCurrentBalance(); + compositeDisposable.add( + this.gateway.checkAutoDebitBalance(gateway.getAuth(), gateway.getUserIDNumber(),domesticRemitDataValidator.selectedSenderAccount.getFintechUseNo()) + .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .doFinally(() -> view.showProgressBar(false, "")) + .subscribeWith(new KFTCAccountBalanceObserver()) + ); +// mockCurrentBalance(); } private void mockCurrentBalance() { @@ -339,6 +352,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti public void validateRecipientBank(DomesticBankDTO selectedReceiverBank) { + this.selectedRecipientBank=selectedReceiverBank; if (selectedReceiverBank == null) { view.setErrorOnWidgetRecipientBank("Please select a bank"); view.showSelectedRecipientBankNameAndIcon(null, 0); @@ -539,7 +553,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti domesticRemitDataValidator.setCurrentBalance(balance); - view.showCurrentBalance("Available Balance: " + Utils.formatCurrencyWithoutTruncatingDecimal(balance) + " KRW"); + view.showCurrentBalance("Available Balance: " + Utils.formatCurrencyWithoutTruncatingDecimal(balance) + " " + Constants.KRW_STRING); view.showCheckBalanceButton(false); domesticRemitDataValidator.validateCurrentBalanceWithSendingAmount(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java index 445d7106..7d0498aa 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java @@ -54,14 +54,14 @@ public class TransactionHistoryV2Presenter extends BasePresenter implements Tran @Override public void getDomesticTransactionHistory(String startDate, String endDate) { -// fetchDomesticTransactionHistory(startDate, endDate) -// .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .doFinally(() -> view.showProgressBar(false, "")) -// .subscribe(new DomesticTransactionHistoryObserver()); - - domesticTransactionHistorySubject.onNext(gateway.getMockedDomesticData()); + fetchDomesticTransactionHistory(startDate, endDate) + .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .doFinally(() -> view.showProgressBar(false, "")) + .subscribe(new DomesticTransactionHistoryObserver()); + +// domesticTransactionHistorySubject.onNext(gateway.getMockedDomesticData()); } private Observable fetchInternationalTransactionHistory(String startDate, String endDate) { @@ -112,9 +112,9 @@ public class TransactionHistoryV2Presenter extends BasePresenter implements Tran public void getAllTransactionRelatedData() { compositeDisposable.add( Observable.zip( -// fetchDomesticTransactionHistory("","").subscribeOn(Schedulers.io()), + fetchDomesticTransactionHistory("","").subscribeOn(Schedulers.io()), //TODO remove this mocked data - Observable.just( gateway.getMockedDomesticData()), +// Observable.just( gateway.getMockedDomesticData()), fetchInternationalTransactionHistory("","").subscribeOn(Schedulers.io()), AllTransactionDTO::new) .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))