aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2019-04-02 22:05:05 +0200
committerHarald Eilertsen <haraldei@anduin.net>2019-04-02 22:05:05 +0200
commit18e23bb10d7645b99419dd6bd3ac50a511b0f65e (patch)
treed71403522a8f32ae7bbe5dae6133fa5d36204279 /src
parent23abdc9488ef84d852a5029340a2ac3c66943d99 (diff)
downloadramaskrik-social-18e23bb10d7645b99419dd6bd3ac50a511b0f65e.tar.gz
ramaskrik-social-18e23bb10d7645b99419dd6bd3ac50a511b0f65e.tar.bz2
ramaskrik-social-18e23bb10d7645b99419dd6bd3ac50a511b0f65e.zip
Add route to fetch films from database.
Diffstat (limited to 'src')
-rw-r--r--src/controllers.rs1
-rw-r--r--src/controllers/film.rs32
-rw-r--r--src/lib.rs5
-rw-r--r--src/models.rs1
-rw-r--r--src/models/film.rs43
5 files changed, 80 insertions, 2 deletions
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 <https://www.gnu.org/licenses/>.
*/
+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 <haraldei@anduin.net>
+
+ 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 <https://www.gnu.org/licenses/>.
+*/
+
+use crate::{
+ db,
+ models::film,
+};
+
+use rocket::get;
+use rocket_contrib::{
+ json::Json,
+};
+
+#[get("/")]
+pub fn get_films(db: db::Connection) -> Json<Vec<film::Film>> {
+ 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<rocket::Rocket, Box<dyn Error>> {
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 <https://www.gnu.org/licenses/>.
*/
+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 <haraldei@anduin.net>
+
+ 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 <https://www.gnu.org/licenses/>.
+*/
+
+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<String>,
+}
+
+#[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<Vec<Film>> {
+ use crate::schema::films::dsl::*;
+ films.load::<Film>(&**db)
+}