optional user pronouns and gender

devsoc-unsw · Dec 30, 2024 · 877c388 · 877c388
1 parent 2ec5c18
commit 877c388
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/backend/migrations/20240406023149_create_users.sql b/backend/migrations/20240406023149_create_users.sql
@@ -5,11 +5,11 @@ CREATE TABLE users (
     email TEXT NOT NULL UNIQUE,
     zid TEXT,
     name TEXT NOT NULL,
-    pronouns TEXT NOT NULL,
-    gender TEXT NOT NULL,
+    pronouns TEXT,
+    gender TEXT,
     degree_name TEXT,
     degree_starting_year INTEGER,
-    role user_role NOT NULL,
+    role user_role NOT NULL DEFAULT 'User',
     created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
 );

diff --git a/backend/server/src/models/application.rs b/backend/server/src/models/application.rs
@@ -52,8 +52,8 @@ pub struct ApplicationData {
     pub user_email: String,
     pub user_zid: Option<String>,
     pub user_name: String,
-    pub user_pronouns: String,
-    pub user_gender: String,
+    pub user_pronouns: Option<String>,
+    pub user_gender: Option<String>,
     pub user_degree_name: Option<String>,
     pub user_degree_starting_year: Option<i32>,
     pub status: ApplicationStatus,

diff --git a/backend/server/src/models/user.rs b/backend/server/src/models/user.rs
@@ -15,8 +15,8 @@ pub struct UserDetails {
     pub email: String,
     pub zid: Option<String>,
     pub name: String,
-    pub pronouns: String,
-    pub gender: String,
+    pub pronouns: Option<String>,
+    pub gender: Option<String>,
     pub degree_name: Option<String>,
     pub degree_starting_year: Option<i32>,
 }
@@ -27,8 +27,8 @@ pub struct User {
     pub email: String,
     pub zid: Option<String>,
     pub name: String,
-    pub pronouns: String,
-    pub gender: String,
+    pub pronouns: Option<String>,
+    pub gender: Option<String>,
     pub degree_name: Option<String>,
     pub degree_starting_year: Option<i32>,
     pub role: UserRole,