zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to update invite count to collab API

Browse Source 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Nathan Sobo 2022-05-18 10:23:08 -06:00
parent cfb31067a5
commit 7e2d1fefc4
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/collab/src/api.rs
View File

@ -97,7 +97,8 @@ async fn create_user(
#[derive(Deserialize)]
struct UpdateUserParams {
admin: bool,
admin: Option<bool>,
invite_count: Option<u32>,
}
async fn update_user(
@ -105,9 +106,16 @@ async fn update_user(
Json(params): Json<UpdateUserParams>,
Extension(app): Extension<Arc<AppState>>,
) -> Result<()> {
app.db
.set_user_is_admin(UserId(user_id), params.admin)
.await?;
if let Some(admin) = params.admin {
app.db.set_user_is_admin(UserId(user_id), admin).await?;
}
if let Some(invite_count) = params.invite_count {
app.db
.set_invite_count(UserId(user_id), invite_count)
.await?;
}
Ok(())
}

10
crates/collab/src/db.rs
View File

@ -796,11 +796,13 @@ macro_rules! id_type {
}
id_type!(UserId);
#[derive(Clone, Debug, FromRow, Serialize, PartialEq)]
#[derive(Clone, Debug, Default, FromRow, Serialize, PartialEq)]
pub struct User {
pub id: UserId,
pub github_login: String,
pub admin: bool,
pub invite_code: Option<String>,
pub invite_count: i32,
}
id_type!(OrgId);
@ -912,21 +914,25 @@ pub mod tests {
id: user,
github_login: "user".to_string(),
admin: false,
..Default::default()
},
User {
id: friend1,
github_login: "friend-1".to_string(),
admin: false,
..Default::default()
},
User {
id: friend2,
github_login: "friend-2".to_string(),
admin: false,
..Default::default()
},
User {
id: friend3,
github_login: "friend-3".to_string(),
admin: false,
..Default::default()
}
]
);
@ -1547,6 +1553,8 @@ pub mod tests {
id: user_id,
github_login: github_login.to_string(),
admin,
invite_code: None,
invite_count: 0,
},
);
Ok(user_id)