From 02bd2f6764edc1c0f858ec4fb76f4d8df5fd98f9 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Sun, 8 Dec 2024 08:49:26 -0500
Subject: [PATCH] Fixing import and fmt.

---
 crates/db_schema/src/newtypes.rs               |  3 +--
 crates/db_schema/src/source/combined/report.rs |  8 +-------
 crates/db_views/src/report_combined_view.rs    | 14 +++++++++-----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/crates/db_schema/src/newtypes.rs b/crates/db_schema/src/newtypes.rs
index c417ea2e4..605687e47 100644
--- a/crates/db_schema/src/newtypes.rs
+++ b/crates/db_schema/src/newtypes.rs
@@ -180,8 +180,7 @@ pub struct LtreeDef(pub String);
 pub struct DbUrl(pub(crate) Box<Url>);
 
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
-#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
-#[cfg_attr(feature = "full", ts(export))]
+#[cfg_attr(feature = "full", derive(DieselNewType))]
 /// The report combined id
 pub struct ReportCombinedId(i32);
 
diff --git a/crates/db_schema/src/source/combined/report.rs b/crates/db_schema/src/source/combined/report.rs
index 4085bddd6..5ea825b83 100644
--- a/crates/db_schema/src/source/combined/report.rs
+++ b/crates/db_schema/src/source/combined/report.rs
@@ -6,27 +6,21 @@ use chrono::{DateTime, Utc};
 use i_love_jesus::CursorKeysModule;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
-#[cfg(feature = "full")]
-use ts_rs::TS;
 
 #[skip_serializing_none]
 #[derive(PartialEq, Eq, Serialize, Deserialize, Debug, Clone)]
 #[cfg_attr(
   feature = "full",
-  derive(Identifiable, Queryable, Selectable, TS, CursorKeysModule)
+  derive(Identifiable, Queryable, Selectable, CursorKeysModule)
 )]
 #[cfg_attr(feature = "full", diesel(table_name = report_combined))]
 #[cfg_attr(feature = "full", diesel(check_for_backend(diesel::pg::Pg)))]
-#[cfg_attr(feature = "full", ts(export))]
 #[cfg_attr(feature = "full", cursor_keys_module(name = report_combined_keys))]
 /// A combined reports table.
 pub struct ReportCombined {
   pub id: ReportCombinedId,
   pub published: DateTime<Utc>,
-  #[cfg_attr(feature = "full", ts(optional))]
   pub post_report_id: Option<PostReportId>,
-  #[cfg_attr(feature = "full", ts(optional))]
   pub comment_report_id: Option<CommentReportId>,
-  #[cfg_attr(feature = "full", ts(optional))]
   pub private_message_report_id: Option<PrivateMessageReportId>,
 }
diff --git a/crates/db_views/src/report_combined_view.rs b/crates/db_views/src/report_combined_view.rs
index f09b041f1..879634cf0 100644
--- a/crates/db_views/src/report_combined_view.rs
+++ b/crates/db_views/src/report_combined_view.rs
@@ -13,6 +13,7 @@ use diesel::{
   ExpressionMethods,
   JoinOnDsl,
   NullableExpressionMethods,
+  PgExpressionMethods,
   QueryDsl,
   SelectableHelper,
 };
@@ -79,9 +80,12 @@ impl ReportCombinedViewInternal {
         Some(my_person_id),
         post::community_id,
       ))
-      .filter(post_report::resolved
-      .or(comment_report::resolved)
-      .or(private_message_report::resolved).is_distinct_from(true))
+      .filter(
+        post_report::resolved
+          .or(comment_report::resolved)
+          .or(private_message_report::resolved)
+          .is_distinct_from(true),
+      )
       .into_boxed();
 
     if let Some(community_id) = community_id {
@@ -306,9 +310,9 @@ impl ReportCombinedQuery {
       query = query
         .filter(
           post_report::resolved
-            
             .or(comment_report::resolved)
-            .or(private_message_report::resolved).is_distinct_from(true),
+            .or(private_message_report::resolved)
+            .is_distinct_from(true),
         )
         // TODO: when a `then_asc` method is added, use it here, make the id sort direction match,
         // and remove the separate index; unless additional columns are added to this sort