civics-cdf-validator 1.49.dev14__py3-none-any.whl → 1.49.dev16__py3-none-any.whl

civics_cdf_validator/loggers.py

@@ -84,7 +84,6 @@ class ElectionInfo(ElectionException):
 
 def get_parent_hierarchy_object_id_str(elt):
   """Get the elt path from the 1st parent with an objectId / ElectionReport."""
-
   elt_hierarchy = []
   current_elt = elt
   while current_elt is not None:
@@ -203,4 +202,3 @@ def severities_names():
   for exp in ExceptionListWrapper.SUPPORTED_SEVERITIES:
     names.append(exp.description.lower())
   return names
-

civics_cdf_validator/rules.py

@@ -2365,17 +2365,24 @@ class OfficesHaveJurisdictionID(base.BaseRule):
     return ["Office"]
 
   def check(self, element):
-    jurisdiction_values = get_entity_info_for_value_type(
-        element, "jurisdiction-id"
-    )
+    jurisdiction_values = []
+    post_office_split_jurisdiction_element = element.find("JurisdictionId")
+    if element_has_text(post_office_split_jurisdiction_element):
+      jurisdiction_values.append(post_office_split_jurisdiction_element.text)
+    else:
+      jurisdiction_values = get_entity_info_for_value_type(
+          element, "jurisdiction-id"
+      )
+
     jurisdiction_values = [j_id for j_id in jurisdiction_values if j_id.strip()]
     if not jurisdiction_values:
       raise loggers.ElectionError.from_message(
-          "Office is missing a jurisdiction-id.", [element]
+          "Office is missing a jurisdiction ID.", [element]
       )
     if len(jurisdiction_values) > 1:
       raise loggers.ElectionError.from_message(
-          "Office has more than one jurisdiction-id.", [element]
+          "Office has more than one jurisdiction ID.",
+          [element],
       )
 
 
@@ -2431,11 +2438,17 @@ class OfficesHaveValidOfficeLevel(base.BaseRule):
     return ["Office"]
 
   def check(self, element):
-    office_levels = [
-        ol_id.strip()
-        for ol_id in get_external_id_values(element, "office-level")
-        if ol_id.strip()
-    ]
+    office_levels = []
+    post_office_split_office_level_element = element.find("Level")
+    if element_has_text(post_office_split_office_level_element):
+      office_levels.append(post_office_split_office_level_element.text)
+    else:
+      office_levels = [
+          ol_id.strip()
+          for ol_id in get_external_id_values(element, "office-level")
+          if ol_id.strip()
+      ]
+
     if not office_levels:
       raise loggers.ElectionError.from_message(
           "Office is missing an office level.",
@@ -2461,10 +2474,13 @@ class OfficesHaveValidOfficeRole(base.BaseRule):
     return ["Office"]
 
   def check(self, element):
-    office_roles = [
-        office_role.strip()
-        for office_role in get_external_id_values(element, "office-role")
-    ]
+    office_roles = [role.text for role in element.findall("Role")]
+    if not office_roles:
+      office_roles = [
+          office_role.strip()
+          for office_role in get_external_id_values(element, "office-role")
+      ]
+
     if not office_roles:
       raise loggers.ElectionError.from_message(
           "Office is missing an office role.",
@@ -3002,8 +3018,10 @@ class RemovePersonAndOfficeHolderId60DaysAfterEndDate(base.TreeRule):
           self.election_tree, "OfficeHolderTenure"
       )
       for officeholder_tenure in officeholder_tenures:
-        person_id = officeholder_tenure.find("OfficeHolderPersonId").text
-        object_id = officeholder_tenure.get("objectId")
+        office_holder_person_elem = officeholder_tenure.find(
+            "OfficeHolderPersonId"
+        )
+        person_id = office_holder_person_elem.text
         date_validator = base.DateRule(None, None)
         date_validator.gather_dates(officeholder_tenure)
         end_date = date_validator.end_date
@@ -3017,13 +3035,15 @@ class RemovePersonAndOfficeHolderId60DaysAfterEndDate(base.TreeRule):
               sixty_days_earlier.day,
           )
           if end_date < partial_date_sixty_days:
-            outdated_officeholder_tenures.append(object_id)
+            outdated_officeholder_tenures.append(officeholder_tenure)
           if person_id in outdated_officetenure_persons.keys():
             outdated_officetenure_persons[person_id].append(
-                (object_id, end_date)
+                (office_holder_person_elem, end_date)
             )
           else:
-            outdated_officetenure_persons[person_id] = [(object_id, end_date)]
+            outdated_officetenure_persons[person_id] = [
+                (office_holder_person_elem, end_date)
+            ]
       for outdated_officeholder_tenure in outdated_officeholder_tenures:
         info_message = (
             "The officeholder tenure end date is more than 60 days"
@@ -3035,7 +3055,9 @@ class RemovePersonAndOfficeHolderId60DaysAfterEndDate(base.TreeRule):
         )
       for person_id, value_list in outdated_officetenure_persons.items():
         has_recent_tenure = False
+        office_holder_person_elem = None
         for value in value_list:
+          office_holder_person_elem = value[0]
           end_date = value[1]
           sixty_days_earlier = datetime.datetime.now() + datetime.timedelta(
               days=-60
@@ -3047,13 +3069,15 @@ class RemovePersonAndOfficeHolderId60DaysAfterEndDate(base.TreeRule):
           )
           if end_date > partial_date_sixty_days:
             has_recent_tenure = True
-        if not has_recent_tenure:
+        if not has_recent_tenure and office_holder_person_elem is not None:
           info_message = (
               "All officeholder tenures ended more than 60 days ago. "
-              "Therefore, you can remove the person and the related "
-              "officeholder tenures from the feed."
+              "Therefore, you can remove the person and the "
+              "related officeholder tenures from the feed."
+          )
+          info_log.append(
+              loggers.LogEntry(info_message, [office_holder_person_elem])
           )
-          info_log.append(loggers.LogEntry(info_message, [person_id]))
     else:
       for office in offices:
         person_id = office.find("OfficeHolderPersonIds").text

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.dev14'
+__version__ = '1.49.dev16'

{civics_cdf_validator-1.49.dev14.dist-info → civics_cdf_validator-1.49.dev16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.49.dev14
+Version: 1.49.dev16
 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.dev14.dist-info → civics_cdf_validator-1.49.dev16.dist-info}/RECORD

@@ -1,15 +1,15 @@
 civics_cdf_validator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 civics_cdf_validator/base.py,sha256=5zntjAdAA-bdwYOOStFgUle9LGX_ccelS--thMhUG9A,16954
 civics_cdf_validator/gpunit_rules.py,sha256=Cg-qlOeVKTCQ5qUKYSxbVrrh3tdLt1X5Eg-7uyyR_SY,9487
-civics_cdf_validator/loggers.py,sha256=LS6U9YWzu72V2Q0PwyE9xE03Ul392UAPRnrp2uRBMLA,6923
+civics_cdf_validator/loggers.py,sha256=ZfWFd9yskcd2-qb83EPz7eqa1iGO8BRFMtDZeE1hofA,6921
 civics_cdf_validator/office_utils.py,sha256=aFxcFQZF2oBn0gPXt_kv1LxHGvwzABScT8X5yaYtVLw,2705
-civics_cdf_validator/rules.py,sha256=FZmaGEm52iPFbvDQqvVFc3BZT7SyNOARJ-x7_3qVKwo,162747
+civics_cdf_validator/rules.py,sha256=vJ5MkZF4FcwBg4WIDV7eiJal80E4dbIIJPP4E72ZaHg,163644
 civics_cdf_validator/stats.py,sha256=YNqv3Khkt_hJxCIunFBRSl23oXqu5gNjCmWMHFbAcSU,3819
 civics_cdf_validator/validator.py,sha256=2nwlFfQ9AmpTaO5n5ekaO845Rm0JPjNF-Il6FJW_50k,12678
-civics_cdf_validator/version.py,sha256=3STupAz7hHTsISiw-I-GyuKq9Tt4pHJgyls1yJfSqWM,189
-civics_cdf_validator-1.49.dev14.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-civics_cdf_validator-1.49.dev14.dist-info/METADATA,sha256=GsP5SO8H7qeVl2huG8vo976TUBpIWNu8Jh8JtXJioY8,1009
-civics_cdf_validator-1.49.dev14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-civics_cdf_validator-1.49.dev14.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
-civics_cdf_validator-1.49.dev14.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
-civics_cdf_validator-1.49.dev14.dist-info/RECORD,,
+civics_cdf_validator/version.py,sha256=ZCxiUD6TuAAC6J4lrdJKqCjSsBp2DZgubMOEktKezks,189
+civics_cdf_validator-1.49.dev16.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+civics_cdf_validator-1.49.dev16.dist-info/METADATA,sha256=GlQSyUJt23C6yB6yIS0X678MG60Zi7IRDQa1LH2vgfM,1009
+civics_cdf_validator-1.49.dev16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+civics_cdf_validator-1.49.dev16.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
+civics_cdf_validator-1.49.dev16.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
+civics_cdf_validator-1.49.dev16.dist-info/RECORD,,