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=e51d40038a499b304c938a150d8a3d9b212aa233;hb=de1680dc2e67d2f7be40466a2e51cf8641393cf1;hpb=0250439d60e198f47f86ab4091027ec0d772d4c9
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 e51d4003..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,18 +1,18 @@
/*
- * Copyright © 2018 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.model;
@@ -20,58 +20,100 @@ 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.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.Iterator;
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) {
- int res = o1.getAccountName().compareTo(o2.getAccountName());
- if (res != 0) return res;
- res = o1.getCurrency().compareTo(o2.getCurrency());
- if (res != 0) return res;
+ 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());
}
};
- private String id;
- private String date;
+ private String profile;
+ private Integer id;
+ private SimpleDate date;
private String description;
- private ArrayList items;
+ private String comment;
+ 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)
+ throws ParseException {
+ this(id, Globals.parseLedgerDate(dateString), description);
+ }
+ public LedgerTransaction(Integer id, SimpleDate date, String description,
+ MobileLedgerProfile profile) {
+ this.profile = profile.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(Integer id, SimpleDate date, String description) {
+ this(id, date, description, Data.profile.getValue());
}
- public LedgerTransaction(String date, String description) {
+ public LedgerTransaction(SimpleDate date, String description) {
this(null, date, description);
}
public LedgerTransaction(int id) {
- this(id, null, null);
+ this(id, (SimpleDate) null, null);
}
- public void add_item(LedgerTransactionItem item) {
- items.add(item);
+ public LedgerTransaction(int id, String profileUUID) {
+ this.profile = profileUUID;
+ this.id = id;
+ this.date = null;
+ this.description = null;
+ this.accounts = new ArrayList<>();
+ this.dataHash = null;
+ this.dataLoaded = false;
+ }
+ public ArrayList getAccounts() {
+ return accounts;
+ }
+ public void addAccount(LedgerTransactionAccount item) {
+ accounts.add(item);
dataHash = null;
}
- public String 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(String date) {
+ public void setDate(SimpleDate date) {
this.date = date;
dataHash = null;
}
@@ -82,51 +124,42 @@ 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 getComment() {
+ return comment;
}
- public String getId() {
- return id;
+ public void setComment(String comment) {
+ this.comment = comment;
}
- 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()});
- }
+ public int getId() {
+ return id;
}
- private void fillDataHash() {
- if (dataHash != null) return;
+ protected void fillDataHash() {
+ 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');
- for (LedgerTransactionItem item : items) {
+ data.append(getComment());
+ data.append('\0');
+ data.append(Globals.formatLedgerDate(getDate()));
+ data.append('\0');
+ for (LedgerTransactionAccount item : accounts) {
data.append(item.getAccountName());
data.append('\0');
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,27 +167,56 @@ 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;
+ if (dataLoaded)
+ return;
- try (Cursor cTr = db.rawQuery("SELECT date, description from transactions WHERE " +
- "id=?",new String[]{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()) {
- date = cTr.getString(0);
- 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 FROM " +
- "transaction_accounts WHERE transaction_id = ?",
- new String[]{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()) {
- add_item(
- new LedgerTransactionItem(cAcc.getString(0), cAcc.getFloat(1),
- cAcc.getString(2)));
+// 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), cAcc.getString(3)));
}
+
+ finishLoading();
}
}
}
}
+ public String getDataHash() {
+ fillDataHash();
+ return dataHash;
+ }
+ public void finishLoading() {
+ dataLoaded = true;
+ }
}