X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=d42e5630d0274f26e3525c510a6435d40f1d023e;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hp=4e7ce33ef3750a3de28ce38662d8728ba6852edd;hpb=f2381ed366479b8d7b3f6f60c6565dbd6df099e3;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 4e7ce33e..d42e5630 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,50 +20,51 @@ 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.App; import net.ktnx.mobileledger.utils.Digest; import net.ktnx.mobileledger.utils.Globals; +import net.ktnx.mobileledger.utils.SimpleDate; 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; - res = o1.getComment() - .compareTo(o2.getComment()); - if (res != 0) - return res; - return Float.compare(o1.getAmount(), o2.getAmount()); - } - }; + 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 String profile; private Integer id; - private Date date; + private SimpleDate date; private String description; private String comment; - private ArrayList accounts; + private List accounts; private String dataHash; private boolean dataLoaded; public LedgerTransaction(Integer id, String dateString, String description) throws ParseException { this(id, Globals.parseLedgerDate(dateString), description); } - public LedgerTransaction(Integer id, Date date, String description, + public LedgerTransaction(Integer id, SimpleDate date, String description, MobileLedgerProfile profile) { this.profile = profile.getUuid(); this.id = id; @@ -73,14 +74,14 @@ public class LedgerTransaction { this.dataHash = null; dataLoaded = false; } - public LedgerTransaction(Integer id, Date date, String description) { - this(id, date, description, Data.profile.getValue()); + public LedgerTransaction(Integer id, SimpleDate date, String description) { + this(id, date, description, Data.getProfile()); } - 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; @@ -91,17 +92,24 @@ public class LedgerTransaction { 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; + } + @NonNull + public SimpleDate getDate() { + 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; } @@ -122,16 +130,20 @@ public class LedgerTransaction { return id; } protected void fillDataHash() { + loadData(App.getDatabase()); 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) { @@ -152,37 +164,20 @@ 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) { + public synchronized 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)})) + "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 " + "transaction %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); + + accounts.clear(); try (Cursor cAcc = db.rawQuery( "SELECT account_name, amount, currency, comment FROM " + @@ -204,9 +199,36 @@ public class LedgerTransaction { } public String getDataHash() { + fillDataHash(); return dataHash; } public void finishLoading() { dataLoaded = true; } + @Override + public boolean equals(@Nullable Object obj) { + if (obj == null) + return false; + if (!obj.getClass() + .equals(this.getClass())) + return false; + + return ((LedgerTransaction) obj).getDataHash() + .equals(getDataHash()); + } + + public boolean hasAccountNamedLike(String name) { + name = name.toUpperCase(); + for (LedgerTransactionAccount acc : accounts) { + if (acc.getAccountName() + .toUpperCase() + .contains(name)) + return true; + } + + return false; + } + public void markDataAsLoaded() { + dataLoaded = true; + } }