IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Domestic Transaction History api integrated

master
Preyea Regmi 5 years ago
parent
89dd72eefd
commit
24ea672a9f
7 changed files with 122 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 94
      app/src/main/assets/domesticrelatedinfo.json
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/adapter/DomesticRemitRecipientHistoryRvAdapter.java
  4. 21
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/presenter/DomesticRemitRecipientHistoryPresenterImpl.java
  5. 22
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticRemitTxnRequestBody.java
  6. 50
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java
  7. 20
      app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java

BIN
.idea/caches/build_file_checksums.ser
View File

94
app/src/main/assets/domesticrelatedinfo.json
View File

@ -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" : [

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/adapter/DomesticRemitRecipientHistoryRvAdapter.java
View File

@ -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<DomesticRemitRecipientHistoryRvAdapterViewHolder> {
@ -21,6 +22,7 @@ public class DomesticRemitRecipientHistoryRvAdapter extends RecyclerView.Adapter
public DomesticRemitRecipientHistoryRvAdapter(DomesticRemitRecipientHistoryListener listener) {
this.listener=listener;
transactionHistoryItemModels=new ArrayList<>();
}
@NonNull

21
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/presenter/DomesticRemitRecipientHistoryPresenterImpl.java
View File

@ -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();
}

22
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticRemitTxnRequestBody.java
View File

@ -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 + '\'' +
'}';
}
}

50
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java
View File

@ -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();

20
app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java
View File

@ -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<InternationalTransactionHistoryDTO> 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)))

Write Preview
Loading…
Cancel
Save