[PATCH proxmox v5 11/42] notify: matcher: add InlineCalendarMatcher

[Lukas Wagner <l.wagner@proxmox.com>]

This move the inline serialization format into a new-type wrapper around
CalendarMatcher.

This allows us to keep the existing single-line serialization format for
the old configuration keys (match-calendar), while deriving a regular
Serializer for CalendarMatcher that will be used in the new expression
based matcher.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
---
 proxmox-notify/src/matcher/calendar.rs | 103 +++++++++++++++++++++----
 proxmox-notify/src/matcher/mod.rs      |   4 +-
 2 files changed, 88 insertions(+), 19 deletions(-)

diff --git a/proxmox-notify/src/matcher/calendar.rs b/proxmox-notify/src/matcher/calendar.rs
index 970801c5..c6263eb5 100644
--- a/proxmox-notify/src/matcher/calendar.rs
+++ b/proxmox-notify/src/matcher/calendar.rs
@@ -1,49 +1,104 @@
 use std::fmt;
 use std::str::FromStr;
 
+use serde::{Deserialize, Serialize};
+
 use proxmox_time::DailyDuration;
 
 use crate::{Error, Notification};
 
 use super::MatchDirective;
 
-/// Match timestamp of the notification.
+/// Convenience wrapper around [`DailyDuration`] that implements [`Serialize`] and
+/// [`Deserialize`].
 #[derive(Clone, Debug)]
+struct DailyDurationWrapper {
+    schedule: String,
+    daily_duration: DailyDuration,
+}
+
+impl fmt::Display for DailyDurationWrapper {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+impl FromStr for DailyDurationWrapper {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Error> {
+        let daily_duration = proxmox_time::parse_daily_duration(s)
+            .map_err(|e| Error::Generic(format!("could not parse schedule: {e}")))?;
+
+        Ok(Self {
+            daily_duration,
+            schedule: s.to_string(),
+        })
+    }
+}
+
+impl DailyDurationWrapper {
+    fn as_str(&self) -> &str {
+        &self.schedule
+    }
+}
+
+proxmox_serde::forward_deserialize_to_from_str!(DailyDurationWrapper);
+proxmox_serde::forward_serialize_to_display!(DailyDurationWrapper);
+
+/// Match timestamp of the notification.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
 pub struct CalendarMatcher {
-    schedule: DailyDuration,
-    original: String,
+    schedule: DailyDurationWrapper,
 }
 
 impl MatchDirective for CalendarMatcher {
     fn matches(&self, notification: &Notification) -> Result<bool, Error> {
         self.schedule
+            .daily_duration
             .time_match(notification.metadata.timestamp, false)
             .map_err(|err| Error::Generic(format!("could not match timestamp: {err}")))
     }
 }
 
-impl fmt::Display for CalendarMatcher {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str(&self.original)
+/// Match the timestamp of a notification.
+///
+/// This is a wrapper that serializes into an inline format that can be used
+/// in a section config key-value pair.
+#[derive(Clone, Debug)]
+pub struct InlineCalendarMatcher(CalendarMatcher);
+
+impl MatchDirective for InlineCalendarMatcher {
+    fn matches(&self, notification: &Notification) -> Result<bool, Error> {
+        self.0.matches(notification)
     }
 }
 
-impl FromStr for CalendarMatcher {
+impl fmt::Display for InlineCalendarMatcher {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(self.0.schedule.as_str())
+    }
+}
+
+impl FromStr for InlineCalendarMatcher {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Error> {
-        let schedule = proxmox_time::parse_daily_duration(s)
-            .map_err(|e| Error::Generic(format!("could not parse schedule: {e}")))?;
-
-        Ok(Self {
-            schedule,
-            original: s.to_string(),
-        })
+        Ok(Self(CalendarMatcher {
+            schedule: s.parse()?,
+        }))
     }
 }
 
-proxmox_serde::forward_deserialize_to_from_str!(CalendarMatcher);
-proxmox_serde::forward_serialize_to_display!(CalendarMatcher);
+impl InlineCalendarMatcher {
+    pub fn into_inner(self) -> CalendarMatcher {
+        self.0
+    }
+}
+
+proxmox_serde::forward_deserialize_to_from_str!(InlineCalendarMatcher);
+proxmox_serde::forward_serialize_to_display!(InlineCalendarMatcher);
 
 #[cfg(test)]
 mod test {
@@ -63,7 +118,21 @@ mod test {
 
         // Match on a wide rage to avoid issues when running this test case
         // in a different time zone.
-        let matcher: CalendarMatcher = "thu..sat 0-23".parse().unwrap();
+        let matcher: InlineCalendarMatcher = "thu..sat 0-23".parse().unwrap();
         assert!(matcher.matches(&notification).unwrap());
     }
+
+    #[test]
+    fn test_calendar_matcher_de_ser_roundtrip() {
+        let calendar_matcher = "{ \"schedule\": \"thu..sat 0-23\" }";
+
+        let calendar_matcher: CalendarMatcher = serde_json::from_str(calendar_matcher).unwrap();
+
+        let s = serde_json::to_string(&calendar_matcher).unwrap();
+        let m: CalendarMatcher = serde_json::from_str(&s).unwrap();
+
+        let a = InlineCalendarMatcher(m);
+
+        assert_eq!(a.to_string(), "thu..sat 0-23");
+    }
 }
diff --git a/proxmox-notify/src/matcher/mod.rs b/proxmox-notify/src/matcher/mod.rs
index 32ed9fbf..24186cda 100644
--- a/proxmox-notify/src/matcher/mod.rs
+++ b/proxmox-notify/src/matcher/mod.rs
@@ -14,7 +14,7 @@ pub mod calendar;
 pub mod field;
 pub mod severity;
 
-use calendar::CalendarMatcher;
+use calendar::InlineCalendarMatcher;
 use field::InlineFieldMatcher;
 use severity::InlineSeverityMatcher;
 
@@ -112,7 +112,7 @@ pub struct MatcherConfig {
     /// List of matched severity levels.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     #[updater(serde(skip_serializing_if = "Option::is_none"))]
-    pub match_calendar: Vec<CalendarMatcher>,
+    pub match_calendar: Vec<InlineCalendarMatcher>,
     /// Decide if 'all' or 'any' match statements must match.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub mode: Option<MatchModeOperator>,
-- 
2.47.3