feat: added leaderboard

backend/src/api/app.py

@@ -79,12 +79,6 @@ def generate_unique_operation_id(route: APIRoute) -> str:
 app.mount(settings.static_mount_path, StaticFiles(directory=settings.static_directory), name="static")
 
 
-from src.modules.events.routes import router as router_events  # noqa: E402
-from src.modules.notifies.routes import router as router_notify  # noqa: E402
-from src.modules.sports.routes import router as router_sports  # noqa: E402
 from src.modules.users.routes import router as router_users  # noqa: E402
 
 app.include_router(router_users)
-app.include_router(router_events)
-app.include_router(router_sports)
-app.include_router(router_notify)

backend/src/api/lifespan.py

@@ -14,8 +14,6 @@
 
 from src.config import settings
 from src.logging_ import logger
-from src.modules.notifies.repository import notification_repository
-from src.modules.notifies.scheams import Filter
 from src.storages.mongo import document_models
 
 

backend/src/modules/users/repository.py

@@ -1,9 +1,11 @@
 __all__ = ["user_repository"]
 
+import datetime
+
 from beanie import PydanticObjectId
 
-from src.modules.users.schemas import CreateUser
-from src.storages.mongo.users import User
+from src.modules.users.schemas import CreateUser, LevelLeaderboardResp
+from src.storages.mongo.users import User, LevelMetaInfo
 from fastapi import HTTPException
 
 # noinspection PyMethodMayBeStatic
@@ -33,9 +35,68 @@ async def exists(self, user_id: PydanticObjectId) -> bool:
     async def is_banned(self, user_id: str | PydanticObjectId) -> bool:
         return False
 
+    async def upsert_level_info(self, user_id: PydanticObjectId, level_name: str, time_passed: float, help_number_used: int, clicks_num: int) -> list[LevelMetaInfo] | None:
+        user = await User.get(user_id)
+
+        if user.level_passed is None:
+            user.level_passed = [LevelMetaInfo(
+                level_name = level_name,
+                time_passed = time_passed, 
+                help_number_used = help_number_used,
+                clicks_num = clicks_num,
+                attempts = 1,
+            )]
+            await User.find_one(User.id == user.id).update(
+                {
+                    "$set": {User.level_passed: user.level_passed}
+                }
+            )
+            return user.level_passed
+
+        found = False
+
+        for lvl in user.level_passed:
+            if lvl.level_name == level_name:
+                lvl.attempts += 1
+                if lvl.time_passed > time_passed:
+                    lvl.time_passed = time_passed
+                found = True
+                break 
+
+        if not found:
+            user.level_passed.append(LevelMetaInfo(
+                level_name = level_name,
+                time_passed = time_passed, 
+                help_number_used = help_number_used,
+                clicks_num = clicks_num,
+                attempts = 1,
+            ))
+
+        await User.find_one(User.id == user.id).update(
+                {
+                    "$set": {User.level_passed: user.level_passed}
+                }
+            )
+        return user.level_passed
 
-    async def upsert_favorites(self, user_id: PydanticObjectId, favorite_items: list[PydanticObjectId]) -> list[PydanticObjectId]: 
-        user = await User.find_one(User.id == user_id).update({"$set": {"favorites": list(set(favorite_items))}})
-        return favorite_items
+    async def get_levels_info(self, user_id: PydanticObjectId):
+        user = await User.get(user_id)
+        return user.level_passed 
+
+    async def get_board_for_level(self, level_name: str) -> list[LevelLeaderboardResp]:
+        users = await User.find_all().to_list()
+        result: list[LevelLeaderboardResp] = []
+        for user in users:
+            if user.level_passed is None:
+                continue
+            for lvl in user.level_passed:
+                if lvl.level_name == level_name:
+                    result.append(
+                        LevelLeaderboardResp(
+                            user_id = user.id,
+                            lvlInfo = lvl,
+                        )
+                    )
+        return sorted(result, key=lambda x: x.lvlInfo.time_passed)
 
 user_repository: UserRepository = UserRepository()

backend/src/modules/users/routes.py

@@ -3,7 +3,7 @@
 from src.api.dependencies import USER_AUTH
 from src.api.exceptions import IncorrectCredentialsException
 from src.modules.users.repository import user_repository
-from src.modules.users.schemas import ViewUser, UpdateFavoriteReq
+from src.modules.users.schemas import ViewUser, AddResultReq, LevelLeaderboardResp
 from beanie import PydanticObjectId
 
 router = APIRouter(
@@ -69,6 +69,25 @@ async def logout(request: Request) -> None:
     request.session.clear()
     return None
 
-@router.put("/favorites")
-async def update_favorites(user: USER_AUTH, req: UpdateFavoriteReq) -> list[PydanticObjectId]:
-    return await user_repository.upsert_favorites(user_id=user.user_id, favorite_items=req.favorite_ids)
+@router.post(
+    "/result",
+    responses={200: {"description": "Result was added successfully"}}
+)
+async def add_result(request: AddResultReq, user: USER_AUTH):
+    """
+    
+    Add result to user; if not exist will create it 
+    """
+    return await user_repository.upsert_level_info(user.user_id, request.level_name, request.time_passed, request.help_number_used, request.clicks_num)
+
+@router.get(
+    "/result"
+)
+async def get_results(user: USER_AUTH):
+    return await user_repository.get_levels_info(user.user_id)
+
+@router.get(
+    "/result/{level_name}"
+)
+async def get_results_by_level_name(level_name: str) -> list[LevelLeaderboardResp]:
+    return await user_repository.get_board_for_level(level_name)

backend/src/modules/users/schemas.py

@@ -1,23 +1,29 @@
 __all__ = ["CreateUser", "ViewUser"]
 
+import datetime
+
 from beanie import PydanticObjectId
 
 from src.pydantic_base import BaseSchema
-
+from src.storages.mongo.users import LevelMetaInfo
 
 class CreateUser(BaseSchema):
     login: str
     password: str
 
+class AddResultReq(BaseSchema):
+    level_name: str 
+    time_passed: float
+    help_number_used: int 
+    clicks_num: int
 
-class UpdateFavoriteReq(BaseSchema):
-    favorite_ids: list[PydanticObjectId]
-
+class LevelLeaderboardResp(BaseSchema):
+    user_id: PydanticObjectId
+    lvlInfo: LevelMetaInfo
 
 class ViewUser(BaseSchema):
     id: PydanticObjectId
     login: str
-    favorites: list[PydanticObjectId]
 
 
 class UserAuthData(BaseSchema):

backend/src/storages/mongo/__init__.py

@@ -2,13 +2,9 @@
 
 from beanie import Document, View
 
-from src.storages.mongo.events import Event
-from src.storages.mongo.notifies import Notification
-from src.storages.mongo.selection import Selection
-from src.storages.mongo.sports import Sport
 from src.storages.mongo.users import User
 
 document_models = cast(
     list[type[Document] | type[View] | str],
-    [User, Event, Sport, Notification, Selection],
+    [User],
 )

backend/src/storages/mongo/users.py

@@ -1,11 +1,13 @@
 __all__ = ["User", "UserRole"]
 
+import datetime
+
 from enum import StrEnum
 
 from beanie import PydanticObjectId
 from pymongo import IndexModel
 
-from src.pydantic_base import BaseSchema
+from src.pydantic_base import BaseSchema, BaseModel
 from src.storages.mongo.__base__ import CustomDocument
 
 
@@ -14,9 +16,18 @@ class UserRole(StrEnum):
     ADMIN = "admin"
 
 
+class LevelMetaInfo(BaseModel):
+    level_name: str 
+    time_passed: float
+    help_number_used: int 
+    clicks_num: int
+    attempts: int
+
+
 class UserSchema(BaseSchema):
     login: str
     password_hash: str
+    level_passed: list[LevelMetaInfo] | None = None 
     role: UserRole = UserRole.DEFAULT