Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Accept a datetime range when querying project activity

Browse source
This commit is contained in:
Antonio Scandurra 2022-06-21 14:03:10 +02:00
parent 95a629d200
commit c90e8c08a6
7 changed files with 131 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/collab/src/api.rs
View file

@ -16,7 +16,7 @@ use axum::{
};
use axum_extra::response::ErasedJson;
use serde::{Deserialize, Serialize};
use std::{sync::Arc, time::Duration};
use std::sync::Arc;
use time::OffsetDateTime;
use tower::ServiceBuilder;
use tracing::instrument;
@ -246,16 +246,20 @@ async fn get_rpc_server_snapshot(
#[derive(Deserialize)]
struct GetProjectActivityParams {
duration_secs: u64,
#[serde(with = "time::serde::iso8601")]
start: OffsetDateTime,
#[serde(with = "time::serde::iso8601")]
end: OffsetDateTime,
}
async fn get_project_activity_summary(
Query(params): Query<GetProjectActivityParams>,
Extension(app): Extension<Arc<AppState>>,
) -> Result<ErasedJson> {
let end = OffsetDateTime::now_utc();
let start = end - Duration::from_secs(params.duration_secs);
let summary = app.db.summarize_project_activity(start..end, 100).await?;
let summary = app
.db
.summarize_project_activity(params.start..params.end, 100)
.await?;
Ok(ErasedJson::pretty(summary))
}

14
crates/collab/src/db.rs
View file

@ -178,8 +178,8 @@ impl Db for PostgresDb {
async fn get_all_users(&self, page: u32, limit: u32) -> Result<Vec<User>> {
let query = "SELECT * FROM users ORDER BY github_login ASC LIMIT $1 OFFSET $2";
Ok(sqlx::query_as(query)
.bind(limit)
.bind(page * limit)
.bind(limit as i32)
.bind((page * limit) as i32)
.fetch_all(&self.pool)
.await?)
}
@ -196,7 +196,7 @@ impl Db for PostgresDb {
.push_bind(email_address)
.push_bind(false)
.push_bind(nanoid!(16))
.push_bind(invite_count as u32);
.push_bind(invite_count as i32);
},
);
query.push(
@ -231,7 +231,7 @@ impl Db for PostgresDb {
Ok(sqlx::query_as(query)
.bind(like_string)
.bind(name_query)
.bind(limit)
.bind(limit as i32)
.fetch_all(&self.pool)
.await?)
}
@ -322,7 +322,7 @@ impl Db for PostgresDb {
WHERE id = $2
",
)
.bind(count)
.bind(count as i32)
.bind(id)
.execute(&mut tx)
.await?;
@ -488,7 +488,7 @@ impl Db for PostgresDb {
.push_bind(project_id)
.push_bind(worktree_id as i32)
.push_bind(extension)
.push_bind(count as u32);
.push_bind(count as i32);
});
query.push(
"
@ -825,7 +825,7 @@ impl Db for PostgresDb {
sqlx::query(cleanup_query)
.bind(user_id.0)
.bind(access_token_hash)
.bind(max_access_token_count as u32)
.bind(max_access_token_count as i32)
.execute(&mut tx)
.await?;
Ok(tx.commit().await?)