Merge branch 'main' into CHAOS-202-Add-pronouns-and-gender-to-user-in…

…fo-when-registering-FrontEnd
devsoc-unsw · Sep 20, 2023 · fc191f8 · fc191f8
2 parents b029e7d + ca22d34
commit fc191f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/backend/seed_data/src/seed.rs b/backend/seed_data/src/seed.rs
@@ -133,7 +133,9 @@ pub fn seed() {
             .expect(&format!("Failed to insert org {}.", org.name));
     }
 
-    assert!(Organisation::get_all(&connection).len() == 2);
+    let x = Organisation::get_all(&connection);
+    println!("{:?}", x);
+    assert!(x.len() == 2);
 
     println!("... Added {} organizations\n", orgs.len());
     // make giuliana the admin of csesoc

diff --git a/backend/server/src/database/models.rs b/backend/server/src/database/models.rs
@@ -152,7 +152,7 @@ impl NewUser {
     }
 }
 
-#[derive(Queryable, Serialize, Deserialize)]
+#[derive(Queryable, Serialize, Deserialize, Debug)]
 pub struct Organisation {
     pub id: i32,
     pub name: String,