feat: add metrix, now we collect how many users uses our service on admin page

Author: depocoder

backend/yet_another_calendar/tests/test_bulk.py

@@ -1063,7 +1063,7 @@ def test_views_response_type_handling_logic(bulk_fixture_content):
 
 
 @pytest.mark.asyncio
-async def test_views_get_calendar_cached_response_type():
+async def test_views_get_calendar_cached_response_type(fake_redis_pool):
     """Test views get_calendar function with different response types (lines 33-40)."""
     # Mock dependencies
     body = modeus_schema.ModeusTimeBody(
@@ -1090,7 +1090,8 @@ async def test_views_get_calendar_cached_response_type():
             lms_user=lms_user,
             cookies=cookies,
             donor_token="test_token",
-            modeus_person_id="550e8400-e29b-41d4-a716-446655440000"
+            modeus_person_id="550e8400-e29b-41d4-a716-446655440000",
+            redis=fake_redis_pool
         )
 
         # Should call change_timezone and return CalendarResponse (line 38)
@@ -1108,7 +1109,8 @@ async def test_views_get_calendar_cached_response_type():
             lms_user=lms_user,
             cookies=cookies,
             donor_token="test_token",
-            modeus_person_id="550e8400-e29b-41d4-a716-446655440000"
+            modeus_person_id="550e8400-e29b-41d4-a716-446655440000",
+            redis=fake_redis_pool
         )
 
         # Should validate dict and return CalendarResponse (line 40)

backend/yet_another_calendar/web/api/bulk/integration.py

@@ -10,6 +10,7 @@
 from starlette import status
 from pydantic import ValidationError
 from loguru import logger
+from redis.asyncio import ConnectionPool, Redis
 
 from yet_another_calendar.settings import settings
 from . import schema
@@ -22,6 +23,48 @@
 from ...cache_builder import key_builder
 
 
+async def count_keys_by_prefix(redis_pool: ConnectionPool, prefix: str = settings.redis_week_metrix_prefix) -> int:
+    """
+    Count Redis keys matching a given prefix pattern.
+
+    Uses scan_iter which is production-safe (non-blocking).
+    Similar to CLI: redis-cli KEYS "prefix*" | wc -l
+
+    :param redis_pool: Redis connection pool
+    :param prefix: Key prefix pattern (e.g., "calendar:*", "user:*")
+    :return: Number of keys matching the prefix
+    """
+    async with Redis(connection_pool=redis_pool) as redis:
+        count = 0
+        async for _ in redis.scan_iter(match=f"{prefix}*", count=1000):
+            count += 1
+        logger.debug(f"Found {count} keys matching prefix '{prefix}'")
+        return count
+
+async def save_user_was_there(
+    redis_pool: ConnectionPool, user_id: str,
+    prefix: str = settings.redis_week_metrix_prefix) -> None:
+    """
+    Mark that a user accessed the calendar by storing their ID in Redis.
+
+    Creates a temporary key-value pair with automatic expiration to track
+    user visits. The key uses the user_id as name and stores a boolean True value.
+
+    This is useful for:
+    - Tracking unique visitors over a time period
+    - Monitoring user activity
+    - Analytics and usage statistics
+
+    The key automatically expires after redis_events_time_live (14 days by default),
+    so it acts as a sliding window for recent user activity.
+
+    :param redis_pool: Redis connection pool from get_redis_pool dependency
+    :param user_id: Unique identifier for the user (e.g., email, person_id, etc.)
+    :return: None
+    """
+    async with Redis(connection_pool=redis_pool) as redis:
+        await redis.set(name=f"{prefix}:{user_id}", value=0, ex=settings.redis_week_live)
+
 
 def create_ics_event(title: str, starts_at: datetime.datetime, ends_at: datetime.datetime,
                      lesson_id: Any, description: str | None = None,

backend/yet_another_calendar/web/api/bulk/views.py

@@ -6,13 +6,16 @@
 from fastapi import APIRouter, Header
 from fastapi.params import Depends
 from starlette.responses import StreamingResponse
+from redis.asyncio import ConnectionPool
 
 from yet_another_calendar.settings import settings
+from yet_another_calendar.web.api.auth.utils import verify_tutor_token
 from . import integration, schema
 from ..lms import schema as lms_schema
 from ..modeus import schema as modeus_schema
 from ..modeus import integration as modeus_integration
 from ..netology import schema as netology_schema
+from ...lifespan import get_redis_pool
 
 router = APIRouter()
 
@@ -24,12 +27,14 @@ async def get_calendar(
         cookies: Annotated[netology_schema.NetologyCookies, Depends(netology_schema.get_cookies_from_headers)],
         donor_token: Annotated[str, Depends(modeus_integration.get_donor_token)],
         modeus_person_id: Annotated[str, Header()],
+        redis: Annotated[ConnectionPool, Depends(get_redis_pool)],
         calendar_id: int = settings.netology_default_course_id,
         time_zone: str = "Europe/Moscow",
 ) -> schema.CalendarResponse:
     """
     Get events from Netology and Modeus, cached.
     """
+    await integration.save_user_was_there(redis_pool=redis, user_id=modeus_person_id)
     cached_calendar = await integration.get_cached_calendar(
         body, calendar_id, modeus_person_id,
         cookies=cookies, lms_user=lms_user, modeus_jwt_token=donor_token,
@@ -77,3 +82,14 @@ async def export_ics(
     )
     calendar_with_timezone = calendar.change_timezone(time_zone)
     return StreamingResponse(integration.export_to_ics(calendar_with_timezone))
+
+
+@router.get("/user_metrix/")
+async def get_user_metrix(
+    redis: Annotated[ConnectionPool, Depends(get_redis_pool)],
+    _: Annotated[None, Depends(verify_tutor_token)],
+) -> int:
+    """
+    Get week users metrix
+    """
+    return await integration.count_keys_by_prefix(redis_pool=redis)

frontend/src/pages/ModeusDaySchedulePage.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { toast } from 'react-toastify';
-import { getDayEvents, saveLinkToEvent, getTutorTokenFromLocalStorage, getMtsLinks } from '../services/api';
+import { getDayEvents, saveLinkToEvent, getTutorTokenFromLocalStorage, getMtsLinks, getWeeklyUsersCount } from '../services/api';
 import Loader from "../elements/Loader";
 import ExitBtn from "../components/Calendar/ExitBtn";
 
@@ -42,6 +42,8 @@ const ModeusDaySchedulePage = () => {
             return false;
         }
     });
+    const [weeklyUsers, setWeeklyUsers] = useState(null);
+    const [loadingStats, setLoadingStats] = useState(false);
 
     // Генерируем список годов (2023-2026)
     const yearOptions = [];
@@ -143,6 +145,32 @@ const ModeusDaySchedulePage = () => {
         fetchEvents();
     }, [selectedDate, selectedYear, profileName, specialtyCode, fetchEvents]);
 
+    // Fetch weekly users count on component mount
+    useEffect(() => {
+        const fetchWeeklyUsers = async () => {
+            const tutorToken = getTutorTokenFromLocalStorage();
+            if (!tutorToken) {
+                return; // Don't fetch if no tutor token
+            }
+
+            setLoadingStats(true);
+            try {
+                const data = await getWeeklyUsersCount();
+                // Handle both formats: {weekly_users: N} or just N
+                const count = typeof data === 'number' ? data : (data.weekly_users || 0);
+                setWeeklyUsers(count);
+                debug.log('Weekly users count:', count);
+            } catch (error) {
+                debug.error('Error fetching weekly users:', error);
+                setWeeklyUsers(0);
+            } finally {
+                setLoadingStats(false);
+            }
+        };
+
+        fetchWeeklyUsers();
+    }, []); // Only run once on mount
+
     const handleDateChange = (e) => {
         setSelectedDate(e.target.value);
     };
@@ -566,6 +594,19 @@ const ModeusDaySchedulePage = () => {
                         <div className="shedule-export">
                             <span className="modeus-page-title">Расписание Modeus на день</span>
                         </div>
+                        {weeklyUsers !== null && (
+                            <div className="weekly-users-badge">
+                                <div className="badge-content">
+                                    <span className="badge-icon">👥</span>
+                                    <div className="badge-info">
+                                        <span className="badge-label">Пользователей за неделю</span>
+                                        <span className="badge-count">
+                                            {loadingStats ? '...' : weeklyUsers.toLocaleString('ru-RU')}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        )}
                         <ExitBtn />
                     </div>
 

frontend/src/services/api.js

@@ -212,4 +212,27 @@ export async function getMtsLinks(lessonIds) {
     } catch (e) {
         return e.response;
     }
+}
+
+// Statistics API functions
+export async function getWeeklyUsersCount() {
+    try {
+        const tutorToken = getTutorTokenFromLocalStorage();
+
+        if (!tutorToken) {
+            throw new Error('Tutor token not found');
+        }
+
+        const response = await axios.get(`${BACKEND_URL}/api/bulk/user_metrix/`, {
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${tutorToken}`
+            }
+        });
+
+        return response.data;
+    } catch (e) {
+        debug.error('Error fetching weekly users count:', e);
+        return { weekly_users: 0 };
+    }
 }

frontend/src/style/modeus.scss

@@ -2035,3 +2035,136 @@ input.has-saved-link {
         }
     }
 }
+
+// Weekly Users Badge - Modern glassmorphism matching page style
+.weekly-users-badge {
+    display: flex;
+    align-items: center;
+    margin-left: 18px;
+    animation: slideInUp 0.5s ease-out;
+
+    .badge-content {
+        position: relative;
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        padding: 10px 18px;
+        min-height: 48px;
+
+        // Glassmorphism background with gradient - matching event cards
+        background:
+            radial-gradient(circle at 15% 25%, rgba(124, 58, 237, 0.1) 0%, transparent 50%),
+            radial-gradient(circle at 85% 75%, rgba(59, 130, 246, 0.08) 0%, transparent 50%),
+            rgba(255, 255, 255, 0.9);
+        backdrop-filter: blur(15px) saturate(150%);
+        border-radius: 16px;
+        border: 1.5px solid rgba(124, 58, 237, 0.25);
+        font-family: "Roboto", sans-serif;
+
+        // Beautiful layered shadows
+        box-shadow:
+            0 10px 20px rgba(124, 58, 237, 0.15),
+            0 5px 10px rgba(59, 130, 246, 0.1),
+            0 2px 5px rgba(0, 0, 0, 0.08),
+            inset 0 1px 0 rgba(255, 255, 255, 0.6);
+
+        transition: all 0.4s cubic-bezier(0.4, 0, 0.2, 1);
+        cursor: default;
+
+        &:hover {
+            transform: translateY(-3px) scale(1.05);
+            border-color: rgba(124, 58, 237, 0.4);
+            background:
+                radial-gradient(circle at 15% 25%, rgba(124, 58, 237, 0.15) 0%, transparent 50%),
+                radial-gradient(circle at 85% 75%, rgba(59, 130, 246, 0.12) 0%, transparent 50%),
+                rgba(255, 255, 255, 0.95);
+
+            box-shadow:
+                0 16px 32px rgba(124, 58, 237, 0.2),
+                0 8px 16px rgba(59, 130, 246, 0.15),
+                0 4px 8px rgba(0, 0, 0, 0.1),
+                inset 0 1px 0 rgba(255, 255, 255, 0.7);
+
+            .badge-icon {
+                transform: scale(1.15) rotate(5deg);
+                box-shadow: 0 6px 18px rgba(124, 58, 237, 0.4);
+            }
+
+            .badge-count {
+                transform: scale(1.08);
+            }
+        }
+    }
+
+    .badge-icon {
+        font-size: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 36px;
+        height: 36px;
+        background: linear-gradient(135deg, #7c3aed 0%, #3b82f6 100%);
+        border-radius: 12px;
+        box-shadow:
+            0 4px 12px rgba(124, 58, 237, 0.3),
+            inset 0 1px 0 rgba(255, 255, 255, 0.3);
+        transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+        flex-shrink: 0;
+    }
+
+    .badge-info {
+        display: flex;
+        flex-direction: column;
+        gap: 2px;
+        min-width: 0;
+    }
+
+    .badge-label {
+        font-size: 11px;
+        font-weight: 600;
+        color: rgba(100, 116, 139, 0.85);
+        text-transform: uppercase;
+        letter-spacing: 0.8px;
+        line-height: 1;
+        transition: color 0.3s ease;
+    }
+
+    .badge-count {
+        font-size: 20px;
+        font-weight: 800;
+        background: linear-gradient(135deg, #7c3aed 0%, #3b82f6 100%);
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        background-clip: text;
+        letter-spacing: -0.5px;
+        line-height: 1;
+        transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+    }
+}
+
+// Responsive design for badge
+@media (max-width: 768px) {
+    .weekly-users-badge {
+        margin-left: 0;
+        margin-top: 10px;
+
+        .badge-content {
+            padding: 8px 14px;
+            min-height: 42px;
+
+            .badge-icon {
+                width: 32px;
+                height: 32px;
+                font-size: 18px;
+            }
+
+            .badge-label {
+                font-size: 10px;
+            }
+
+            .badge-count {
+                font-size: 18px;
+            }
+        }
+    }
+}