marc/folkugat-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use basedpyright refactor

Browse Source
This commit is contained in:
marc
2025-03-22 23:06:34 +01:00
parent ac54453b7f
commit 2f7c7c2429
41 changed files with 480 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
folkugat_web/services/sessions.py
View File

@@ -1,9 +1,8 @@
import datetime
from datetime import date as Date
from typing import Optional
from folkugat_web.config import date as config
from folkugat_web.dal.sql import sessions as dal
from folkugat_web.dal.sql.sessions import query, write
from folkugat_web.model import sessions as model
from folkugat_web.model.sql import Order, OrderCol, Range
@@ -27,11 +26,11 @@ def new_session() -> model.Session:
def get_sessions() -> list[model.Session]:
return dal.get_sessions(order_by=OrderCol(model.SessionCols.DATE, Order.ASCENDING))
return query.get_sessions(order_by=OrderCol(model.SessionCols.DATE, Order.ASCENDING))
def get_next_sessions(limit: Optional[int] = None, offset: Optional[int] = None) -> list[model.Session]:
return dal.get_sessions(
def get_next_sessions(limit: int | None = None, offset: int | None = None) -> list[model.Session]:
return query.get_sessions(
date_range=Range(gte=datetime.date.today()),
order_by=OrderCol(model.SessionCols.DATE, Order.ASCENDING),
limit=limit,
@@ -39,8 +38,8 @@ def get_next_sessions(limit: Optional[int] = None, offset: Optional[int] = None)
)
def get_sessions_history(limit: Optional[int] = None, offset: Optional[int] = None) -> list[model.Session]:
return dal.get_sessions(
def get_sessions_history(limit: int | None = None, offset: int | None = None) -> list[model.Session]:
return query.get_sessions(
date_range=Range(lt=datetime.date.today()),
order_by=OrderCol(model.SessionCols.DATE, Order.DESCENDING),
limit=limit,
@@ -48,33 +47,33 @@ def get_sessions_history(limit: Optional[int] = None, offset: Optional[int] = No
)
def get_next_session() -> Optional[model.Session]:
def get_next_session() -> model.Session | None:
return next(iter(get_next_sessions(limit=1,)), None)
def get_live_session() -> Optional[model.Session]:
return next(iter(dal.get_sessions(is_live=True)), None)
def get_live_session() -> model.Session | None:
return next(iter(query.get_sessions(is_live=True)), None)
def get_session(session_id: int) -> Optional[model.Session]:
return next(iter(dal.get_sessions(session_id=session_id)), None)
def get_session(session_id: int) -> model.Session | None:
return next(iter(query.get_sessions(session_id=session_id)), None)
def insert_session(session: model.Session):
return dal.insert_session(session)
return write.insert_session(session)
def set_session(session: model.Session):
dal.update_session(session)
write.update_session(session)
def delete_session(session_id: int):
dal.delete_session_by_id(session_id)
write.delete_session_by_id(session_id)
def stop_live_sessions():
dal.stop_live_sessions()
write.stop_live_sessions()
def set_live_session(session_id: int):
dal.set_live_session(session_id=session_id)
write.set_live_session(session_id=session_id)