Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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

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

This file was deleted.

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

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

6 changes: 5 additions & 1 deletion src/db/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ pub async fn get_user_activity_stats(pool: &Pool<Postgres>) -> Result<ActivitySt
COUNT(*) FILTER (WHERE last_active >= date_trunc('week', CURRENT_DATE)) AS "this_week_users!",
COUNT(*) FILTER (WHERE last_active >= CURRENT_DATE) AS "todays_users!"
FROM pseudo_user
WHERE base_user_id IS NULL
"#
)
.fetch_one(pool);
Expand All @@ -351,6 +352,7 @@ pub async fn get_user_activity_stats(pool: &Pool<Postgres>) -> Result<ActivitySt
SELECT COUNT(*) AS cnt
FROM pseudo_user
WHERE last_active >= CURRENT_DATE - INTERVAL '6 months'
AND base_user_id IS NULL
GROUP BY date_trunc('month', last_active)
) t
), 0) AS "avg_month_users!",
Expand All @@ -360,6 +362,7 @@ pub async fn get_user_activity_stats(pool: &Pool<Postgres>) -> Result<ActivitySt
SELECT COUNT(*) AS cnt
FROM pseudo_user
WHERE last_active >= CURRENT_DATE - INTERVAL '8 weeks'
AND base_user_id IS NULL
GROUP BY date_trunc('week', last_active)
) t
), 0) AS "avg_week_users!",
Expand All @@ -369,6 +372,7 @@ pub async fn get_user_activity_stats(pool: &Pool<Postgres>) -> Result<ActivitySt
SELECT COUNT(*) AS cnt
FROM pseudo_user
WHERE last_active >= CURRENT_DATE - INTERVAL '30 days'
AND base_user_id IS NULL
GROUP BY last_active::date
) t
), 0) AS "avg_daily_users!"
Expand All @@ -380,7 +384,7 @@ pub async fn get_user_activity_stats(pool: &Pool<Postgres>) -> Result<ActivitySt
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);
sqlx::query_scalar!("SELECT COUNT(*)::bigint as count FROM pseudo_user WHERE base_user_id IS NULL").fetch_one(pool);

type RecentStatsResult = Result<RecentUserStats, sqlx::Error>;
type AverageStatsResult = Result<AverageUserStats, sqlx::Error>;
Expand Down