From 30f65b62e84fcd9975643716d61fa21bc8495291 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Mon, 8 Apr 2019 16:25:54 +0200
Subject: Import model structs to main models module.

---
 src/db.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/db.rs')

diff --git a/src/db.rs b/src/db.rs
index 53c4ea4..d7a12b0 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -34,13 +34,13 @@ pub struct Connection(diesel::PgConnection);
 impl Connection {
     pub fn create_screening(
         &self,
-        room: &models::room::Room,
-        film: &models::film::Film,
+        room: &models::Room,
+        film: &models::Film,
         date: chrono::NaiveDate,
         start_time: chrono::NaiveTime,
         end_time: chrono::NaiveTime) -> QueryResult<usize>
     {
-        let s = models::screening::NewScreening {
+        let s = models::NewScreening {
             room_id: room.id,
             film_id: film.id,
             date: date,
@@ -53,7 +53,7 @@ impl Connection {
             .execute(&**self)
     }
 
-    pub fn get_screenings(&self) -> QueryResult<Vec<(models::screening::Screening, Option<models::film::Film>, Option<models::room::Room>)>> {
+    pub fn get_screenings(&self) -> QueryResult<Vec<(models::Screening, Option<models::Film>, Option<models::Room>)>> {
         use crate::schema::screenings::dsl::*;
         screenings
             .left_join(films::table)
@@ -61,24 +61,24 @@ impl Connection {
             .get_results(&**self)
     }
 
-    pub fn get_rooms(&self) -> QueryResult<Vec<models::room::Room>> {
+    pub fn get_rooms(&self) -> QueryResult<Vec<models::Room>> {
         use crate::schema::rooms::dsl::*;
         rooms.load(&**self)
     }
 
-    pub fn get_room_by_name(&self, room_name: &str) -> QueryResult<models::room::Room> {
+    pub fn get_room_by_name(&self, room_name: &str) -> QueryResult<models::Room> {
         use crate::schema::rooms::dsl::*;
         rooms
             .filter(name.eq(&room_name))
             .get_result(&**self)
     }
 
-    pub fn get_films(&self) -> QueryResult<Vec<models::film::Film>> {
+    pub fn get_films(&self) -> QueryResult<Vec<models::Film>> {
         use crate::schema::films::dsl::*;
         films.load(&**self)
     }
 
-    pub fn get_film_by_title(&self, film_title: &str) -> QueryResult<models::film::Film> {
+    pub fn get_film_by_title(&self, film_title: &str) -> QueryResult<models::Film> {
         use crate::schema::films::dsl::*;
         films
             .filter(title.eq(&film_title))
-- 
cgit v1.2.3