more gh_login removal

Author: carols10cents

src/tests/issues/issue2736.rs

@@ -2,7 +2,7 @@ use crate::builders::CrateBuilder;
 use crate::util::{RequestHelper, TestApp};
 use claims::assert_none;
 use crates_io::models::CrateOwner;
-use crates_io_database::schema::users;
+use crates_io_database::schema::oauth_github;
 use diesel::prelude::*;
 use diesel_async::RunQueryDsl;
 use insta::assert_snapshot;
@@ -36,10 +36,10 @@ async fn test_issue_2736() -> anyhow::Result<()> {
     // - When `foo` now logs in to crates.io, it's a different account than their old `foo` crates.io account because of the new GitHub ID (and if it wasn't, this would be a security problem)
     let foo2 = app.db_new_user("foo").await;
 
-    let github_ids = users::table
-        .filter(users::gh_login.eq("foo"))
-        .select(users::gh_id)
-        .load::<i32>(&mut conn)
+    let github_ids = oauth_github::table
+        .filter(oauth_github::login.eq("foo"))
+        .select(oauth_github::account_id)
+        .load::<i64>(&mut conn)
         .await?;
 
     assert_eq!(github_ids.len(), 2);

src/tests/worker/sync_admins.rs

@@ -91,7 +91,6 @@ async fn create_user(
     let user_id = diesel::insert_into(users::table)
         .values((
             users::name.eq(name),
-            users::gh_login.eq(name),
             users::username.eq(name),
             users::gh_id.eq(account_id as i32),
             users::is_admin.eq(is_admin),
@@ -134,7 +133,7 @@ async fn delete_oauth_github_from_user(
 
 async fn get_admins(conn: &mut AsyncPgConnection) -> QueryResult<Vec<String>> {
     users::table
-        .select(users::gh_login)
+        .select(users::username)
         .filter(users::is_admin.eq(true))
         .order(users::id.asc())
         .get_results(conn)

src/worker/jobs/generate_og_image.rs

@@ -179,7 +179,7 @@ async fn fetch_user_owners(
         .filter(crate_owners::crate_id.eq(crate_id))
         .filter(crate_owners::owner_kind.eq(OwnerKind::User))
         .filter(crate_owners::deleted.eq(false))
-        .select((users::gh_login, oauth_github::avatar.nullable()))
+        .select((users::username, oauth_github::avatar.nullable()))
         .load(&mut conn)
         .await
 }

src/worker/jobs/update_user_from_github.rs

@@ -167,10 +167,7 @@ impl UpdateUserFromGithub {
                 if oauth_github.login != github_user.login {
                     diesel::update(users::table)
                         .filter(users::id.eq(oauth_github.user_id))
-                        .set((
-                            users::gh_login.eq(&github_user.login),
-                            users::username.eq(&github_user.login),
-                        ))
+                        .set((users::username.eq(&github_user.login),))
                         .execute(conn)
                         .await?;
                 }