aboutsummaryrefslogtreecommitdiffstats
path: root/src/controllers/room.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/controllers/room.rs')
-rw-r--r--src/controllers/room.rs13
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())
}