civics-cdf-validator 1.49.dev4__py3-none-any.whl → 1.49.dev6__py3-none-any.whl

civics_cdf_validator/rules.py

@@ -1941,8 +1941,20 @@ class PersonHasOffice(base.ValidReferenceRule):
       if leader_id.text:
         person_reference_ids.add(leader_id.text)
 
+    office_holder_tenure_collection = root.find("OfficeHolderTenureCollection")
+    if office_holder_tenure_collection is not None:
+      for office_holder_tenure in office_holder_tenure_collection.findall(
+          "OfficeHolderTenure"
+      ):
+        id_obj = office_holder_tenure.find("OfficeHolderPersonId")
+        if id_obj is not None and id_obj.text:
+          person_reference_ids.add(id_obj.text.strip())
+
     office_collection = root.find("OfficeCollection")
-    if office_collection is not None:
+    if (
+        office_holder_tenure_collection is None
+        and office_collection is not None
+    ):
       for office in office_collection.findall("Office"):
         id_obj = office.find("OfficeHolderPersonIds")
         if id_obj is not None and id_obj.text:
@@ -2845,6 +2857,47 @@ class DateStatusMatches(base.DateRule):
       raise loggers.ElectionInfo.from_message(msg, [election_elem])
 
 
+class OfficeSelectionMethodMatch(base.BaseRule):
+  """Office and OfficeHolderTenure need to have matching selection methods.
+
+  Ensure that the OfficeSelectionMethod of a given OfficeHolderTenure is
+  also
+  present in the list of SelectionMethods of the Office it points to.
+  """
+
+  def __init__(self, election_tree, schema_tree, **kwargs):
+    self.office_selection_methods = {}
+    officeholder_tenure_elements = self.get_elements_by_class(
+        election_tree, "OfficeHolderTenure"
+    )
+    office_elements = self.get_elements_by_class(election_tree, "Office")
+    if officeholder_tenure_elements:
+      for element in office_elements:
+        office_id = element.get("objectId")
+        selection_methods = {
+            selection_method.text
+            for selection_method in element.findall("SelectionMethod")
+        }
+        self.office_selection_methods[office_id] = selection_methods
+
+  def elements(self):
+    return ["OfficeHolderTenure"]
+
+  def check(self, element):
+    office_id = element.find("OfficeId").text
+    office_selection_method = element.find("OfficeSelectionMethod").text
+    if (
+        office_id not in self.office_selection_methods
+        or office_selection_method
+        not in self.office_selection_methods[office_id]
+    ):
+      raise loggers.ElectionError.from_message(
+          "OfficeSelectionMethod does not have a matching SelectionMethod"
+          " in the corresponding Office element.",
+          [element],
+      )
+
+
 class OfficeTermDates(base.DateRule):
   """Office elements should contain valid term dates.
 
@@ -4534,6 +4587,7 @@ ELECTION_RESULTS_RULES = ELECTION_RULES + (
 OFFICEHOLDER_RULES = COMMON_RULES + (
     # go/keep-sorted start
     DateOfBirthIsInPast,
+    OfficeSelectionMethodMatch,
     OfficeTermDates,
     PersonHasOffice,
     ProhibitElectionData,

civics_cdf_validator/version.py

@@ -5,4 +5,4 @@ No dependencies should be added to this module.
 See https://packaging.python.org/guides/single-sourcing-package-version/
 """
 
-__version__ = '1.49.dev4'
+__version__ = '1.49.dev6'

{civics_cdf_validator-1.49.dev4.dist-info → civics_cdf_validator-1.49.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.49.dev4
+Version: 1.49.dev6
 Summary: Checks if an election feed follows best practices
 Home-page: https://github.com/google/civics_cdf_validator
 Author: Google Civics

{civics_cdf_validator-1.49.dev4.dist-info → civics_cdf_validator-1.49.dev6.dist-info}/RECORD

@@ -3,13 +3,13 @@ civics_cdf_validator/base.py,sha256=E1Tp15P-zJl7-4YmFpxB4OEbWbFbQWpT9NW0XT98C_c,
 civics_cdf_validator/gpunit_rules.py,sha256=Cg-qlOeVKTCQ5qUKYSxbVrrh3tdLt1X5Eg-7uyyR_SY,9487
 civics_cdf_validator/loggers.py,sha256=LS6U9YWzu72V2Q0PwyE9xE03Ul392UAPRnrp2uRBMLA,6923
 civics_cdf_validator/office_utils.py,sha256=aFxcFQZF2oBn0gPXt_kv1LxHGvwzABScT8X5yaYtVLw,2705
-civics_cdf_validator/rules.py,sha256=8sMV8VL8eWFNhqDBtsh5r-5Jd5jRSm1bJ4OMGWe02zs,151896
+civics_cdf_validator/rules.py,sha256=iofXrU1QLmgvwb9kBr_bca8z6z7AM_P7VB5rT3W2QQg,153888
 civics_cdf_validator/stats.py,sha256=YNqv3Khkt_hJxCIunFBRSl23oXqu5gNjCmWMHFbAcSU,3819
 civics_cdf_validator/validator.py,sha256=SXPsYLu0G_JT2B03i24-yJFh41YzaSYecan4LQ_Xqm4,12553
-civics_cdf_validator/version.py,sha256=6C8Z4BVJHdzi0RW5shiztdupmQNW-pNC_XjrjfKroMg,188
-civics_cdf_validator-1.49.dev4.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-civics_cdf_validator-1.49.dev4.dist-info/METADATA,sha256=fb1wKnepxYMS3JdoA2eLVD-6i3MbdUgIXFFtX2mD82Y,1008
-civics_cdf_validator-1.49.dev4.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-civics_cdf_validator-1.49.dev4.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
-civics_cdf_validator-1.49.dev4.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
-civics_cdf_validator-1.49.dev4.dist-info/RECORD,,
+civics_cdf_validator/version.py,sha256=ON0Bvzu35yVJTLI3YHWpiJzQKOkGV4ppGiLCitAeFA8,188
+civics_cdf_validator-1.49.dev6.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+civics_cdf_validator-1.49.dev6.dist-info/METADATA,sha256=xxY41oXrwGPc_NZEIguT9tuB5kvbYSC66MgHqP_q6C8,1008
+civics_cdf_validator-1.49.dev6.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+civics_cdf_validator-1.49.dev6.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
+civics_cdf_validator-1.49.dev6.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
+civics_cdf_validator-1.49.dev6.dist-info/RECORD,,

{civics_cdf_validator-1.49.dev4.dist-info → civics_cdf_validator-1.49.dev6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any