/*
- * 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
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;
-import java.util.GregorianCalendar;
public class LedgerTransaction {
private static final String DIGEST_TYPE = "SHA-256";
new Comparator<LedgerTransactionAccount>() {
@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<LedgerTransactionAccount> accounts;
private String dataHash;
private boolean dataLoaded;
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;
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;
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;
}
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) {
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) {
}
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,
}
}
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);
+
+ accounts.clear();
- try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +
- "transaction_accounts WHERE " +
- "profile=? AND transaction_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()) {
// 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();
}
public String getDataHash() {
+ fillDataHash();
return dataHash;
}
public void finishLoading() {
dataLoaded = true;
}
- public ParsedLedgerTransaction toParsedLedgerTransaction() {
- ParsedLedgerTransaction result = new ParsedLedgerTransaction();
- result.setTcomment("");
- result.setTprecedingcomment("");
-
- ArrayList<ParsedPosting> postings = new ArrayList<>();
- for (LedgerTransactionAccount acc : accounts) {
- if (!acc.getAccountName().isEmpty()) postings.add(acc.asParsedPosting());
- }
-
- result.setTpostings(postings);
- Date transactionDate = date;
- if (transactionDate == null) {
- transactionDate = new GregorianCalendar().getTime();
- }
- result.setTdate(Globals.formatIsoDate(transactionDate));
- result.setTdate2(null);
- result.setTindex(1);
- result.setTdescription(description);
- return result;
- }
}
projects / mobile-ledger.git / blobdiff