From 606e216391a18ce85b2ef2563a3a3a302c78d0fd Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Sun, 2 Sep 2018 16:51:26 +0900 Subject: [PATCH] Login response v2 implemented for new flow --- .../gmeremittance_native/base/PrefKeys.java | 50 ++++++++--------- .../base/PrivilegedGateway.java | 13 +++-- .../base/PrivilegedGatewayInterface.java | 6 ++- .../recipientadd/RecipientAddV2Presenter.java | 2 +- .../RecipientListingV2Presenter.java | 12 +---- .../gateway/SendMoneyV2Gateway.java | 54 +------------------ .../presenter/SendMoneyV2Presenter.java | 6 +-- .../sign_in/model/LoginModel.java | 2 +- .../model/data/LoginApiResponseModelV2.java | 22 +------- 9 files changed, 49 insertions(+), 118 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrefKeys.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrefKeys.java index 4143b242..2ad0caf7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrefKeys.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrefKeys.java @@ -3,30 +3,30 @@ package com.gmeremit.online.gmeremittance_native.base; public class PrefKeys { //USER RELATED DATA - public static final String USER_FIRST_NAME = "USER_FIRST_NAME"; - public static final String USER_MIDDLE_NAME = "USER_MIDDLE_NAME"; - public static final String USER_LAST_NAME = "USER_LAST_NAME"; - public static final String USER_NICK_NAME = "USER_NICK_NAME"; - public static final String USER_EMAIL = "USER_EMAIL_NAME"; - public static final String USER_MSISDN = "USER_MSISDN"; - public static final String USER_REWAD_POINT = "USER_REWAD_POINT"; - public static final String USER_WALLET_NUMBER = "USER_WALLET_NUMBER"; - public static final String USER_AVAILABLE_BALANCE = "USER_AVAILABLE_BALANCE"; - public static final String USER_PRIMARY_BANK_NAME = "USER_PRIMARY_BANK_NAME"; - public static final String USER_ACCESS_CODE = "USER_PRIMARY_BANK"; - public static final String USER_DP_URL = "USER_DP_URL"; - public static final String USER_KYC_VERIFIED = "USER_KYC_VERIFIED"; - public static final String USER_VERIFIED = "USER_VERIFIED"; - public static final String USER_ACTIVE = "USER_ACTIVE"; - public static final String USER_CM_REGISTRATION_ID = "USER_CM_REGISTRATION_ID"; - public static final String USER_IS_REFERRED = "USER_IS_REFERRED"; - public static final String USER_COUNTRY = "USER_COUNTRY"; - public static final String USER_PROVINCE = "USER_PROVINCE"; - public static final String USER_PROVINCE_ID = "USER_PROVINCE_ID"; - public static final String USER_SOURCE_ID = "USER_SOURCE_ID"; - public static final String USER_ID = "USER_ID"; - public static final String USER_ID_TYPE = "USER_ID_TYPE"; - public static final String USER_ID_NUMBER = "USER_ID_NUMBER"; - public static final String USER_COOUNTRY_CODE = "USER_COOUNTRY_CODE"; + public static final String USER_FIRST_NAME = "USER_FIRST_NAME_V2"; + public static final String USER_MIDDLE_NAME = "USER_MIDDLE_NAME_V2"; + public static final String USER_LAST_NAME = "USER_LAST_NAME_V2"; + public static final String USER_NICK_NAME = "USER_NICK_NAME_V2"; + public static final String USER_EMAIL = "USER_EMAIL_NAME_V2"; + public static final String USER_MSISDN = "USER_MSISDN_V2"; + public static final String USER_REWAD_POINT = "USER_REWAD_POINT_V2"; + public static final String USER_WALLET_NUMBER = "USER_WALLET_NUMBER_V2"; + public static final String USER_AVAILABLE_BALANCE = "USER_AVAILABLE_BALANCE_V2"; + public static final String USER_PRIMARY_BANK_NAME = "USER_PRIMARY_BANK_NAME_V2"; + public static final String USER_ACCESS_CODE = "USER_PRIMARY_BANK_V2"; + public static final String USER_DP_URL = "USER_DP_UR_V2L"; + public static final String USER_KYC_VERIFIED = "USER_KYC_VERIFIED_V2"; + public static final String USER_VERIFIED = "USER_VERIFIED_V2"; + public static final String USER_ACTIVE = "USER_ACTIVE_V2"; + public static final String USER_CM_REGISTRATION_ID = "USER_CM_REGISTRATION_ID_V2"; + public static final String USER_IS_REFERRED = "USER_IS_REFERRED_V2"; + public static final String USER_COUNTRY = "USER_COUNTRY_V2"; + public static final String USER_PROVINCE = "USER_PROVINCE_V2"; + public static final String USER_PROVINCE_ID = "USER_PROVINCE_ID_V2"; + public static final String USER_SOURCE_ID = "USER_SOURCE_ID_V2"; + public static final String USER_ID = "USER_ID_V2"; + public static final String USER_ID_TYPE = "USER_ID_TYPE_V2"; + public static final String USER_ID_NUMBER = "USER_ID_NUMBER_V2"; + public static final String USER_COOUNTRY_CODE = "USER_COOUNTRY_CODE_V2"; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java index 6ca708c5..3d4b9255 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java @@ -8,8 +8,8 @@ import com.gmeremit.online.gmeremittance_native.utils.Utils; public abstract class PrivilegedGateway implements PrivilegedGatewayInterface { @Override - public String getUserID() { - return GmeApplication.getStorage().getString(PrefKeys.USER_ID,""); + public String getUserEmailID() { + return GmeApplication.getStorage().getString(PrefKeys.USER_EMAIL,""); } @@ -39,12 +39,17 @@ public abstract class PrivilegedGateway implements PrivilegedGatewayInterface { } @Override - public String getIDType() { + public String getUserIDType() { return GmeApplication.getStorage().getString(PrefKeys.USER_ID_TYPE,""); } @Override - public String getIDNumber() { + public String getUserIDNumber() { return GmeApplication.getStorage().getString(PrefKeys.USER_ID_NUMBER,""); } + + @Override + public String getUserID() { + return GmeApplication.getStorage().getString(PrefKeys.USER_ID,""); + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java index a7bf706b..b90bf0ab 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java @@ -6,15 +6,17 @@ public interface PrivilegedGatewayInterface extends BaseGatewayInterface { String getAuth(); + String getUserEmailID(); + String getUserID(); String getUserFirstName(); String getUserLastName(); - String getIDType(); + String getUserIDType(); - String getIDNumber(); + String getUserIDNumber(); String getUserCountryId(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java index 4fda872f..8e832432 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java @@ -57,7 +57,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA validateLocation(selectedCountry, selectedProvince, selectedDistrict)) { this.compositeDisposable.add( this.gateway.addRecipientAndSendToServer(gateway.getAuth(), - gateway.getUserID(), + gateway.getUserEmailID(), firstName, middleName, lastName, selectedCountry.getId(), (selectedProvince)==null?"":selectedProvince.getId(), diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java index caa5ad88..a65c49e6 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java @@ -4,21 +4,13 @@ import com.gmeremit.online.gmeremittance_native.base.BasePresenter; import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; import com.gmeremit.online.gmeremittance_native.recipientV2.gateway.RecipientListingV2Gateway; import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.AddRecipientApiResponse; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.CountryDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.DistrictDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.ProvinceDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.RecipientRelatedDataApiResponse; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.RelationDetailModel; -import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.TransferDetailModel; import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientlisting.GetAllRecipientApiResponse; -import com.gmeremit.online.gmeremittance_native.recipientV2.presenter.recipientadd.RecipientAddV2Presenter; import com.gmeremit.online.gmeremittance_native.utils.Constants; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import okhttp3.ResponseBody; public class RecipientListingV2Presenter extends BasePresenter implements RecipientListingV2PresenterInterface, RecipientListingV2InteractorInterface { @@ -46,7 +38,7 @@ public class RecipientListingV2Presenter extends BasePresenter implements Recipi @Override public void getAllRecipientList() { compositeDisposable.add( - this.gateway.getAllRecipientFromNetwork(gateway.getAuth(),gateway.getUserID()) + this.gateway.getAllRecipientFromNetwork(gateway.getAuth(),gateway.getUserEmailID()) .doOnSubscribe(disposable -> view.showProgressBar(true, "Fetching data...")) .doFinally(() -> view.showProgressBar(false, "")) .subscribeOn(Schedulers.io()) @@ -58,7 +50,7 @@ public class RecipientListingV2Presenter extends BasePresenter implements Recipi @Override public void deleteRecipient(String recipientId) { compositeDisposable.add( - this.gateway.deleteRecipientFromNetwork(gateway.getAuth(),gateway.getUserID(),recipientId) + this.gateway.deleteRecipientFromNetwork(gateway.getAuth(),gateway.getUserEmailID(),recipientId) .doOnSubscribe(disposable -> view.showProgressBar(true, "Deleting recipient...")) .doFinally(() -> view.showProgressBar(false, "")) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/gateway/SendMoneyV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/gateway/SendMoneyV2Gateway.java index fd12d975..959a05f0 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/gateway/SendMoneyV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/gateway/SendMoneyV2Gateway.java @@ -19,56 +19,6 @@ public class SendMoneyV2Gateway extends PrivilegedGateway implements SendMoneyV2 private final SendMoneyV2InteractorInterface interactor; - private String mockedPaymentModeString="{\n"+ - " \"ErrorCode\": \"0\",\n"+ - " \"Msg\": \"Success\",\n"+ - " \"Id\": null,\n"+ - " \"Data\": {\n"+ - " \"Name\": \"Nepal\",\n"+ - " \"Id\": \"151\",\n"+ - " \"Code\": \"NP\",\n"+ - " \"PayoutMode\": [\n"+ - " {\n"+ - " \"Id\": \"1\",\n"+ - " \"Mode\": \"Cash Payment\",\n"+ - " \"PayoutPartner\": \"1056\",\n"+ - " \"PayCurrency\": [\n"+ - " \"KRW\",\n"+ - " \"NPR\"\n"+ - " ],\n"+ - " \"Bankrequired\": \"False\",\n"+ - " \"BankList\": null\n"+ - " },\n"+ - " {\n"+ - " \"Id\": \"2\",\n"+ - " \"Mode\": \"Bank Deposit\",\n"+ - " \"PayoutPartner\": \"1056\",\n"+ - " \"PayCurrency\": [\n"+ - " \"KRW\",\n"+ - " \"NPR\"\n"+ - " ],\n"+ - " \"Bankrequired\": \"True\",\n"+ - " \"BankList\": [\n"+ - " {\n"+ - " \"Id\": \"1143\",\n"+ - " \"Name\": \"IME Cooperative Services LTD.\",\n"+ - " \"BranchRequired\": \"False\",\n"+ - " \"IsAccountRequired\": \"True\",\n"+ - " \"IsAccountValidation\": \"False\",\n"+ - " \"PayCurrency\": [\n"+ - " \"KRW\",\n"+ - " \"NPR\"\n"+ - " ]\n"+ - " }\n"+ - " ]\n"+ - " }\n"+ - " ]\n"+ - " }\n"+ - "}\n"+ - "\n"+ - "\n"; - - public SendMoneyV2Gateway(SendMoneyV2InteractorInterface sendMoneyV2InteractorInterface) { this.interactor=sendMoneyV2InteractorInterface; @@ -153,12 +103,12 @@ public class SendMoneyV2Gateway extends PrivilegedGateway implements SendMoneyV2 } @Override - public String getIDType() { + public String getUserIDType() { return null; } @Override - public String getIDNumber() { + public String getUserIDNumber() { return null; } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java index 3562ba06..85f452d2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java @@ -126,8 +126,8 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr public Observable sendDataForAccountValidation() { - String idType=gateway.getIDType(); - String idNumber=gateway.getIDNumber(); + String idType=gateway.getUserIDType(); + String idNumber=gateway.getUserIDNumber(); String customerFirstName=gateway.getUserFirstName(); String customerLastName=gateway.getUserLastName(); String receiverFirstName=selectedRecipient.getFirstName(); @@ -169,7 +169,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr return gateway.sendDataForForexCalculation(gateway.getAuth(),senderCountryId, senderCurrency,recieverCurrency,senderAmount, recieveAmount,paymentMethodId,calculationPreference,recipientCountryName, - recipientCountryID,bankId,paymentPartnerId,gateway.getUserID()) + recipientCountryID,bankId,paymentPartnerId,gateway.getUserEmailID()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/LoginModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/LoginModel.java index 8524fead..7664fa88 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/LoginModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/LoginModel.java @@ -91,7 +91,7 @@ public class LoginModel implements LoginContract.LoginModel { sharedPreferenceEditor.putString(PrefKeys.USER_DP_URL,loginApiResponseModelV2.getDpUrl()); sharedPreferenceEditor.putString(PrefKeys.USER_EMAIL,loginApiResponseModelV2.getEmail()); sharedPreferenceEditor.putString(PrefKeys.USER_FIRST_NAME,loginApiResponseModelV2.getFirstName()); - sharedPreferenceEditor.putString(PrefKeys.USER_ID,loginApiResponseModelV2.getId()); + sharedPreferenceEditor.putString(PrefKeys.USER_ID,loginApiResponseModelV2.getUserId()); sharedPreferenceEditor.putString(PrefKeys.USER_ID_NUMBER,loginApiResponseModelV2.getIdNumber()); sharedPreferenceEditor.putString(PrefKeys.USER_ID_TYPE,loginApiResponseModelV2.getIdType()); sharedPreferenceEditor.putBoolean(PrefKeys.USER_IS_REFERRED,loginApiResponseModelV2.getReferred()); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/data/LoginApiResponseModelV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/data/LoginApiResponseModelV2.java index 734d3499..31c7d0a8 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/data/LoginApiResponseModelV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sign_in/model/data/LoginApiResponseModelV2.java @@ -86,12 +86,8 @@ public class LoginApiResponseModelV2 { @SerializedName("Msg") @Expose private String msg; - @SerializedName("Id") - @Expose - private String id; - @SerializedName("Data") - @Expose - private Object data; + + public String getUserId() { return userId; @@ -309,19 +305,5 @@ public class LoginApiResponseModelV2 { this.msg = msg; } - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - public Object getData() { - return data; - } - - public void setData(Object data) { - this.data = data; - } }