mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(db): Use ConverseError instead of unwrapping/expecting

Browse source
This commit is contained in:
Vincent Ambo 2018-04-08 19:22:42 +02:00
parent fdc1abe7cc
commit 15d460bab3
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/db.rs
View file

@ -1,10 +1,10 @@
//! This module implements the database connection actor. //! This module implements the database connection actor.
use actix::prelude::*; use actix::prelude::*;
use actix_web::Error;
use diesel::prelude::*; use diesel::prelude::*;
use diesel::r2d2::{Pool, ConnectionManager}; use diesel::r2d2::{Pool, ConnectionManager};
use models::*; use models::*;
use errors::Result;
/// The DB actor itself. Several of these will be run in parallel by /// The DB actor itself. Several of these will be run in parallel by
/// `SyncArbiter`. /// `SyncArbiter`.
@ -19,7 +19,7 @@ impl Actor for DbExecutor {
pub struct ListThreads; pub struct ListThreads;
impl Message for ListThreads { impl Message for ListThreads {
type Result = Result<Vec<Thread>, Error>; type Result = Result<Vec<Thread>>;
} }
impl Handler<ListThreads> for DbExecutor { impl Handler<ListThreads> for DbExecutor {
@ -28,8 +28,8 @@ impl Handler<ListThreads> for DbExecutor {
fn handle(&mut self, _: ListThreads, _: &mut Self::Context) -> Self::Result { fn handle(&mut self, _: ListThreads, _: &mut Self::Context) -> Self::Result {
use schema::threads::dsl::*; use schema::threads::dsl::*;
let conn = self.0.get().unwrap(); let conn = self.0.get()?;
let results = threads.load::<Thread>(&conn).expect("Error loading threads"); let results = threads.load::<Thread>(&conn)?;
Ok(results) Ok(results)
} }
} }
@ -39,7 +39,7 @@ impl Handler<ListThreads> for DbExecutor {
pub struct GetThread(pub i32); pub struct GetThread(pub i32);
impl Message for GetThread { impl Message for GetThread {
type Result = Result<(Thread, Vec<Post>), Error>; type Result = Result<(Thread, Vec<Post>)>;
} }
impl Handler<GetThread> for DbExecutor { impl Handler<GetThread> for DbExecutor {
@ -48,13 +48,11 @@ impl Handler<GetThread> for DbExecutor {
fn handle(&mut self, msg: GetThread, _: &mut Self::Context) -> Self::Result { fn handle(&mut self, msg: GetThread, _: &mut Self::Context) -> Self::Result {
use schema::threads::dsl::*; use schema::threads::dsl::*;
let conn = self.0.get().unwrap(); let conn = self.0.get()?;
let thread_result: Thread = threads let thread_result: Thread = threads
.find(msg.0).first(&conn) .find(msg.0).first(&conn)?;
.expect("Error loading thread");
let post_list = Post::belonging_to(&thread_result) let post_list = Post::belonging_to(&thread_result).load::<Post>(&conn)?;
.load::<Post>(&conn).expect("Error loading posts for thread");
Ok((thread_result, post_list)) Ok((thread_result, post_list))
} }