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=3919ad141e431f39da7673be2ca3ecd835d29b32;hp=fab4ff3e0d1f2988eacd0f06be35687bb20c758e;hb=160edb0e0fe58f5076329e8622db414001895530;hpb=e157cecbc90a45da05dcb8c2ad38050bbb7ba395

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 fab4ff3e..3919ad14 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -19,6 +19,7 @@ package net.ktnx.mobileledger.model;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
 
 import net.ktnx.mobileledger.utils.Digest;
 
@@ -30,10 +31,10 @@ import java.util.Iterator;
 
 public class LedgerTransaction {
     private static final String DIGEST_TYPE = "SHA-256";
-    public final Comparator<LedgerTransactionItem> comparator =
-            new Comparator<LedgerTransactionItem>() {
+    public final Comparator<LedgerTransactionAccount> comparator =
+            new Comparator<LedgerTransactionAccount>() {
                 @Override
-                public int compare(LedgerTransactionItem o1, LedgerTransactionItem o2) {
+                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());
@@ -41,13 +42,13 @@ public class LedgerTransaction {
                     return Float.compare(o1.getAmount(), o2.getAmount());
                 }
             };
-    private String id;
+    private Integer id;
     private String date;
     private String description;
-    private ArrayList<LedgerTransactionItem> items;
+    private ArrayList<LedgerTransactionAccount> items;
     private String dataHash;
     private boolean dataLoaded;
-    public LedgerTransaction(String id, String date, String description) {
+    public LedgerTransaction(Integer id, String date, String description) {
         this.id = id;
         this.date = date;
         this.description = description;
@@ -55,16 +56,13 @@ public class LedgerTransaction {
         this.dataHash = null;
         dataLoaded = false;
     }
-    public LedgerTransaction(int id, String date, String description) {
-        this(String.valueOf(id), date, description);
-    }
     public LedgerTransaction(String date, String description) {
         this(null, date, description);
     }
     public LedgerTransaction(int id) {
         this(id, null, null);
     }
-    public void add_item(LedgerTransactionItem item) {
+    public void addAccount(LedgerTransactionAccount item) {
         items.add(item);
         dataHash = null;
     }
@@ -82,8 +80,8 @@ public class LedgerTransaction {
         this.description = description;
         dataHash = null;
     }
-    public Iterator<LedgerTransactionItem> getItemsIterator() {
-        return new Iterator<LedgerTransactionItem>() {
+    public Iterator<LedgerTransactionAccount> getAccountsIterator() {
+        return new Iterator<LedgerTransactionAccount>() {
             private int pointer = 0;
             @Override
             public boolean hasNext() {
@@ -91,20 +89,20 @@ public class LedgerTransaction {
             }
 
             @Override
-            public LedgerTransactionItem next() {
+            public LedgerTransactionAccount next() {
                 return hasNext() ? items.get(pointer++) : null;
             }
         };
     }
-    public String getId() {
+    public int getId() {
         return id;
     }
     public void insertInto(SQLiteDatabase db) {
         fillDataHash();
         db.execSQL("INSERT INTO transactions(id, date, description, data_hash) values(?,?,?,?)",
-                new String[]{id, date, description});
+                new Object[]{id, date, description, dataHash});
 
-        for (LedgerTransactionItem item : items) {
+        for (LedgerTransactionAccount item : items) {
             db.execSQL("INSERT INTO transaction_accounts(transaction_id, account_name, amount, " +
                        "currency) values(?, ?, ?, ?)",
                     new Object[]{id, item.getAccountName(), item.getAmount(), item.getCurrency()});
@@ -119,7 +117,7 @@ public class LedgerTransaction {
             data.append('\0');
             data.append(getDescription());
             data.append('\0');
-            for (LedgerTransactionItem item : items) {
+            for (LedgerTransactionAccount item : items) {
                 data.append(item.getAccountName());
                 data.append('\0');
                 data.append(item.getCurrency());
@@ -134,23 +132,34 @@ 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();
+            Log.d("transactions", String.format("Transaction %d (%s) %s", id, dataHash,
+                    result ? "already present" : "not present"));
+            return result;
+        }
+    }
     public void loadData(SQLiteDatabase db) {
         if (dataLoaded) return;
 
-        try (Cursor cTr = db.rawQuery("SELECT date, description from transactions WHERE " +
-                                         "id=?",new String[]{id})) {
+        try (Cursor cTr = db.rawQuery("SELECT date, description from transactions WHERE id=?",
+                new String[]{String.valueOf(id)}))
+        {
             if (cTr.moveToFirst()) {
                 date = cTr.getString(0);
                 description = cTr.getString(1);
 
                 try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +
                                                "transaction_accounts WHERE transaction_id = ?",
-                        new String[]{id}))
+                        new String[]{String.valueOf(id)}))
                 {
                     while (cAcc.moveToNext()) {
-                        add_item(
-                                new LedgerTransactionItem(cAcc.getString(0), cAcc.getFloat(1),
-                                        cAcc.getString(2)));
+                        addAccount(new LedgerTransactionAccount(cAcc.getString(0), cAcc.getFloat(1),
+                                cAcc.getString(2)));
                     }
 
                     dataLoaded = true;