X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdao%2FAccountDAO.java;h=3b401b669ef9e303e2b91d1aa5348acf05cdd0bf;hb=8098a8b37a4331b9faf6cf50a51a0d7aa9677421;hp=3bdf431d3189f52a17f69c3ae8ec0ad2b28912ed;hpb=d6040b0ed8cc133b60ad25aa2f38e2cb9a6ad166;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/dao/AccountDAO.java b/app/src/main/java/net/ktnx/mobileledger/dao/AccountDAO.java
index 3bdf431d..3b401b66 100644
--- a/app/src/main/java/net/ktnx/mobileledger/dao/AccountDAO.java
+++ b/app/src/main/java/net/ktnx/mobileledger/dao/AccountDAO.java
@@ -19,21 +19,32 @@ package net.ktnx.mobileledger.dao;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
+import androidx.room.ColumnInfo;
 import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
 import androidx.room.Query;
-import androidx.room.RoomWarnings;
+import androidx.room.Transaction;
 import androidx.room.Update;
 
 import net.ktnx.mobileledger.db.Account;
+import net.ktnx.mobileledger.db.AccountWithAmounts;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Dao
 public abstract class AccountDAO extends BaseDAO<Account> {
+    static public List<String> unbox(List<AccountNameContainer> list) {
+        ArrayList<String> result = new ArrayList<>(list.size());
+        for (AccountNameContainer item : list) {
+            result.add(item.name);
+        }
+
+        return result;
+    }
     @Insert
-    public abstract void insertSync(Account item);
+    public abstract long insertSync(Account item);
 
     @Update
     public abstract void updateSync(Account item);
@@ -41,51 +52,71 @@ public abstract class AccountDAO extends BaseDAO<Account> {
     @Delete
     public abstract void deleteSync(Account item);
 
-    @Query("SELECT * FROM accounts")
-    public abstract LiveData<List<Account>> getAll();
+    @Delete
+    public abstract void deleteSync(List<Account> items);
+
+    @Query("SELECT * FROM accounts WHERE profile_id=:profileId")
+    public abstract LiveData<List<Account>> getAll(long profileId);
+
+    @Transaction
+    @Query("SELECT * FROM accounts WHERE profile_id = :profileId")
+    public abstract LiveData<List<AccountWithAmounts>> getAllWithAmounts(long profileId);
 
-    @Query("SELECT * FROM accounts WHERE profile = :profileUUID AND name = :accountName")
-    public abstract LiveData<Account> getByName(@NonNull String profileUUID,
-                                                @NonNull String accountName);
+    @Query("SELECT * FROM accounts WHERE id=:id")
+    public abstract Account getByIdSync(long id);
 
-//    not useful for now
+    //    not useful for now
 //    @Transaction
 //    @Query("SELECT * FROM patterns")
 //    List<PatternWithAccounts> getPatternsWithAccounts();
+    @Query("SELECT * FROM accounts WHERE profile_id = :profileId AND name = :accountName")
+    public abstract LiveData<Account> getByName(long profileId, @NonNull String accountName);
 
-    @Query("SELECT *, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
+    @Transaction
+    @Query("SELECT * FROM accounts WHERE profile_id = :profileId AND name = :accountName")
+    public abstract LiveData<AccountWithAmounts> getByNameWithAmounts(long profileId,
+                                                                      @NonNull String accountName);
+
+    @Query("SELECT name, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
            "               WHEN name_upper LIKE '%%:'||:term||'%%' THEN 2 " +
            "               WHEN name_upper LIKE '%% '||:term||'%%' THEN 3 " +
            "               ELSE 9 END AS ordering " + "FROM accounts " +
-           "WHERE profile=:profileUUID AND name_upper LIKE '%%'||:term||'%%' " +
+           "WHERE profile_id=:profileId AND name_upper LIKE '%%'||:term||'%%' " +
            "ORDER BY ordering, name_upper, rowid ")
-    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
-    public abstract LiveData<List<Account>> lookupInProfileByName(@NonNull String profileUUID,
-                                                                  @NonNull String term);
+    public abstract LiveData<List<AccountNameContainer>> lookupInProfileByName(long profileId,
+                                                                               @NonNull
+                                                                                       String term);
 
-    @Query("SELECT *, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
+    @Query("SELECT name, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
            "               WHEN name_upper LIKE '%%:'||:term||'%%' THEN 2 " +
            "               WHEN name_upper LIKE '%% '||:term||'%%' THEN 3 " +
            "               ELSE 9 END AS ordering " + "FROM accounts " +
-           "WHERE profile=:profileUUID AND name_upper LIKE '%%'||:term||'%%' " +
+           "WHERE profile_id=:profileId AND name_upper LIKE '%%'||:term||'%%' " +
            "ORDER BY ordering, name_upper, rowid ")
-    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
-    public abstract List<Account> lookupInProfileByNameSync(@NonNull String profileUUID,
-                                                            @NonNull String term);
+    public abstract List<AccountNameContainer> lookupInProfileByNameSync(long profileId,
+                                                                         @NonNull String term);
 
-    @Query("SELECT *, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
+    @Query("SELECT DISTINCT name, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
            "               WHEN name_upper LIKE '%%:'||:term||'%%' THEN 2 " +
            "               WHEN name_upper LIKE '%% '||:term||'%%' THEN 3 " +
            "               ELSE 9 END AS ordering " + "FROM accounts " +
            "WHERE name_upper LIKE '%%'||:term||'%%' " + "ORDER BY ordering, name_upper, rowid ")
-    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
-    public abstract LiveData<List<Account>> lookupByName(@NonNull String term);
+    public abstract LiveData<List<AccountNameContainer>> lookupByName(@NonNull String term);
 
-    @Query("SELECT *, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
+    @Query("SELECT DISTINCT name, CASE WHEN name_upper LIKE :term||'%%' THEN 1 " +
            "               WHEN name_upper LIKE '%%:'||:term||'%%' THEN 2 " +
            "               WHEN name_upper LIKE '%% '||:term||'%%' THEN 3 " +
            "               ELSE 9 END AS ordering " + "FROM accounts " +
            "WHERE name_upper LIKE '%%'||:term||'%%' " + "ORDER BY ordering, name_upper, rowid ")
-    @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
-    public abstract List<Account> lookupByNameSync(@NonNull String term);
+    public abstract List<AccountNameContainer> lookupByNameSync(@NonNull String term);
+
+    @Query("SELECT * FROM accounts WHERE profile_id = :profileId")
+    public abstract List<Account> allForProfileSync(long profileId);
+
+    static public class AccountNameContainer {
+        @ColumnInfo
+        public String name;
+        @ColumnInfo
+        public int ordering;
+    }
 }