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

This commit is contained in:
Lucien Cartier-Tilet 2023-01-17 01:52:56 +01:00
parent 1eb31f8e1e
commit b5dfdee453
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
2 changed files with 36 additions and 50 deletions

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>>())
}
}

View File

@ -133,22 +133,19 @@ impl Word {
}
#[graphql(description = "Language to which the word belongs")]
fn language(&self, context: &Context) -> Language {
fn language(&self, context: &Context) -> FieldResult<Language> {
use schema::languages::dsl;
match &mut context.db.conn() {
Ok(conn) => {
match dsl::languages.find(self.language).first::<Language>(conn)
{
Ok(lang) => lang,
Err(e) => {
panic!("Failed to retrieve language {} of word {} from database: {:?}",
self.language, self.norm, e
)
}
}
}
Err(e) => panic!("Failed to connect to database: {:?}", e),
}
use std::convert::Into;
dsl::languages
.find(self.language)
.first::<Language>(&mut context.db.conn()?)
.map_err(|e| DatabaseError::new(
format!(
"Failed to retrieve language {} of word {} from database: {e:?}",
self.language, self.norm
),
"Database Error"
).into())
}
#[graphql(