X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=38db6b17f8c7b30648a92d980f23626f4fbe222e;hb=63d4636c19652b688fb0a1e4f3081843c740bf78;hp=fb1bd72fd2a359c790e6611a83fe15ad827847a1;hpb=abd5a19252bf81af903c3406132030e3ad63704f;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
index fb1bd72f..38db6b17 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2021 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -17,87 +17,65 @@
 
 package net.ktnx.mobileledger.async;
 
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
-import android.util.Log;
 
+import net.ktnx.mobileledger.db.DB;
+import net.ktnx.mobileledger.db.Profile;
+import net.ktnx.mobileledger.db.TransactionWithAccounts;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.model.MobileLedgerProfile;
-import net.ktnx.mobileledger.model.TransactionListItem;
-import net.ktnx.mobileledger.utils.Globals;
-import net.ktnx.mobileledger.utils.MLDB;
+import net.ktnx.mobileledger.ui.MainModel;
+import net.ktnx.mobileledger.utils.Logger;
 
-import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.List;
 
-public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
-    protected String doInBackground(String[] filterAccName) {
-        final MobileLedgerProfile profile = Data.profile.get();
-        if (profile == null) return "Profile not configured";
+import static net.ktnx.mobileledger.db.Profile.NO_PROFILE_ID;
+import static net.ktnx.mobileledger.utils.Logger.debug;
 
-        String profile_uuid = profile.getUuid();
-        Data.backgroundTaskCount.incrementAndGet();
-        try {
-            ArrayList<TransactionListItem> newList = new ArrayList<>();
+public class UpdateTransactionsTask extends AsyncTask<MainModel, Void, String> {
+    protected String doInBackground(MainModel[] parentModel) {
+        final Profile profile = Data.getProfile();
 
-            String sql;
-            String[] params;
+        long profileId = (profile == null) ? NO_PROFILE_ID : profile.getId();
+        Data.backgroundTaskStarted();
+        try {
+            Logger.debug("UTT", "Starting DB transaction list retrieval");
 
-            if (filterAccName[0] == null) {
-                sql = "SELECT id, date FROM transactions WHERE profile=? ORDER BY date desc, id " +
-                      "desc";
-                params = new String[]{profile_uuid};
+            final MainModel model = parentModel[0];
+            final String accFilter = model.getAccountFilter()
+                                          .getValue();
+            final List<TransactionWithAccounts> transactions;
 
+            if (profileId == NO_PROFILE_ID)
+                transactions = new ArrayList<>();
+            else if (accFilter == null) {
+                transactions = DB.get()
+                                 .getTransactionDAO()
+                                 .getAllWithAccountsSync(profileId);
             }
             else {
-                sql = "SELECT distinct tr.id, tr.date from transactions tr JOIN " +
-                      "transaction_accounts ta " +
-                      "ON ta.transaction_id=tr.id AND ta.profile=tr.profile WHERE tr.profile=? " +
-                      "and ta.account_name LIKE ?||'%' AND ta" +
-                      ".amount <> 0 ORDER BY tr.date desc, tr.id desc";
-                params = new String[]{profile_uuid, filterAccName[0]};
+                transactions = DB.get()
+                                 .getTransactionDAO()
+                                 .getAllWithAccountsFilteredSync(profileId, accFilter);
             }
 
-            Log.d("UTT", sql);
-            SQLiteDatabase db = MLDB.getDatabase();
-            String lastDateString = Globals.formatLedgerDate(new Date());
-            Date lastDate = Globals.parseLedgerDate(lastDateString);
-            boolean odd = true;
-            try (Cursor cursor = db.rawQuery(sql, params)) {
-                while (cursor.moveToNext()) {
-                    if (isCancelled()) return null;
-
-                    int transaction_id = cursor.getInt(0);
-                    String dateString = cursor.getString(1);
-                    Date date = Globals.parseLedgerDate(dateString);
+            TransactionAccumulator accumulator = new TransactionAccumulator(model);
 
-                    if (!lastDateString.equals(dateString)) {
-                        boolean showMonth = (date.getMonth() != lastDate.getMonth() ||
-                                             date.getYear() != lastDate.getYear());
-                        newList.add(new TransactionListItem(date, showMonth));
-                    }
-                    newList.add(
-                            new TransactionListItem(new LedgerTransaction(transaction_id), odd));
-//                    Log.d("UTT", String.format("got transaction %d", transaction_id));
+            for (TransactionWithAccounts tr : transactions) {
+                if (isCancelled())
+                    return null;
 
-                    lastDate = date;
-                    lastDateString = dateString;
-                    odd = !odd;
-                }
-                Data.transactions.set(newList);
-                Log.d("UTT", "transaction list value updated");
+                accumulator.put(new LedgerTransaction(tr));
             }
 
+            accumulator.done();
+            debug("UTT", "transaction list value updated");
+
             return null;
         }
-        catch (ParseException e) {
-            return String.format("Error parsing stored date '%s'", e.getMessage());
-        }
         finally {
-            Data.backgroundTaskCount.decrementAndGet();
+            Data.backgroundTaskFinished();
         }
     }
 }