Testing bug fixes (#788)

* fixes

* adds tests- fixes failures

* changes

* moved transaction commits/caches around

* collections nullable

* merge fixes

* sqlx prepare

* revs

* lf fixes

* made changes back

* added collections update

---------

Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>

src/database/models/collection_item.rs

@@ -13,7 +13,7 @@ pub struct CollectionBuilder {
     pub collection_id: CollectionId,
     pub user_id: UserId,
     pub name: String,
-    pub description: String,
+    pub description: Option<String>,
     pub status: CollectionStatus,
     pub projects: Vec<ProjectId>,
 }
@@ -45,7 +45,7 @@ pub struct Collection {
     pub id: CollectionId,
     pub user_id: UserId,
     pub name: String,
-    pub description: String,
+    pub description: Option<String>,
     pub created: DateTime<Utc>,
     pub updated: DateTime<Utc>,
     pub icon_url: Option<String>,
@@ -73,7 +73,7 @@ impl Collection {
             self.id as CollectionId,
             self.user_id as UserId,
             &self.name,
-            &self.description,
+            self.description.as_ref(),
             self.created,
             self.icon_url.as_ref(),
             self.status.to_string(),

src/database/models/project_item.rs

@@ -344,6 +344,28 @@ impl Project {
             .execute(&mut **transaction)
             .await?;
 
+            // Notably joins with report id and not thread.mod_id directly, as
+            // this is set to null for threads that are reports.
+            let report_threads = sqlx::query!(
+                "
+                SELECT t.id
+                FROM threads t
+                INNER JOIN reports r ON t.report_id = r.id
+                WHERE r.mod_id = $1 AND report_id IS NOT NULL 
+                ",
+                id as ProjectId,
+            )
+            .fetch_many(&mut **transaction)
+            .try_filter_map(|e| async { Ok(e.right().map(|x| ThreadId(x.id))) })
+            .try_collect::<Vec<_>>()
+            .await?;
+
+            for thread_id in report_threads {
+                models::Thread::remove_full(thread_id, transaction).await?;
+            }
+
+            models::Thread::remove_full(project.thread_id, transaction).await?;
+
             sqlx::query!(
                 "
                 DELETE FROM reports
@@ -398,8 +420,6 @@ impl Project {
             .execute(&mut **transaction)
             .await?;
 
-            models::Thread::remove_full(project.thread_id, transaction).await?;
-
             sqlx::query!(
                 "
                 DELETE FROM mods