changed condition of upcoming events and fixed styling

Author: SenneDrent

backend/src/apiserver/app/routers/ranking.py

@@ -70,7 +70,7 @@ async def member_get_upcoming_training_events(
 ) -> RawJSONResponse:
     try:
         upcoming_training_eventList = await get_all_upcoming_training_events(dsrc)
-        return upcoming_training_eventList
+        return RawJSONResponse(upcoming_training_eventList)
     except AppError as e:
         raise ErrorResponse(400, "invalid_training_request", e.err_desc, e.debug_key)
 

backend/src/apiserver/data/api/trainings.py

@@ -1,6 +1,5 @@
 from datetime import date
 from datetime import datetime
-from apiserver.lib.model.entities import ClassEvent
 from schema.model.model import (
     C_EVENTS_CATEGORY,
     C_EVENTS_DATE,
@@ -9,11 +8,12 @@
     CLASS_EVENTS_TABLE,
     CLASS_ID,
 )
+from sqlalchemy import RowMapping
 from sqlalchemy.ext.asyncio import AsyncConnection
 from store.db import (
     LiteralDict,
     insert_many,
-    select_where_bigger_than,
+    select_where_equal_bigger_than,
 )
 
 
@@ -48,11 +48,11 @@ async def add_training_event(
 
 async def get_upcoming_training_events_from_db(
     conn: AsyncConnection,
-) -> list[ClassEvent]:
+) -> list[RowMapping]:
     """If resulting list is empty, either the event doesn't exist or it has no users in it."""
 
     now = datetime.now()
-    upcoming_training_events = await select_where_bigger_than(
+    upcoming_training_events = await select_where_equal_bigger_than(
         conn, CLASS_EVENTS_TABLE, C_EVENTS_DATE, now
     )
 

backend/src/store/db.py

@@ -148,11 +148,11 @@ async def select_where(
     return all_rows(res)
 
 
-async def select_where_bigger_than(
+async def select_where_equal_bigger_than(
     conn: AsyncConnection, table: LiteralString, column: LiteralString, value: Any
 ) -> list[RowMapping]:
     """Ensure `table` and `column` are never user-defined."""
-    query = text(f"SELECT * FROM {table} WHERE {column} > :val;")
+    query = text(f"SELECT * FROM {table} WHERE {column} >= :val;")
     res = await execute_catch(conn, query, parameters={"val": value})
     return all_rows(res)