From 72a19acc830489403743a1c4cd6ca46703ca2a95 Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Fri, 14 Sep 2018 18:24:43 +0900
Subject: [PATCH] KYC form related data fetched

---
 app/src/main/AndroidManifest.xml              | 32 ++++++------
 .../{Data.java => KYCRelatedDataModel.java}   | 12 ++---
 .../kycV2/model/KYCRelatedDataResponse.java   | 10 ++--
 .../kycV2/presenter/KYCV2Presenter.java       | 52 +++++++++++--------
 .../presenter/KYCV2PresenterInterface.java    | 12 +++++
 .../kycV2/view/KYCFormV2Activity.java         |  1 +
 .../kycV2/view/view1/KYCView1Fragment.java    | 21 ++++++++
 .../kycV2/view/view2/KYCView2Fragment.java    | 15 ++++++
 .../MyFirebaseMessagingService.java           | 10 ++--
 .../utils/https/ApiEndpoints.java             |  2 +-
 app/src/main/res/xml/file_paths.xml           |  2 +-
 11 files changed, 114 insertions(+), 55 deletions(-)
 rename app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/{Data.java => KYCRelatedDataModel.java} (85%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 708c2d2b..487bc369 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,16 +48,16 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="HOME" />
+            <!--<intent-filter>-->
+                <!--<action android:name="HOME" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <!--<category android:name="android.intent.category.DEFAULT" />-->
+            <!--</intent-filter>-->
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
         </activity>
 
         <meta-data
@@ -496,16 +496,16 @@
             android:name=".kycV2.view.KYCFormV2Activity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
-            <!--<intent-filter>-->
-                <!--<action android:name="HOME" />-->
+            <intent-filter>
+                <action android:name="HOME" />
 
-                <!--<category android:name="android.intent.category.DEFAULT" />-->
-            <!--</intent-filter>-->
-            <!--<intent-filter>-->
-                <!--<action android:name="android.intent.action.MAIN" />-->
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-                <!--<category android:name="android.intent.category.LAUNCHER" />-->
-            <!--</intent-filter>-->
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".loginV2.view.LoginV2Activity"
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/Data.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataModel.java
similarity index 85%
rename from app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/Data.java
rename to app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataModel.java
index 6a9a4f58..3f5a6a6c 100755
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/Data.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataModel.java
@@ -5,14 +5,14 @@ import java.util.List;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
-public class Data {
+public class KYCRelatedDataModel {
 
     @SerializedName("NativeCountry")
     @Expose
     private List<NativeCountry> nativeCountry = null;
     @SerializedName("City")
     @Expose
-    private List<Province> city = null;
+    private List<Province> provinceList = null;
     @SerializedName("Occupation")
     @Expose
     private List<Occupation> occupation = null;
@@ -35,12 +35,12 @@ public class Data {
         this.nativeCountry = nativeCountry;
     }
 
-    public List<Province> getCity() {
-        return city;
+    public List<Province> getProvinceList() {
+        return provinceList;
     }
 
-    public void setCity(List<Province> city) {
-        this.city = city;
+    public void setProvinceList(List<Province> provinceList) {
+        this.provinceList = provinceList;
     }
 
     public List<Occupation> getOccupation() {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataResponse.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataResponse.java
index 3aa0efaf..ab801aba 100755
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataResponse.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataResponse.java
@@ -23,7 +23,7 @@ public class KYCRelatedDataResponse {
     private String extra2;
     @SerializedName("Data")
     @Expose
-    private Data data;
+    private KYCRelatedDataModel kycRelatedDataModel;
 
     public String getErrorCode() {
         return errorCode;
@@ -65,12 +65,12 @@ public class KYCRelatedDataResponse {
         this.extra2 = extra2;
     }
 
-    public Data getData() {
-        return data;
+    public KYCRelatedDataModel getKycRelatedDataModel() {
+        return kycRelatedDataModel;
     }
 
-    public void setData(Data data) {
-        this.data = data;
+    public void setKycRelatedDataModel(KYCRelatedDataModel kycRelatedDataModel) {
+        this.kycRelatedDataModel = kycRelatedDataModel;
     }
 
 }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java
index 361d540b..826a9210 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java
@@ -3,28 +3,14 @@ package com.gmeremit.online.gmeremittance_native.kycV2.presenter;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.kycV2.gateway.KYCV2Gateway;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRelatedDataModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRelatedDataResponse;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.KYCView1VModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.KYCView2VModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view3.KYCView3VModel;
-import com.gmeremit.online.gmeremittance_native.loginV2.gateway.LoginV2Gateway;
-import com.gmeremit.online.gmeremittance_native.loginV2.presenter.LoginV2InteractorInterface;
-import com.gmeremit.online.gmeremittance_native.loginV2.presenter.LoginV2PresenterInterface;
-import com.gmeremit.online.gmeremittance_native.recipientV2.gateway.RecipientAddV2Gateway;
-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.RecipientRelatedModel;
-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.RecipientInfoModel;
-import com.gmeremit.online.gmeremittance_native.registerV2.presenter.RegisterV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.utils.Constants;
 import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse;
 
-import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
@@ -45,17 +31,17 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
 
     @Override
     public boolean validateKYCView1(KYCView1VModel data) {
-        return false;
+        return true;
     }
 
     @Override
     public boolean validateKYCView2(KYCView2VModel data) {
-        return false;
+        return true;
     }
 
     @Override
     public boolean validateKYCView3(KYCView3VModel data) {
-        return false;
+        return true;
     }
 
     @Override
@@ -82,17 +68,41 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter
 
         @Override
         protected void onSuccess(KYCRelatedDataResponse kycRelatedDataResponse) {
-
+                if(kycRelatedDataResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
+                {
+                    KYCRelatedDataModel data=kycRelatedDataResponse.getKycRelatedDataModel();
+                    view.getView1Contract().setKycRelatedData(data.getNativeCountry(),data.getOccupation(),data.getProvinceList());
+                    view.getView2Contract().setKycRelatedData(data.getBank(),data.getIdType(),data.getSourceOfFund());
+                }
+                else
+                {
+                        view.showPopUpMessage(kycRelatedDataResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, new CustomAlertDialog.CustomDialogActionListener() {
+                            @Override
+                            public void onCutomDialogActionPressed(CustomAlertDialog.AlertType alertType) {
+                                view.exitView();
+                            }
+                        });
+                }
         }
 
         @Override
         public void onFailed(String message) {
-
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, new CustomAlertDialog.CustomDialogActionListener() {
+                @Override
+                public void onCutomDialogActionPressed(CustomAlertDialog.AlertType alertType) {
+                    view.exitView();
+                }
+            });
         }
 
         @Override
         protected void onConnectionNotEstablished(String message) {
-
+            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, new CustomAlertDialog.CustomDialogActionListener() {
+                @Override
+                public void onCutomDialogActionPressed(CustomAlertDialog.AlertType alertType) {
+                    view.exitView();
+                }
+            });
         }
     }
 }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2PresenterInterface.java
index c59e69cb..d383efd5 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2PresenterInterface.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2PresenterInterface.java
@@ -2,10 +2,18 @@ package com.gmeremit.online.gmeremittance_native.kycV2.presenter;
 
 import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.IdType;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.NativeCountry;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.Occupation;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.SourceOfFund;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.KYCView1VModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.KYCView2VModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view3.KYCView3VModel;
 
+import java.util.List;
+
 import io.reactivex.Observable;
 
 /** Created by Preyea R Regmi, September 10th, 2018
@@ -66,6 +74,8 @@ public interface KYCV2PresenterInterface extends BasePresenterInterface {
             void setErrorOnProvince(String message);
 
             void setErrorOnOccupation(String message);
+
+            void setKycRelatedData(List<NativeCountry> nativeCountry, List<Occupation> occupation, List<Province> provinceList);
         }
 
 
@@ -87,6 +97,8 @@ public interface KYCV2PresenterInterface extends BasePresenterInterface {
             void setErrorOnExpiryDate(String message);
 
             void setErrorOnSourceOfFund(String message);
+
+            void setKycRelatedData(List<Bank> bank, List<IdType> idType, List<SourceOfFund> sourceOfFund);
         }
 
 
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/KYCFormV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/KYCFormV2Activity.java
index 5cc355a4..abedcf49 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/KYCFormV2Activity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/KYCFormV2Activity.java
@@ -74,6 +74,7 @@ public class KYCFormV2Activity extends BaseActivity implements KYCV2ActionListen
             viewPager.setCurrentItem(0);
             this.presenter.getKycRelatedData();
         } else {
+
         }
        
 
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java
index f7e51a72..209e7c2b 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java
@@ -12,8 +12,14 @@ import android.widget.EditText;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.NativeCountry;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.Occupation;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
 import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.reactivex.Observable;
@@ -93,6 +99,10 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen
 
 
     CompositeDisposable compositeDisposable = null;
+    private List<String> genderData;
+    private List<NativeCountry> nativeCountryListData;
+    private List<Occupation> occupationListData;
+    private List<Province> provinceListData;
 
 
     @Override
@@ -210,6 +220,17 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen
         occupationListWrapper.setError(message);
     }
 
+    @Override
+    public void setKycRelatedData(List<NativeCountry> nativeCountry, List<Occupation> occupation, List<Province> provinceList) {
+        this.nativeCountryListData=nativeCountry;
+        this.occupationListData=occupation;
+        this.provinceListData=provinceList;
+        this.genderData=new ArrayList<>();
+        this.genderData.add("Male");
+        this.genderData.add("Female");
+        this.genderData.add("Other");
+    }
+
     @Override
     public Observable<KYCView1VModel> getView1RelatedData() {
         return Observable.just(createViewModelDataFromView());
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java
index 7dd2c57b..8d761dbc 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java
@@ -12,9 +12,14 @@ import android.widget.EditText;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.IdType;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.SourceOfFund;
 import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.KYCView1VModel;
 
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.reactivex.Observable;
@@ -54,6 +59,9 @@ public class KYCView2Fragment extends BaseFragment implements  View.OnClickListe
 
 
     CompositeDisposable compositeDisposable = null;
+    private List<Bank> bankListData;
+    private List<IdType> idTypeListData;
+    private List<SourceOfFund> sourceOfFundListData;
 
 
     @Override
@@ -151,6 +159,13 @@ public class KYCView2Fragment extends BaseFragment implements  View.OnClickListe
         sourceOfFundWrapper.setError(message);
     }
 
+    @Override
+    public void setKycRelatedData(List<Bank> bank, List<IdType> idType, List<SourceOfFund> sourceOfFund) {
+        this.bankListData=bank;
+        this.idTypeListData=idType;
+        this.sourceOfFundListData=sourceOfFund;
+    }
+
     @Override
     public Observable<KYCView2VModel> getView2RelatedData() {
         return Observable.just(createViewModelDataFromView());
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java
index 64c7406c..a1526c60 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java
@@ -39,13 +39,13 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
         if (remoteMessage != null) {
-//            Log.d("msg", remoteMessage.getData().get("code"));
+//            Log.d("msg", remoteMessage.getKycRelatedDataModel().get("code"));
 
-        /*showNotification(remoteMessage.getData().get("message"),remoteMessage.getData().get("subject"));
+        /*showNotification(remoteMessage.getKycRelatedDataModel().get("message"),remoteMessage.getKycRelatedDataModel().get("subject"));
         Message message = new Message();
-        message.setTitle(remoteMessage.getData().get("subject"));
-        message.setBody(remoteMessage.getData().get("message"));
-        Log.d("message",remoteMessage.getData().get("message"));
+        message.setTitle(remoteMessage.getKycRelatedDataModel().get("subject"));
+        message.setBody(remoteMessage.getKycRelatedDataModel().get("message"));
+        Log.d("message",remoteMessage.getKycRelatedDataModel().get("message"));
         database.addMessage(message);*/
             new PersistenceStorageManager(this).setNotificationStatus(true);
             EventBus.getDefault().post(new NotificationEvent());
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java
index cdc8fc5e..8d82f9c5 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java
@@ -597,7 +597,7 @@ public interface ApiEndpoints {
     Observable<ResetApiResponse> resetPassV2(@Header("Authorization") String token, @Body JsonObject signInJsonBody);
 
 
-    @POST(API_URL.KYC_RELATED_DATA_V2)
+    @GET(API_URL.KYC_RELATED_DATA_V2)
     @Headers("Content-Type: application/json")
     Observable<KYCRelatedDataResponse> getKYCRelatedDAtaV2(@Header("Authorization") String token);
 
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
index bfb43706..49dbf1ca 100644
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-path name="my_images" path="Android/data/com.example.package.name/files/Pictures" />
+    <external-path name="my_images" path="Android/kycRelatedDataModel/com.example.package.name/files/Pictures" />
 </paths>
\ No newline at end of file