Ach Presenter Test Update

chargeAccount code moved into 1 singular processTransaction() to follow the single responsibility principle which makes the code more testable
Ach Fragment and Contract modified to allow for the parameter change in processTransaction() new implementation
Test adjust in view of this code change
onAmountValidated() included.

Author: mikelis135

raveandroid/src/main/java/com/flutterwave/raveandroid/RavePayInitializer.java

@@ -253,7 +253,8 @@ public void setPreAuth(boolean isPreAuth) {
     public boolean getIsDisplayFee() {
         return displayFee;
     }
-    public void setIsDisplayFee() {
+
+    public void setIsDisplayFee(boolean displayFee) {
         this.displayFee = displayFee;
     }
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchContract.java

@@ -1,6 +1,5 @@
 package com.flutterwave.raveandroid.ach;
 
-import com.flutterwave.raveandroid.Payload;
 import com.flutterwave.raveandroid.RavePayInitializer;
 import com.flutterwave.raveandroid.responses.RequeryResponse;
 
@@ -28,20 +27,20 @@ interface View {
         void showFee(String authUrl, String flwRef, String chargedAmount, String currency);
 
         void onValidationSuccessful(String amount);
+
+        void onAmountValidated(String amountToSet, int visibility);
     }
 
     interface UserActionsListener {
         void init(RavePayInitializer ravePayInitializer);
 
         void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amount);
 
-        void chargeAccount(Payload payload, String encryptionKey, boolean isDisplayFee);
-
         void verifyRequeryResponse(RequeryResponse response, String responseAsJSONString, RavePayInitializer ravePayInitializer, String flwRef);
 
         void onFeeConfirmed(String authUrl, String flwRef);
 
-        void processTransaction(String amount, RavePayInitializer ravePayInitializer);
+        void processTransaction(String amount, RavePayInitializer ravePayInitializer, boolean isDisplayFee);
 
         void onAttachView(View view);
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java

@@ -127,7 +127,14 @@ public void onClick(DialogInterface dialog, int which) {
 
     @Override
     public void onValidationSuccessful(String amount) {
-        presenter.processTransaction(amount, ravePayInitializer);
+        presenter.processTransaction(amount, ravePayInitializer, ravePayInitializer.getIsDisplayFee());
+    }
+
+    @Override
+    public void onAmountValidated(String amountToSet, int visibility) {
+        amountTil.setVisibility(visibility);
+        amountEt.setText(amountToSet);
+
     }
 
     @Override

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchPresenter.java

@@ -1,6 +1,7 @@
 package com.flutterwave.raveandroid.ach;
 
 import android.content.Context;
+import android.view.View;
 
 import com.flutterwave.raveandroid.DeviceIdGetter;
 import com.flutterwave.raveandroid.GetEncryptedData;
@@ -55,11 +56,12 @@ public void init(RavePayInitializer ravePayInitializer) {
         if (ravePayInitializer != null) {
 
             boolean isAmountValid = amountValidator.isAmountValid(ravePayInitializer.getAmount());
+
             if (isAmountValid) {
-                mView.showAmountField(false);
+                mView.onAmountValidated(String.valueOf(ravePayInitializer.getAmount()), View.GONE);
                 mView.showRedirectMessage(true);
             } else {
-                mView.showAmountField(true);
+                mView.onAmountValidated("", View.VISIBLE);
                 mView.showRedirectMessage(false);
             }
         }
@@ -82,7 +84,7 @@ public void onPayButtonClicked(RavePayInitializer ravePayInitializer, String amo
     }
 
     @Override
-    public void processTransaction(String amount, RavePayInitializer ravePayInitializer) {
+    public void processTransaction(String amount, final RavePayInitializer ravePayInitializer, final boolean isDisplayFee) {
 
         ravePayInitializer.setAmount(Double.parseDouble(amount));
         PayloadBuilder builder = new PayloadBuilder();
@@ -103,21 +105,14 @@ public void processTransaction(String amount, RavePayInitializer ravePayInitiali
             builder.setPaymentPlan(ravePayInitializer.getPayment_plan());
         }
 
-        Payload body = builder.createBankPayload();
-
-        chargeAccount(body, ravePayInitializer.getEncryptionKey(), ravePayInitializer.getIsDisplayFee());
-    }
+        Payload bankPayload = builder.createBankPayload();
 
-
-    @Override
-    public void chargeAccount(Payload payload, String encryptionKey, final boolean isDisplayFee) {
-
-        String requestBodyAsString = payloadToJson.convertChargeRequestPayloadToJson(payload);
-        String accountRequestBody = getEncryptedData.getEncryptedData(requestBodyAsString, encryptionKey);
+        String requestBodyAsString = payloadToJson.convertChargeRequestPayloadToJson(bankPayload);
+        String accountRequestBody = getEncryptedData.getEncryptedData(requestBodyAsString, ravePayInitializer.getEncryptionKey());
 
         final ChargeRequestBody body = new ChargeRequestBody();
         body.setAlg("3DES-24");
-        body.setPBFPubKey(payload.getPBFPubKey());
+        body.setPBFPubKey(bankPayload.getPBFPubKey());
         body.setClient(accountRequestBody);
 
         mView.showProgressIndicator(true);
@@ -140,17 +135,14 @@ public void onSuccess(ChargeResponse response, String responseAsJSONString) {
 
                         if (isDisplayFee) {
                             mView.showFee(authUrl, flwRef, chargedAmount, currency);
-                        }
-                        else {
+                        } else {
                             mView.showWebView(authUrl, flwRef);
                         }
-                    }
-                    else {
+                    } else {
                         mView.onPaymentError(RaveConstants.no_authurl_was_returnedmsg);
                     }
 
-                }
-                else {
+                } else {
                     mView.onPaymentError(RaveConstants.noResponse);
                 }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/NullAchView.java

@@ -57,4 +57,9 @@ public void showFee(String authUrl, String flwRef, String chargedAmount, String
     public void onValidationSuccessful(String amount) {
 
     }
+
+    @Override
+    public void onAmountValidated(String amountToSet, int visibility) {
+
+    }
 }