Network Validator Refactor

Author: mikelis135

raveandroid/src/main/java/com/flutterwave/raveandroid/validators/NetworkValidator.java

@@ -0,0 +1,16 @@
+package com.flutterwave.raveandroid.validators;
+
+import com.flutterwave.raveandroid.RaveConstants;
+
+import javax.inject.Inject;
+
+public class NetworkValidator {
+
+    @Inject
+    public NetworkValidator() {
+    }
+
+    public boolean isNetworkValid(String network) {
+        return network != null && network.equalsIgnoreCase(RaveConstants.mtn) && !network.isEmpty();
+    }
+}

raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyFragment.java

@@ -105,8 +105,6 @@ private void setListeners() {
     private void initializeViews() {
         networkSpinner = v.findViewById(R.id.rave_networkSpinner);
         instructionsTv = v.findViewById(R.id.instructionsTv);
-        voucherTil = v.findViewById(R.id.rave_voucherTil);
-        voucherEt = v.findViewById(R.id.rave_voucherEt);
         payButton = v.findViewById(R.id.rave_payButton);
         amountTil = v.findViewById(R.id.rave_amountTil);
         phoneTil = v.findViewById(R.id.rave_phoneTil);
@@ -175,10 +173,6 @@ private void collectData() {
         dataHashMap.put(RaveConstants.fieldPhone, new ViewObject(phoneTil.getId(), phoneEt.getText().toString(), TextInputLayout.class));
         dataHashMap.put(RaveConstants.fieldNetwork, new ViewObject(networkSpinner.getId(), String.valueOf(networkSpinner.getSelectedItem()), Spinner.class));
 
-        if (voucherTil.getVisibility() == View.VISIBLE) {
-            dataHashMap.put(RaveConstants.fieldVoucher, new ViewObject(voucherTil.getId(), voucherEt.getText().toString(), TextInputLayout.class));
-        }
-
         presenter.onDataCollected(dataHashMap);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/zmmobilemoney/ZmMobileMoneyPresenter.java

@@ -19,6 +19,7 @@
 import com.flutterwave.raveandroid.responses.MobileMoneyChargeResponse;
 import com.flutterwave.raveandroid.responses.RequeryResponse;
 import com.flutterwave.raveandroid.validators.AmountValidator;
+import com.flutterwave.raveandroid.validators.NetworkValidator;
 import com.flutterwave.raveandroid.validators.PhoneValidator;
 
 import java.util.HashMap;
@@ -35,7 +36,6 @@
 import static com.flutterwave.raveandroid.RaveConstants.validAmountPrompt;
 import static com.flutterwave.raveandroid.RaveConstants.validNetworkPrompt;
 import static com.flutterwave.raveandroid.RaveConstants.validPhonePrompt;
-import static com.flutterwave.raveandroid.RaveConstants.validVoucherPrompt;
 
 /**
  * Created by hfetuga on 28/06/2018.
@@ -49,6 +49,8 @@ public class ZmMobileMoneyPresenter implements ZmMobileMoneyContract.UserActions
     @Inject
     PhoneValidator phoneValidator;
     @Inject
+    NetworkValidator networkValidator;
+    @Inject
     DeviceIdGetter deviceIdGetter;
     private Context context;
     private ZmMobileMoneyContract.View mView;
@@ -217,24 +219,11 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
         String phone = dataHashMap.get(fieldPhone).getData();
         Class phoneViewType = dataHashMap.get(fieldPhone).getViewType();
 
-        ViewObject voucherViewObject = dataHashMap.get(fieldVoucher);
-
-        if (voucherViewObject != null) {
-            int voucherID = dataHashMap.get(fieldVoucher).getViewId();
-            String voucher = dataHashMap.get(fieldVoucher).getData();
-            Class voucherViewType = dataHashMap.get(fieldVoucher).getViewType();
-
-            if (voucher.isEmpty()) {
-                valid = false;
-                mView.showFieldError(voucherID, validVoucherPrompt, voucherViewType);
-            }
-
-        }
-
         String network = dataHashMap.get(fieldNetwork).getData();
 
         boolean isAmountValidated = amountValidator.isAmountValid(amount);
         boolean isPhoneValid = phoneValidator.isPhoneValid(phone);
+        boolean isNetworkValid = networkValidator.isNetworkValid(network);
 
         if (!isAmountValidated) {
             valid = false;
@@ -246,7 +235,7 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
             mView.showFieldError(phoneID, validPhonePrompt, phoneViewType);
         }
 
-        if (network.equals(RaveConstants.selectNetwork)) {
+        if (!isNetworkValid) {
             valid = false;
             mView.showToast(validNetworkPrompt);
         }

raveandroid/src/main/res/layout/fragment_zm_mobile_money.xml

@@ -32,21 +32,13 @@
                 android:layout_marginBottom="15dp"
                 android:text="@string/pay" />
 
+
             <Spinner
                 android:id="@+id/rave_networkSpinner"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_marginBottom="10dp" />
 
-
-            <TextView
-                android:id="@+id/instructionsTv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp"
-                android:gravity="left"
-                tools:text="@string/vodafone_msg" />
-
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/rave_phoneTil"
                 android:layout_width="match_parent"
@@ -63,23 +55,6 @@
 
             </android.support.design.widget.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/rave_voucherTil"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="20dp">
-
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/rave_voucherEt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/rave_card1"
-                    android:hint="Voucher"
-                    android:inputType="text" />
-
-            </android.support.design.widget.TextInputLayout>
-
-
             <android.support.design.widget.TextInputLayout
                 android:id="@+id/rave_amountTil"
                 android:layout_width="match_parent"

raveandroid/src/test/java/com/flutterwave/raveandroid/di/TestAndroidModule.java

@@ -16,6 +16,7 @@
 import com.flutterwave.raveandroid.validators.CvvValidator;
 import com.flutterwave.raveandroid.validators.DateOfBirthValidator;
 import com.flutterwave.raveandroid.validators.EmailValidator;
+import com.flutterwave.raveandroid.validators.NetworkValidator;
 import com.flutterwave.raveandroid.validators.PhoneValidator;
 import com.flutterwave.raveandroid.validators.UrlValidator;
 
@@ -53,13 +54,18 @@ public EmailValidator providesEmailValidator() {
         return Mockito.mock(EmailValidator.class);
     }
 
-
     @Provides
     @Singleton
     public PhoneValidator providesPhoneValidator() {
         return Mockito.mock(PhoneValidator.class);
     }
 
+    @Provides
+    @Singleton
+    public NetworkValidator providesNetworkValidator() {
+        return Mockito.mock(NetworkValidator.class);
+    }
+
 
     @Provides
     @Singleton

raveandroid/src/test/java/com/flutterwave/raveandroid/di/TestAppComponent.java

@@ -12,6 +12,8 @@
 import com.flutterwave.raveandroid.mpesa.MpesaPresenterTest;
 import com.flutterwave.raveandroid.ugmobilemoney.UgMobileMoneyPresenter;
 import com.flutterwave.raveandroid.ugmobilemoney.UgMobileMoneyPresenterTest;
+import com.flutterwave.raveandroid.zmmobilemoney.ZmMobileMoneyPresenter;
+import com.flutterwave.raveandroid.zmmobilemoney.ZmMobileMoneyPresenterTest;
 
 import javax.inject.Singleton;
 
@@ -31,6 +33,8 @@ public interface TestAppComponent extends AppComponent {
 
     void inject(GhMobileMoneyPresenterTest ghMobileMoneyPresenterTest);
 
+    void inject(ZmMobileMoneyPresenterTest zmMobileMoneyPresenterTest);
+
     void inject(TransactionStatusCheckerTest transactionStatusCheckerTest);
 
     void inject(CardPresenter cardPresenter);
@@ -43,4 +47,6 @@ public interface TestAppComponent extends AppComponent {
 
     void inject(GhMobileMoneyPresenter ghMobileMoneyPresenter);
 
+    void inject(ZmMobileMoneyPresenter zmMobileMoneyPresenter);
+
 }

raveandroid/src/test/java/com/flutterwave/raveandroid/validators/NetworkValidatorTest.java

@@ -0,0 +1,39 @@
+package com.flutterwave.raveandroid.validators;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class NetworkValidatorTest {
+
+    NetworkValidator SUT;
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = new NetworkValidator();
+    }
+
+    @Test
+    public void isNetworkValid_isCorrectNetworkPassed_returnTrue() {
+        String network = "mtn";
+        boolean isNetworkValid = SUT.isNetworkValid(network);
+        assertThat(true, is(isNetworkValid));
+    }
+
+    @Test
+    public void isNetworkInValid_isEmptyPassed_returnFalse() {
+        String network = "";
+        boolean isNetworkValid = SUT.isNetworkValid(network);
+        assertThat(false, is(isNetworkValid));
+    }
+
+    @Test
+    public void isNetworkInValid_isNoNetworkPassed_returnFalse() {
+        String network = "Select network";
+        boolean isNetworkValid = SUT.isNetworkValid(network);
+        assertThat(false, is(isNetworkValid));
+    }
+
+}