X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=8b795ac1296ab703a74918a3a53393ba7418882f;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;hp=d092a1cbfc55f1f0294cef1f6fc583248e14efa6;hpb=a87079ed41bdc3ad89fe8bd15dfba10e37b29b76;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java index d092a1cb..8b795ac1 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 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 @@ -23,11 +23,24 @@ import android.os.AsyncTask; import android.os.OperationCanceledException; import androidx.annotation.NonNull; +import androidx.room.Transaction; import com.fasterxml.jackson.databind.RuntimeJsonMappingException; import net.ktnx.mobileledger.App; +import net.ktnx.mobileledger.dao.AccountDAO; +import net.ktnx.mobileledger.dao.AccountValueDAO; +import net.ktnx.mobileledger.dao.TransactionAccountDAO; +import net.ktnx.mobileledger.dao.TransactionDAO; +import net.ktnx.mobileledger.db.Account; +import net.ktnx.mobileledger.db.AccountWithAmounts; +import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.Option; +import net.ktnx.mobileledger.db.Profile; +import net.ktnx.mobileledger.db.TransactionAccount; +import net.ktnx.mobileledger.db.TransactionWithAccounts; import net.ktnx.mobileledger.err.HTTPException; +import net.ktnx.mobileledger.json.API; import net.ktnx.mobileledger.json.AccountListParser; import net.ktnx.mobileledger.json.ApiNotSupportedException; import net.ktnx.mobileledger.json.TransactionListParser; @@ -35,9 +48,9 @@ import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.model.LedgerTransactionAccount; -import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.ui.MainModel; import net.ktnx.mobileledger.utils.Logger; +import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.NetworkUtil; import java.io.BufferedReader; @@ -51,6 +64,7 @@ import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.ArrayList; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -80,15 +94,11 @@ public class RetrieveTransactionsTask extends private final Pattern reAccountValue = Pattern.compile( "\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?"); private final MainModel mainModel; - private final MobileLedgerProfile profile; - private final List prevAccounts; + private final Profile profile; private int expectedPostingsCount = -1; - public RetrieveTransactionsTask(@NonNull MainModel mainModel, - @NonNull MobileLedgerProfile profile, - List accounts) { + public RetrieveTransactionsTask(@NonNull MainModel mainModel, @NonNull Profile profile) { this.mainModel = mainModel; this.profile = profile; - this.prevAccounts = accounts; } private static void L(String msg) { //debug("transaction-parser", msg); @@ -120,9 +130,6 @@ public class RetrieveTransactionsTask extends return null; } } - public MobileLedgerProfile getProfile() { - return profile; - } @Override protected void onProgressUpdate(Progress... values) { super.onProgressUpdate(values); @@ -213,7 +220,7 @@ public class RetrieveTransactionsTask extends else { parentAccount = null; } - lastAccount = new LedgerAccount(profile, accName, parentAccount); + lastAccount = new LedgerAccount(accName, parentAccount); accounts.add(lastAccount); map.put(accName, lastAccount); @@ -327,7 +334,7 @@ public class RetrieveTransactionsTask extends state = ParserState.EXPECTING_TRANSACTION; L(String.format("transaction %s parsed → expecting transaction", - transaction.getId())); + transaction.getLedgerId())); // sounds like a good idea, but transaction-1 may not be the first one chronologically // for example, when you add the initial seeding transaction after entering some others @@ -342,8 +349,9 @@ public class RetrieveTransactionsTask extends LedgerTransactionAccount lta = parseTransactionAccountLine(line); if (lta != null) { transaction.addAccount(lta); - L(String.format(Locale.ENGLISH, "%d: %s = %s", transaction.getId(), - lta.getAccountName(), lta.getAmount())); + L(String.format(Locale.ENGLISH, "%d: %s = %s", + transaction.getLedgerId(), lta.getAccountName(), + lta.getAmount())); } else throw new IllegalStateException( @@ -377,7 +385,7 @@ public class RetrieveTransactionsTask extends parentAccount = null; } - acc = new LedgerAccount(profile, accountName, parentAccount); + acc = new LedgerAccount(accountName, parentAccount); createdAccounts.add(acc); return acc; } @@ -386,11 +394,11 @@ public class RetrieveTransactionsTask extends } private List retrieveAccountList() throws IOException, HTTPException, ApiNotSupportedException { - final SendTransactionTask.API apiVersion = profile.getApiVersion(); - if (apiVersion.equals(SendTransactionTask.API.auto)) { + final API apiVersion = API.valueOf(profile.getApiVersion()); + if (apiVersion.equals(API.auto)) { return retrieveAccountListAnyVersion(); } - else if (apiVersion.equals(SendTransactionTask.API.html)) { + else if (apiVersion.equals(API.html)) { Logger.debug("json", "Declining using JSON API for /accounts with configured legacy API version"); return null; @@ -401,7 +409,7 @@ public class RetrieveTransactionsTask extends } private List retrieveAccountListAnyVersion() throws HTTPException, ApiNotSupportedException { - for (SendTransactionTask.API ver : SendTransactionTask.API.allVersions) { + for (API ver : API.allVersions) { try { return retrieveAccountListForVersion(ver); } @@ -416,7 +424,7 @@ public class RetrieveTransactionsTask extends throw new RuntimeException("This should never be reached"); } - private List retrieveAccountListForVersion(SendTransactionTask.API version) + private List retrieveAccountListForVersion(API version) throws IOException, HTTPException { HttpURLConnection http = NetworkUtil.prepareConnection(profile, "accounts"); http.setAllowUserInteraction(false); @@ -432,9 +440,6 @@ public class RetrieveTransactionsTask extends SQLiteDatabase db = App.getDatabase(); ArrayList list = new ArrayList<>(); HashMap map = new HashMap<>(); - HashMap currentMap = new HashMap<>(); - for (LedgerAccount acc : prevAccounts) - currentMap.put(acc.getName(), acc); throwIfCancelled(); try (InputStream resp = http.getInputStream()) { throwIfCancelled(); @@ -454,24 +459,15 @@ public class RetrieveTransactionsTask extends throwIfCancelled(); } - // the current account tree may have changed, update the new-to be tree to match - for (LedgerAccount acc : list) { - LedgerAccount prevData = currentMap.get(acc.getName()); - if (prevData != null) { - acc.setExpanded(prevData.isExpanded()); - acc.setAmountsExpanded(prevData.amountsExpanded()); - } - } - return list; } private List retrieveTransactionList() throws ParseException, HTTPException, IOException, ApiNotSupportedException { - final SendTransactionTask.API apiVersion = profile.getApiVersion(); - if (apiVersion.equals(SendTransactionTask.API.auto)) { + final API apiVersion = API.valueOf(profile.getApiVersion()); + if (apiVersion.equals(API.auto)) { return retrieveTransactionListAnyVersion(); } - else if (apiVersion.equals(SendTransactionTask.API.html)) { + else if (apiVersion.equals(API.html)) { Logger.debug("json", "Declining using JSON API for /accounts with configured legacy API version"); return null; @@ -483,7 +479,7 @@ public class RetrieveTransactionsTask extends } private List retrieveTransactionListAnyVersion() throws ApiNotSupportedException { - for (SendTransactionTask.API ver : SendTransactionTask.API.allVersions) { + for (API ver : API.allVersions) { try { return retrieveTransactionListForVersion(ver); } @@ -498,8 +494,8 @@ public class RetrieveTransactionsTask extends throw new RuntimeException("This should never be reached"); } - private List retrieveTransactionListForVersion( - SendTransactionTask.API apiVersion) throws IOException, ParseException, HTTPException { + private List retrieveTransactionListForVersion(API apiVersion) + throws IOException, ParseException, HTTPException { Progress progress = new Progress(); progress.setTotal(expectedPostingsCount); @@ -554,7 +550,7 @@ public class RetrieveTransactionsTask extends .compareTo(o1.getDate()); if (res != 0) return res; - return Integer.compare(o2.getId(), o1.getId()); + return Long.compare(o2.getLedgerId(), o1.getLedgerId()); }); return trList; } @@ -581,7 +577,10 @@ public class RetrieveTransactionsTask extends transactions = new ArrayList<>(); retrieveTransactionListLegacy(accounts, transactions); } - mainModel.setAndStoreAccountAndTransactionListFromWeb(accounts, transactions); + + storeAccountsAndTransactions(accounts, transactions); + + mainModel.updateDisplayedTransactionsFromWeb(transactions); return new Result(accounts, transactions); } @@ -618,6 +617,55 @@ public class RetrieveTransactionsTask extends Data.backgroundTaskFinished(); } } + @Transaction + private void storeAccountsAndTransactions(List accounts, + List transactions) { + AccountDAO accDao = DB.get() + .getAccountDAO(); + TransactionDAO trDao = DB.get() + .getTransactionDAO(); + TransactionAccountDAO trAccDao = DB.get() + .getTransactionAccountDAO(); + AccountValueDAO valDao = DB.get() + .getAccountValueDAO(); + + final List list = new ArrayList<>(); + for (LedgerAccount acc : accounts) { + final AccountWithAmounts a = acc.toDBOWithAmounts(); + Account existing = accDao.getByNameSync(profile.getId(), acc.getName()); + if (existing != null) { + a.account.setExpanded(existing.isExpanded()); + a.account.setAmountsExpanded(existing.isAmountsExpanded()); + a.account.setId( + existing.getId()); // not strictly needed, but since we have it anyway... + } + + list.add(a); + } + accDao.storeAccountsSync(list, profile.getId()); + + long trGen = trDao.getGenerationSync(profile.getId()); + for (LedgerTransaction tr : transactions) { + TransactionWithAccounts tran = tr.toDBO(); + tran.transaction.setGeneration(trGen); + tran.transaction.setProfileId(profile.getId()); + + tran.transaction.setId(trDao.insertSync(tran.transaction)); + + for (TransactionAccount trAcc : tran.accounts) { + trAcc.setGeneration(trGen); + trAcc.setTransactionId(tran.transaction.getId()); + trAcc.setId(trAccDao.insertSync(trAcc)); + } + } + + trDao.purgeOldTransactionsSync(profile.getId(), trGen); + + DB.get() + .getOptionDAO() + .insertSync(new Option(profile.getId(), MLDB.OPT_LAST_SCRAPE, + String.valueOf((new Date()).getTime()))); + } public void throwIfCancelled() { if (isCancelled()) throw new OperationCanceledException(null);