Replace not-null checks with exact date assertions mirroring the route's defaulting logic (tomorrow + 7-day window).