Added belongs_to to most of diesel structs for easier querying.

gamenight-database/src/gamenight.rs

@@ -7,6 +7,8 @@ use uuid::Uuid;
 use super::error::DatabaseError;
 
 #[derive(Serialize, Deserialize, Debug, Insertable, Queryable)]
+#[diesel(belongs_to(User, foreign_key=FK_UserId))]
+#[diesel(belongs_to(Location, foreign_key=FK_location_id))]
 #[diesel(table_name = gamenight)]
 pub struct Gamenight {
     pub id: Uuid,

gamenight-database/src/gamenight_gamelist.rs

@@ -0,0 +1,13 @@
+use diesel::{Insertable, Queryable};
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+use crate::schema::gamenight_gamelist;
+
+#[derive(Serialize, Deserialize, Debug, Insertable, Queryable)]
+#[diesel(belongs_to(Gamenight, foreign_key=FK_gamenight_id))]
+#[diesel(belongs_to(Game, foreign_key=FK_game_id))]
+#[diesel(table_name = gamenight_gamelist)]
+pub struct GamenightGamelist {
+    pub gamenight_id: Uuid,
+    pub game_id: Uuid,
+}

gamenight-database/src/gamenight_participants.rs

@@ -10,8 +10,8 @@ use super::DbConnection;
 use super::error::DatabaseError;
 
 #[derive(Serialize, Deserialize, Debug, Insertable, Queryable)]
-#[diesel(belongs_to(Gamenight))]
-#[diesel(belongs_to(User))]
+#[diesel(belongs_to(Gamenight, foreign_key=FK_gamenight_id))]
+#[diesel(belongs_to(User, foreign_key=FK_user_id))]
 #[diesel(table_name = gamenight_participant)]
 pub struct GamenightParticipant {
     pub gamenight_id: Uuid,

gamenight-database/src/lib.rs

@@ -7,6 +7,7 @@ pub mod location_owner;
 pub mod owned_game;
 pub mod schema;
 pub mod user;
+mod gamenight_gamelist;
 
 use diesel::PgConnection;
 use diesel::r2d2::ConnectionManager;

gamenight-database/src/location_owner.rs

@@ -8,6 +8,8 @@ use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
 #[derive(Serialize, Deserialize, Debug, Insertable, Queryable)]
+#[diesel(belongs_to(location))]
+#[diesel(belongs_to(User))]
 #[diesel(table_name = location_owner)]
 pub struct LocationOwner {
     pub location_id: Uuid,

gamenight-database/src/owned_game.rs

@@ -8,6 +8,8 @@ use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
 #[derive(Serialize, Deserialize, Debug, Insertable, Queryable)]
+#[diesel(belongs_to(user, foreign_key=FK_user_id))]
+#[diesel(belongs_to(game, foreign_key=FK_gamenight_id))]
 #[diesel(table_name = owned_game)]
 pub struct OwnedGame {
     pub user_id: Uuid,