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

Before refactoring alternate id validation logic

master
Preyea Regmi 5 years ago
parent
ef82c3dd55
commit
6df251eda2
1 changed files with 7 additions and 43 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. 50
      app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java

50
app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java
View File

@ -130,7 +130,6 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
Observable.combineLatest(setUpForm1Validation(), setUpForm2Validation(), setUpForm3Validation(), (form1Result, form2Result, form3Result) -> form1Result && form2Result && form3Result)
.subscribeOn(AndroidSchedulers.mainThread())
.subscribeWith(new CustomerDetailFormViewBindingObserver()));
// getDummyKYCRelatedData();
getKycRelatedData();
}
@ -160,39 +159,6 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
}));
}
private void getDummyKYCRelatedData() {
compositeDisposable.add(
Observable.zip(
gateway.getNativeCountryListAsObservable(view.getContext()).subscribeOn(Schedulers.io()),
gateway.getKycRelatedDataDummy(view.getContext()).subscribeOn(Schedulers.io()),
(nativeCountries, kycRelatedDataModel) -> {
kycRelatedDataModel.setNativeCountriesList(nativeCountries);
List<IDTextDTO> genderList = new ArrayList<>();
genderList.add(new IDTextDTO("M", getStringfromStringId(R.string.male_text)));
genderList.add(new IDTextDTO("F", getStringfromStringId(R.string.female_text)));
kycRelatedDataModel.setGenderList(genderList);
return kycRelatedDataModel;
}
).observeOn(AndroidSchedulers.mainThread())
.subscribeWith(new DisposableObserver<KYCRelatedDataDTO>() {
@Override
public void onNext(KYCRelatedDataDTO kycRelatedDataDTO) {
onReceivingKycRelatedData(kycRelatedDataDTO);
}
@Override
public void onError(Throwable e) {
view.showToastMessage(e.getMessage());
e.printStackTrace();
}
@Override
public void onComplete() {
}
})
);
}
private void onReceivingKycRelatedData(KYCRelatedDataDTO data) {
data.setNativeCountriesList(gateway.getNativeCountryList(view.getContext()));
@ -200,8 +166,6 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
genderList.add(new IDTextDTO("M", getStringfromStringId(R.string.male_text)));
genderList.add(new IDTextDTO("F", getStringfromStringId(R.string.female_text)));
data.setGenderList(genderList);
// data.setPrimaryInformation(null);
// data.setPictures(null);
this.validator = new CustomerDetailViewValidator(data);
customerDetailForm.setValue(data);
}
@ -233,20 +197,20 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getPassportNumberChangeEvent().map(val -> validator.validatePassportNo(val.toString())));
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getPassportIssuedDateChangeEvent().map(val -> validator.validatePassportIssuedDate(val.toString())));
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getPassportExpiryDateChangeEvent().map(val -> validator.validatePassportExpiryDate(val.toString())));
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getAlternateIdTypeChangeEvent().map(val -> validator.validateAlternateIdType(val)));
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getAlternateIDNoChangeEvent().map(val -> validator.validateAlternateIdNo(val.toString())));
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getAlternateIDIssuedDateChangeEvent().map(val -> validator.validateAlternateIDIssuedDate(val.toString())));
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getAlternateIDExpiryDateChangeEvent().map(val -> validator.validateAlternateIDExpiryDate(val.toString())));
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getGMEBranchChangeEvent().map(val -> validator.validateGmeBranch(val)));
list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getReferralCodeChangeEvent().map(val -> validator.validateReferralCode(val)));
// list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getAlternateIdTypeChangeEvent().map(val -> validator.validateAlternateIdType(val)));
// list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getAlternateIDNoChangeEvent().map(val -> validator.validateAlternateIdNo(val.toString())));
// list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getAlternateIDIssuedDateChangeEvent().map(val -> validator.validateAlternateIDIssuedDate(val.toString())));
// list.add(this.view.getCustomerDetailViewContract().getForm2ViewBindings().getAlternateIDExpiryDateChangeEvent().map(val -> validator.validateAlternateIDExpiryDate(val.toString())));
return Observable.combineLatest(
list,
args ->
{
boolean result = ((boolean) args[0]) && ((boolean) args[1]) && ((boolean) args[2])
&& ((boolean) args[3]) && ((boolean) args[4]) && ((boolean) args[5])
&& ((boolean) args[6]) && ((boolean) args[7]) && ((boolean) args[8])
&& ((boolean) args[9]) && ((boolean) args[10]);
&& ((boolean) args[3]) && ((boolean) args[4]) && ((boolean) args[5]) && ((boolean) args[6]) ;
// && ((boolean) args[7]) && ((boolean) args[8]) && ((boolean) args[9]) && ((boolean) args[10]);
Log.d(TAG, "Form 2 valid: " + result);
customerDetailForm2Button.setValue(result);

Write Preview
Loading…
Cancel
Save