Resolve issues With missing response data

Author: cleopatra27

src/main/java/com/flutterwave/bean/BillRequest.java

@@ -16,12 +16,16 @@ public class BillRequest extends Shared {
     private String recurrence;
     private String country;
     private String customer;
+    private String type;
+    private String reference;
 
 
-    public BillRequest(String country, String customer, BigDecimal amount,
+    public BillRequest(String country, String customer, BigDecimal amount, String type, String reference,
                        Optional<Recurrence> recurrence, Optional<GhanaAirtimeBills> ghanaAirtimeBills) {
 
         this.country = country;
+        this.type = type;
+        this.reference = reference;
         this.customer = customer;
         this.setAmount(amount);
         recurrence.ifPresent(value -> this.recurrence = String.valueOf(value));

src/main/java/com/flutterwave/bean/Data.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -104,6 +105,11 @@ public class Data {
     private String response_message;
     private String product_code;
     private String email;
+    private String account_number;
+    private String expiry_date;
+    private String note;
+    private String active;
+    private String frequency;
 
     private Customer getCustomer(){
         try {
@@ -139,4 +145,20 @@ public String getCustomerString(){
         }
         return null;
     }
+
+    @Override
+    public String toString() {
+
+        String value = null;
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        try {
+            value = objectMapper.writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+
+        return value;
+
+    }
 }

src/main/java/com/flutterwave/bean/ListResponse.java

@@ -24,7 +24,6 @@ public class ListResponse {
     private String code;
 
     public static ListResponse toListResponse(String value){
-        System.out.println(value);
         return new GsonBuilder().create().
                 fromJson(value, ListResponse.class);
     }

src/main/java/com/flutterwave/services/Transactions.java

@@ -39,9 +39,22 @@ public Response runVerifyTransaction(int id) {
      * Query previously initiated transactions. You can do a single or bulk query with the endpoint depending on your use case.
      * @return ListResponse
      */
-    public ListResponse runGetTransactions() {
+    public ListResponse runGetTransactions(Optional<String> from, Optional<String> to, Optional<String> page,
+                                           Optional<String> customer_email,Optional<String> status,Optional<String> tx_ref,
+                                           Optional<String> customer_fullname, Optional<String> currency) {
+
+        List<NameValuePair> nameValuePairs = new ArrayList<>();
+        from.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("from", from.get())));
+        to.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("to", to.get())));
+        page.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("page", page.get())));
+        customer_email.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("customer_email", customer_email.get())));
+        status.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("status", status.get())));
+        tx_ref.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("tx_ref", tx_ref.get())));
+        customer_fullname.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("customer_fullname", customer_fullname.get())));
+        currency.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("currency", currency.get())));
+
         return Optional.of(get(getProperty("VERIFY_TRANSACTION_ENDPOINT"),
-                        GET_TRANSACTION, null))
+                        GET_TRANSACTION, nameValuePairs))
                 .map(ListResponse::toListResponse).orElseThrow(() -> new RuntimeException(ERROR));
     }
 
@@ -91,9 +104,18 @@ public ListResponse runViewTimeline(int id) {
     }
 
     public class Refunds {
-        public ListResponse runGet() {
+        public ListResponse runGet(Optional<String> from, Optional<String> to, Optional<String> status,
+                                   Optional<String> currency,Optional<String> id) {
+
+            List<NameValuePair> nameValuePairs = new ArrayList<>();
+            from.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("from", from.get())));
+            to.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("to", to.get())));
+            currency.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("currency", currency.get())));
+            id.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("id", id.get())));
+            status.ifPresent(String -> nameValuePairs.add(new BasicNameValuePair("status", status.get())));
+
             return Optional.of(get(getProperty("REFUND_ENDPOINT"),
-                            REFUND, null))
+                            REFUND, nameValuePairs))
                     .map(ListResponse::toListResponse).orElseThrow(() -> new RuntimeException(ERROR));
         }
 

src/test/java/com/flutterwave/services/BillsTest.java

@@ -32,6 +32,8 @@ void setUp() {
         billRequest = new BillRequest("NG",
                 "+23490803840303",
                 new BigDecimal("500"),
+                "AIRTIME",
+                "14rdxs",
                         Optional.of(ONCE),
                         Optional.empty());
     }

src/test/java/com/flutterwave/services/TransactionsTest.java

@@ -30,7 +30,9 @@ void runVerifyTransaction() {
 
     @Test
     void runGetTransactions() {
-        Assertions.assertEquals("success", new Transactions().runGetTransactions().getStatus());
+        Assertions.assertEquals("success", new Transactions().runGetTransactions(Optional.empty(),
+                Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(),
+                Optional.empty(), Optional.empty()).getStatus());
     }
 
     @Test
@@ -52,7 +54,13 @@ void runViewTimeline() {
 
     @Test
     void rungetRefunds() {
-        Assertions.assertEquals("success", new Transactions().new Refunds().runGet().getStatus());
+        Assertions.assertEquals("success", new Transactions().new Refunds().runGet(
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty()
+        ).getStatus());
     }
 
     @Test