X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=cef83169f7a35ec21b304f08eb7c0b5b9dd25983;hb=HEAD;hp=fd900efa1851c5cf1135cebc2a8da5f715f405b6;hpb=0fc2ddc465cd9b9314ae336e69535020a96a7fbc;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 fd900efa..cef83169 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 © 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 @@ -17,83 +17,137 @@ package net.ktnx.mobileledger.model; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; -import net.ktnx.mobileledger.json.ParsedLedgerTransaction; -import net.ktnx.mobileledger.json.ParsedPosting; +import net.ktnx.mobileledger.db.Profile; +import net.ktnx.mobileledger.db.Transaction; +import net.ktnx.mobileledger.db.TransactionAccount; +import net.ktnx.mobileledger.db.TransactionWithAccounts; 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; +import java.util.List; public class LedgerTransaction { private static final String DIGEST_TYPE = "SHA-256"; - public final Comparator comparator = - 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; - return Float.compare(o1.getAmount(), o2.getAmount()); - } - }; - private String profile; - private Integer id; - private Date date; + public final Comparator comparator = (o1, o2) -> { + 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 final long profile; + private final long ledgerId; + private final List accounts; + private long dbId; + private SimpleDate date; private String description; - private ArrayList accounts; + private String comment; private String dataHash; private boolean dataLoaded; - public LedgerTransaction(Integer id, String dateString, String description) + public LedgerTransaction(long ledgerId, String dateString, String description) throws ParseException { - this(id, Globals.parseLedgerDate(dateString), description); + this(ledgerId, Globals.parseLedgerDate(dateString), description); + } + public LedgerTransaction(TransactionWithAccounts dbo) { + this(dbo.transaction.getLedgerId(), dbo.transaction.getProfileId()); + dbId = dbo.transaction.getId(); + date = new SimpleDate(dbo.transaction.getYear(), dbo.transaction.getMonth(), + dbo.transaction.getDay()); + description = dbo.transaction.getDescription(); + comment = dbo.transaction.getComment(); + dataHash = dbo.transaction.getDataHash(); + if (dbo.accounts != null) + for (TransactionAccount acc : dbo.accounts) { + accounts.add(new LedgerTransactionAccount(acc)); + } + dataLoaded = true; + } + public TransactionWithAccounts toDBO() { + TransactionWithAccounts o = new TransactionWithAccounts(); + o.transaction = new Transaction(); + o.transaction.setId(dbId); + o.transaction.setProfileId(profile); + o.transaction.setLedgerId(ledgerId); + o.transaction.setYear(date.year); + o.transaction.setMonth(date.month); + o.transaction.setDay(date.day); + o.transaction.setDescription(description); + o.transaction.setComment(comment); + fillDataHash(); + o.transaction.setDataHash(dataHash); + + o.accounts = new ArrayList<>(); + int orderNo = 1; + for (LedgerTransactionAccount acc : accounts) { + TransactionAccount a = acc.toDBO(); + a.setOrderNo(orderNo++); + a.setTransactionId(dbId); + o.accounts.add(a); + } + return o; } - public LedgerTransaction(Integer id, Date date, String description, MobileLedgerProfile profile) { - this.profile = profile.getUuid(); - this.id = id; + public LedgerTransaction(long ledgerId, SimpleDate date, String description, Profile profile) { + this.profile = profile.getId(); + this.ledgerId = ledgerId; this.date = date; this.description = description; this.accounts = new ArrayList<>(); this.dataHash = null; dataLoaded = false; } - public LedgerTransaction(Integer id, Date date, String description) { - this(id, date, description, Data.profile.getValue()); + public LedgerTransaction(long ledgerId, SimpleDate date, String description) { + this(ledgerId, date, description, Data.getProfile()); } - public LedgerTransaction(Date date, String description) { - this(null, date, description); + public LedgerTransaction(SimpleDate date, String description) { + this(0, date, description); } - public LedgerTransaction(int id) { - this(id, (Date) null, null); + public LedgerTransaction(int ledgerId) { + this(ledgerId, (SimpleDate) null, null); } - public LedgerTransaction(int id, String profileUUID) { - this.profile = profileUUID; - this.id = id; + public LedgerTransaction(long ledgerId, long profileId) { + this.profile = profileId; + this.ledgerId = ledgerId; this.date = null; this.description = null; this.accounts = new ArrayList<>(); this.dataHash = null; this.dataLoaded = false; } - public ArrayList getAccounts() { + public List getAccounts() { return accounts; } public void addAccount(LedgerTransactionAccount item) { accounts.add(item); dataHash = null; } - public Date getDate() { + @Nullable + public SimpleDate getDateIfAny() { return date; } - public void setDate(Date date) { + @NonNull + public SimpleDate getDate() { + if (date == null) + throw new IllegalStateException("Transaction has no date"); + return date; + } + public void setDate(SimpleDate date) { this.date = date; dataHash = null; } @@ -104,19 +158,29 @@ public class LedgerTransaction { this.description = description; dataHash = null; } - public int getId() { - return id; + public String getComment() { + return comment; + } + public void setComment(String comment) { + this.comment = comment; + } + public long getLedgerId() { + return ledgerId; } 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(getLedgerId()); 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 +189,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) { @@ -134,77 +201,37 @@ 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(); -// debug("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 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); - - try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " + - "transaction_accounts WHERE " + - "profile=? AND transaction_id = ?", - new String[]{profile, String.valueOf(id)})) - { - while (cAcc.moveToNext()) { -// debug("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))); - } - - finishLoading(); - } - } - } - - } public String getDataHash() { + fillDataHash(); return dataHash; } public void finishLoading() { dataLoaded = true; } - public ParsedLedgerTransaction toParsedLedgerTransaction() { - ParsedLedgerTransaction result = new ParsedLedgerTransaction(); - result.setTcomment(""); - result.setTprecedingcomment(""); + @Override + public boolean equals(@Nullable Object obj) { + if (obj == null) + return false; + if (!obj.getClass() + .equals(this.getClass())) + return false; - ArrayList postings = new ArrayList<>(); + return ((LedgerTransaction) obj).getDataHash() + .equals(getDataHash()); + } + + public boolean hasAccountNamedLike(String name) { + name = name.toUpperCase(); for (LedgerTransactionAccount acc : accounts) { - if (!acc.getAccountName().isEmpty()) postings.add(acc.asParsedPosting()); + if (acc.getAccountName() + .toUpperCase() + .contains(name)) + return true; } - result.setTpostings(postings); - result.setTdate(Globals.formatIsoDate(date)); - result.setTdate2(null); - result.setTindex(1); - result.setTdescription(description); - return result; + return false; + } + public void markDataAsLoaded() { + dataLoaded = true; } }