Update /screenings endpoint to return full info on screenings.

This makes each screening record self-contained, and the json
payload more consistent with how it semantically fit together.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/db.rs b/src/db.rs
index d7a12b0..d24384f 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -53,12 +53,13 @@ impl Connection {
             .execute(&**self)
     }
 
-    pub fn get_screenings(&self) -> QueryResult<Vec<(models::Screening, Option<models::Film>, Option<models::Room>)>> {
+    pub fn get_screenings(&self) -> QueryResult<Vec<models::Screening>> {
         use crate::schema::screenings::dsl::*;
-        screenings
+        let s = screenings
             .left_join(films::table)
             .left_join(rooms::table)
-            .get_results(&**self)
+            .get_results(&**self)?;
+        Ok(models::Screening::from_query(s))
     }
 
     pub fn get_rooms(&self) -> QueryResult<Vec<models::Room>> {