refactor of codes and validation update

mikelis135 · mikelis135 · commit f58615d23438 · 2019-07-25T17:43:02.000+01:00
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountPresenter.java
@@ -8,8 +8,6 @@
 import com.flutterwave.raveandroid.FeeCheckRequestBody;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
-import com.flutterwave.raveandroid.R;
-import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.ViewObject;
@@ -29,7 +27,25 @@
 import java.util.HashMap;
 import java.util.List;
 
-import static com.flutterwave.raveandroid.RaveConstants.*;
+import static com.flutterwave.raveandroid.RaveConstants.NG;
+import static com.flutterwave.raveandroid.RaveConstants.NGN;
+import static com.flutterwave.raveandroid.RaveConstants.RAVEPAY;
+import static com.flutterwave.raveandroid.RaveConstants.accounNumberPrompt;
+import static com.flutterwave.raveandroid.RaveConstants.date_of_birth;
+import static com.flutterwave.raveandroid.RaveConstants.defaultAccounNumber;
+import static com.flutterwave.raveandroid.RaveConstants.fieldAccount;
+import static com.flutterwave.raveandroid.RaveConstants.fieldAmount;
+import static com.flutterwave.raveandroid.RaveConstants.fieldBVN;
+import static com.flutterwave.raveandroid.RaveConstants.fieldBankCode;
+import static com.flutterwave.raveandroid.RaveConstants.fieldEmail;
+import static com.flutterwave.raveandroid.RaveConstants.fieldPhone;
+import static com.flutterwave.raveandroid.RaveConstants.invalidCharge;
+import static com.flutterwave.raveandroid.RaveConstants.isInternetBanking;
+import static com.flutterwave.raveandroid.RaveConstants.success;
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
+import static com.flutterwave.raveandroid.RaveConstants.validAmountPrompt;
+import static com.flutterwave.raveandroid.RaveConstants.validEmailPrompt;
+import static com.flutterwave.raveandroid.RaveConstants.validPhonePrompt;
 
 /**
  * Created by hamzafetuga on 20/07/2017.
@@ -252,7 +268,7 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
         String phone = dataHashMap.get(fieldPhone).getData();
         Class phoneViewType = dataHashMap.get(fieldPhone).getViewType();
 
-        boolean isAmountValid = amountValidator.isAmountValid(Double.valueOf(amount));
+        boolean isAmountValid = amountValidator.isAmountValid(amount);
         boolean isPhoneValid = phoneValidator.isPhoneValid(phone);
         boolean isEmailValid = emailValidator.isEmailValid(email);
 
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardPresenter.java
@@ -7,7 +7,6 @@
 import com.flutterwave.raveandroid.FeeCheckRequestBody;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
-import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.ViewObject;
@@ -26,7 +25,35 @@
 
 import java.util.HashMap;
 
-import static com.flutterwave.raveandroid.RaveConstants.*;
+import static com.flutterwave.raveandroid.RaveConstants.ACCESS_OTP;
+import static com.flutterwave.raveandroid.RaveConstants.AVS_VBVSECURECODE;
+import static com.flutterwave.raveandroid.RaveConstants.GTB_OTP;
+import static com.flutterwave.raveandroid.RaveConstants.MANUAL_CARD_CHARGE;
+import static com.flutterwave.raveandroid.RaveConstants.NOAUTH;
+import static com.flutterwave.raveandroid.RaveConstants.NOAUTH_INTERNATIONAL;
+import static com.flutterwave.raveandroid.RaveConstants.PIN;
+import static com.flutterwave.raveandroid.RaveConstants.RAVEPAY;
+import static com.flutterwave.raveandroid.RaveConstants.VBV;
+import static com.flutterwave.raveandroid.RaveConstants.enterOTP;
+import static com.flutterwave.raveandroid.RaveConstants.expired;
+import static com.flutterwave.raveandroid.RaveConstants.fieldAmount;
+import static com.flutterwave.raveandroid.RaveConstants.fieldCardExpiry;
+import static com.flutterwave.raveandroid.RaveConstants.fieldCvv;
+import static com.flutterwave.raveandroid.RaveConstants.fieldEmail;
+import static com.flutterwave.raveandroid.RaveConstants.fieldcardNoStripped;
+import static com.flutterwave.raveandroid.RaveConstants.invalidChargeCode;
+import static com.flutterwave.raveandroid.RaveConstants.noResponse;
+import static com.flutterwave.raveandroid.RaveConstants.success;
+import static com.flutterwave.raveandroid.RaveConstants.tokenExpired;
+import static com.flutterwave.raveandroid.RaveConstants.tokenNotFound;
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
+import static com.flutterwave.raveandroid.RaveConstants.unknownAuthmsg;
+import static com.flutterwave.raveandroid.RaveConstants.unknownResCodemsg;
+import static com.flutterwave.raveandroid.RaveConstants.validAmountPrompt;
+import static com.flutterwave.raveandroid.RaveConstants.validCreditCardPrompt;
+import static com.flutterwave.raveandroid.RaveConstants.validCvvPrompt;
+import static com.flutterwave.raveandroid.RaveConstants.validExpiryDatePrompt;
+import static com.flutterwave.raveandroid.RaveConstants.validPhonePrompt;
 
 /**
  * Created by hamzafetuga on 18/07/2017.
@@ -221,33 +248,33 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
 
         Class cardNoStrippedViewType = dataHashMap.get(fieldcardNoStripped).getViewType();
 
-        boolean isAmountValidated = amountValidator.isAmountValid(Double.valueOf(amount));
-        boolean isEmailValidated = emailValidator.isEmailValid(email);
-        boolean isCVVValidated = cvvValidator.isCvvValid(cvv);
-        boolean isCardExpiryValidated = cardExpiryValidator.isCardExpiryValid(cardExpiry);
-        boolean isCardNoValidator = cardNoValidator.isCardNoStrippedValid(cardNoStripped);
+        boolean isAmountValid = amountValidator.isAmountValid(amount);
+        boolean isEmailValid = emailValidator.isEmailValid(email);
+        boolean isCVVValid = cvvValidator.isCvvValid(cvv);
+        boolean isCardExpiryValid = cardExpiryValidator.isCardExpiryValid(cardExpiry);
+        boolean isCardNoValid = cardNoValidator.isCardNoStrippedValid(cardNoStripped);
 
-        if (!isAmountValidated) {
+        if (!isAmountValid) {
             valid = false;
             mView.showFieldError(amountID, validAmountPrompt, amountViewType);
         }
 
-        if (!isEmailValidated) {
+        if (!isEmailValid) {
             valid = false;
             mView.showFieldError(emailID, validPhonePrompt, emailViewType);
         }
 
-        if (!isCVVValidated) {
+        if (!isCVVValid) {
             valid = false;
             mView.showFieldError(cvvID, validCvvPrompt, cvvViewType);
         }
 
-        if (!isCardExpiryValidated) {
+        if (!isCardExpiryValid) {
             valid = false;
             mView.showFieldError(cardExpiryID, validExpiryDatePrompt, cardExpiryViewType);
         }
 
-        if (!isCardNoValidator) {
+        if (!isCardNoValid) {
             valid = false;
             mView.showFieldError(cardNoStrippedID, validCreditCardPrompt, cardNoStrippedViewType);
         }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenter.java
@@ -21,7 +21,17 @@
 
 import java.util.HashMap;
 
-import static com.flutterwave.raveandroid.RaveConstants.*;
+import static com.flutterwave.raveandroid.RaveConstants.RAVEPAY;
+import static com.flutterwave.raveandroid.RaveConstants.fieldAmount;
+import static com.flutterwave.raveandroid.RaveConstants.fieldNetwork;
+import static com.flutterwave.raveandroid.RaveConstants.fieldPhone;
+import static com.flutterwave.raveandroid.RaveConstants.fieldVoucher;
+import static com.flutterwave.raveandroid.RaveConstants.noResponse;
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
+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.
@@ -202,7 +212,7 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
 
         int network = Integer.valueOf(dataHashMap.get(fieldNetwork).getData());
 
-        boolean isAmountValidated = amountValidator.isAmountValid(Double.valueOf(amount));
+        boolean isAmountValidated = amountValidator.isAmountValid(amount);
         boolean isPhoneValid = phoneValidator.isPhoneValid(phone);
 
                 if (!isAmountValidated) {
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaPresenter.java
@@ -6,8 +6,6 @@
 import com.flutterwave.raveandroid.FeeCheckRequestBody;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
-import com.flutterwave.raveandroid.R;
-import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
 import com.flutterwave.raveandroid.ViewObject;
@@ -23,7 +21,13 @@
 
 import java.util.HashMap;
 
-import static com.flutterwave.raveandroid.RaveConstants.*;
+import static com.flutterwave.raveandroid.RaveConstants.RAVEPAY;
+import static com.flutterwave.raveandroid.RaveConstants.fieldAmount;
+import static com.flutterwave.raveandroid.RaveConstants.fieldPhone;
+import static com.flutterwave.raveandroid.RaveConstants.noResponse;
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
+import static com.flutterwave.raveandroid.RaveConstants.validAmountPrompt;
+import static com.flutterwave.raveandroid.RaveConstants.validPhonePrompt;
 
 /**
  * Created by hfetuga on 27/06/2018.
@@ -164,7 +168,7 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
         String phone = dataHashMap.get(fieldPhone).getData();
         Class phoneViewType = dataHashMap.get(fieldPhone).getViewType();
 
-        boolean isAmountValidated = amountValidator.isAmountValid(Double.valueOf(amount));
+        boolean isAmountValidated = amountValidator.isAmountValid(amount);
         boolean isPhoneValid = phoneValidator.isPhoneValid(phone);
 
         if (!isAmountValidated) {
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenter.java
@@ -6,7 +6,6 @@
 import com.flutterwave.raveandroid.FeeCheckRequestBody;
 import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.PayloadBuilder;
-import com.flutterwave.raveandroid.R;
 import com.flutterwave.raveandroid.RaveConstants;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.Utils;
@@ -162,7 +161,7 @@ public void onDataCollected(HashMap<String, ViewObject> dataHashMap) {
         String phone = dataHashMap.get(RaveConstants.fieldPhone).getData();
         Class phoneViewType = dataHashMap.get(RaveConstants.fieldPhone).getViewType();
 
-        boolean isAmountValidated = amountValidator.isAmountValid(Double.valueOf(amount));
+        boolean isAmountValidated = amountValidator.isAmountValid(amount);
         boolean isPhoneValid = phoneValidator.isPhoneValid(phone);
 
         if (!isAmountValidated) {
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java
@@ -5,4 +5,12 @@ public class AmountValidator {
     public boolean isAmountValid(Double amount) {
         return amount > 0;
     }
+
+    public boolean isAmountValid(String amount) {
+        if (!amount.isEmpty()) {
+            return isAmountValid(Double.valueOf(amount));
+        } else {
+            return false;
+        }
+    }
 }
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/AmountValidatorTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/AmountValidatorTest.java
@@ -6,7 +6,7 @@
 import org.junit.runners.JUnit4;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
 
 @RunWith(JUnit4.class)
 public class AmountValidatorTest {
@@ -32,4 +32,11 @@ public void isAmountvalid_isNegativeAmountPassed_returnsFalse(){
         assertThat(false, is(isAmountValid));
     }
 
+    @Test
+    public void isAmountvalid_isEmptyAmountPassed_returnsFalse() {
+        String amount = "";
+        boolean isAmountValid = SUT.isAmountValid(amount);
+        assertThat(false, is(isAmountValid));
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,12 @@ public class AmountValidator {`
`5`	`5`	`public boolean isAmountValid(Double amount) {`
`6`	`6`	`return amount > 0;`
`7`	`7`	`}`
	`8`	`+`
	`9`	`+ public boolean isAmountValid(String amount) {`
	`10`	`+ if (!amount.isEmpty()) {`
	`11`	`+ return isAmountValid(Double.valueOf(amount));`
	`12`	`+ } else {`
	`13`	`+ return false;`
	`14`	`+ }`
	`15`	`+ }`
`8`	`16`	`}`