X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdao%2FTransactionDAO.java;h=001976d3b1ee08393c2ac48d6fbc5d634566a403;hp=9012d489ca08a7b5b71ea12b160a679650fb2598;hb=833544eb24cb630dc1ce221e4aa3dedb3f6341e3;hpb=95f74e99982edc8750858ff9400048c3d6f07e81 diff --git a/app/src/main/java/net/ktnx/mobileledger/dao/TransactionDAO.java b/app/src/main/java/net/ktnx/mobileledger/dao/TransactionDAO.java index 9012d489..001976d3 100644 --- a/app/src/main/java/net/ktnx/mobileledger/dao/TransactionDAO.java +++ b/app/src/main/java/net/ktnx/mobileledger/dao/TransactionDAO.java @@ -27,11 +27,15 @@ import androidx.room.OnConflictStrategy; import androidx.room.Query; import androidx.room.Update; +import net.ktnx.mobileledger.db.Account; +import net.ktnx.mobileledger.db.AccountValue; import net.ktnx.mobileledger.db.DB; import net.ktnx.mobileledger.db.Transaction; import net.ktnx.mobileledger.db.TransactionAccount; import net.ktnx.mobileledger.db.TransactionWithAccounts; +import net.ktnx.mobileledger.model.LedgerAccount; import net.ktnx.mobileledger.utils.Logger; +import net.ktnx.mobileledger.utils.Misc; import java.util.ArrayList; import java.util.List; @@ -62,6 +66,9 @@ public abstract class TransactionDAO extends BaseDAO { @Delete public abstract void deleteSync(List items); + @Query("DELETE FROM transactions") + public abstract void deleteAllSync(); + @Query("SELECT * FROM transactions WHERE id = :id") public abstract LiveData getById(long id); @@ -73,12 +80,11 @@ public abstract class TransactionDAO extends BaseDAO { @Query("SELECT * FROM transactions WHERE id = :transactionId") public abstract TransactionWithAccounts getByIdWithAccountsSync(long transactionId); - @Query("SELECT DISTINCT description, CASE WHEN description_upper LIKE :term||'%%' THEN 1 " + - " WHEN description_upper LIKE '%%:'||:term||'%%' THEN 2 " + - " WHEN description_upper LIKE '%% '||:term||'%%' THEN 3 " + - " ELSE 9 END AS ordering " + "FROM description_history " + - "WHERE description_upper LIKE '%%'||:term||'%%' " + - "ORDER BY ordering, description_upper, rowid ") + @Query("SELECT DISTINCT description, CASE WHEN description_uc LIKE :term||'%%' THEN 1 " + + " WHEN description_uc LIKE '%%:'||:term||'%%' THEN 2 " + + " WHEN description_uc LIKE '%% '||:term||'%%' THEN 3 " + + " ELSE 9 END AS ordering FROM transactions " + + "WHERE description_uc LIKE '%%'||:term||'%%' ORDER BY ordering, description_uc, rowid ") public abstract List lookupDescriptionSync(@NonNull String term); @androidx.room.Transaction @@ -87,9 +93,9 @@ public abstract class TransactionDAO extends BaseDAO { public abstract TransactionWithAccounts getFirstByDescriptionSync(@NonNull String description); @androidx.room.Transaction - @Query("SELECT tr.id, tr.profile_id, tr.ledger_id, tr.description, tr.data_hash, tr.comment, " + - "tr.year, tr.month, tr.day, tr.generation from transactions tr JOIN " + - "transaction_accounts t_a ON t_a.transaction_id = tr.id WHERE tr.description = " + + @Query("SELECT tr.id, tr.profile_id, tr.ledger_id, tr.description, tr.description_uc, tr" + + ".data_hash, tr.comment, tr.year, tr.month, tr.day, tr.generation from transactions tr" + + " JOIN transaction_accounts t_a ON t_a.transaction_id = tr.id WHERE tr.description = " + ":description AND t_a.account_name LIKE '%'||:accountTerm||'%' ORDER BY year desc, " + "month desc, day desc, tr.ledger_id desc LIMIT 1") public abstract TransactionWithAccounts getFirstByDescriptionHavingAccountSync( @@ -102,25 +108,19 @@ public abstract class TransactionDAO extends BaseDAO { protected abstract TransactionGenerationContainer getGenerationPOJOSync(long profileId); @androidx.room.Transaction - @Query("SELECT * FROM transactions WHERE profile_id = :profileId") - public abstract List getAllWithAccountsSync(long profileId); + @Query("SELECT * FROM transactions WHERE profile_id = :profileId ORDER BY year " + + " asc, month asc, day asc, ledger_id asc") + public abstract LiveData> getAllWithAccounts(long profileId); @androidx.room.Transaction @Query("SELECT distinct(tr.id), tr.ledger_id, tr.profile_id, tr.data_hash, tr.year, tr.month," + - " tr.day, tr.description, tr.comment, tr.generation FROM transactions tr JOIN " + - "transaction_accounts ta ON ta.transaction_id=tr.id WHERE ta.account_name LIKE " + - ":accountName||'%' AND ta.amount <> 0 AND tr.profile_id = :profileId ORDER BY tr.year " + - "desc, tr.month desc, tr.day desc, tr.ledger_id desc") - public abstract List getAllWithAccountsFilteredSync(long profileId, - String accountName); - - public long getGenerationSync(long profileId) { - TransactionGenerationContainer result = getGenerationPOJOSync(profileId); + " tr.day, tr.description, tr.description_uc, tr.comment, tr.generation FROM " + + "transactions tr JOIN transaction_accounts ta ON ta.transaction_id=tr.id WHERE ta" + + ".account_name LIKE :accountName||'%' AND ta.amount <> 0 AND tr.profile_id = " + + ":profileId ORDER BY tr.year asc, tr.month asc, tr.day asc, tr.ledger_id asc") + public abstract LiveData> getAllWithAccountsFiltered( + long profileId, String accountName); - if (result == null) - return 0; - return result.generation; - } @Query("DELETE FROM transactions WHERE profile_id = :profileId AND generation <> " + ":currentGeneration") public abstract int purgeOldTransactionsSync(long profileId, long currentGeneration); @@ -129,6 +129,42 @@ public abstract class TransactionDAO extends BaseDAO { ".id=transaction_accounts.transaction_id AND tr.profile_id=:profileId) AND generation " + "<> :currentGeneration") public abstract int purgeOldTransactionAccountsSync(long profileId, long currentGeneration); + + @Query("DELETE FROM transactions WHERE profile_id = :profileId") + public abstract int deleteAllSync(long profileId); + + @Query("SELECT * FROM transactions where profile_id = :profileId AND ledger_id = :ledgerId") + public abstract Transaction getByLedgerId(long profileId, long ledgerId); + + @Query("UPDATE transactions SET generation = :newGeneration WHERE id = :transactionId") + public abstract int updateGeneration(long transactionId, long newGeneration); + + @Query("UPDATE transaction_accounts SET generation = :newGeneration WHERE transaction_id = " + + ":transactionId") + public abstract int updateAccountsGeneration(long transactionId, long newGeneration); + + @Query("SELECT max(ledger_id) as ledger_id FROM transactions WHERE profile_id = :profileId") + public abstract LedgerIdContainer getMaxLedgerIdPOJOSync(long profileId); + @androidx.room.Transaction + public void updateGenerationWithAccounts(long transactionId, long newGeneration) { + updateGeneration(transactionId, newGeneration); + updateAccountsGeneration(transactionId, newGeneration); + } + public long getGenerationSync(long profileId) { + TransactionGenerationContainer result = getGenerationPOJOSync(profileId); + + if (result == null) + return 0; + return result.generation; + } + public long getMaxLedgerIdSync(long profileId) { + LedgerIdContainer result = getMaxLedgerIdPOJOSync(profileId); + + if (result == null) + return 0; + return result.ledgerId; + } + @androidx.room.Transaction public void storeTransactionsSync(List list, long profileId) { long generation = getGenerationSync(profileId) + 1; @@ -147,17 +183,22 @@ public abstract class TransactionDAO extends BaseDAO { Logger.debug("Transaction", String.format(Locale.ROOT, "Purged %d transaction accounts", removed)); } - @Query("DELETE FROM transactions WHERE profile_id = :profileId") - public abstract int deleteAllSync(long profileId); - private void storeSync(TransactionWithAccounts rec) { + @androidx.room.Transaction + void storeSync(TransactionWithAccounts rec) { TransactionAccountDAO trAccDao = DB.get() .getTransactionAccountDAO(); Transaction transaction = rec.transaction; Transaction existing = getByLedgerId(transaction.getProfileId(), transaction.getLedgerId()); if (existing != null) { + if (Misc.equalStrings(transaction.getDataHash(), existing.getDataHash())) { + updateGenerationWithAccounts(existing.getId(), rec.transaction.getGeneration()); + return; + } + existing.copyDataFrom(transaction); updateSync(existing); + transaction = existing; } else @@ -176,8 +217,62 @@ public abstract class TransactionDAO extends BaseDAO { trAcc.setId(trAccDao.insertSync(trAcc)); } } - @Query("SELECT * FROM transactions where profile_id = :profileId AND ledger_id = :ledgerId") - public abstract Transaction getByLedgerId(long profileId, long ledgerId); + public void storeLast(TransactionWithAccounts rec) { + BaseDAO.runAsync(() -> appendSync(rec)); + } + @androidx.room.Transaction + public void appendSync(TransactionWithAccounts rec) { + TransactionAccountDAO trAccDao = DB.get() + .getTransactionAccountDAO(); + AccountDAO accDao = DB.get() + .getAccountDAO(); + AccountValueDAO accValDao = DB.get() + .getAccountValueDAO(); + + Transaction transaction = rec.transaction; + final long profileId = transaction.getProfileId(); + transaction.setGeneration(getGenerationSync(profileId)); + transaction.setLedgerId(getMaxLedgerIdSync(profileId) + 1); + transaction.setId(insertSync(transaction)); + + for (TransactionAccount trAcc : rec.accounts) { + trAcc.setTransactionId(transaction.getId()); + trAcc.setGeneration(transaction.getGeneration()); + trAcc.setId(trAccDao.insertSync(trAcc)); + + String accName = trAcc.getAccountName(); + while (accName != null) { + Account acc = accDao.getByNameSync(profileId, accName); + if (acc == null) { + acc = new Account(); + acc.setProfileId(profileId); + acc.setName(accName); + acc.setNameUpper(accName.toUpperCase()); + acc.setParentName(LedgerAccount.extractParentName(accName)); + acc.setLevel(LedgerAccount.determineLevel(acc.getName())); + acc.setGeneration(trAcc.getGeneration()); + + acc.setId(accDao.insertSync(acc)); + } + + AccountValue accVal = accValDao.getByCurrencySync(acc.getId(), trAcc.getCurrency()); + if (accVal == null) { + accVal = new AccountValue(); + accVal.setAccountId(acc.getId()); + accVal.setGeneration(trAcc.getGeneration()); + accVal.setCurrency(trAcc.getCurrency()); + accVal.setValue(trAcc.getAmount()); + accVal.setId(accValDao.insertSync(accVal)); + } + else { + accVal.setValue(accVal.getValue() + trAcc.getAmount()); + accValDao.updateSync(accVal); + } + + accName = LedgerAccount.extractParentName(accName); + } + } + } static class TransactionGenerationContainer { @ColumnInfo long generation; @@ -186,6 +281,14 @@ public abstract class TransactionDAO extends BaseDAO { } } + static class LedgerIdContainer { + @ColumnInfo(name = "ledger_id") + long ledgerId; + public LedgerIdContainer(long ledgerId) { + this.ledgerId = ledgerId; + } + } + static public class DescriptionContainer { @ColumnInfo public String description;