newthuhole/hole-backend-rust
2
1
Fork 0
Code Issues 7 Pull Requests Projects Releases 4 Wiki Activity

fix search sql for posts without any comment

Browse Source
This commit is contained in:
hole-thu
2022-03-23 23:15:48 +08:00
parent ce21b2825e
commit cb1ebfeb56
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/models.rs
View File

@@ -177,8 +177,7 @@ impl Post {
let pat; let pat;
let mut query = base_query!(posts) let mut query = base_query!(posts)
.distinct() .distinct()
.left_join(comments::table) .left_join(comments::table);
.filter(comments::is_deleted.eq(false));
// 先用搜索+缓存，性能有问题了再真的做tag表 // 先用搜索+缓存，性能有问题了再真的做tag表
query = match search_mode { query = match search_mode {
0 => { 0 => {
@@ -187,7 +186,7 @@ impl Post {
.filter(posts::cw.eq(&search_text)) .filter(posts::cw.eq(&search_text))
.or_filter(posts::cw.eq(format!("#{}", &search_text))) .or_filter(posts::cw.eq(format!("#{}", &search_text)))
.or_filter(posts::content.like(&pat)) .or_filter(posts::content.like(&pat))
.or_filter(comments::content.like(&pat)) .or_filter(comments::content.like(&pat).and(comments::is_deleted.eq(false)))
} }
1 => { 1 => {
pat = format!("%{}%", search_text2.replace(" ", "%")); pat = format!("%{}%", search_text2.replace(" ", "%"));

2
src/rds_models.rs
View File

@@ -65,7 +65,7 @@ impl PostCache {
pub async fn get(&mut self) -> Option<Post> { pub async fn get(&mut self) -> Option<Post> {
let rds_result = self.rconn.get::<&String, String>(&self.key).await; let rds_result = self.rconn.get::<&String, String>(&self.key).await;
if let Ok(s) = rds_result { if let Ok(s) = rds_result {
debug!("hint post cache: {}", &s); debug!("hint post cache");
self.rconn self.rconn
.expire::<&String, bool>(&self.key, INSTANCE_EXPIRE_TIME) .expire::<&String, bool>(&self.key, INSTANCE_EXPIRE_TIME)
.await .await