Give tips a date, a scope per child, and a dismissal that sticks
Three faults, all invisible while the tests passed. Advice was built for the first child only, so a second child got none. The planned days feeding every count were fetched once per parent and appended to one list, so a couple's days were counted twice and every intensity and projection derived from them was wrong. And dismissing a tip forgot the moment the page reloaded. Tips now carry the date they concern, lifted from figures the rules already computed, so a view of a month can show only what applies to it. They are built per child and identified per child, so the same rule firing for two children is two separate pieces of advice. A dismissal is stored against a fingerprint of the facts that were dismissed. When those facts change the advice returns with its new numbers, rather than one click silencing a warning about a forfeiture that keeps growing.
This commit is contained in:
@@ -24,6 +24,7 @@ from app.repositories.leave_wish_repository import LeaveWishRepository
|
||||
from app.repositories.parental_leave_repository import ParentalLeaveRepository
|
||||
from app.repositories.personal_data_repository import PersonalDataRepository
|
||||
from app.repositories.planned_leave_repository import PlannedLeaveRepository
|
||||
from app.repositories.tip_dismissal_repository import TipDismissalRepository
|
||||
from app.repositories.user_repository import UserRepository
|
||||
from app.repositories.vacation_days_repository import VacationDaysRepository
|
||||
from app.repositories.workspace_repository import (
|
||||
@@ -36,6 +37,7 @@ from app.repositories_impl.sqlite.leave_wish_repository import SQLiteLeaveWishRe
|
||||
from app.repositories_impl.sqlite.parental_leave_repository import SQLiteParentalLeaveRepository
|
||||
from app.repositories_impl.sqlite.personal_data_repository import SQLitePersonalDataRepository
|
||||
from app.repositories_impl.sqlite.planned_leave_repository import SQLitePlannedLeaveRepository
|
||||
from app.repositories_impl.sqlite.tip_dismissal_repository import SQLiteTipDismissalRepository
|
||||
from app.repositories_impl.sqlite.user_repository import SQLiteUserRepository
|
||||
from app.repositories_impl.sqlite.vacation_days_repository import SQLiteVacationDaysRepository
|
||||
from app.repositories_impl.sqlite.workspace_repository import (
|
||||
@@ -51,6 +53,7 @@ from app.services.day_override_service import DayOverrideService
|
||||
from app.services.leave_wish_service import LeaveWishService
|
||||
from app.services.personal_data_service import PersonalDataService
|
||||
from app.services.planning_service import PlanningService
|
||||
from app.services.tips_service import TipsService
|
||||
from app.services.vacation_days_service import VacationDaysService
|
||||
from app.services.workspace_service import WorkspaceService
|
||||
from app.utils.errors import UnauthorizedError
|
||||
@@ -175,6 +178,15 @@ def get_day_override_repository(conn: ConnectionDep) -> DayOverrideRepository:
|
||||
DayOverrideRepositoryDep = Annotated[DayOverrideRepository, Depends(get_day_override_repository)]
|
||||
|
||||
|
||||
def get_tip_dismissal_repository(conn: ConnectionDep) -> TipDismissalRepository:
|
||||
if settings.database_type == "sqlite":
|
||||
return SQLiteTipDismissalRepository(conn)
|
||||
raise ValueError(f"Unsupported database_type: {settings.database_type}")
|
||||
|
||||
|
||||
TipDismissalRepositoryDep = Annotated[TipDismissalRepository, Depends(get_tip_dismissal_repository)]
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Service factories
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -219,6 +231,31 @@ def get_calendar_service(day_override_service: DayOverrideServiceDep) -> Calenda
|
||||
CalendarServiceDep = Annotated[CalendarService, Depends(get_calendar_service)]
|
||||
|
||||
|
||||
def get_tips_service(
|
||||
leave_repo: ParentalLeaveRepositoryDep,
|
||||
planned_repo: PlannedLeaveRepositoryDep,
|
||||
child_repo: ChildRepositoryDep,
|
||||
pd_repo: PersonalDataRepositoryDep,
|
||||
vacation_repo: VacationDaysRepositoryDep,
|
||||
leave_wish_repo: LeaveWishRepositoryDep,
|
||||
ws_repo: WorkspaceRepositoryDep,
|
||||
dismissal_repo: TipDismissalRepositoryDep,
|
||||
) -> TipsService:
|
||||
return TipsService(
|
||||
leave_repo,
|
||||
planned_repo,
|
||||
child_repo,
|
||||
pd_repo,
|
||||
vacation_repo,
|
||||
leave_wish_repo,
|
||||
ws_repo,
|
||||
dismissal_repo,
|
||||
)
|
||||
|
||||
|
||||
TipsServiceDep = Annotated[TipsService, Depends(get_tips_service)]
|
||||
|
||||
|
||||
def get_child_service(repo: ChildRepositoryDep) -> ChildService:
|
||||
return ChildService(repo)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user