From 18e23bb10d7645b99419dd6bd3ac50a511b0f65e Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 2 Apr 2019 22:05:05 +0200 Subject: Add route to fetch films from database. --- src/controllers.rs | 1 + src/controllers/film.rs | 32 ++++++++++++++++++++++++++++++++ src/lib.rs | 5 +++-- src/models.rs | 1 + src/models/film.rs | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 src/controllers/film.rs create mode 100644 src/models/film.rs (limited to 'src') diff --git a/src/controllers.rs b/src/controllers.rs index d8f9d5d..f5b1f08 100644 --- a/src/controllers.rs +++ b/src/controllers.rs @@ -16,4 +16,5 @@ along with this program. If not, see . */ +pub mod film; pub mod room; diff --git a/src/controllers/film.rs b/src/controllers/film.rs new file mode 100644 index 0000000..f4bcd03 --- /dev/null +++ b/src/controllers/film.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::film, +}; + +use rocket::get; +use rocket_contrib::{ + json::Json, +}; + +#[get("/")] +pub fn get_films(db: db::Connection) -> Json> { + Json(film::get_all(&db).unwrap()) +} diff --git a/src/lib.rs b/src/lib.rs index 4e94f5a..a0eabc8 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::room; +use crate::controllers::{film, room}; use rocket::routes; use std::collections::HashMap; @@ -43,5 +43,6 @@ pub fn build_rocket(db_url: &str) -> Result> { Ok(rocket::custom(config) .attach(db::Connection::fairing()) .mount("/", rocket_contrib::serve::StaticFiles::from("./public")) - .mount("/rooms", routes![room::get_rooms])) + .mount("/rooms", routes![room::get_rooms]) + .mount("/films", routes![film::get_films])) } diff --git a/src/models.rs b/src/models.rs index d8f9d5d..f5b1f08 100644 --- a/src/models.rs +++ b/src/models.rs @@ -16,4 +16,5 @@ along with this program. If not, see . */ +pub mod film; pub mod room; diff --git a/src/models/film.rs b/src/models/film.rs new file mode 100644 index 0000000..3926dd1 --- /dev/null +++ b/src/models/film.rs @@ -0,0 +1,43 @@ +/* + 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, + schema::films, +}; +use diesel::prelude::*; +use serde_derive::{Deserialize, Serialize}; + +#[derive(Deserialize, Identifiable, PartialEq, Serialize, Queryable)] +pub struct Film { + pub id: i32, + pub title: String, + pub url: Option, +} + +#[derive(Deserialize, Insertable)] +#[table_name = "films"] +pub struct NewFilm<'a> { + pub title: &'a str, + pub url: Option<&'a str>, +} + +pub fn get_all(db: &Connection) -> QueryResult> { + use crate::schema::films::dsl::*; + films.load::(&**db) +} -- cgit v1.2.3