Move functions to query/modify db to connection object.

Makes tha API a bit nicer by asking the database rather than
passing the database on to each model. Reserve models for
method/functions that work on the model structs themselves.

1 files changed, 1 insertions, 17 deletions

diff --git a/src/models/room.rs b/src/models/room.rs
index 6360c88..d475901 100644
--- a/src/models/room.rs
+++ b/src/models/room.rs
@@ -16,11 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-use crate::{
-    db::Connection,
-    schema::rooms,
-};
-use diesel::prelude::*;
+use crate::schema::rooms;
 use serde_derive::{Deserialize, Serialize};
 
 #[derive(Deserialize, Identifiable, PartialEq, Serialize, Queryable)]
@@ -28,15 +24,3 @@ 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)
-}
-
-pub fn by_name(rname: &str, db: &Connection) -> QueryResult<Room> {
-    use crate::schema::rooms::dsl::*;
-    rooms
-        .filter(name.eq(&rname))
-        .get_result::<Room>(&**db)
-}