Actually fetch available rooms from the database.

5 files changed, 67 insertions, 7 deletions

diff --git a/src/controllers/room.rs b/src/controllers/room.rs
index 27f6a41..df77414 100644
--- a/src/controllers/room.rs
+++ b/src/controllers/room.rs
@@ -16,14 +16,17 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-use crate::db;
+use crate::{
+    db,
+    models::room,
+};
+
 use rocket::get;
 use rocket_contrib::{
-    json,
-    json::JsonValue,
+    json::Json,
 };
 
 #[get("/")]
-pub fn get_rooms(_db: db::Connection) -> JsonValue {
-    json!([])
+pub fn get_rooms(db: db::Connection) -> Json<Vec<room::Room>> {
+    Json(room::get_all(&db).unwrap())
 }
diff --git a/src/db.rs b/src/db.rs
index f427e14..b299911 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -23,4 +23,3 @@ use rocket_contrib::{
 
 #[database("main")]
 pub struct Connection(diesel::PgConnection);
-
diff --git a/src/lib.rs b/src/lib.rs
index 989a6ba..4e94f5a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,8 +17,12 @@
 */
 #![feature(proc_macro_hygiene, decl_macro)]
 
+#[macro_use] extern crate diesel;
+
 mod controllers;
-mod db;
+pub mod db;
+pub mod models;
+pub mod schema;
 use crate::controllers::room;
 
 use rocket::routes;
diff --git a/src/models.rs b/src/models.rs
new file mode 100644
index 0000000..d8f9d5d
--- /dev/null
+++ b/src/models.rs
@@ -0,0 +1,19 @@
+/*
+    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/>.
+*/
+
+pub mod room;
diff --git a/src/models/room.rs b/src/models/room.rs
new file mode 100644
index 0000000..2ec3c7f
--- /dev/null
+++ b/src/models/room.rs
@@ -0,0 +1,35 @@
+/*
+    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::rooms,
+};
+use diesel::prelude::*;
+use serde_derive::{Deserialize, Serialize};
+
+#[derive(Deserialize, Identifiable, PartialEq, Serialize, Queryable)]
+pub struct Room {
+    pub id: i32,
+    pub name: String,
+}
+
+pub fn get_all(db: &Connection) -> QueryResult<Vec<Room>> {
+    use crate::schema::rooms::dsl::*;
+    rooms.load::<Room>(&**db)
+}