From 8afcbccd6a6418f4c9102e290d941c2962482fb3 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Sun, 30 Jun 2024 19:42:26 +0200
Subject: [PATCH] Fix bug where deleted events stay listed

---
 ...ae332f8eb18dddbd80d31989c074804f31dee.json | 12 ----
 ...a1cb47f51128b5d0b6b3931277a392274b021.json | 62 -------------------
 ...35d5e2bf913c30f9f3e7bd9fecc7d4376be0f.json | 12 ----
 ...55d7875115de1e8b2bdcb5e5cb55300c3cd02.json | 26 --------
 ...f371a4b813cdf2381396cd0aa41833f7eb9a8.json | 12 ----
 ...b350f0bc02d26d0ba1a61a305b7e4aae3415b.json | 12 ----
 ...d4593c4c7df812d4d13e3b7829be11a1d81a8.json | 26 --------
 ...d95b6bf86268b64e714fa7ca587eae9e5df15.json | 12 ----
 ...8794de8eb7845867e41921d301055782f9d9d.json | 12 ----
 ...c77bb95c1a25b6a3c0c389ef0ad4f468320ee.json | 12 ----
 ...e68ec8ebfbd127b68316b12c4dc9c3007ff50.json | 12 ----
 ...a4af1c2f34515288bade397b87a1e43d789df.json | 12 ----
 ...eb23ec942a31bcdad9a4622cc266c210f954f.json | 62 -------------------
 crates/store/src/sqlite_store.rs              |  2 +-
 14 files changed, 1 insertion(+), 285 deletions(-)
 delete mode 100644 .sqlx/query-02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee.json
 delete mode 100644 .sqlx/query-091674cd48db0193ca1fef6053ea1cb47f51128b5d0b6b3931277a392274b021.json
 delete mode 100644 .sqlx/query-2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f.json
 delete mode 100644 .sqlx/query-732e371bf23a0d21225d01ffa6255d7875115de1e8b2bdcb5e5cb55300c3cd02.json
 delete mode 100644 .sqlx/query-8ad1d8fd1839cf30f9cc383505ef371a4b813cdf2381396cd0aa41833f7eb9a8.json
 delete mode 100644 .sqlx/query-9f7e3d16640a0de1fd4e4b37cadb350f0bc02d26d0ba1a61a305b7e4aae3415b.json
 delete mode 100644 .sqlx/query-9f8b564d4ecb98256e2dcd99165d4593c4c7df812d4d13e3b7829be11a1d81a8.json
 delete mode 100644 .sqlx/query-a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15.json
 delete mode 100644 .sqlx/query-afeba8a8451de7646f4dab5be1c8794de8eb7845867e41921d301055782f9d9d.json
 delete mode 100644 .sqlx/query-c7a56d737fc8627427d0be202c3c77bb95c1a25b6a3c0c389ef0ad4f468320ee.json
 delete mode 100644 .sqlx/query-ea38d8cf5d5b398eb13ce5d36f5e68ec8ebfbd127b68316b12c4dc9c3007ff50.json
 delete mode 100644 .sqlx/query-eba774e8d8afa04d33443b42ec3a4af1c2f34515288bade397b87a1e43d789df.json
 delete mode 100644 .sqlx/query-fb4e007cf9faaa033cb2936368beb23ec942a31bcdad9a4622cc266c210f954f.json

diff --git a/.sqlx/query-02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee.json b/.sqlx/query-02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee.json
deleted file mode 100644
index d37f103..0000000
--- a/.sqlx/query-02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET deleted_at = NULL WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "02a9260d0ff496a6bf226fc8238ae332f8eb18dddbd80d31989c074804f31dee"
-}
diff --git a/.sqlx/query-091674cd48db0193ca1fef6053ea1cb47f51128b5d0b6b3931277a392274b021.json b/.sqlx/query-091674cd48db0193ca1fef6053ea1cb47f51128b5d0b6b3931277a392274b021.json
deleted file mode 100644
index 4ac4de5..0000000
--- a/.sqlx/query-091674cd48db0193ca1fef6053ea1cb47f51128b5d0b6b3931277a392274b021.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone, deleted_at\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NULL",
-  "describe": {
-    "columns": [
-      {
-        "name": "principal",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "id",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 2,
-        "type_info": "Text"
-      },
-      {
-        "name": "order",
-        "ordinal": 3,
-        "type_info": "Int64"
-      },
-      {
-        "name": "description",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "color",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "deleted_at",
-        "ordinal": 7,
-        "type_info": "Datetime"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      true,
-      false,
-      true,
-      true,
-      false,
-      true
-    ]
-  },
-  "hash": "091674cd48db0193ca1fef6053ea1cb47f51128b5d0b6b3931277a392274b021"
-}
diff --git a/.sqlx/query-2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f.json b/.sqlx/query-2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f.json
deleted file mode 100644
index 54384e5..0000000
--- a/.sqlx/query-2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM calendars WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "2834e16e6a7acb58141a2433f7735d5e2bf913c30f9f3e7bd9fecc7d4376be0f"
-}
diff --git a/.sqlx/query-732e371bf23a0d21225d01ffa6255d7875115de1e8b2bdcb5e5cb55300c3cd02.json b/.sqlx/query-732e371bf23a0d21225d01ffa6255d7875115de1e8b2bdcb5e5cb55300c3cd02.json
deleted file mode 100644
index 12eca53..0000000
--- a/.sqlx/query-732e371bf23a0d21225d01ffa6255d7875115de1e8b2bdcb5e5cb55300c3cd02.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT uid, ics FROM events WHERE (principal, cid, uid) = (?, ?, ?)",
-  "describe": {
-    "columns": [
-      {
-        "name": "uid",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "ics",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "732e371bf23a0d21225d01ffa6255d7875115de1e8b2bdcb5e5cb55300c3cd02"
-}
diff --git a/.sqlx/query-8ad1d8fd1839cf30f9cc383505ef371a4b813cdf2381396cd0aa41833f7eb9a8.json b/.sqlx/query-8ad1d8fd1839cf30f9cc383505ef371a4b813cdf2381396cd0aa41833f7eb9a8.json
deleted file mode 100644
index 0cc76ee..0000000
--- a/.sqlx/query-8ad1d8fd1839cf30f9cc383505ef371a4b813cdf2381396cd0aa41833f7eb9a8.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE events SET deleted_at = datetime() WHERE (principal, cid, uid) = (?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "8ad1d8fd1839cf30f9cc383505ef371a4b813cdf2381396cd0aa41833f7eb9a8"
-}
diff --git a/.sqlx/query-9f7e3d16640a0de1fd4e4b37cadb350f0bc02d26d0ba1a61a305b7e4aae3415b.json b/.sqlx/query-9f7e3d16640a0de1fd4e4b37cadb350f0bc02d26d0ba1a61a305b7e4aae3415b.json
deleted file mode 100644
index 8861a79..0000000
--- a/.sqlx/query-9f7e3d16640a0de1fd4e4b37cadb350f0bc02d26d0ba1a61a305b7e4aae3415b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "REPLACE INTO events (principal, cid, uid, ics) VALUES (?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "9f7e3d16640a0de1fd4e4b37cadb350f0bc02d26d0ba1a61a305b7e4aae3415b"
-}
diff --git a/.sqlx/query-9f8b564d4ecb98256e2dcd99165d4593c4c7df812d4d13e3b7829be11a1d81a8.json b/.sqlx/query-9f8b564d4ecb98256e2dcd99165d4593c4c7df812d4d13e3b7829be11a1d81a8.json
deleted file mode 100644
index 4fc4907..0000000
--- a/.sqlx/query-9f8b564d4ecb98256e2dcd99165d4593c4c7df812d4d13e3b7829be11a1d81a8.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT uid, ics FROM events WHERE principal = ? AND cid = ?",
-  "describe": {
-    "columns": [
-      {
-        "name": "uid",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "ics",
-        "ordinal": 1,
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "9f8b564d4ecb98256e2dcd99165d4593c4c7df812d4d13e3b7829be11a1d81a8"
-}
diff --git a/.sqlx/query-a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15.json b/.sqlx/query-a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15.json
deleted file mode 100644
index 1ff3ec2..0000000
--- a/.sqlx/query-a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET deleted_at = datetime() WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "a4371f228f94afd8e6f4ac4b0f7d95b6bf86268b64e714fa7ca587eae9e5df15"
-}
diff --git a/.sqlx/query-afeba8a8451de7646f4dab5be1c8794de8eb7845867e41921d301055782f9d9d.json b/.sqlx/query-afeba8a8451de7646f4dab5be1c8794de8eb7845867e41921d301055782f9d9d.json
deleted file mode 100644
index b4b560d..0000000
--- a/.sqlx/query-afeba8a8451de7646f4dab5be1c8794de8eb7845867e41921d301055782f9d9d.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE events SET deleted_at = NULL WHERE (principal, cid, uid) = (?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "afeba8a8451de7646f4dab5be1c8794de8eb7845867e41921d301055782f9d9d"
-}
diff --git a/.sqlx/query-c7a56d737fc8627427d0be202c3c77bb95c1a25b6a3c0c389ef0ad4f468320ee.json b/.sqlx/query-c7a56d737fc8627427d0be202c3c77bb95c1a25b6a3c0c389ef0ad4f468320ee.json
deleted file mode 100644
index 79cd4da..0000000
--- a/.sqlx/query-c7a56d737fc8627427d0be202c3c77bb95c1a25b6a3c0c389ef0ad4f468320ee.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone = ?\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 9
-    },
-    "nullable": []
-  },
-  "hash": "c7a56d737fc8627427d0be202c3c77bb95c1a25b6a3c0c389ef0ad4f468320ee"
-}
diff --git a/.sqlx/query-ea38d8cf5d5b398eb13ce5d36f5e68ec8ebfbd127b68316b12c4dc9c3007ff50.json b/.sqlx/query-ea38d8cf5d5b398eb13ce5d36f5e68ec8ebfbd127b68316b12c4dc9c3007ff50.json
deleted file mode 100644
index 99bf30f..0000000
--- a/.sqlx/query-ea38d8cf5d5b398eb13ce5d36f5e68ec8ebfbd127b68316b12c4dc9c3007ff50.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "DELETE FROM events WHERE cid = ? AND uid = ?",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": []
-  },
-  "hash": "ea38d8cf5d5b398eb13ce5d36f5e68ec8ebfbd127b68316b12c4dc9c3007ff50"
-}
diff --git a/.sqlx/query-eba774e8d8afa04d33443b42ec3a4af1c2f34515288bade397b87a1e43d789df.json b/.sqlx/query-eba774e8d8afa04d33443b42ec3a4af1c2f34515288bade397b87a1e43d789df.json
deleted file mode 100644
index 6b80dd3..0000000
--- a/.sqlx/query-eba774e8d8afa04d33443b42ec3a4af1c2f34515288bade397b87a1e43d789df.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, timezone)\n                VALUES (?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 7
-    },
-    "nullable": []
-  },
-  "hash": "eba774e8d8afa04d33443b42ec3a4af1c2f34515288bade397b87a1e43d789df"
-}
diff --git a/.sqlx/query-fb4e007cf9faaa033cb2936368beb23ec942a31bcdad9a4622cc266c210f954f.json b/.sqlx/query-fb4e007cf9faaa033cb2936368beb23ec942a31bcdad9a4622cc266c210f954f.json
deleted file mode 100644
index 1bda9ee..0000000
--- a/.sqlx/query-fb4e007cf9faaa033cb2936368beb23ec942a31bcdad9a4622cc266c210f954f.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "SELECT principal, id, \"order\", displayname, description, color, timezone, deleted_at\n                FROM calendars\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [
-      {
-        "name": "principal",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "id",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "order",
-        "ordinal": 2,
-        "type_info": "Int64"
-      },
-      {
-        "name": "displayname",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "description",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "color",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "timezone",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "deleted_at",
-        "ordinal": 7,
-        "type_info": "Datetime"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false,
-      true
-    ]
-  },
-  "hash": "fb4e007cf9faaa033cb2936368beb23ec942a31bcdad9a4622cc266c210f954f"
-}
diff --git a/crates/store/src/sqlite_store.rs b/crates/store/src/sqlite_store.rs
index 8cca5f4..7a4182b 100644
--- a/crates/store/src/sqlite_store.rs
+++ b/crates/store/src/sqlite_store.rs
@@ -145,7 +145,7 @@ impl CalendarStore for SqliteCalendarStore {
     async fn get_events(&self, principal: &str, cid: &str) -> Result<Vec<Event>, Error> {
         sqlx::query_as!(
             EventRow,
-            "SELECT uid, ics FROM events WHERE principal = ? AND cid = ?",
+            "SELECT uid, ics FROM events WHERE principal = ? AND cid = ? AND deleted_at IS NULL",
             principal,
             cid
         )