[30m]. Refactor code to not use Repo layer outside of its own controller.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AddAccountActivity.java

@@ -9,6 +9,7 @@
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseActivity;
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
+import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.model.Account;
 import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
 
@@ -78,7 +79,7 @@ private void addAccount() {
 
         Account account = new Account(title, initSum, currency);
 
-        new AccountRepo(new DbHelper(AddAccountActivity.this)).create(account);
+        new AccountController(new AccountRepo(new DbHelper(AddAccountActivity.this))).create(account);
     }
 
     public static List<String> getAllCurrencies() {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AddRecordActivity.java

@@ -18,7 +18,6 @@
 import com.blogspot.e_kanivets.moneytracker.model.Record;
 import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
 import com.blogspot.e_kanivets.moneytracker.repo.CategoryRepo;
-import com.blogspot.e_kanivets.moneytracker.repo.IRepo;
 import com.blogspot.e_kanivets.moneytracker.repo.RecordRepo;
 
 import java.util.ArrayList;
@@ -46,7 +45,7 @@ public class AddRecordActivity extends BaseActivity {
 
     protected List<Account> accountList;
 
-    protected IRepo<Account> accountRepo;
+    protected AccountController accountController;
     protected RecordController recordController;
 
     @Bind(R.id.et_title)
@@ -69,14 +68,15 @@ protected boolean initData() {
 
         DbHelper dbHelper = new DbHelper(AddRecordActivity.this);
 
-        accountRepo = new AccountRepo(dbHelper);
-        recordController = new RecordController(new RecordRepo(dbHelper), new CategoryRepo(dbHelper),
+        AccountRepo accountRepo = new AccountRepo(dbHelper);
+        accountController = new AccountController(accountRepo);
+        recordController = new RecordController(new RecordRepo(dbHelper),
                 new CategoryController(new CategoryRepo(dbHelper)), new AccountController(accountRepo));
 
         record = (Record) getIntent().getSerializableExtra(KEY_RECORD);
         mode = (Mode) getIntent().getSerializableExtra(KEY_MODE);
         type = getIntent().getIntExtra(KEY_TYPE, -1);
-        accountList = accountRepo.readAll();
+        accountList = accountController.readAll();
 
         return mode != null && type != -1 && (!mode.equals(Mode.MODE_EDIT) || record != null);
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java

@@ -62,8 +62,8 @@ protected boolean initData() {
         CategoryController categoryController = new CategoryController(categoryRepo);
         AccountController accountController = new AccountController(new AccountRepo(dbHelper));
 
-        recordController = new RecordController(new RecordRepo(dbHelper), categoryRepo,
-                categoryController, accountController);
+        recordController = new RecordController(new RecordRepo(dbHelper), categoryController,
+                accountController);
 
         period = getIntent().getParcelableExtra(KEY_PERIOD);
         report = new Report(recordController.getRecordsForPeriod(period));

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/TransferActivity.java

@@ -14,7 +14,6 @@
 import com.blogspot.e_kanivets.moneytracker.model.Account;
 import com.blogspot.e_kanivets.moneytracker.model.Transfer;
 import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
-import com.blogspot.e_kanivets.moneytracker.repo.IRepo;
 import com.blogspot.e_kanivets.moneytracker.repo.TransferRepo;
 
 import java.util.ArrayList;
@@ -48,11 +47,10 @@ protected int getContentViewId() {
     protected boolean initData() {
         DbHelper dbHelper = new DbHelper(TransferActivity.this);
 
-        IRepo<Account> accountRepo = new AccountRepo(dbHelper);
-        AccountController accountController = new AccountController(accountRepo);
+        AccountController accountController = new AccountController(new AccountRepo(dbHelper));
         transferController = new TransferController(new TransferRepo(dbHelper), accountController);
 
-        accountList = accountRepo.readAll();
+        accountList = accountController.readAll();
 
         return super.initData();
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/RecordController.java

@@ -16,14 +16,12 @@
  * @author Evgenii Kanivets
  */
 public class RecordController extends BaseController<Record> {
-    private final IRepo<Category> categoryRepo;
     private final CategoryController categoryController;
     private final AccountController accountController;
 
-    public RecordController(IRepo<Record> recordRepo, IRepo<Category> categoryRepo,
-                            CategoryController categoryController, AccountController accountController) {
+    public RecordController(IRepo<Record> recordRepo, CategoryController categoryController,
+                            AccountController accountController) {
         super(recordRepo);
-        this.categoryRepo = categoryRepo;
         this.categoryController = categoryController;
         this.accountController = accountController;
     }
@@ -96,7 +94,7 @@ public List<String> getRecordsForExport(long fromDate, long toDate) {
             sb.append(record.getId()).append(DELIMITER);
             sb.append(record.getTime()).append(DELIMITER);
             sb.append(record.getTitle()).append(DELIMITER);
-            Category category = categoryRepo.read(record.getCategoryId());
+            Category category = categoryController.read(record.getCategoryId());
             sb.append(category == null ? "NONE" : category.getName()).append(DELIMITER);
             sb.append(record.getType() == 0 ? record.getPrice() : -record.getPrice());
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/fragment/AccountsFragment.java

@@ -24,6 +24,7 @@
 import com.blogspot.e_kanivets.moneytracker.activity.TransferActivity;
 import com.blogspot.e_kanivets.moneytracker.adapter.AccountAdapter;
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
+import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.model.Account;
 import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
 import com.blogspot.e_kanivets.moneytracker.repo.IRepo;
@@ -41,7 +42,7 @@ public class AccountsFragment extends Fragment {
     @Bind(R.id.list_view)
     ListView listView;
 
-    private IRepo<Account> accountRepo;
+    private AccountController accountController;
 
     public static AccountsFragment newInstance() {
         AccountsFragment fragment = new AccountsFragment();
@@ -59,7 +60,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
 
-        accountRepo = new AccountRepo(new DbHelper(getActivity()));
+        accountController = new AccountController(new AccountRepo(new DbHelper(getActivity())));
     }
 
     @Override
@@ -118,7 +119,7 @@ public boolean onContextItemSelected(MenuItem item) {
 
         switch (item.getItemId()) {
             case R.id.delete:
-                accountRepo.delete(accountRepo.readAll().get(info.position));
+                accountController.delete(accountController.readAll().get(info.position));
                 update();
                 return true;
             default:
@@ -147,15 +148,15 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void update() {
-        listView.setAdapter(new AccountAdapter(getActivity(), accountRepo.readAll()));
+        listView.setAdapter(new AccountAdapter(getActivity(), accountController.readAll()));
         ((BaseAdapter) listView.getAdapter()).notifyDataSetChanged();
     }
 
     private void initViews(View rootView) {
         if (rootView != null) {
             ButterKnife.bind(this, rootView);
 
-            listView.setAdapter(new AccountAdapter(getActivity(), accountRepo.readAll()));
+            listView.setAdapter(new AccountAdapter(getActivity(), accountController.readAll()));
             ((BaseAdapter) listView.getAdapter()).notifyDataSetChanged();
             registerForContextMenu(listView);
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/fragment/ExportFragment.java

@@ -81,7 +81,7 @@ public void exportRecords() {
         AccountController accountController = new AccountController(new AccountRepo(dbHelper));
         IRepo<Record> recordRepo = new RecordRepo(dbHelper);
 
-        RecordController recordController = new RecordController(recordRepo, categoryRepo, categoryController, accountController);
+        RecordController recordController = new RecordController(recordRepo, categoryController, accountController);
 
         List<String> records = recordController.getRecordsForExport(0, Long.MAX_VALUE);
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/fragment/RecordsFragment.java

@@ -95,7 +95,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         AccountController accountController = new AccountController(new AccountRepo(dbHelper));
         IRepo<Record> recordRepo = new RecordRepo(dbHelper);
 
-        recordController = new RecordController(recordRepo, categoryRepo, categoryController, accountController);
+        recordController = new RecordController(recordRepo, categoryController, accountController);
     }
 
     @Override