phundrak/ordabok
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove panics, cleaner code
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Lucien Cartier-Tilet
2023-01-17 01:52:56 +01:00
parent 1eb31f8e1e
commit b5dfdee453
2 changed files with 36 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/db/models/languages.rs
View File

@@ -72,41 +72,30 @@ impl Language {
relationship: AgentLanguageRelation,
) -> Result<Vec<User>, DatabaseError> {
use schema::langandagents::dsl;
match &mut db.conn() {
Ok(conn) => Ok(dsl::langandagents
.filter(dsl::language.eq(self.id))
.filter(dsl::relationship.eq(relationship))
.load::<LangAndAgent>(conn)
.map_err(|e| {
DatabaseError::new(
format!(
"Failed to retrieve language relationship: {:?}",
e
),
"Database reading error",
)
})?
.iter()
.map(|v| {
use schema::users::dsl;
dsl::users.find(v.agent.clone()).first::<User>(conn)
})
.filter_map(|author| match author {
Ok(val) => Some(val),
Err(e) => {
info!(
"Failed ot retrieve author from database: {:?}",
e
);
None
}
})
.collect::<Vec<User>>()),
Err(e) => {
panic!("Could not connect to the database: {:?}", e);
}
}
let conn = &mut db.conn()?;
Ok(dsl::langandagents
.filter(dsl::language.eq(self.id))
.filter(dsl::relationship.eq(relationship))
.load::<LangAndAgent>(conn)
.map_err(|e| {
DatabaseError::new(
format!("Failed to retrieve language relationship: {e:?}"),
"Database reading error",
)
})?
.iter()
.map(|v| {
use schema::users::dsl;
dsl::users.find(v.agent.clone()).first::<User>(conn)
})
.filter_map(|author| match author {
Ok(val) => Some(val),
Err(e) => {
info!("Failed ot retrieve author from database: {:?}", e);
None
}
})
.collect::<Vec<User>>())
}
}