bb9f2f8713
This PR makes the `github_user_created_at` field required at ingress points into collab. In practice we already have this value passed up, this change just makes that explicit. This is a precursor to making it required in the database. Release Notes: - N/A
98 lines
3.1 KiB
Rust
98 lines
3.1 KiB
Rust
use super::*;
|
|
|
|
#[derive(Debug)]
|
|
pub enum ContributorSelector {
|
|
GitHubUserId { github_user_id: i32 },
|
|
GitHubLogin { github_login: String },
|
|
}
|
|
|
|
impl Database {
|
|
/// Retrieves the GitHub logins of all users who have signed the CLA.
|
|
pub async fn get_contributors(&self) -> Result<Vec<String>> {
|
|
self.transaction(|tx| async move {
|
|
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
|
|
enum QueryGithubLogin {
|
|
GithubLogin,
|
|
}
|
|
|
|
Ok(contributor::Entity::find()
|
|
.inner_join(user::Entity)
|
|
.order_by_asc(contributor::Column::SignedAt)
|
|
.select_only()
|
|
.column(user::Column::GithubLogin)
|
|
.into_values::<_, QueryGithubLogin>()
|
|
.all(&*tx)
|
|
.await?)
|
|
})
|
|
.await
|
|
}
|
|
|
|
/// Records that a given user has signed the CLA.
|
|
pub async fn get_contributor_sign_timestamp(
|
|
&self,
|
|
selector: &ContributorSelector,
|
|
) -> Result<Option<DateTime>> {
|
|
self.transaction(|tx| async move {
|
|
let condition = match selector {
|
|
ContributorSelector::GitHubUserId { github_user_id } => {
|
|
user::Column::GithubUserId.eq(*github_user_id)
|
|
}
|
|
ContributorSelector::GitHubLogin { github_login } => {
|
|
user::Column::GithubLogin.eq(github_login)
|
|
}
|
|
};
|
|
|
|
if let Some(user) = user::Entity::find().filter(condition).one(&*tx).await? {
|
|
if user.admin {
|
|
return Ok(Some(user.created_at));
|
|
}
|
|
|
|
if let Some(contributor) =
|
|
contributor::Entity::find_by_id(user.id).one(&*tx).await?
|
|
{
|
|
return Ok(Some(contributor.signed_at));
|
|
}
|
|
}
|
|
|
|
Ok(None)
|
|
})
|
|
.await
|
|
}
|
|
|
|
/// Records that a given user has signed the CLA.
|
|
pub async fn add_contributor(
|
|
&self,
|
|
github_login: &str,
|
|
github_user_id: i32,
|
|
github_email: Option<&str>,
|
|
github_user_created_at: DateTimeUtc,
|
|
initial_channel_id: Option<ChannelId>,
|
|
) -> Result<()> {
|
|
self.transaction(|tx| async move {
|
|
let user = self
|
|
.get_or_create_user_by_github_account_tx(
|
|
github_login,
|
|
github_user_id,
|
|
github_email,
|
|
github_user_created_at.naive_utc(),
|
|
initial_channel_id,
|
|
&tx,
|
|
)
|
|
.await?;
|
|
|
|
contributor::Entity::insert(contributor::ActiveModel {
|
|
user_id: ActiveValue::Set(user.id),
|
|
signed_at: ActiveValue::NotSet,
|
|
})
|
|
.on_conflict(
|
|
OnConflict::column(contributor::Column::UserId)
|
|
.do_nothing()
|
|
.to_owned(),
|
|
)
|
|
.exec_without_returning(&*tx)
|
|
.await?;
|
|
Ok(())
|
|
})
|
|
.await
|
|
}
|
|
}
|