cleanup: use serde(flatten) for VerificationJobStatus, improve code reuse

src/config/verify.rs

@@ -70,88 +70,26 @@ pub struct VerificationJobConfig {
     pub schedule: Option<String>,
 }
 
-
 #[api(
     properties: {
-        id: {
-            schema: JOB_ID_SCHEMA,
+        config: {
+            type: VerificationJobConfig,
         },
-        store: {
-            schema: DATASTORE_SCHEMA,
+        status: {
+            type: JobScheduleStatus,
         },
-        "ignore-verified": {
-            optional: true,
-            schema: IGNORE_VERIFIED_BACKUPS_SCHEMA,
-        },
-        "outdated-after": {
-            optional: true,
-            schema: VERIFICATION_OUTDATED_AFTER_SCHEMA,
-        },
-        comment: {
-            optional: true,
-            schema: SINGLE_LINE_COMMENT_SCHEMA,
-        },
-        schedule: {
-            optional: true,
-            schema: VERIFICATION_SCHEDULE_SCHEMA,
-        },
-        "next-run": {
-            description: "Estimated time of the next run (UNIX epoch).",
-            optional: true,
-            type: Integer,
-        },
-        "last-run-state": {
-            description: "Result of the last run.",
-            optional: true,
-            type: String,
-        },
-        "last-run-upid": {
-            description: "Task UPID of the last run.",
-            optional: true,
-            type: String,
-        },
-        "last-run-endtime": {
-            description: "Endtime of the last run.",
-            optional: true,
-            type: Integer,
-        },
-    }
+    },
 )]
 #[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
 /// Status of Verification Job
 pub struct VerificationJobStatus {
-    /// unique ID to address this job
-    pub id: String,
-    /// the datastore ID this verificaiton job affects
-    pub store: String,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// if not set to false, check the age of the last snapshot verification to filter
-    /// out recent ones, depending on 'outdated_after' configuration.
-    pub ignore_verified: Option<bool>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// Reverify snapshots after X days, never if 0. Ignored if 'ignore_verified' is false.
-    pub outdated_after: Option<i64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    pub comment: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// when to schedule this job in calendar event notation
-    pub schedule: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// The timestamp when this job runs the next time.
-    pub next_run: Option<i64>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// The state of the last scheduled run, if any
-    pub last_run_state: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// The task UPID of the last scheduled run, if any
-    pub last_run_upid: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
-    /// When the last run was finished, combined with UPID.starttime one can calculate the duration
-    pub last_run_endtime: Option<i64>,
+    #[serde(flatten)]
+    pub config: VerificationJobConfig,
+    #[serde(flatten)]
+    pub status: JobScheduleStatus,
 }
 
-
 fn init() -> SectionConfig {
     let obj_schema = match VerificationJobConfig::API_SCHEMA {
         Schema::Object(ref obj_schema) => obj_schema,