diff options
author | Harald Eilertsen <haraldei@anduin.net> | 2019-03-21 10:39:16 +0100 |
---|---|---|
committer | Harald Eilertsen <haraldei@anduin.net> | 2019-03-21 10:39:16 +0100 |
commit | b4a8149dc6ed595c0bd95f5824f7048799989bdb (patch) | |
tree | ffc490cb7e13a3abe55e176b0fd308c55da051e6 /src/controllers | |
parent | 9c3a341e79581541fc39ceddeec28daae7dc28cf (diff) | |
download | ramaskrik-social-b4a8149dc6ed595c0bd95f5824f7048799989bdb.tar.gz ramaskrik-social-b4a8149dc6ed595c0bd95f5824f7048799989bdb.tar.bz2 ramaskrik-social-b4a8149dc6ed595c0bd95f5824f7048799989bdb.zip |
Actually fetch available rooms from the database.
Diffstat (limited to 'src/controllers')
-rw-r--r-- | src/controllers/room.rs | 13 |
1 files changed, 8 insertions, 5 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()) } |