Skip to content

feat: add registered user stats to ActivityStats via pseudo_user #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: add registered user stats to ActivityStats via pseudo_user #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .sqlx/query-ee6d312bca42c66a9c815aca81d7f636a366f6cad0e5fce08e8fc46358df4410.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 19 additions & 2 deletions src/db/user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::{
system_log::{LogAction, LogCeverity},
user::{
ActivityStats, Auth0User, AverageUserStats, BaseUser, ListUsersQuery, PatchUserRequest,
RecentUserStats,
RecentUserStats, RegisteredUserStats,
},
},
service::system_log_builder::SystemLogBuilder,
Expand Down Expand Up @@ -376,23 +376,39 @@ pub async fn get_user_activity_stats(pool: &Pool<Postgres>) -> Result<ActivitySt
)
.fetch_one(pool);

let registered_fut = sqlx::query_as!(
RegisteredUserStats,
r#"
SELECT
COUNT(*) FILTER (WHERE b.created_at >= date_trunc('month', CURRENT_DATE)) AS "this_month_registered!",
COUNT(*) FILTER (WHERE b.created_at >= date_trunc('week', CURRENT_DATE)) AS "this_week_registered!",
COUNT(*) FILTER (WHERE b.created_at >= CURRENT_DATE) AS "todays_registered!"
FROM pseudo_user p
JOIN base_user b ON b.id = p.base_user_id
"#
)
.fetch_one(pool);

let total_game_count_fut =
sqlx::query_scalar!("SELECT COUNT(*)::bigint as count FROM game_base").fetch_one(pool);

let total_user_count_fut =
sqlx::query_scalar!("SELECT COUNT(*)::bigint as count FROM pseudo_user").fetch_one(pool);

type RecentStatsResult = Result<RecentUserStats, sqlx::Error>;
type RegisteredStatsResult = Result<RegisteredUserStats, sqlx::Error>;
type AverageStatsResult = Result<AverageUserStats, sqlx::Error>;
type StatsResult = Result<Option<i64>, sqlx::Error>;

let (recent, average, total_game_count, total_user_count): (
let (recent, registered, average, total_game_count, total_user_count): (
RecentStatsResult,
RegisteredStatsResult,
AverageStatsResult,
StatsResult,
StatsResult,
) = tokio::join!(
recent_fut,
registered_fut,
average_fut,
total_game_count_fut,
total_user_count_fut
Expand All @@ -402,6 +418,7 @@ pub async fn get_user_activity_stats(pool: &Pool<Postgres>) -> Result<ActivitySt
total_game_count: total_game_count?.unwrap_or(0),
total_user_count: total_user_count?.unwrap_or(0),
recent: recent?,
registered: registered?,
average: average?,
})
}
8 changes: 8 additions & 0 deletions src/models/user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,17 @@ pub struct ActivityStats {
pub total_game_count: i64,
pub total_user_count: i64,
pub recent: RecentUserStats,
pub registered: RegisteredUserStats,
pub average: AverageUserStats,
}

#[derive(Debug, Serialize, Deserialize, sqlx::FromRow)]
pub struct RegisteredUserStats {
pub this_month_registered: i64,
pub this_week_registered: i64,
pub todays_registered: i64,
}

#[derive(Debug, Serialize, Deserialize, sqlx::FromRow)]
pub struct RecentUserStats {
pub this_month_users: i64,
Expand Down