Remove name field (and remove existing data) (#935)

* Remove name field (and remove existing data) * run prep, fmt * fix dummy data
modrinth · Sep 7, 2024 · 2e35f36 · 2e35f36
1 parent 637a923
commit 2e35f36
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 133 deletions.
diff --git a/.sqlx/query-55f7a2e7fa37697bbcd7031b2bff742ae3921c1f2067723ff13f06328debee3e.json b/.sqlx/query-55f7a2e7fa37697bbcd7031b2bff742ae3921c1f2067723ff13f06328debee3e.json
diff --git a/.sqlx/query-5eb2795d25d6d03e22564048c198d821cd5ff22eb4e39b9dd7f198c9113d4f87.json b/.sqlx/query-5eb2795d25d6d03e22564048c198d821cd5ff22eb4e39b9dd7f198c9113d4f87.json
diff --git a/...238527ec210f20de13bd8995885159c6d277.json → ...e1866ec395146d5dabe071a13baa55ec3c09.json b/...238527ec210f20de13bd8995885159c6d277.json → ...e1866ec395146d5dabe071a13baa55ec3c09.json
diff --git a/.sqlx/query-c33fb3503d040fd91a049b10853f608166e1fa1f4ce5f655849874858d5f9e27.json b/.sqlx/query-c33fb3503d040fd91a049b10853f608166e1fa1f4ce5f655849874858d5f9e27.json
diff --git a/migrations/20240701213559_remove-user-names.sql b/migrations/20240701213559_remove-user-names.sql
@@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN name;
diff --git a/src/auth/validate.rs b/src/auth/validate.rs
@@ -51,7 +51,6 @@ where
     let user = User {
         id: UserId::from(db_user.id),
         username: db_user.username,
-        name: db_user.name,
         email: db_user.email,
         email_verified: Some(db_user.email_verified),
         avatar_url: db_user.avatar_url,

diff --git a/src/database/models/user_item.rs b/src/database/models/user_item.rs
@@ -37,7 +37,6 @@ pub struct User {
     pub totp_secret: Option<String>,
 
     pub username: String,
-    pub name: Option<String>,
     pub email: Option<String>,
     pub email_verified: bool,
     pub avatar_url: Option<String>,
@@ -57,7 +56,7 @@ impl User {
         sqlx::query!(
             "
             INSERT INTO users (
-                id, username, name, email,
+                id, username, email,
                 avatar_url, bio, created,
                 github_id, discord_id, gitlab_id, google_id, steam_id, microsoft_id,
                 email_verified, password, paypal_id, paypal_country, paypal_email,
@@ -67,12 +66,11 @@ impl User {
                 $1, $2, $3, $4, $5,
                 $6, $7,
                 $8, $9, $10, $11, $12, $13,
-                $14, $15, $16, $17, $18, $19, $20
+                $14, $15, $16, $17, $18, $19
             )
             ",
             self.id as UserId,
             &self.username,
-            self.name.as_ref(),
             self.email.as_ref(),
             self.avatar_url.as_ref(),
             self.bio.as_ref(),
@@ -166,7 +164,7 @@ impl User {
 
                 let users = sqlx::query!(
                     "
-                    SELECT id, name, email,
+                    SELECT id, email,
                         avatar_url, username, bio,
                         created, role, badges,
                         balance,
@@ -189,7 +187,6 @@ impl User {
                             google_id: u.google_id,
                             steam_id: u.steam_id,
                             microsoft_id: u.microsoft_id,
-                            name: u.name,
                             email: u.email,
                             email_verified: u.email_verified,
                             avatar_url: u.avatar_url,

diff --git a/src/models/v2/user.rs b/src/models/v2/user.rs
@@ -35,7 +35,7 @@ impl From<crate::models::v3::users::User> for LegacyUser {
         Self {
             id: data.id,
             username: data.username,
-            name: data.name,
+            name: None,
             email: data.email,
             email_verified: data.email_verified,
             avatar_url: data.avatar_url,

diff --git a/src/models/v3/users.rs b/src/models/v3/users.rs
@@ -39,7 +39,6 @@ impl Default for Badges {
 pub struct User {
     pub id: UserId,
     pub username: String,
-    pub name: Option<String>,
     pub avatar_url: Option<String>,
     pub bio: Option<String>,
     pub created: DateTime<Utc>,
@@ -73,7 +72,6 @@ impl From<DBUser> for User {
         Self {
             id: data.id.into(),
             username: data.username,
-            name: data.name,
             email: None,
             email_verified: None,
             avatar_url: data.avatar_url,

diff --git a/src/routes/internal/billing.rs b/src/routes/internal/billing.rs
@@ -999,7 +999,7 @@ pub async fn stripe_webhook(
                     let price = match metadata.product_price.prices {
                         Price::OneTime { price } => Some(price),
                         Price::Recurring { intervals } => {
-                            if let Some((subscription_id, interval)) =
+                            if let Some((_subscription_id, interval)) =
                                 metadata.user_subscription_data
                             {
                                 if let Some(mut user_subscription) = metadata.user_subscription {