]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
two fallouts after transaction date reorganisation and 'go to date' feature
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / LedgerTransaction.java
index 03b9c7ac54582d501482810680b39c5f10d95c4c..04b63b64169f03b11ac0ab7e747abfab51a17431 100644 (file)
@@ -1,35 +1,38 @@
 /*
- * Copyright © 2019 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 <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package net.ktnx.mobileledger.model;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 
+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;
 
 public class LedgerTransaction {
     private static final String DIGEST_TYPE = "SHA-256";
@@ -37,17 +40,26 @@ public class LedgerTransaction {
             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;
@@ -55,8 +67,9 @@ public class LedgerTransaction {
             throws ParseException {
         this(id, Globals.parseLedgerDate(dateString), description);
     }
-    public LedgerTransaction(Integer id, Date date, String description) {
-        this.profile = Data.profile.get().getUuid();
+    public LedgerTransaction(Integer id, SimpleDate date, String description,
+                             MobileLedgerProfile profile) {
+        this.profile = profile.getUuid();
         this.id = id;
         this.date = date;
         this.description = description;
@@ -64,11 +77,23 @@ public class LedgerTransaction {
         this.dataHash = null;
         dataLoaded = false;
     }
-    public LedgerTransaction(Date date, String description) {
+    public LedgerTransaction(Integer id, SimpleDate date, String description) {
+        this(id, date, description, Data.profile.getValue());
+    }
+    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;
+        this.id = id;
+        this.date = null;
+        this.description = null;
+        this.accounts = new ArrayList<>();
+        this.dataHash = null;
+        this.dataLoaded = false;
     }
     public ArrayList<LedgerTransactionAccount> getAccounts() {
         return accounts;
@@ -77,10 +102,18 @@ public class LedgerTransaction {
         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;
     }
@@ -91,19 +124,29 @@ public class LedgerTransaction {
         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) {
@@ -112,8 +155,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) {
@@ -123,46 +169,41 @@ public class LedgerTransaction {
     }
     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();
-            Log.d("db", String.format("Transaction %d (%s) %s", id, dataHash,
-                    result ? "already present" : "not present"));
+//            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 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);
 
-                try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +
-                                               "transaction_accounts WHERE " +
-                                               "profile=? AND transaction_id = ?",
+                accounts.clear();
+
+                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()) {
-//                        Log.d("transactions",
+//                        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(2), cAcc.getString(3)));
                     }
 
                     finishLoading();
@@ -172,6 +213,7 @@ public class LedgerTransaction {
 
     }
     public String getDataHash() {
+        fillDataHash();
         return dataHash;
     }
     public void finishLoading() {