upsync WIP

4 files changed, 18 insertions, 4 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
index d64b17d86..d69154b03 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
@@ -60,8 +60,8 @@ public class DataBaseAdapter {
         return db.getBoardDao().getFullBoardByRemoteIdDirectly(accountId, remoteId);
     }
 
-    public FullBoard getFullBoardByIdDirectly(long accountId, long id) {
-        return db.getBoardDao().getFullBoardByIdDirectly(accountId, id);
+    public FullBoard getFullBoardByLocalIdDirectly(long accountId, long localId) {
+        return db.getBoardDao().getFullBoardByLocalIdDirectly(accountId, localId);
     }
 
     public LiveData<Stack> getStackByRemoteId(long accountId, long localBoardId, long remoteId) {
@@ -318,6 +318,9 @@ public class DataBaseAdapter {
     public List<FullCard> getLocallyChangedCardsDirectly(long accountId) {
         return db.getCardDao().getLocallyChangedCardsDirectly(accountId);
     }
+    public List<FullCard> getLocallyChangedCardsByLocalStackIdDirectly(long accountId, long localStackId) {
+        return db.getCardDao().getLocallyChangedCardsByLocalStackIdDirectly(accountId, localStackId);
+    }
 
     public long createCard(long accountId, Card card) {
         card.setAccountId(accountId);
@@ -426,6 +429,9 @@ public class DataBaseAdapter {
         return db.getBoardDao().getLocallyChangedBoardsDirectly(accountId);
     }
 
+    public List<FullStack> getLocallyChangedStacksForBoard(long accountId, long localBoardId) {
+        return db.getStackDao().getLocallyChangedStacksForBoardDirectly(accountId, localBoardId);
+    }
     public List<FullStack> getLocallyChangedStacks(long accountId) {
         return db.getStackDao().getLocallyChangedStacksDirectly(accountId);
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java
index e74922c60..f013ab358 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java
@@ -30,8 +30,8 @@ public interface BoardDao extends GenericDao<Board> {
     FullBoard getFullBoardByRemoteIdDirectly(long accountId, long remoteId);
 
     @Transaction
-    @Query("SELECT * FROM board WHERE accountId = :accountId and localId = :id")
-    FullBoard getFullBoardByIdDirectly(long accountId, long id);
+    @Query("SELECT * FROM board WHERE accountId = :accountId and localId = :localId")
+    FullBoard getFullBoardByLocalIdDirectly(long accountId, long localId);
 
     @Transaction
     @Query("SELECT * FROM board WHERE accountId = :accountId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java
index de18cf398..7fa13eca0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java
@@ -52,4 +52,8 @@ public interface CardDao extends GenericDao<Card> {
     @Transaction
     @Query("SELECT * FROM card WHERE accountId = :accountId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
     List<FullCard> getLocallyChangedCardsDirectly(long accountId);
+
+    @Transaction
+    @Query("SELECT * FROM card WHERE accountId = :accountId and stackId = :localStackId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
+    List<FullCard> getLocallyChangedCardsByLocalStackIdDirectly(long accountId, long localStackId);
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java
index 0f2b747ad..9bd881370 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java
@@ -43,6 +43,10 @@ public interface StackDao extends GenericDao<Stack> {
     LiveData<FullStack> getFullStack(long accountId, long localId);
 
     @Transaction
+    @Query("SELECT * FROM stack WHERE accountId = :accountId and boardId = :localBoardId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
+    List<FullStack> getLocallyChangedStacksForBoardDirectly(long accountId, long localBoardId);
+
+    @Transaction
     @Query("SELECT * FROM stack WHERE accountId = :accountId and (status<>1 or id is null or lastModified <> lastModifiedLocal)")
     List<FullStack> getLocallyChangedStacksDirectly(long accountId);
 }
\ No newline at end of file