Skip to content

Commit

Permalink
Shorter code
Browse files Browse the repository at this point in the history
  • Loading branch information
@hongquan
hongquan committed Sep 19, 2023
1 parent 4f2d482 commit 02434d8
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 29 deletions.
25 changes: 23 additions & 2 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ async-fred-session = "0.1.5"
async-trait = "0.1.71"
atom_syndication = { version = "0.12.2", features = ["serde"] }
axum = { version = "0.6.19", features = ["tracing", "json", "tower-log", "macros", "tokio", "headers", "query", "original-uri"] }
axum-extra = { version = "0.7.5" }
axum-extra = { version = "0.8.0" }
axum-login = "0.6.0"
axum-sessions = "0.5.0"
chrono = { version = "0.4.26", features = ["serde", "alloc", "clock"], default-features = false }
Expand Down
53 changes: 27 additions & 26 deletions src/api/structs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use validify::Validify;

use super::macros::append_set_statement;
use crate::models::DocFormat;
use crate::types::ext::VecExt;
use crate::types::conversions::{edge_object_from_pairs, edge_object_from_simple_pairs};
use crate::utils::markdown::{make_excerpt, markdown_to_html};

Expand Down Expand Up @@ -69,7 +70,7 @@ impl BlogPostPatchData {
append_set_statement!("slug", "optional str", lines, submitted_fields);
append_set_statement!("is_published", "optional bool", lines, submitted_fields);
append_set_statement!("format", "optional DocFormat", lines, submitted_fields);
if submitted_fields.iter().any(|&f| f == "body") {
if submitted_fields.contains("body") {
// If user submitted "body" field, we will generate "html", "excerpt" and write, too
lines.push("body := <optional str>$body");
lines.push("html := <optional str>$html");
Expand All @@ -78,7 +79,7 @@ impl BlogPostPatchData {
append_set_statement!("locale", "optional str", lines, submitted_fields);
append_set_statement!("author", "optional User", lines, submitted_fields);
append_set_statement!("og_image", "optional str", lines, submitted_fields);
if submitted_fields.iter().any(|&f| f == "categories") && self.categories.is_some() {
if submitted_fields.contains("categories") && self.categories.is_some() {
let line = "categories := (
SELECT BlogCategory FILTER .id IN array_unpack(<array<uuid>>$categories)
)";
Expand All @@ -91,25 +92,25 @@ impl BlogPostPatchData {
let mut pairs = indexmap! {
"id" => (Some(EValue::Uuid(post_id)), Cd::One),
};
if submitted_fields.iter().any(|&f| f == "title") {
if submitted_fields.contains("title") {
pairs.insert(
"title",
(self.title.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "slug") {
if submitted_fields.contains("slug") {
pairs.insert(
"slug",
(self.slug.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "is_published") {
if submitted_fields.contains("is_published") {
pairs.insert(
"is_published",
(self.is_published.map(EValue::Bool), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "format") {
if submitted_fields.contains("format") {
pairs.insert(
"format",
(
Expand All @@ -118,7 +119,7 @@ impl BlogPostPatchData {
),
);
}
if submitted_fields.iter().any(|&f| f == "body") {
if submitted_fields.contains("body") {
let body = self.body.clone();
let html = body.as_ref().map(|b| markdown_to_html(b));
let excerpt = body.as_ref().map(|b| make_excerpt(b));
Expand All @@ -129,19 +130,19 @@ impl BlogPostPatchData {
(excerpt.map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "locale") {
if submitted_fields.contains("locale") {
pairs.insert(
"locale",
(self.locale.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "author") {
if submitted_fields.contains("author") {
pairs.insert(
"author",
(self.author.map(EValue::Uuid), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "og_image") {
if submitted_fields.contains("og_image") {
pairs.insert(
"og_image",
(self.og_image.clone().map(EValue::Str), Cd::AtMostOne),
Expand Down Expand Up @@ -178,7 +179,7 @@ impl BlogPostCreateData {
pub fn gen_set_clause<'a>(&self, submitted_fields: &Vec<&String>) -> String {
let mut lines = vec!["title := <str>$title", "slug := <str>$slug"];
append_set_statement!("is_published", "optional bool", lines, submitted_fields);
if submitted_fields.iter().any(|&f| f == "body") {
if submitted_fields.contains("body") {
// If user submitted "body" field, we will generate "html", "excerpt" and write, too
lines.push("body := <optional str>$body");
lines.push("html := <optional str>$html");
Expand All @@ -203,13 +204,13 @@ impl BlogPostCreateData {
"title" => (Some(EValue::Str(self.title.clone())), Cd::One),
"slug" => (Some(EValue::Str(self.slug.clone())), Cd::One),
};
if submitted_fields.iter().any(|&f| f == "is_published") {
if submitted_fields.contains("is_published") {
pairs.insert(
"is_published",
(self.is_published.map(EValue::Bool), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "body") {
if submitted_fields.contains("body") {
let body = self.body.clone();
let html = body.as_ref().map(|v| markdown_to_html(v));
let excerpt = body.as_ref().map(|v| make_excerpt(v));
Expand All @@ -220,7 +221,7 @@ impl BlogPostCreateData {
(excerpt.map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "format") {
if submitted_fields.contains("format") {
pairs.insert(
"format",
(
Expand All @@ -229,19 +230,19 @@ impl BlogPostCreateData {
),
);
}
if submitted_fields.iter().any(|&f| f == "locale") {
if submitted_fields.contains("locale") {
pairs.insert(
"locale",
(self.locale.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "author") {
if submitted_fields.contains("author") {
pairs.insert(
"author",
(self.author.map(EValue::Uuid), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "og_image") {
if submitted_fields.contains("og_image") {
pairs.insert(
"og_image",
(self.og_image.clone().map(EValue::Str), Cd::AtMostOne),
Expand Down Expand Up @@ -277,13 +278,13 @@ impl BlogCategoryPatchData {
let mut pairs = indexmap!(
"id" => (Some(EValue::Uuid(id)), Cd::One),
);
if submitted_fields.iter().any(|&f| f == "title") {
if submitted_fields.contains("title") {
pairs.insert(
"title",
(self.title.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "slug") {
if submitted_fields.contains("slug") {
pairs.insert(
"slug",
(self.slug.clone().map(EValue::Str), Cd::AtMostOne),
Expand Down Expand Up @@ -338,19 +339,19 @@ impl PresentationPatchData {
let mut pairs = indexmap!(
"id" => (Some(EValue::Uuid(id)), Cd::One),
);
if submitted_fields.iter().any(|&f| f == "title") {
if submitted_fields.contains("title") {
pairs.insert(
"title",
(self.title.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "url") {
if submitted_fields.contains("url") {
pairs.insert(
"url",
(self.url.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "event") {
if submitted_fields.contains("event") {
pairs.insert(
"event",
(self.event.clone().map(EValue::Str), Cd::AtMostOne),
Expand Down Expand Up @@ -411,7 +412,7 @@ impl BookPatchData {
let mut lines = Vec::<&str>::new();
append_set_statement!("title", "optional str", lines, submitted_fields);
append_set_statement!("download_url", "optional str", lines, submitted_fields);
if submitted_fields.iter().any(|&f| f == "author") {
if submitted_fields.contains("author") {
let line = "author := (
SELECT BookAuthor FILTER .id = <uuid>$author
)";
Expand All @@ -425,19 +426,19 @@ impl BookPatchData {
let mut pairs = indexmap!(
"id" => (Some(EValue::Uuid(id)), Cd::One),
);
if submitted_fields.iter().any(|&f| f == "title") {
if submitted_fields.contains("title") {
pairs.insert(
"title",
(self.title.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "download_url") {
if submitted_fields.contains("download_url") {
pairs.insert(
"download_url",
(self.download_url.clone().map(EValue::Str), Cd::AtMostOne),
);
}
if submitted_fields.iter().any(|&f| f == "author") {
if submitted_fields.contains("author") {
pairs.insert(
"author",
(self.author.map(EValue::Uuid), Cd::One),
Expand Down
10 changes: 10 additions & 0 deletions src/types/ext.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,13 @@ impl UriExt for Uri {
builder.build().unwrap_or(self.clone())
}
}

pub trait VecExt<T: ?Sized> {
fn contains(&self, elm: &T) -> bool;
}

impl VecExt<str> for &Vec<&String> {
fn contains(&self, elm: &str) -> bool {
self.iter().any(|&e| e == elm)
}
}

0 comments on commit 02434d8

Please sign in to comment.