#95. Display account records.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountRecordsFragment.kt

@@ -5,15 +5,15 @@ import android.view.View
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseFragment
 import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter
-import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
+import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account
 import kotlinx.android.synthetic.main.fragment_account_records.*
 import javax.inject.Inject
 
 class AccountRecordsFragment : BaseFragment() {
 
     @Inject
-    internal lateinit var accountController: AccountController
+    internal lateinit var recordController: RecordController
 
     private lateinit var account: Account
 
@@ -25,7 +25,7 @@ class AccountRecordsFragment : BaseFragment() {
     }
 
     override fun initViews(view: View) {
-        listView.adapter = RecordAdapter(activity, listOf())
+        listView.adapter = RecordAdapter(activity, recordController.getRecordsForAccount(account))
     }
 
     companion object {

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

@@ -27,75 +27,70 @@ public class RecordController extends BaseController<Record> {
     private final AccountController accountController;
 
     public RecordController(IRepo<Record> recordRepo, CategoryController categoryController,
-                            AccountController accountController) {
+            AccountController accountController) {
         super(recordRepo);
         this.categoryController = categoryController;
         this.accountController = accountController;
     }
 
-    @Override
-    @SuppressWarnings("SimplifiableIfStatement")
-    public Record create(@Nullable Record record) {
+    @Override @SuppressWarnings("SimplifiableIfStatement") public Record create(@Nullable Record record) {
         if (record == null) return null;
 
         record = validateRecord(record);
 
         Record createdRecord = repo.create(record);
-        if (createdRecord == null) return null;
-        else {
+        if (createdRecord == null) {
+            return null;
+        } else {
             accountController.recordAdded(createdRecord);
             return createdRecord;
         }
     }
 
-    @Override
-    @SuppressWarnings("SimplifiableIfStatement")
-    public Record update(@Nullable Record record) {
+    @Override @SuppressWarnings("SimplifiableIfStatement") public Record update(@Nullable Record record) {
         if (record == null) return null;
 
         record = validateRecord(record);
 
         Record oldRecord = read(record.getId());
 
         Record updatedRecord = repo.update(record);
-        if (updatedRecord == null) return null;
-        else {
+        if (updatedRecord == null) {
+            return null;
+        } else {
             accountController.recordUpdated(oldRecord, updatedRecord);
             return updatedRecord;
         }
     }
 
-    @Override
-    @SuppressWarnings("SimplifiableIfStatement")
-    public boolean delete(@Nullable Record record) {
-        if (repo.delete(record)) return accountController.recordDeleted(record);
-        else return false;
+    @Override @SuppressWarnings("SimplifiableIfStatement") public boolean delete(@Nullable Record record) {
+        if (repo.delete(record)) {
+            return accountController.recordDeleted(record);
+        } else {
+            return false;
+        }
     }
 
-    @Nullable
-    @Override
-    public Record read(long id) {
-        List<Record> list = readWithCondition("id=?", new String[]{Long.toString(id)});
+    @Nullable @Override public Record read(long id) {
+        List<Record> list = readWithCondition("id=?", new String[] { Long.toString(id) });
 
-        if (list.size() == 1) return list.get(0);
-        else return null;
+        if (list.size() == 1) {
+            return list.get(0);
+        } else {
+            return null;
+        }
     }
 
-    @NonNull
-    @Override
-    public List<Record> readAll() {
+    @NonNull @Override public List<Record> readAll() {
         return readWithCondition(null, null);
     }
 
-    @NonNull
-    @Override
-    public List<Record> readWithCondition(String condition, String[] args) {
+    @NonNull @Override public List<Record> readWithCondition(String condition, String[] args) {
         List<Record> recordList = super.readWithCondition(condition, args);
 
         // Sort record list by time field from smallest to biggest
         Collections.sort(recordList, new Comparator<Record>() {
-            @Override
-            public int compare(Record lhs, Record rhs) {
+            @Override public int compare(Record lhs, Record rhs) {
                 return lhs.getTime() < rhs.getTime() ? -1 : (lhs.getTime() == rhs.getTime() ? 0 : 1);
             }
         });
@@ -104,25 +99,31 @@ public int compare(Record lhs, Record rhs) {
         List<Record> completedRecordList = new ArrayList<>();
         for (Record record : recordList) {
             Category category = null;
-            if (record.getCategory() != null)
-                category = categoryController.read(record.getCategory().getId());
+            if (record.getCategory() != null) category = categoryController.read(record.getCategory().getId());
 
             Account account = null;
-            if (record.getAccount() != null)
-                account = accountController.read(record.getAccount().getId());
+            if (record.getAccount() != null) account = accountController.read(record.getAccount().getId());
 
-            completedRecordList.add(new Record(record.getId(), record.getTime(), record.getType(),
-                    record.getTitle(), category, record.getPrice(), account, record.getCurrency(),
-                    record.getDecimals()));
+            completedRecordList.add(
+                    new Record(record.getId(), record.getTime(), record.getType(), record.getTitle(), category,
+                            record.getPrice(), account, record.getCurrency(), record.getDecimals()));
         }
 
         return completedRecordList;
     }
 
     public List<Record> getRecordsForPeriod(Period period) {
         String condition = DbHelper.TIME_COLUMN + " BETWEEN ? AND ?";
-        String[] args = new String[]{Long.toString(period.getFirst().getTime()),
-                Long.toString(period.getLast().getTime())};
+        String[] args = new String[] {
+                Long.toString(period.getFirst().getTime()), Long.toString(period.getLast().getTime())
+        };
+
+        return readWithCondition(condition, args);
+    }
+
+    public List<Record> getRecordsForAccount(Account account) {
+        String condition = DbHelper.ACCOUNT_ID_COLUMN + "=?";
+        String[] args = new String[] { Long.toString(account.getId()) };
 
         return readWithCondition(condition, args);
     }
@@ -132,8 +133,7 @@ private Record validateRecord(@NonNull Record record) {
 
         Category category = categoryController.readOrCreate(record.getCategory().getName());
 
-        return new Record(record.getId(), record.getTime(), record.getType(), record.getTitle(),
-                category, record.getPrice(), record.getAccount(), record.getCurrency(),
-                record.getDecimals());
+        return new Record(record.getId(), record.getTime(), record.getType(), record.getTitle(), category,
+                record.getPrice(), record.getAccount(), record.getCurrency(), record.getDecimals());
     }
 }