X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=7b63a59a3ef6c8839df40b8ff5abfe5a8051cae7;hp=fab4ff3e0d1f2988eacd0f06be35687bb20c758e;hb=6ea8c7c196778dda4496d23541b059ec78cba76d;hpb=e157cecbc90a45da05dcb8c2ad38050bbb7ba395 diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java index fab4ff3e..7b63a59a 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Damyan Ivanov. + * Copyright © 2019 Damyan Ivanov. * This file is part of Mobile-Ledger. * Mobile-Ledger is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -19,21 +19,23 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.util.Log; import net.ktnx.mobileledger.utils.Digest; +import net.ktnx.mobileledger.utils.Globals; import java.nio.charset.Charset; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Comparator; -import java.util.Iterator; +import java.util.Date; public class LedgerTransaction { private static final String DIGEST_TYPE = "SHA-256"; - public final Comparator comparator = - new Comparator() { + public final Comparator comparator = + new Comparator() { @Override - public int compare(LedgerTransactionItem o1, LedgerTransactionItem o2) { + public int compare(LedgerTransactionAccount o1, LedgerTransactionAccount o2) { int res = o1.getAccountName().compareTo(o2.getAccountName()); if (res != 0) return res; res = o1.getCurrency().compareTo(o2.getCurrency()); @@ -41,37 +43,42 @@ public class LedgerTransaction { return Float.compare(o1.getAmount(), o2.getAmount()); } }; - private String id; - private String date; + private String profile; + private Integer id; + private Date date; private String description; - private ArrayList items; + private ArrayList accounts; private String dataHash; private boolean dataLoaded; - public LedgerTransaction(String id, String date, String description) { + public LedgerTransaction(Integer id, String dateString, String description) { + this(id, Globals.parseLedgerDate(dateString), description); + } + public LedgerTransaction(Integer id, Date date, String description) { + this.profile = Data.profile.get().getUuid(); this.id = id; this.date = date; this.description = description; - this.items = new ArrayList<>(); + this.accounts = new ArrayList<>(); this.dataHash = null; dataLoaded = false; } - public LedgerTransaction(int id, String date, String description) { - this(String.valueOf(id), date, description); - } - public LedgerTransaction(String date, String description) { + public LedgerTransaction(Date date, String description) { this(null, date, description); } public LedgerTransaction(int id) { - this(id, null, null); + this(id, (Date) null, null); + } + public ArrayList getAccounts() { + return accounts; } - public void add_item(LedgerTransactionItem item) { - items.add(item); + public void addAccount(LedgerTransactionAccount item) { + accounts.add(item); dataHash = null; } - public String getDate() { + public Date getDate() { return date; } - public void setDate(String date) { + public void setDate(Date date) { this.date = date; dataHash = null; } @@ -82,44 +89,22 @@ public class LedgerTransaction { this.description = description; dataHash = null; } - public Iterator getItemsIterator() { - return new Iterator() { - private int pointer = 0; - @Override - public boolean hasNext() { - return pointer < items.size(); - } - - @Override - public LedgerTransactionItem next() { - return hasNext() ? items.get(pointer++) : null; - } - }; - } - public String getId() { + public int getId() { return id; } - public void insertInto(SQLiteDatabase db) { - fillDataHash(); - db.execSQL("INSERT INTO transactions(id, date, description, data_hash) values(?,?,?,?)", - new String[]{id, date, description}); - - for (LedgerTransactionItem item : items) { - db.execSQL("INSERT INTO transaction_accounts(transaction_id, account_name, amount, " + - "currency) values(?, ?, ?, ?)", - new Object[]{id, item.getAccountName(), item.getAmount(), item.getCurrency()}); - } - } - private void fillDataHash() { + protected void fillDataHash() { if (dataHash != null) return; try { Digest sha = new Digest(DIGEST_TYPE); StringBuilder data = new StringBuilder(); + data.append(profile); data.append(getId()); data.append('\0'); data.append(getDescription()); data.append('\0'); - for (LedgerTransactionItem item : items) { + data.append(Globals.formatLedgerDate(getDate())); + data.append('\0'); + for (LedgerTransactionAccount item : accounts) { data.append(item.getAccountName()); data.append('\0'); data.append(item.getCurrency()); @@ -134,29 +119,52 @@ public class LedgerTransaction { String.format("Unable to get instance of %s digest", DIGEST_TYPE), e); } } + public boolean existsInDb(SQLiteDatabase db) { + fillDataHash(); + try (Cursor c = db + .rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash})) + { + boolean result = c.moveToFirst(); + Log.d("db", String.format("Transaction %d (%s) %s", id, dataHash, + result ? "already present" : "not present")); + return result; + } + } public void loadData(SQLiteDatabase db) { if (dataLoaded) return; - try (Cursor cTr = db.rawQuery("SELECT date, description from transactions WHERE " + - "id=?",new String[]{id})) { + try (Cursor cTr = db + .rawQuery("SELECT date, description from transactions WHERE profile=? AND id=?", + new String[]{profile, String.valueOf(id)})) + { if (cTr.moveToFirst()) { - date = cTr.getString(0); + String dateString = cTr.getString(0); + date = Globals.parseLedgerDate(dateString); description = cTr.getString(1); try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " + - "transaction_accounts WHERE transaction_id = ?", - new String[]{id})) + "transaction_accounts WHERE " + + "profile=? AND transaction_id = ?", + new String[]{profile, String.valueOf(id)})) { while (cAcc.moveToNext()) { - add_item( - new LedgerTransactionItem(cAcc.getString(0), cAcc.getFloat(1), - cAcc.getString(2))); +// Log.d("transactions", +// String.format("Loaded %d: %s %1.2f %s", id, cAcc.getString(0), +// cAcc.getFloat(1), cAcc.getString(2))); + addAccount(new LedgerTransactionAccount(cAcc.getString(0), cAcc.getFloat(1), + cAcc.getString(2))); } - dataLoaded = true; + finishLoading(); } } } } + public String getDataHash() { + return dataHash; + } + public void finishLoading() { + dataLoaded = true; + } }