Skip to content

fix(schedule): Date rules silently ignored due to zero-padding mismatch in Day::Display #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vit0-9 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(schedule): Date rules silently ignored due to zero-padding mismatch in Day::Display #412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions crates/domain/src/schedule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ use serde::{Deserialize, Serialize};
use ts_rs::TS;

use crate::{
CompatibleInstances,
Meta,
date,
CompatibleInstances, Meta, date,
event_instance::EventInstance,
shared::entity::{Entity, ID},
timespan::TimeSpan,
Expand Down Expand Up @@ -337,7 +335,7 @@ impl Day {

impl std::fmt::Display for Day {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}-{}-{}", self.year, self.month, self.day)
write!(f, "{}-{:02}-{:02}", self.year, self.month, self.day)
}
}

Expand Down Expand Up @@ -366,8 +364,14 @@ impl Schedule {
let mut weekday_lookup = HashMap::new();
for rule in &self.rules {
match &rule.variant {
ScheduleRuleVariant::Date(date) => {
date_lookup.insert(date, &rule.intervals);
ScheduleRuleVariant::Date(datestr) => {
// Normalize the date string so lookup always matches
// regardless of zero-padding (e.g. "2026-4-2" vs "2026-04-02")
let normalized = match datestr.parse::<Day>() {
Ok(day) => day.to_string(),
Err(_) => datestr.clone(),
};
date_lookup.insert(normalized, &rule.intervals);
}
ScheduleRuleVariant::WDay(wkay) => {
weekday_lookup.insert(wkay, &rule.intervals);
Expand Down Expand Up @@ -503,7 +507,7 @@ mod test {
}],
},
ScheduleRule {
variant: ScheduleRuleVariant::Date("1970-1-12".into()),
variant: ScheduleRuleVariant::Date("1970-01-12".into()),
intervals: vec![ScheduleRuleInterval {
start: Time {
hours: 9,
Expand Down