database redesign

Author: Sidharth-Singh10

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 
 services:
   rusty_backend:
@@ -20,8 +19,6 @@ services:
       - backend_net
     command: ["./rusty_backend"]  # Command to start the application
     env_file: .env.example
-      # ADD AWS CREDS to run code runner
-
   postgres:
     image: postgres:latest
     container_name: postgres
@@ -44,7 +41,7 @@ services:
       - backend_net
     volumes:
       - ./:/app  # Mount project directory to /app in the container
-    env_file: .env.example
+    env_file: .env
 
   docker:
     image: docker:dind
@@ -74,5 +71,4 @@ networks:
 volumes:
   postgres_data:
   rusty_backend-docker-certs:
-  rusty_backend-data:
- rusty_backend-data:
+  rusty_backend-data:

entity/src/avatar.rs

@@ -1,24 +1,23 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.0-rc.5
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "avatar")]
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
-    pub user_name: String,
+    pub user_id: i32,
     pub object_key: String,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(
         belongs_to = "super::users::Entity",
-        from = "Column::UserName",
-        to = "super::users::Column::UserName",
-        on_update = "Cascade",
+        from = "Column::UserId",
+        to = "super::users::Column::Id",
+        on_update = "NoAction",
         on_delete = "Cascade"
     )]
     Users,

entity/src/game_sessions.rs

@@ -0,0 +1,52 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.0-rc.5
+
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
+#[sea_orm(table_name = "game_sessions")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    pub male_id: i32,
+    pub female_id: i32,
+    #[sea_orm(column_type = "Float")]
+    pub score: f32,
+    pub game_id: i32,
+    pub match_id: i32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::matches::Entity",
+        from = "Column::MatchId",
+        to = "super::matches::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Matches,
+    #[sea_orm(
+        belongs_to = "super::users::Entity",
+        from = "Column::FemaleId",
+        to = "super::users::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Users2,
+    #[sea_orm(
+        belongs_to = "super::users::Entity",
+        from = "Column::MaleId",
+        to = "super::users::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Users1,
+}
+
+impl Related<super::matches::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Matches.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}

entity/src/matches.rs

@@ -0,0 +1,44 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.0-rc.5
+
+use sea_orm::entity::prelude::*;
+use serde::Serialize;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize)]
+#[sea_orm(table_name = "matches")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    pub male_id: i32,
+    pub female_id: i32,
+    pub status: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::game_sessions::Entity")]
+    GameSessions,
+    #[sea_orm(
+        belongs_to = "super::users::Entity",
+        from = "Column::FemaleId",
+        to = "super::users::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Users2,
+    #[sea_orm(
+        belongs_to = "super::users::Entity",
+        from = "Column::MaleId",
+        to = "super::users::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Users1,
+}
+
+impl Related<super::game_sessions::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::GameSessions.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}

entity/src/mod.rs

@@ -3,7 +3,8 @@
 pub mod prelude;
 
 pub mod avatar;
-pub mod friend_list;
-pub mod matched;
+pub mod game_sessions;
+pub mod matches;
 pub mod pass_reset;
+pub mod user_details;
 pub mod users;

entity/src/pass_reset.rs

@@ -13,6 +13,21 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::users::Entity",
+        from = "Column::UserId",
+        to = "super::users::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Users,
+}
+
+impl Related<super::users::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Users.def()
+    }
+}
 
 impl ActiveModelBehavior for ActiveModel {}

entity/src/prelude.rs

@@ -1,7 +1,8 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.0-rc.5
 
 pub use super::avatar::Entity as Avatar;
-pub use super::friend_list::Entity as FriendList;
-pub use super::matched::Entity as Matched;
+pub use super::game_sessions::Entity as GameSessions;
+pub use super::matches::Entity as Matches;
 pub use super::pass_reset::Entity as PassReset;
+pub use super::user_details::Entity as UserDetails;
 pub use super::users::Entity as Users;

entity/src/user_details.rs

@@ -0,0 +1,46 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.0-rc.5
+
+use sea_orm::entity::prelude::*;
+use serde::Serialize;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize)]
+#[sea_orm(table_name = "user_details")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub user_id: i32,
+    pub location: String,
+    pub openness: String,
+    pub interests: String,
+    pub exp_qual: String,
+    pub relation_type: String,
+    pub social_habits: String,
+    pub past_relations: String,
+    pub values: String,
+    pub style: String,
+    pub traits: String,
+    pub commitment: String,
+    pub resolution: String,
+    pub image_url: String,
+    #[sea_orm(column_type = "Float")]
+    pub score: f32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::users::Entity",
+        from = "Column::UserId",
+        to = "super::users::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Users,
+}
+
+impl Related<super::users::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Users.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}

entity/src/users.rs

@@ -1,45 +1,33 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.0-rc.5
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize)]
 #[sea_orm(table_name = "users")]
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
     #[sea_orm(unique)]
-    pub user_name: String,
-    pub first_name: Option<String>,
-    pub last_name: Option<String>,
+    pub username: String,
+    pub first_name: String,
+    pub last_name: String,
+    pub age: i32,
     #[sea_orm(unique)]
     pub email: String,
     pub password: String,
-    pub age: i32,
     pub gender: String,
-    pub location: Option<String>,
-    pub openness: Option<String>,
-    pub interests: Option<String>,
-    pub exp_qual: Option<String>,
-    pub relation_type: Option<String>,
-    pub social_habits: Option<String>,
-    pub past_relations: Option<String>,
-    pub values: Option<String>,
-    pub style: Option<String>,
-    pub traits: Option<String>,
-    pub commitment: Option<String>,
-    pub resolution: Option<String>,
-    pub image_url: String,
-    pub score: i32,
-    #[sea_orm(unique)]
-    pub uuid: Uuid,
     pub created_at: DateTime,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 pub enum Relation {
     #[sea_orm(has_many = "super::avatar::Entity")]
     Avatar,
+    #[sea_orm(has_many = "super::pass_reset::Entity")]
+    PassReset,
+    #[sea_orm(has_many = "super::user_details::Entity")]
+    UserDetails,
 }
 
 impl Related<super::avatar::Entity> for Entity {
@@ -48,4 +36,16 @@ impl Related<super::avatar::Entity> for Entity {
     }
 }
 
+impl Related<super::pass_reset::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PassReset.def()
+    }
+}
+
+impl Related<super::user_details::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserDetails.def()
+    }
+}
+
 impl ActiveModelBehavior for ActiveModel {}

migration/src/lib.rs

@@ -8,21 +8,13 @@ mod m20240929_173839_pass_reset_table;
 mod m20240930_194047_pass_reset_table2;
 mod m20241004_152931_pass_reset3;
 mod m20241103_131410_avatar_table;
+mod m20250322_102921_redesign;
 
 pub struct Migrator;
 
 #[async_trait::async_trait]
 impl MigratorTrait for Migrator {
     fn migrations() -> Vec<Box<dyn MigrationTrait>> {
-        vec![
-            Box::new(m20220101_000001_create_table::Migration),
-            Box::new(m20240822_161852_create_friendlist::Migration),
-            Box::new(m20240822_171309_add_field_to_friendlist::Migration),
-            Box::new(m20240823_075457_create_matched::Migration),
-            Box::new(m20240929_173839_pass_reset_table::Migration),
-            Box::new(m20240930_194047_pass_reset_table2::Migration),
-            Box::new(m20241004_152931_pass_reset3::Migration),
-            Box::new(m20241103_131410_avatar_table::Migration),
-        ]
+        vec![Box::new(m20250322_102921_redesign::Migration)]
     }
 }