More DAOs and refactoring

14 files changed, 80 insertions, 81 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java
index d1d4f6276..2c7132a53 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java
@@ -19,6 +19,7 @@ public class Account implements Serializable {
     @NonNull
     private String name;
 
+    @Ignore
     public Account(Long id, @NonNull String name) {
         this.id = id;
         this.name = name;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
index 7c794a8ec..691a96c27 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java
@@ -10,21 +10,21 @@ import it.niedermann.nextcloud.deck.model.interfaces.RemoteEntity;
 
 @Entity(
         inheritSuperIndices = true,
-        foreignKeys = {@ForeignKey(entity = User.class, parentColumns = "id", childColumns = "ownerId")}
+        foreignKeys = {@ForeignKey(entity = User.class, parentColumns = "localId", childColumns = "ownerId")}
 )
 public class Board extends RemoteEntity {
 
     private String title;
     long ownerId;
-//    @ToOne(joinProperty = "ownerId")
+    //    @ToOne(joinProperty = "ownerId")
 //    private User owner;
     private String color;
     private boolean archived;
-//    @ToMany
+    //    @ToMany
 //    @JoinEntity(entity = JoinBoardWithLabel.class, sourceProperty = "boardId", targetProperty = "labelId")
 //    private List<Label> labels = new ArrayList<>();
     private String acl;
-//    @ToMany
+    //    @ToMany
 //    @JoinEntity(entity = JoinBoardWithPermission.class, sourceProperty = "boardId", targetProperty = "permissionId")
 //    private List<Permission> permissions = new ArrayList<>();
 //    @ToMany
@@ -54,10 +54,6 @@ public class Board extends RemoteEntity {
         this.lastModifiedLocal = lastModifiedLocal;
     }
 
-    public void setLocalId(Long localId) {
-        this.localId = localId;
-    }
-    
     public Long getId() {
         return id;
     }
@@ -78,10 +74,6 @@ public class Board extends RemoteEntity {
         return archived;
     }
 
-    public void setArchived(boolean archived) {
-        this.archived = archived;
-    }
-
     public String getAcl() {
         return acl;
     }
@@ -106,14 +98,6 @@ public class Board extends RemoteEntity {
         this.deletedAt = deletedAt;
     }
 
-    public Long getLocalId() {
-        return localId;
-    }
-
-    public void setLocalId(long localId) {
-        this.localId = localId;
-    }
-
     public String getTitle() {
         return title;
     }
@@ -134,11 +118,6 @@ public class Board extends RemoteEntity {
         this.status = status;
     }
 
-    public boolean getArchived() {
-        return this.archived;
-    }
-
-
     public int getStatus() {
         return this.status;
     }
@@ -151,4 +130,7 @@ public class Board extends RemoteEntity {
         this.ownerId = ownerId;
     }
 
+    public void setArchived(boolean archived) {
+        this.archived = archived;
+    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
index 5a3e349e5..2d8cff0b7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java
@@ -4,45 +4,40 @@ import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.Index;
 import android.support.annotation.NonNull;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
 import it.niedermann.nextcloud.deck.model.interfaces.RemoteEntity;
 
-@Entity(inheritSuperIndices = true, indices = {@Index("accountId")})
+@Entity(inheritSuperIndices = true, indices = {@Index(value = "accountId", name = "card_acc")})
 public class Card extends RemoteEntity {
 
 
-
     private String title;
     private String description;
     @NonNull
 //    @Index
     private long stackId;
-//    @ToOne(joinProperty = "stackId")
+    //    @ToOne(joinProperty = "stackId")
 //    protected Stack stack;
     private String type;
-    private Date lastModified;
     private Date createdAt;
     private Date deletedAt;
-//    @ToMany
+    //    @ToMany
 //    @JoinEntity(entity = JoinCardWithLabel.class, sourceProperty = "cardId", targetProperty = "labelId")
 //    private List<Label> labels = new ArrayList<>();
 //    @ToMany
 //    @JoinEntity(entity = JoinCardWithUser.class, sourceProperty = "cardId", targetProperty = "userId")
-    private List<User> assignedUsers = new ArrayList<>();
     private String attachments;
     private int attachmentCount;
 
     private Long userId;
-//    @ToOne(joinProperty = "userId")
+    //    @ToOne(joinProperty = "userId")
 //    private User owner;
 //    @Index
     @NonNull
     private int order;
-//    @Index
+    //    @Index
     private boolean archived;
     private Date dueDate;
     private boolean notified;
@@ -50,9 +45,6 @@ public class Card extends RemoteEntity {
     private int commentsUnread;
 
 
-    public void setAssignedUsers(List<User> assignedUsers) {
-        this.assignedUsers = assignedUsers;
-    }
 
     public boolean isNotified() {
         return notified;
@@ -62,14 +54,6 @@ public class Card extends RemoteEntity {
         this.notified = notified;
     }
 
-    public Long getLocalId() {
-        return localId;
-    }
-
-    public void setLocalId(Long localId) {
-        this.localId = localId;
-    }
-
     public Long getId() {
         return id;
     }
@@ -118,14 +102,6 @@ public class Card extends RemoteEntity {
         this.type = type;
     }
 
-    public Date getLastModified() {
-        return lastModified;
-    }
-
-    public void setLastModified(Date lastModified) {
-        this.lastModified = lastModified;
-    }
-
     public Date getCreatedAt() {
         return createdAt;
     }
@@ -142,10 +118,6 @@ public class Card extends RemoteEntity {
         this.deletedAt = deletedAt;
     }
 
-    public void addAssignedUser(User user) {
-        this.assignedUsers.add(user);
-    }
-
     public String getAttachments() {
         return attachments;
     }
@@ -202,10 +174,6 @@ public class Card extends RemoteEntity {
         this.status = status;
     }
 
-    public boolean getArchived() {
-        return this.archived;
-    }
-
     public int getStatus() {
         return this.status;
     }
@@ -221,8 +189,4 @@ public class Card extends RemoteEntity {
     public int getOrder() {
         return this.order;
     }
-
-    public boolean getNotified() {
-        return this.notified;
-    }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithLabel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithLabel.java
index c5973c1c0..4a058e127 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithLabel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithLabel.java
@@ -2,9 +2,10 @@ package it.niedermann.nextcloud.deck.model;
 
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
+import android.support.annotation.NonNull;
 
 @Entity(
-        primaryKeys = { "labelId", "boardId" },
+        primaryKeys = {"labelId", "boardId"},
         foreignKeys = {
                 @ForeignKey(entity = Board.class,
                         parentColumns = "localId",
@@ -14,8 +15,10 @@ import android.arch.persistence.room.ForeignKey;
                         childColumns = "labelId")
         })
 public class JoinBoardWithLabel {
-    private Long labelId;
+    @NonNull
     private Long boardId;
+    @NonNull
+    private Long labelId;
 
 
     public Long getLabelId() {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithPermission.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithPermission.java
index a811b7897..2f5b7b076 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithPermission.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithPermission.java
@@ -2,19 +2,22 @@ package it.niedermann.nextcloud.deck.model;
 
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
+import android.support.annotation.NonNull;
 
 @Entity(
-        primaryKeys = { "permissionId", "boardId" },
+        primaryKeys = {"permissionId", "boardId"},
         foreignKeys = {
                 @ForeignKey(entity = Board.class,
-                        parentColumns = "id",
+                        parentColumns = "localId",
                         childColumns = "boardId"),
                 @ForeignKey(entity = Permission.class,
                         parentColumns = "id",
                         childColumns = "permissionId")
         })
 public class JoinBoardWithPermission {
+    @NonNull
     private Long permissionId;
+    @NonNull
     private Long boardId;
 
     public Long getPermissionId() {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithUser.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithUser.java
index 97ab0a678..e24d98482 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithUser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithUser.java
@@ -2,9 +2,10 @@ package it.niedermann.nextcloud.deck.model;
 
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
+import android.support.annotation.NonNull;
 
 @Entity(
-        primaryKeys = { "userId", "boardId" },
+        primaryKeys = {"userId", "boardId"},
         foreignKeys = {
                 @ForeignKey(entity = Board.class,
                         parentColumns = "localId",
@@ -14,7 +15,9 @@ import android.arch.persistence.room.ForeignKey;
                         childColumns = "userId")
         })
 public class JoinBoardWithUser {
+    @NonNull
     private Long userId;
+    @NonNull
     private Long boardId;
 
     public Long getUserId() {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithLabel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithLabel.java
index d21789ebf..af607191d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithLabel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithLabel.java
@@ -2,9 +2,10 @@ package it.niedermann.nextcloud.deck.model;
 
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
+import android.support.annotation.NonNull;
 
 @Entity(
-        primaryKeys = { "labelId", "cardId" },
+        primaryKeys = {"labelId", "cardId"},
         foreignKeys = {
                 @ForeignKey(entity = Label.class,
                         parentColumns = "localId",
@@ -14,7 +15,9 @@ import android.arch.persistence.room.ForeignKey;
                         childColumns = "cardId")
         })
 public class JoinCardWithLabel {
+    @NonNull
     private Long labelId;
+    @NonNull
     private Long cardId;
 
     public Long getLabelId() {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithUser.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithUser.java
index 6fea1765b..c8ef6f9fa 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithUser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithUser.java
@@ -2,9 +2,10 @@ package it.niedermann.nextcloud.deck.model;
 
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
+import android.support.annotation.NonNull;
 
 @Entity(
-        primaryKeys = { "userId", "cardId" },
+        primaryKeys = {"userId", "cardId"},
         foreignKeys = {
                 @ForeignKey(entity = User.class,
                         parentColumns = "localId",
@@ -14,7 +15,9 @@ import android.arch.persistence.room.ForeignKey;
                         childColumns = "cardId")
         })
 public class JoinCardWithUser {
+    @NonNull
     private Long userId;
+    @NonNull
     private Long cardId;
 
     public Long getUserId() {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinStackWithCard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinStackWithCard.java
index 3035cb04e..de09242ca 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinStackWithCard.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinStackWithCard.java
@@ -2,9 +2,10 @@ package it.niedermann.nextcloud.deck.model;
 
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.ForeignKey;
+import android.support.annotation.NonNull;
 
 @Entity(
-        primaryKeys = { "stackId", "cardId" },
+        primaryKeys = {"stackId", "cardId"},
         foreignKeys = {
                 @ForeignKey(entity = Stack.class,
                         parentColumns = "localId",
@@ -14,7 +15,9 @@ import android.arch.persistence.room.ForeignKey;
                         childColumns = "cardId")
         })
 public class JoinStackWithCard {
+    @NonNull
     private Long stackId;
+    @NonNull
     private Long cardId;
 
     public Long getStackId() {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java
index 341c6e9f4..f0c46787b 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java
@@ -18,10 +18,11 @@ public class Permission {
         this.id = id;
     }
 
-    public PermissionType getType(){
+    public PermissionType getType() {
         return PermissionType.findById(id);
     }
-    public void setType(PermissionType type){
+
+    public void setType(PermissionType type) {
         this.id = type.getId();
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/DBStatus.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/DBStatus.java
index 8454b60ce..7fa9c30be 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/DBStatus.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/DBStatus.java
@@ -41,7 +41,7 @@ public enum DBStatus {
      * @return The DBStatus fitting to the String.
      */
     public static DBStatus findById(int id) {
-        for (DBStatus s : DBStatus.values()){
+        for (DBStatus s : DBStatus.values()) {
             if (s.getId() == id) {
                 return s;
             }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/PermissionType.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/PermissionType.java
index f8b34e9e4..49f10ef24 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/PermissionType.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/PermissionType.java
@@ -10,12 +10,12 @@ public enum PermissionType {
     private long id;
     private String key;
 
-    PermissionType(long id, String key){
+    PermissionType(long id, String key) {
         this.key = key;
     }
 
     public static PermissionType findByKey(String key) {
-        for (PermissionType s : PermissionType.values()){
+        for (PermissionType s : PermissionType.values()) {
             if (s.getKey().equals(key)) {
                 return s;
             }
@@ -24,7 +24,7 @@ public enum PermissionType {
     }
 
     public static PermissionType findById(long key) {
-        for (PermissionType s : PermissionType.values()){
+        for (PermissionType s : PermissionType.values()) {
             if (s.getId() == key) {
                 return s;
             }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
new file mode 100644
index 000000000..856dbe3f2
--- /dev/null
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
@@ -0,0 +1,34 @@
+package it.niedermann.nextcloud.deck.model.full;
+
+import android.arch.persistence.room.Embedded;
+import android.arch.persistence.room.Relation;
+
+import java.util.List;
+
+import it.niedermann.nextcloud.deck.model.Card;
+import it.niedermann.nextcloud.deck.model.JoinCardWithLabel;
+import it.niedermann.nextcloud.deck.model.Label;
+
+public class FullCard {
+    @Embedded
+    public Card card;
+
+    @Relation(entity = JoinCardWithLabel.class, parentColumn = "localId", entityColumn = "labelId")
+    public List<Label> labels;
+
+    public Card getCard() {
+        return card;
+    }
+
+    public void setCard(Card card) {
+        this.card = card;
+    }
+
+    public List<Label> getLabels() {
+        return labels;
+    }
+
+    public void setLabels(List<Label> labels) {
+        this.labels = labels;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/RemoteEntity.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/RemoteEntity.java
index bb2784e9d..6c283efe8 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/RemoteEntity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/RemoteEntity.java
@@ -7,7 +7,6 @@ import android.support.annotation.NonNull;
 
 import java.util.Date;
 
-import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
 
 @Entity(