civics-cdf-validator 1.49.dev15__tar.gz → 1.49.dev17__tar.gz

{civics_cdf_validator-1.49.dev15/civics_cdf_validator.egg-info → civics_cdf_validator-1.49.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.49.dev15
+Version: 1.49.dev17
 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.dev15 → civics_cdf_validator-1.49.dev17/civics_cdf_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.49.dev15
+Version: 1.49.dev17
 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.dev15 → civics_cdf_validator-1.49.dev17}/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-1.49.dev15 → civics_cdf_validator-1.49.dev17}/rules.py

@@ -3018,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
@@ -3033,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"
@@ -3051,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
@@ -3063,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
@@ -3481,9 +3489,6 @@ class MissingFieldsInfo(base.MissingFieldRule):
 
   def element_field_mapping(self):
     return {
-        "Office": [
-            "ElectoralDistrictId",
-        ],
     }
 
 
@@ -4503,10 +4508,20 @@ class UnreferencedEntitiesOfficeholders(UnreferencedEntitiesBase):
   """
 
   def __init__(self, election_tree, schema_tree, **kwargs):
+    office_holder_tenure_collection = self.get_elements_by_class(
+        election_tree, "OfficeHolderTenure"
+    )
+    is_post_office_split = False
+    if office_holder_tenure_collection:
+      is_post_office_split = True
     super(UnreferencedEntitiesOfficeholders, self).__init__(
         election_tree,
         schema_tree,
-        frozenset(["Office", "Leadership"]),
+        (
+            frozenset(["OfficeHolderTenure", "Leadership"])
+            if is_post_office_split
+            else frozenset(["Office", "Leadership"])
+        ),
         frozenset(["Party"]),
         **kwargs,
     )

{civics_cdf_validator-1.49.dev15 → civics_cdf_validator-1.49.dev17}/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.dev15'
+__version__ = '1.49.dev17'