Unit Test and Enhancements

mifosng-android/src/commonTest/java/com/mifos/mifosxdroid/FakeJsonName.java

@@ -6,4 +6,10 @@
 public class FakeJsonName {
 
     public static final String CLIENTS_JSON = "clients.json";
+    public static final String SEARCHED_ENTITY_JSON = "searchedEntity.json";
+    public static final String CENTERS_JSON = "centers.json";
+    public static final String CENTER_WITH_ASSOCIATIONS_JSON = "centerWithAssociations.json";
+    public static final String CHARGES_JSON = "charges.json";
+    public static final String LOAN_CHARGES_JSON = "loancharges.json";
+    public static final String DOCUMENTS_JSON = "documents.json";
 }

mifosng-android/src/commonTest/java/com/mifos/mifosxdroid/FakeRemoteDataSource.java

@@ -1,7 +1,14 @@
 package com.mifos.mifosxdroid;
 
-import com.mifos.objects.client.Client;
+import com.google.gson.reflect.TypeToken;
+import com.mifos.objects.SearchedEntity;
+import com.mifos.objects.client.Charges;
 import com.mifos.objects.client.Page;
+import com.mifos.objects.group.Center;
+import com.mifos.objects.group.CenterWithAssociations;
+import com.mifos.objects.noncore.Document;
+
+import java.util.List;
 
 /**
  * Created by Rajan Maurya on 18/6/16.
@@ -11,8 +18,38 @@ public class FakeRemoteDataSource {
     private static TestDataFactory mTestDataFactory = new TestDataFactory();
 
 
-    public static Page<Client> getClientList() {
+    public static Page getClientList() {
         return mTestDataFactory.getObjectTypePojo(Page.class, FakeJsonName.CLIENTS_JSON);
+    }
+
+    public static List<SearchedEntity> getSearchedEntity() {
+        return mTestDataFactory.getListTypePojo(new TypeToken<List<SearchedEntity>>() {
+        }, FakeJsonName.SEARCHED_ENTITY_JSON);
+    }
 
+    public static Page<Center> getCenters() {
+        return mTestDataFactory.getListTypePojo(new TypeToken<Page<Center>>() {
+        }, FakeJsonName.CENTERS_JSON);
     }
+
+    public static CenterWithAssociations getCentersGroupAndMeeting() {
+        return mTestDataFactory.getObjectTypePojo(CenterWithAssociations.class,
+                FakeJsonName.CENTER_WITH_ASSOCIATIONS_JSON);
+    }
+
+    public static Page<Charges> getClientCharges() {
+        return mTestDataFactory.getListTypePojo(new TypeToken<Page<Charges>>() {
+        }, FakeJsonName.CHARGES_JSON);
+    }
+
+    public static List<Charges> getLoanCharges() {
+        return mTestDataFactory.getListTypePojo(new TypeToken<List<Charges>>() {
+        }, FakeJsonName.LOAN_CHARGES_JSON);
+    }
+
+    public static List<Document> getDouments() {
+        return mTestDataFactory.getListTypePojo(new TypeToken<List<Document>>() {
+        }, FakeJsonName.DOCUMENTS_JSON);
+    }
+
 }

mifosng-android/src/commonTest/java/com/mifos/mifosxdroid/TestDataFactory.java

@@ -15,22 +15,19 @@ public class TestDataFactory {
 
 
     /**
-     *
      * Note : This Generic Method DeSerialize Only Json Object in POJO
-     *
+     * <p/>
      * Note : Do Not use Array [] in POJO classes for of any element initialization,
-     *        Use Instead ArrayList.
+     * Use Instead ArrayList.
      *
-     * @param model Class of the Model of the Pojo
+     * @param model    Class of the Model of the Pojo
      * @param jsonName Name of Json file in test/resource
-     * @param <T> Return type
+     * @param <T>      Return type
      * @return Return the Object Type model by Deserializing the Json of resources
-     *
      * @Example Of Deserializing Object Type Json
-     *
+     * <p/>
      * Object object = mTestDataFactory.getListTypePojo(
-     *                          new TypeToken<Object>(){}, "Object.json")
-     *
+     * new TypeToken<Object>(){}, "Object.json")
      */
     public <T> T getObjectTypePojo(Class<T> model, String jsonName) {
 
@@ -43,30 +40,25 @@ public <T> T getObjectTypePojo(Class<T> model, String jsonName) {
 
 
     /**
-     *
      * Note : This Generic Method DeSerialize Both Object and List Type Json in POJO
-     *
+     * <p/>
      * Note : Do Not use Array [] in POJO classes for of any element initialization,
-     *        Use Instead ArrayList.
+     * Use Instead ArrayList.
      *
      * @param listModel Class of the List Model
-     * @param jsonName Name of the Json in resources
-     * @param <T> return type
+     * @param jsonName  Name of the Json in resources
+     * @param <T>       return type
      * @return Return the List of the listModel by Deserializing the Json of resources
-     *
-     * @Example  of Deserializing List Type Json
-     *
+     * @Example of Deserializing List Type Json
+     * <p/>
      * TestDataFactory mTestDataFactory = new TestDataFactory();
-     *
+     * <p/>
      * List<Object> listObject = mTestDataFactory.getListTypePojo(
-     *                          new TypeToken<List<Object>>(){}, "ListObject.json")
-     *
+     * new TypeToken<List<Object>>(){}, "ListObject.json")
      * @Example Of Deserializing Object Type Json
-     *
+     * <p/>
      * Object object = mTestDataFactory.getListTypePojo(
-     *                          new TypeToken<Object>(){}, "Object.json")
-     *
-     *
+     * new TypeToken<Object>(){}, "Object.json")
      */
     public <T> T getListTypePojo(TypeToken<T> listModel, String jsonName) {
 

mifosng-android/src/main/java/com/mifos/api/DataManager.java

@@ -89,9 +89,9 @@ public Observable<User> login(String username, String password) {
     /**
      * Center API
      */
-    //Return Centers List
-    public Observable<List<Center>> getCenters() {
-        return mBaseApiManager.getCenterApi().getAllCenters();
+    //Return Centers List according to offset and limit parameter
+    public Observable<Page<Center>> getCenters(boolean b, int offset, int limit) {
+        return mBaseApiManager.getCenterApi().getCenters(b, offset, limit);
     }
 
     //Return Center With Association
@@ -137,8 +137,8 @@ public Observable<List<OfflineCenter>> getCenterList(
     /**
      * Charges API
      */
-    public Observable<Page<Charges>> getClientCharges(int id) {
-        return mBaseApiManager.getChargeApi().getListOfCharges(id);
+    public Observable<Page<Charges>> getClientCharges(int clientId, int offset, int limit) {
+        return mBaseApiManager.getChargeApi().getListOfCharges(clientId, offset, limit);
     }
 
     public Observable<ResponseBody> getAllChargesV2(int clientId) {
@@ -359,7 +359,7 @@ public Observable<GenericResponse> dispurseLoan(int loanId,
         return mBaseApiManager.getLoanApi().disburseLoan(loanId, loanDisbursement);
     }
 
-    public Observable<Page<Charges>> getListOfLoanCharges(int loanId) {
+    public Observable<List<Charges>> getListOfLoanCharges(int loanId) {
         return mBaseApiManager.getLoanApi().getListOfLoanCharges(loanId);
     }
 

mifosng-android/src/main/java/com/mifos/api/services/CenterService.java

@@ -8,6 +8,7 @@
 import com.mifos.api.model.CollectionSheetPayload;
 import com.mifos.api.model.Payload;
 import com.mifos.api.model.SaveResponse;
+import com.mifos.objects.client.Page;
 import com.mifos.objects.db.CollectionSheet;
 import com.mifos.objects.db.OfflineCenter;
 import com.mifos.objects.group.Center;
@@ -32,7 +33,9 @@ public interface CenterService {
 
 
     @GET(APIEndPoint.CENTERS)
-    Observable<List<Center>> getAllCenters();
+    Observable<Page<Center>> getCenters(@Query("paged") boolean b,
+                                        @Query("offset") int offset,
+                                        @Query("limit") int limit);
 
     @GET(APIEndPoint.CENTERS + "/{centerId}?associations=groupMembers,collectionMeetingCalendar")
     Observable<CenterWithAssociations> getCenterWithGroupMembersAndCollectionMeetingCalendar

mifosng-android/src/main/java/com/mifos/api/services/ChargeService.java

@@ -14,6 +14,7 @@
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.Path;
+import retrofit2.http.Query;
 import rx.Observable;
 
 /**
@@ -31,7 +32,9 @@ public interface ChargeService {
     Observable<ResponseBody> getAllChargev3(@Path("loanId") int loanId);
 
     @GET(APIEndPoint.CLIENTS + "/{clientId}/charges")
-    Observable<Page<Charges>> getListOfCharges(@Path("clientId") int clientId);
+    Observable<Page<Charges>> getListOfCharges(@Path("clientId") int clientId,
+                                               @Query("offset") int offset,
+                                               @Query("limit") int limit);
 
     @POST(APIEndPoint.CLIENTS + "/{clientId}/charges")
     Observable<Charges> createCharges(@Path("clientId") int clientId,

mifosng-android/src/main/java/com/mifos/api/services/LoanService.java

@@ -89,7 +89,7 @@ Observable<ResponseBody> getGroupLoansAccountTemplate(@Query("groupId") int grou
                                                           @Query("productId") int productId);
 
     @GET(APIEndPoint.LOANS + "/{loanId}/" + APIEndPoint.CHARGES)
-    Observable<Page<Charges>> getListOfLoanCharges(@Path("loanId") int loanId);
+    Observable<List<Charges>> getListOfLoanCharges(@Path("loanId") int loanId);
 
 
     @GET(APIEndPoint.CLIENTS + "/{clientId}/" + APIEndPoint.CHARGES)

mifosng-android/src/main/java/com/mifos/mifosxdroid/adapters/CentersListAdapter.java

@@ -7,21 +7,24 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.mifos.mifosxdroid.R;
 import com.mifos.objects.group.Center;
 
 import java.util.List;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
 /**
  * Created by ishankhanna on 11/03/14.
  */
-public class CentersListAdapter extends BaseAdapter {
+public class CentersListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private LayoutInflater layoutInflater;
     private List<Center> centers;
@@ -35,64 +38,74 @@ public CentersListAdapter(Context context, List<Center> centers) {
 
     }
 
-    @Override
-    public int getCount() {
-        return this.centers.size();
-    }
-
-    @Override
     public Center getItem(int i) {
         return this.centers.get(i);
     }
 
     @Override
-    public long getItemId(int i) {
-        return 0;
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        RecyclerView.ViewHolder vh;
+        View v = LayoutInflater.from(parent.getContext()).inflate(
+                R.layout.row_center_list_item, parent, false);
+        vh = new ViewHolder(v);
+        return vh;
     }
 
     @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        if (holder instanceof ViewHolder) {
 
-        ViewHolder viewHolder;
+            ((ViewHolder) holder).tv_center_id.setText(resources
+                    .getString(R.string.center_id) + centers.get(position).getId());
 
-        if (view == null) {
-            view = layoutInflater.inflate(R.layout.row_center_list_item, viewGroup, false);
-            viewHolder = new ViewHolder();
-            view.setTag(viewHolder);
-        } else {
-            viewHolder = (ViewHolder) view.getTag();
-        }
+            ((ViewHolder) holder).tv_center_name.setText(centers.get(position).getName());
 
-        viewHolder.tv_center_id = (TextView) view.findViewById(R.id.tv_center_id);
-        viewHolder.tv_center_name = (TextView) view.findViewById(R.id.tv_center_name);
-        viewHolder.tv_staff_id = (TextView) view.findViewById(R.id.tv_staff_id);
-        viewHolder.tv_staff_name = (TextView) view.findViewById(R.id.tv_staff_name);
-        viewHolder.tv_office_id = (TextView) view.findViewById(R.id.tv_office_id);
-        viewHolder.tv_office_name = (TextView) view.findViewById(R.id.tv_office_name);
+            ((ViewHolder) holder).tv_staff_id.setText(
+                    resources.getString(R.string.staff_id) + centers.get(position).getStaffId());
 
-        viewHolder.tv_center_id.setText(resources.getString(R.string.center_id) + centers.get(i)
-                .getId());
-        viewHolder.tv_center_name.setText(centers.get(i).getName());
+            ((ViewHolder) holder).tv_staff_name.setText(centers.get(position).getStaffName());
 
-        viewHolder.tv_staff_id.setText(resources.getString(R.string.staff_id) + centers.get(i)
-                .getStaffId());
-        viewHolder.tv_staff_name.setText(centers.get(i).getStaffName());
+            ((ViewHolder) holder).tv_office_id.setText(
+                    resources.getString(R.string.office_id) + centers.get(position).getOfficeId());
 
-        viewHolder.tv_office_id.setText(resources.getString(R.string.office_id) + centers.get(i)
-                .getOfficeId());
-        viewHolder.tv_office_name.setText(centers.get(i).getOfficeName());
+            ((ViewHolder) holder).tv_office_name.setText(centers.get(position).getOfficeName());
+        }
+    }
 
-        return view;
+    @Override
+    public long getItemId(int i) {
+        return 0;
+    }
+
+    @Override
+    public int getItemCount() {
+        return centers.size();
     }
 
-    public static class ViewHolder {
 
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.tv_center_name)
         TextView tv_center_name;
+
+        @BindView(R.id.tv_center_id)
         TextView tv_center_id;
+
+        @BindView(R.id.tv_staff_name)
         TextView tv_staff_name;
+
+        @BindView(R.id.tv_staff_id)
         TextView tv_staff_id;
+
+        @BindView(R.id.tv_office_name)
         TextView tv_office_name;
+
+        @BindView(R.id.tv_office_id)
         TextView tv_office_id;
 
+        public ViewHolder(View v) {
+            super(v);
+            ButterKnife.bind(this, v);
+        }
     }
 }