Merge pull request #12 from teleportx/dev

fixes
teleportx · Jul 27, 2024 · 565d8dd · 565d8dd
2 parents a30c718 + bd427a5
commit 565d8dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/export_info_service/main.py b/export_info_service/main.py
@@ -1,13 +1,14 @@
 import sys
+
+sys.path.append('..')
+
 from datetime import datetime
 
 from aiogram.types import BufferedInputFile
 from tortoise.expressions import Q
 
 from db.ToiletSessions import SretSession
 
-sys.path.append('..')
-
 import asyncio
 import json
 

diff --git a/frontend_service/.gitignore b/frontend_service/.gitignore
diff --git a/frontend_service/src/main.rs b/frontend_service/src/main.rs
@@ -70,8 +70,8 @@ async fn get_analytics(db_pool: PgPool) -> Option<AnalyticsTemplate> {
     .await
     .ok()?;
   let leaderboard1: Vec<LeaderboardRecord> = sqlx::query_as!(LeaderboardRecord, "SELECT u.name, COUNT(*) count FROM sretsession as s JOIN \"user\" u ON u.uid = s.user_id GROUP BY u.name ORDER BY COUNT(*) DESC LIMIT 10").fetch_all(&db_pool).await.ok()?;
-  let leaderboard2: Vec<LeaderboardRecord> = sqlx::query_as!(LeaderboardRecord, "SELECT u.name, COUNT(*) count FROM sretsession as s JOIN \"user\" u on u.uid = s.user_id WHERE s.sret_type IN (1, 2) GROUP BY u.name ORDER BY COUNT(*) DESC LIMIT 10").fetch_all(&db_pool).await.ok()?;
-  let leaderboard3: Vec<LeaderboardRecord> = sqlx::query_as!(LeaderboardRecord, "SELECT u.name, COUNT(*) count FROM sretsession as s JOIN \"user\" u on u.uid = s.user_id WHERE s.sret_type = 3 GROUP BY u.name ORDER BY COUNT(*) DESC LIMIT 10").fetch_all(&db_pool).await.ok()?;
+  let leaderboard2: Vec<LeaderboardRecord> = sqlx::query_as!(LeaderboardRecord, "SELECT u.name, COUNT(*) count FROM sretsession as s JOIN \"user\" u on u.uid = s.user_id WHERE s.sret_type = 3 GROUP BY u.name ORDER BY COUNT(*) DESC LIMIT 10").fetch_all(&db_pool).await.ok()?;
+  let leaderboard3: Vec<LeaderboardRecord> = sqlx::query_as!(LeaderboardRecord, "SELECT u.name, COUNT(*) count FROM sretsession as s JOIN \"user\" u on u.uid = s.user_id WHERE s.sret_type IN (1, 2) GROUP BY u.name ORDER BY COUNT(*) DESC LIMIT 10").fetch_all(&db_pool).await.ok()?;
   Some(AnalyticsTemplate {
     type1_total: shit
       .iter()