GKaszewski/k-tv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(domain): 7-day generation window, day_blocks lookup by weekday

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-03-17 14:29:10 +01:00
parent d8e39c66be
commit a79ee1b228
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
k-tv-backend/domain/src/entities.rs
View File

@@ -348,7 +348,7 @@ pub struct MediaItem {
pub episode_number: Option<u32>, pub episode_number: Option<u32>,
} }
/// A fully resolved 48-hour broadcast program for one channel. /// A fully resolved 7-day broadcast program for one channel.
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub struct GeneratedSchedule { pub struct GeneratedSchedule {
pub id: Uuid, pub id: Uuid,

15
k-tv-backend/domain/src/services/schedule/mod.rs
View File

@@ -20,7 +20,7 @@ mod recycle;
/// Core scheduling engine. /// Core scheduling engine.
/// ///
/// Generates 48-hour broadcast schedules by walking through a channel's /// Generates 7-day broadcast schedules by walking through a channel's
/// `ScheduleConfig` day by day, resolving each `ProgrammingBlock` into concrete /// `ScheduleConfig` day by day, resolving each `ProgrammingBlock` into concrete
/// `ScheduledSlot`s via the `IMediaProvider`, and applying the `RecyclePolicy` /// `ScheduledSlot`s via the `IMediaProvider`, and applying the `RecyclePolicy`
/// to avoid replaying recently aired items. /// to avoid replaying recently aired items.
@@ -47,12 +47,12 @@ impl ScheduleEngineService {
// Public API // Public API
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
/// Generate and persist a 48-hour schedule for `channel_id` starting at `from`. /// Generate and persist a 7-day schedule for `channel_id` starting at `from`.
/// ///
/// The algorithm: /// The algorithm:
/// 1. Walk each calendar day in the 48-hour window. /// 1. Walk each calendar day in the 7-day window.
/// 2. For each `ProgrammingBlock`, compute its UTC wall-clock interval for that day. /// 2. For each `ProgrammingBlock`, compute its UTC wall-clock interval for that day.
/// 3. Clip the interval to `[from, from + 48h)`. /// 3. Clip the interval to `[from, from + 7d)`.
/// 4. Resolve the block content via the media provider, applying the recycle policy. /// 4. Resolve the block content via the media provider, applying the recycle policy.
/// 5. For `Sequential` blocks, resume from where the previous generation left off /// 5. For `Sequential` blocks, resume from where the previous generation left off
/// (series continuity — see `fill::fill_sequential`). /// (series continuity — see `fill::fill_sequential`).
@@ -101,7 +101,7 @@ impl ScheduleEngineService {
.await?; .await?;
let valid_from = from; let valid_from = from;
let valid_until = from + Duration::hours(48); let valid_until = from + Duration::days(7);
let start_date = from.with_timezone(&tz).date_naive(); let start_date = from.with_timezone(&tz).date_naive();
let end_date = valid_until.with_timezone(&tz).date_naive(); let end_date = valid_until.with_timezone(&tz).date_naive();
@@ -110,7 +110,8 @@ impl ScheduleEngineService {
let mut current_date = start_date; let mut current_date = start_date;
while current_date <= end_date { while current_date <= end_date {
for block in channel.schedule_config.blocks_for(chrono::Weekday::from(current_date.weekday()).into()) { let weekday = crate::value_objects::Weekday::from(current_date.weekday());
for block in channel.schedule_config.blocks_for(weekday) {
let naive_start = current_date.and_time(block.start_time); let naive_start = current_date.and_time(block.start_time);
// `earliest()` handles DST gaps — if the local time doesn't exist // `earliest()` handles DST gaps — if the local time doesn't exist
@@ -123,7 +124,7 @@ impl ScheduleEngineService {
let block_end_utc = let block_end_utc =
block_start_utc + Duration::minutes(block.duration_mins as i64); block_start_utc + Duration::minutes(block.duration_mins as i64);
// Clip to the 48-hour window. // Clip to the 7-day window.
let slot_start = block_start_utc.max(valid_from); let slot_start = block_start_utc.max(valid_from);
let slot_end = block_end_utc.min(valid_until); let slot_end = block_end_utc.min(valid_until);