Merge pull request #378 from marchhq/dev

fix: overdue
marchhq · Oct 23, 2024 · a3ad8d4 · a3ad8d4
2 parents 20df265 + 749f3fd
commit a3ad8d4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/apps/backend/src/models/lib/item.model.js b/apps/backend/src/models/lib/item.model.js
@@ -104,6 +104,17 @@ ItemSchema.pre("save", function (next) {
     next();
 });
 
+ItemSchema.pre("findOneAndUpdate", function (next) {
+    const update = this.getUpdate();
+    if (update.$set && update.$set.status === "done") {
+        update.$set.isCompleted = true;
+    } else if (update.$set && update.$set.status) {
+        update.$set.isCompleted = false;
+    }
+
+    next();
+});
+
 const Item = db.model("Item", ItemSchema, "items");
 
 export {

diff --git a/apps/backend/src/services/lib/item.service.js b/apps/backend/src/services/lib/item.service.js
@@ -112,8 +112,9 @@ const getOverdueItemsByDate = async (me, date) => {
     const items = await Item.find({
         user: me,
         dueDate: { $lt: date },
-        isArchived: false,
-        isDeleted: false
+        isCompleted: false,
+        isDeleted: false,
+        isArchived: false
     })
         .sort({ createdAt: -1 });