fix: handle none condition

Author: amustaque97

sync-team/src/github/api/mod.rs

@@ -491,7 +491,9 @@ pub(crate) struct Ruleset {
     pub(crate) enforcement: RulesetEnforcement,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) bypass_actors: Option<Vec<RulesetBypassActor>>,
-    pub(crate) conditions: RulesetConditions,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub(crate) conditions: Option<RulesetConditions>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub(crate) rules: Vec<RulesetRule>,
 }
 

sync-team/src/github/mod.rs

@@ -971,14 +971,14 @@ pub fn construct_ruleset(
         source_type: RulesetSourceType::Repository,
         enforcement: RulesetEnforcement::Active,
         bypass_actors: None,
-        conditions: RulesetConditions {
+        conditions: Some(RulesetConditions {
             ref_name: Some(RulesetRefNameCondition {
                 include: vec![convert_branch_pattern_to_ref_pattern(
                     &branch_protection.pattern,
                 )],
                 exclude: vec![],
             }),
-        },
+        }),
         rules,
     }
 }
@@ -1190,8 +1190,10 @@ impl std::fmt::Display for CreateRepoDiff {
             for ruleset in rulesets {
                 let id_str = ruleset.id.map_or("new".to_string(), |id| id.to_string());
                 writeln!(f, "    - {} (ID: {})", ruleset.name, id_str)?;
-                if let Some(ref_name) = &ruleset.conditions.ref_name {
-                    writeln!(f, "      Branches: {}", ref_name.include.join(", "))?;
+                if let Some(conditions) = &ruleset.conditions {
+                    if let Some(ref_name) = &conditions.ref_name {
+                        writeln!(f, "      Branches: {}", ref_name.include.join(", "))?;
+                    }
                 }
                 if ruleset
                     .rules
@@ -1665,21 +1667,23 @@ fn log_ruleset(
     );
 
     // Log branch conditions
-    if let Some(ref_name) = &current.conditions.ref_name {
-        let new_ref_name = new.and_then(|n| n.conditions.ref_name.as_ref());
-        if !ref_name.include.is_empty() {
-            log!(
-                "Include Branches",
-                &ref_name.include,
-                new_ref_name.map(|r| &r.include)
-            );
-        }
-        if !ref_name.exclude.is_empty() {
-            log!(
-                "Exclude Branches",
-                &ref_name.exclude,
-                new_ref_name.map(|r| &r.exclude)
-            );
+    if let Some(conditions) = &current.conditions {
+        if let Some(ref_name) = &conditions.ref_name {
+            let new_ref_name = new.and_then(|n| n.conditions.as_ref()?.ref_name.as_ref());
+            if !ref_name.include.is_empty() {
+                log!(
+                    "Include Branches",
+                    &ref_name.include,
+                    new_ref_name.map(|r| &r.include)
+                );
+            }
+            if !ref_name.exclude.is_empty() {
+                log!(
+                    "Exclude Branches",
+                    &ref_name.exclude,
+                    new_ref_name.map(|r| &r.exclude)
+                );
+            }
         }
     }