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=8e16408ff18c69abc73d693fa18734b642c18194;hp=40d1f5fe05c4dc99cded5bf2a5790f35733c0caf;hb=c0a2a2d5aa42ad56f76dfe73ba10250e11e7f3fd;hpb=95cf1db4897d97d1be0ec8e5a7c5d11de26efa85
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 40d1f5fe..8e16408f 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 © 2019 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;
@@ -21,12 +21,17 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
+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.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";
@@ -41,11 +46,19 @@ public class LedgerTransaction {
return Float.compare(o1.getAmount(), o2.getAmount());
}
};
+ private String profile;
private Integer id;
- private String date;
+ private Date date;
private String description;
private ArrayList accounts;
- public LedgerTransaction(Integer id, String date, String description) {
+ 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, MobileLedgerProfile profile) {
+ this.profile = profile.getUuid();
this.id = id;
this.date = date;
this.description = description;
@@ -53,25 +66,35 @@ public class LedgerTransaction {
this.dataHash = null;
dataLoaded = false;
}
- private String dataHash;
- private boolean dataLoaded;
- public ArrayList getAccounts() {
- return accounts;
+ public LedgerTransaction(Integer id, Date date, String description) {
+ this(id, date, description, Data.profile.get());
}
- public LedgerTransaction(String date, String description) {
+ public LedgerTransaction(Date date, String description) {
this(null, date, description);
}
public LedgerTransaction(int id) {
- this(id, null, null);
+ this(id, (Date) null, null);
+ }
+ 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() {
+ public Date getDate() {
return date;
}
- public void setDate(String date) {
+ public void setDate(Date date) {
this.date = date;
dataHash = null;
}
@@ -85,26 +108,18 @@ public class LedgerTransaction {
public int getId() {
return id;
}
- public void insertInto(SQLiteDatabase db) {
- fillDataHash();
- db.execSQL("INSERT INTO transactions(id, date, description, data_hash) values(?,?,?,?)",
- new Object[]{id, date, description, dataHash});
-
- for (LedgerTransactionAccount item : accounts) {
- db.execSQL("INSERT INTO transaction_accounts(transaction_id, account_name, amount, " +
- "currency) values(?, ?, ?, ?)",
- new Object[]{id, item.getAccountName(), item.getAmount(), item.getCurrency()});
- }
- }
- private void fillDataHash() {
+ protected void fillDataHash() {
if (dataHash != null) return;
try {
Digest sha = new Digest(DIGEST_TYPE);
StringBuilder data = new StringBuilder();
+ data.append(profile);
data.append(getId());
data.append('\0');
data.append(getDescription());
data.append('\0');
+ data.append(Globals.formatLedgerDate(getDate()));
+ data.append('\0');
for (LedgerTransactionAccount item : accounts) {
data.append(item.getAccountName());
data.append('\0');
@@ -126,7 +141,7 @@ public class LedgerTransaction {
.rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash}))
{
boolean result = c.moveToFirst();
- Log.d("transactions", String.format("Transaction %d (%s) %s", id, dataHash,
+ Log.d("db", String.format("Transaction %d (%s) %s", id, dataHash,
result ? "already present" : "not present"));
return result;
}
@@ -134,26 +149,63 @@ public class LedgerTransaction {
public void loadData(SQLiteDatabase db) {
if (dataLoaded) return;
- try (Cursor cTr = db.rawQuery("SELECT date, description from transactions WHERE id=?",
- new String[]{String.valueOf(id)}))
+ try (Cursor cTr = db
+ .rawQuery("SELECT date, description from transactions WHERE profile=? AND id=?",
+ new String[]{profile, String.valueOf(id)}))
{
if (cTr.moveToFirst()) {
- date = cTr.getString(0);
+ 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 transaction_id = ?",
- new String[]{String.valueOf(id)}))
+ "transaction_accounts WHERE " +
+ "profile=? AND transaction_id = ?",
+ new String[]{profile, String.valueOf(id)}))
{
while (cAcc.moveToNext()) {
+// Log.d("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)));
}
- dataLoaded = true;
+ finishLoading();
}
}
}
}
+ public String getDataHash() {
+ 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;
+ }
}