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=04b63b64169f03b11ac0ab7e747abfab51a17431;hp=fd900efa1851c5cf1135cebc2a8da5f715f405b6;hb=de1680dc2e67d2f7be40466a2e51cf8641393cf1;hpb=0fc2ddc465cd9b9314ae336e69535020a96a7fbc 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 fd900efa..04b63b64 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 © 2019 Damyan Ivanov. + * Copyright © 2020 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 @@ -20,17 +20,19 @@ 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 androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import net.ktnx.mobileledger.App; import net.ktnx.mobileledger.utils.Digest; import net.ktnx.mobileledger.utils.Globals; +import net.ktnx.mobileledger.utils.SimpleDate; -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; public class LedgerTransaction { private static final String DIGEST_TYPE = "SHA-256"; @@ -38,17 +40,26 @@ 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()); } }; private String profile; private Integer id; - private Date date; + private SimpleDate date; private String description; + private String comment; private ArrayList accounts; private String dataHash; private boolean dataLoaded; @@ -56,7 +67,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, SimpleDate date, String description, + MobileLedgerProfile profile) { this.profile = profile.getUuid(); this.id = id; this.date = date; @@ -65,14 +77,14 @@ public class LedgerTransaction { this.dataHash = null; dataLoaded = false; } - public LedgerTransaction(Integer id, Date date, String description) { + public LedgerTransaction(Integer id, SimpleDate date, String description) { this(id, date, description, Data.profile.getValue()); } - public LedgerTransaction(Date date, String description) { + public LedgerTransaction(SimpleDate date, String description) { this(null, date, description); } public LedgerTransaction(int id) { - this(id, (Date) null, null); + this(id, (SimpleDate) null, null); } public LedgerTransaction(int id, String profileUUID) { this.profile = profileUUID; @@ -90,10 +102,18 @@ public class LedgerTransaction { accounts.add(item); dataHash = null; } - public Date getDate() { + @Nullable + public SimpleDate getDateIfAny() { + return date; + } + @NonNull + public SimpleDate getDate() { + loadData(App.getDatabase()); + if (date == null) + throw new IllegalStateException("Transaction has no date"); return date; } - public void setDate(Date date) { + public void setDate(SimpleDate date) { this.date = date; dataHash = null; } @@ -104,19 +124,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) { @@ -125,8 +155,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) { @@ -136,8 +169,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, @@ -146,28 +179,23 @@ 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 year, month, day, description, comment from transactions WHERE profile=? " + + "AND id=?", new String[]{profile, String.valueOf(id)})) { if (cTr.moveToFirst()) { - String dateString = cTr.getString(0); - try { - date = Globals.parseLedgerDate(dateString); - } - catch (ParseException e) { - e.printStackTrace(); - throw new RuntimeException( - String.format("Error parsing date '%s' from " + "transacion %d", - dateString, id)); - } - description = cTr.getString(1); + date = new SimpleDate(cTr.getInt(0), cTr.getInt(1), cTr.getInt(2)); + description = cTr.getString(3); + comment = cTr.getString(4); - try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " + - "transaction_accounts WHERE " + - "profile=? AND transaction_id = ?", + accounts.clear(); + + 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()) { @@ -175,7 +203,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(); @@ -185,26 +213,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); - result.setTdate(Globals.formatIsoDate(date)); - result.setTdate2(null); - result.setTindex(1); - result.setTdescription(description); - return result; - } }