X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=869d060abf64b6e56d903e026a323e910dc92c5d;hb=650ed7db3f2371b8a7cf65b52adfceeb25e34bca;hp=252b32f41ed7f1fe1ae8fbad7afbefde7c7127e7;hpb=43893dc20e2552b711e85b453fa939efbc8bbbc2;p=mobile-ledger.git 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 252b32f4..869d060a 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java @@ -20,18 +20,15 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import net.ktnx.mobileledger.json.ParsedLedgerTransaction; -import net.ktnx.mobileledger.json.ParsedPosting; import net.ktnx.mobileledger.utils.Digest; import net.ktnx.mobileledger.utils.Globals; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; import java.text.ParseException; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; -import java.util.GregorianCalendar; public class LedgerTransaction { private static final String DIGEST_TYPE = "SHA-256"; @@ -39,10 +36,18 @@ public class LedgerTransaction { new Comparator() { @Override 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()); - if (res != 0) return res; + int res = o1.getAccountName() + .compareTo(o2.getAccountName()); + if (res != 0) + return res; + res = o1.getCurrency() + .compareTo(o2.getCurrency()); + if (res != 0) + return res; + res = o1.getComment() + .compareTo(o2.getComment()); + if (res != 0) + return res; return Float.compare(o1.getAmount(), o2.getAmount()); } }; @@ -50,6 +55,7 @@ public class LedgerTransaction { private Integer id; private Date date; private String description; + private String comment; private ArrayList accounts; private String dataHash; private boolean dataLoaded; @@ -57,7 +63,8 @@ public class LedgerTransaction { throws ParseException { this(id, Globals.parseLedgerDate(dateString), description); } - public LedgerTransaction(Integer id, Date date, String description, MobileLedgerProfile profile) { + public LedgerTransaction(Integer id, Date date, String description, + MobileLedgerProfile profile) { this.profile = profile.getUuid(); this.id = id; this.date = date; @@ -105,19 +112,29 @@ public class LedgerTransaction { this.description = description; dataHash = null; } + public String getComment() { + return comment; + } + public void setComment(String comment) { + this.comment = comment; + } public int getId() { return id; } protected void fillDataHash() { - if (dataHash != null) return; + if (dataHash != null) + return; try { Digest sha = new Digest(DIGEST_TYPE); StringBuilder data = new StringBuilder(); + data.append("ver1"); data.append(profile); data.append(getId()); data.append('\0'); data.append(getDescription()); data.append('\0'); + data.append(getComment()); + data.append('\0'); data.append(Globals.formatLedgerDate(getDate())); data.append('\0'); for (LedgerTransactionAccount item : accounts) { @@ -126,8 +143,11 @@ public class LedgerTransaction { data.append(item.getCurrency()); data.append('\0'); data.append(item.getAmount()); + data.append('\0'); + data.append(item.getComment()); } - sha.update(data.toString().getBytes(Charset.forName("UTF-8"))); + sha.update(data.toString() + .getBytes(StandardCharsets.UTF_8)); dataHash = sha.digestToHexString(); } catch (NoSuchAlgorithmException e) { @@ -137,8 +157,8 @@ public class LedgerTransaction { } public boolean existsInDb(SQLiteDatabase db) { fillDataHash(); - try (Cursor c = db - .rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash})) + try (Cursor c = db.rawQuery("SELECT 1 from transactions where data_hash = ?", + new String[]{dataHash})) { boolean result = c.moveToFirst(); // debug("db", String.format("Transaction %d (%s) %s", id, dataHash, @@ -147,11 +167,12 @@ public class LedgerTransaction { } } public void loadData(SQLiteDatabase db) { - if (dataLoaded) return; + if (dataLoaded) + return; - try (Cursor cTr = db - .rawQuery("SELECT date, description from transactions WHERE profile=? AND id=?", - new String[]{profile, String.valueOf(id)})) + try (Cursor cTr = db.rawQuery( + "SELECT date, description, comment from transactions WHERE profile=? AND id=?", + new String[]{profile, String.valueOf(id)})) { if (cTr.moveToFirst()) { String dateString = cTr.getString(0); @@ -161,14 +182,15 @@ public class LedgerTransaction { catch (ParseException e) { e.printStackTrace(); throw new RuntimeException( - String.format("Error parsing date '%s' from " + "transacion %d", + String.format("Error parsing date '%s' from " + "transaction %d", dateString, id)); } description = cTr.getString(1); + comment = cTr.getString(2); - try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " + - "transaction_accounts WHERE " + - "profile=? AND transaction_id = ?", + try (Cursor cAcc = db.rawQuery( + "SELECT account_name, amount, currency, comment FROM " + + "transaction_accounts WHERE profile=? AND transaction_id = ?", new String[]{profile, String.valueOf(id)})) { while (cAcc.moveToNext()) { @@ -176,7 +198,7 @@ public class LedgerTransaction { // 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))); + cAcc.getString(2), cAcc.getString(3))); } finishLoading(); @@ -186,30 +208,10 @@ public class LedgerTransaction { } public String getDataHash() { + fillDataHash(); return dataHash; } public void finishLoading() { dataLoaded = true; } - public ParsedLedgerTransaction toParsedLedgerTransaction() { - ParsedLedgerTransaction result = new ParsedLedgerTransaction(); - result.setTcomment(""); - result.setTprecedingcomment(""); - - ArrayList postings = new ArrayList<>(); - for (LedgerTransactionAccount acc : accounts) { - if (!acc.getAccountName().isEmpty()) postings.add(acc.asParsedPosting()); - } - - result.setTpostings(postings); - Date transactionDate = date; - if (transactionDate == null) { - transactionDate = new GregorianCalendar().getTime(); - } - result.setTdate(Globals.formatIsoDate(transactionDate)); - result.setTdate2(null); - result.setTindex(1); - result.setTdescription(description); - return result; - } }