a few cleanups
This commit is contained in:
parent
7626ec0b99
commit
cfdde5c3d2
|
@ -156,6 +156,26 @@ pub fn make_switch(conn: MainDatabase, who: StringBody) -> Result<String> {
|
||||||
Ok(to.cmene)
|
Ok(to.cmene)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[get("/switches/<switch_id>")]
|
||||||
|
#[instrument(skip(conn), err)]
|
||||||
|
pub fn get_switch(conn: MainDatabase, switch_id: String) -> Result<Json<FrontChange>> {
|
||||||
|
use schema::{members, switches::dsl::switches};
|
||||||
|
|
||||||
|
let (switch, member): (models::Switch, models::Member) = switches
|
||||||
|
.find(switch_id)
|
||||||
|
.inner_join(members::table)
|
||||||
|
.get_result(&*conn)
|
||||||
|
.map_err(Error::Database)?;
|
||||||
|
|
||||||
|
Ok(Json(FrontChange {
|
||||||
|
id: switch.id,
|
||||||
|
who: member.cmene,
|
||||||
|
started_at: switch.started_at,
|
||||||
|
ended_at: switch.ended_at,
|
||||||
|
duration: switch.duration,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct StringBody(String);
|
pub struct StringBody(String);
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,7 @@ fn main() -> Result<()> {
|
||||||
routes![
|
routes![
|
||||||
api::get_members,
|
api::get_members,
|
||||||
api::get_switches,
|
api::get_switches,
|
||||||
|
api::get_switch,
|
||||||
api::get_current_front,
|
api::get_current_front,
|
||||||
api::make_switch
|
api::make_switch
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue