#1556 mark card as done: first impl

stefan-niedermann · Dec 22, 2023 · 2d62de8 · 2d62de8
1 parent 07fd0c2
commit 2d62de8
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 1 deletion.
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/database/DeckDatabase.java b/app/src/main/java/it/niedermann/nextcloud/deck/database/DeckDatabase.java
@@ -65,6 +65,7 @@
 import it.niedermann.nextcloud.deck.database.migration.Migration_29_30;
 import it.niedermann.nextcloud.deck.database.migration.Migration_30_31;
 import it.niedermann.nextcloud.deck.database.migration.Migration_31_32;
+import it.niedermann.nextcloud.deck.database.migration.Migration_32_33;
 import it.niedermann.nextcloud.deck.database.migration.Migration_8_9;
 import it.niedermann.nextcloud.deck.database.migration.Migration_9_10;
 import it.niedermann.nextcloud.deck.model.AccessControl;
@@ -135,7 +136,7 @@
                 FilterWidgetSort.class,
         },
         exportSchema = false,
-        version = 32
+        version = 33
 )
 @TypeConverters({DateTypeConverter.class, EnumConverter.class})
 public abstract class DeckDatabase extends RoomDatabase {
@@ -188,6 +189,7 @@ private static DeckDatabase create(final Context context) {
                 .addMigrations(new Migration_29_30(context))
                 .addMigrations(new Migration_30_31())
                 .addMigrations(new Migration_31_32(context))
+                .addMigrations(new Migration_32_33())
                 .fallbackToDestructiveMigration()
                 .addCallback(ON_CREATE_CALLBACK)
                 .build();

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_32_33.java b/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_32_33.java
@@ -0,0 +1,20 @@
+package it.niedermann.nextcloud.deck.database.migration;
+
+import androidx.annotation.NonNull;
+import androidx.room.migration.Migration;
+import androidx.sqlite.db.SupportSQLiteDatabase;
+
+/**
+ * Adds support for marking a card as done: https://github.com/stefan-niedermann/nextcloud-deck/issues/1556
+ */
+public class Migration_32_33 extends Migration {
+
+    public Migration_32_33() {
+        super(32, 33);
+    }
+
+    @Override
+    public void migrate(@NonNull SupportSQLiteDatabase database) {
+        database.execSQL("ALTER TABLE `Card` add column done INTEGER");
+    }
+}
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
@@ -57,6 +57,7 @@ public TaskStatus(int taskCount, int doneCount) {
     private String type;
     private Instant createdAt;
     private Instant deletedAt;
+    private Instant done;
     private int attachmentCount;
 
     private Long userId;
@@ -252,6 +253,14 @@ public int getOrder() {
         return this.order;
     }
 
+    public Instant getDone() {
+        return done;
+    }
+
+    public void setDone(Instant done) {
+        this.done = done;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -274,6 +283,8 @@ public boolean equals(Object o) {
             return false;
         if (deletedAt != null ? !deletedAt.equals(card.deletedAt) : card.deletedAt != null)
             return false;
+        if (done != null ? !done.equals(card.done) : card.done != null)
+            return false;
         if (userId != null ? !userId.equals(card.userId) : card.userId != null) return false;
         return dueDate != null ? dueDate.equals(card.dueDate) : card.dueDate == null;
     }
@@ -286,6 +297,7 @@ public int hashCode() {
         result = 31 * result + (type != null ? type.hashCode() : 0);
         result = 31 * result + (createdAt != null ? createdAt.hashCode() : 0);
         result = 31 * result + (deletedAt != null ? deletedAt.hashCode() : 0);
+        result = 31 * result + (done != null ? done.hashCode() : 0);
         result = 31 * result + attachmentCount;
         result = 31 * result + (userId != null ? userId.hashCode() : 0);
         result = 31 * result + order;
@@ -306,6 +318,7 @@ public String toString() {
                 ", type='" + type + '\'' +
                 ", createdAt=" + createdAt +
                 ", deletedAt=" + deletedAt +
+                ", done=" + done +
                 ", attachmentCount=" + attachmentCount +
                 ", userId=" + userId +
                 ", order=" + order +

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/propagation/CardUpdate.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/propagation/CardUpdate.java
@@ -27,6 +27,7 @@ public CardUpdate(FullCard card) {
         setAccountId(card.getAccountId());
         setId(card.getId());
         setLocalId(card.getLocalId());
+        setDone(card.getCard().getDone());
     }
 
     public User getOwner() {

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java
@@ -408,6 +408,7 @@ protected static FullCard parseCard(JsonObject e) {
             card.setLastModified(getTimestampFromLong(e.get("lastModified")));
             card.setCreatedAt(getTimestampFromLong(e.get("createdAt")));
             card.setDeletedAt(getTimestampFromLong(e.get("deletedAt")));
+            card.setDone(getTimestampFromString(e.get("done")));
             if (e.has("labels") && !e.get("labels").isJsonNull()) {
                 JsonArray labelsJson = e.getAsJsonArray("labels");
                 List<Label> labels = new ArrayList<>();