From c72d5e88d519e7fac72bfc5a6dc498479a79a137 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 12 Dec 2024 09:46:16 -0500 Subject: [PATCH 1/2] Addressing PR comments. --- api_tests/src/post.spec.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/api_tests/src/post.spec.ts b/api_tests/src/post.spec.ts index 37381d302..52f86e8ef 100644 --- a/api_tests/src/post.spec.ts +++ b/api_tests/src/post.spec.ts @@ -698,7 +698,7 @@ test("Report a post", async () => { () => listReports(beta).then(p => p.reports.find(r => { - return checkReportName(r, gammaReport); + return checkPostReportName(r, gammaReport); }), ), res => !!res, @@ -718,15 +718,7 @@ test("Report a post", async () => { () => listReports(alpha).then(p => p.reports.find(r => { - switch (r.type_) { - case "Post": - return ( - r.post_report.original_post_name === - gammaReport.original_post_name - ); - default: - return false; - } + return checkPostReportName(r, gammaReport); }), ), res => !!res, @@ -833,7 +825,7 @@ test("Rewrite markdown links", async () => { ); }); -function checkReportName(rcv: ReportCombinedView, report: PostReport) { +function checkPostReportName(rcv: ReportCombinedView, report: PostReport) { switch (rcv.type_) { case "Post": return rcv.post_report.original_post_name === report.original_post_name; From 7c962d63fb22c47d161d6ea31593a9346776d67f Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 12 Dec 2024 19:20:31 -0500 Subject: [PATCH 2/2] Removing serialization --- crates/db_schema/src/newtypes.rs | 2 +- crates/db_schema/src/source/combined/report.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/db_schema/src/newtypes.rs b/crates/db_schema/src/newtypes.rs index 605687e47..18f8ef923 100644 --- a/crates/db_schema/src/newtypes.rs +++ b/crates/db_schema/src/newtypes.rs @@ -179,7 +179,7 @@ pub struct LtreeDef(pub String); #[cfg_attr(feature = "full", ts(export))] pub struct DbUrl(pub(crate) Box); -#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)] +#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default)] #[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 5ea825b83..2902c5548 100644 --- a/crates/db_schema/src/source/combined/report.rs +++ b/crates/db_schema/src/source/combined/report.rs @@ -4,11 +4,8 @@ use crate::schema::report_combined; use chrono::{DateTime, Utc}; #[cfg(feature = "full")] use i_love_jesus::CursorKeysModule; -use serde::{Deserialize, Serialize}; -use serde_with::skip_serializing_none; -#[skip_serializing_none] -#[derive(PartialEq, Eq, Serialize, Deserialize, Debug, Clone)] +#[derive(PartialEq, Eq, Debug, Clone)] #[cfg_attr( feature = "full", derive(Identifiable, Queryable, Selectable, CursorKeysModule)