From a7c734d39512385177426bcb2131726906ce2fff Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 8 Apr 2019 12:31:26 +0200 Subject: Add endpoint to fetch screenings from the database. Not entirely happy about the way this turned out for now. A more ergonomic return type from the models::screenings::get_all() function will be investigated. --- src/controllers.rs | 1 + src/controllers/screening.rs | 32 ++++++++++++++++++ src/lib.rs | 5 +-- src/models.rs | 1 + src/models/screening.rs | 77 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 src/controllers/screening.rs create mode 100644 src/models/screening.rs (limited to 'src') diff --git a/src/controllers.rs b/src/controllers.rs index f5b1f08..40d910c 100644 --- a/src/controllers.rs +++ b/src/controllers.rs @@ -18,3 +18,4 @@ pub mod film; pub mod room; +pub mod screening; diff --git a/src/controllers/screening.rs b/src/controllers/screening.rs new file mode 100644 index 0000000..d060eb7 --- /dev/null +++ b/src/controllers/screening.rs @@ -0,0 +1,32 @@ +/* + Social program for Ramaskrik. + Copyright (C) 2019 Harald Eilertsen + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +use crate::{ + db, + models::{screening::{self, Screening}, film::Film, room::Room}, +}; + +use rocket::get; +use rocket_contrib::{ + json::Json, +}; + +#[get("/")] +pub fn get_screenings(db: db::Connection) -> Json, Option)>> { + Json(screening::get_all(&db).unwrap()) +} diff --git a/src/lib.rs b/src/lib.rs index a0eabc8..6554e7c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,7 +23,7 @@ mod controllers; pub mod db; pub mod models; pub mod schema; -use crate::controllers::{film, room}; +use crate::controllers::{film, room, screening}; use rocket::routes; use std::collections::HashMap; @@ -44,5 +44,6 @@ pub fn build_rocket(db_url: &str) -> Result> { .attach(db::Connection::fairing()) .mount("/", rocket_contrib::serve::StaticFiles::from("./public")) .mount("/rooms", routes![room::get_rooms]) - .mount("/films", routes![film::get_films])) + .mount("/films", routes![film::get_films]) + .mount("/screenings", routes![screening::get_screenings])) } diff --git a/src/models.rs b/src/models.rs index f5b1f08..40d910c 100644 --- a/src/models.rs +++ b/src/models.rs @@ -18,3 +18,4 @@ pub mod film; pub mod room; +pub mod screening; diff --git a/src/models/screening.rs b/src/models/screening.rs new file mode 100644 index 0000000..cd08e88 --- /dev/null +++ b/src/models/screening.rs @@ -0,0 +1,77 @@ +/* + Social program for Ramaskrik. + Copyright (C) 2019 Harald Eilertsen + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +use crate::{ + db::Connection, + models::{film::Film, room::Room}, + schema::*, +}; +use diesel::prelude::*; +use serde_derive::{Deserialize, Serialize}; + +joinable!(screenings -> rooms (room_id)); +joinable!(screenings -> films (film_id)); + +#[derive(Deserialize, Identifiable, PartialEq, Serialize, Queryable)] +pub struct Screening { + pub id: i32, + pub film_id: i32, + pub room_id: i32, + pub date: chrono::NaiveDate, + pub start_time: chrono::NaiveTime, + pub end_time: chrono::NaiveTime, +} + +#[derive(Deserialize, Insertable)] +#[table_name = "screenings"] +pub struct NewScreening { + pub film_id: i32, + pub room_id: i32, + pub date: chrono::NaiveDate, + pub start_time: chrono::NaiveTime, + pub end_time: chrono::NaiveTime, +} + +pub fn get_all(db: &Connection) -> QueryResult, Option)>> { + use crate::schema::screenings::dsl::*; + screenings + .left_join(films::table) + .left_join(rooms::table) + .get_results::<(Screening, Option, Option)>(&**db) +} + +pub fn create( + room: &Room, + film: &Film, + date: chrono::NaiveDate, + start_time: chrono::NaiveTime, + end_time: chrono::NaiveTime, + db: &Connection) -> QueryResult +{ + let s = NewScreening { + room_id: room.id, + film_id: film.id, + date: date, + start_time: start_time, + end_time: end_time, + }; + + diesel::insert_into(screenings::table) + .values(&s) + .execute(&**db) +} -- cgit v1.2.3