LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-12-23 03:11:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'combined_tables_2' into search_combined

Browse source
This commit is contained in:
Dessalines 2024-12-13 11:14:29 -05:00
commit fb1f2ff174
3 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api_tests/src/post.spec.ts
View file

@ -698,7 +698,7 @@ test("Report a post", async () => {
() => () =>
listReports(beta).then(p => listReports(beta).then(p =>
p.reports.find(r => { p.reports.find(r => {
return checkReportName(r, gammaReport); return checkPostReportName(r, gammaReport);
}), }),
), ),
res => !!res, res => !!res,
@ -718,15 +718,7 @@ test("Report a post", async () => {
() => () =>
listReports(alpha).then(p => listReports(alpha).then(p =>
p.reports.find(r => { p.reports.find(r => {
switch (r.type_) { return checkPostReportName(r, gammaReport);
case "Post":
return (
r.post_report.original_post_name ===
gammaReport.original_post_name
);
default:
return false;
}
}), }),
), ),
res => !!res, 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_) { switch (rcv.type_) {
case "Post": case "Post":
return rcv.post_report.original_post_name === report.original_post_name; return rcv.post_report.original_post_name === report.original_post_name;

2
crates/db_schema/src/newtypes.rs
View file

@ -190,7 +190,7 @@ pub struct LtreeDef(pub String);
#[cfg_attr(feature = "full", ts(export))] #[cfg_attr(feature = "full", ts(export))]
pub struct DbUrl(pub(crate) Box<Url>); pub struct DbUrl(pub(crate) Box<Url>);
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)] #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default)]
#[cfg_attr(feature = "full", derive(DieselNewType))] #[cfg_attr(feature = "full", derive(DieselNewType))]
/// The report combined id /// The report combined id
pub struct ReportCombinedId(i32); pub struct ReportCombinedId(i32);

5
crates/db_schema/src/source/combined/report.rs
View file

@ -4,11 +4,8 @@ use crate::schema::report_combined;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
#[cfg(feature = "full")] #[cfg(feature = "full")]
use i_love_jesus::CursorKeysModule; use i_love_jesus::CursorKeysModule;
use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none;
#[skip_serializing_none] #[derive(PartialEq, Eq, Debug, Clone)]
#[derive(PartialEq, Eq, Serialize, Deserialize, Debug, Clone)]
#[cfg_attr( #[cfg_attr(
feature = "full", feature = "full",
derive(Identifiable, Queryable, Selectable, CursorKeysModule) derive(Identifiable, Queryable, Selectable, CursorKeysModule)