civics-cdf-validator 1.49.dev13__py3-none-any.whl → 1.49.dev15__py3-none-any.whl

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.",
@@ -2989,20 +3005,25 @@ class RemovePersonAndOfficeHolderId60DaysAfterEndDate(base.TreeRule):
     info_log = []
     persons = self.get_elements_by_class(self.election_tree, "Person")
     offices = self.get_elements_by_class(self.election_tree, "Office")
+    officeholder_tenure_collection = self.get_elements_by_class(
+        self.election_tree, "OfficeHolderTenureCollection"
+    )
+    is_post_office_split_feed = bool(officeholder_tenure_collection)
     person_office_dict = dict()
     outdated_offices = []
-    for office in offices:
-      ohpid = office.find("OfficeHolderPersonIds").text
-      if ohpid in person_office_dict:
-        person_office_dict[ohpid].append(office.get("objectId"))
-      else:
-        person_office_dict[ohpid] = [office.get("objectId")]
-      term = office.find(".//Term")
-      if term is not None:
+    outdated_officeholder_tenures = []
+    outdated_officetenure_persons = dict()
+    if is_post_office_split_feed:
+      officeholder_tenures = self.get_elements_by_class(
+          self.election_tree, "OfficeHolderTenure"
+      )
+      for officeholder_tenure in officeholder_tenures:
+        person_id = officeholder_tenure.find("OfficeHolderPersonId").text
+        object_id = officeholder_tenure.get("objectId")
         date_validator = base.DateRule(None, None)
-        date_validator.gather_dates(term)
-        end_date_person = date_validator.end_date
-        if end_date_person is not None:
+        date_validator.gather_dates(officeholder_tenure)
+        end_date = date_validator.end_date
+        if end_date is not None:
           sixty_days_earlier = datetime.datetime.now() + datetime.timedelta(
               days=-60
           )
@@ -3011,21 +3032,80 @@ class RemovePersonAndOfficeHolderId60DaysAfterEndDate(base.TreeRule):
               sixty_days_earlier.month,
               sixty_days_earlier.day,
           )
-          if end_date_person < partial_date_sixty_days:
-            outdated_offices.append(office.get("objectId"))
-    for person in persons:
-      pid = person.get("objectId")
-      if person_office_dict.get(pid) is not None:
-        check_person_outdated = all(
-            item in outdated_offices for item in person_office_dict.get(pid)
+          if end_date < partial_date_sixty_days:
+            outdated_officeholder_tenures.append(object_id)
+          if person_id in outdated_officetenure_persons.keys():
+            outdated_officetenure_persons[person_id].append(
+                (object_id, end_date)
+            )
+          else:
+            outdated_officetenure_persons[person_id] = [(object_id, end_date)]
+      for outdated_officeholder_tenure in outdated_officeholder_tenures:
+        info_message = (
+            "The officeholder tenure end date is more than 60 days"
+            " in the past; this OfficeHolderTenure element can be removed"
+            " from the feed."
+        )
+        info_log.append(
+            loggers.LogEntry(info_message, [outdated_officeholder_tenure])
         )
-        if check_person_outdated:
+      for person_id, value_list in outdated_officetenure_persons.items():
+        has_recent_tenure = False
+        for value in value_list:
+          end_date = value[1]
+          sixty_days_earlier = datetime.datetime.now() + datetime.timedelta(
+              days=-60
+          )
+          partial_date_sixty_days = base.PartialDate(
+              sixty_days_earlier.year,
+              sixty_days_earlier.month,
+              sixty_days_earlier.day,
+          )
+          if end_date > partial_date_sixty_days:
+            has_recent_tenure = True
+        if not has_recent_tenure:
           info_message = (
-              "The officeholder mandates ended more than 60 days ago. "
-              "Therefore, you can remove the person and the related offices "
-              "from the feed."
+              "All officeholder tenures ended more than 60 days ago. "
+              "Therefore, you can remove the person and the related "
+              "officeholder tenures from the feed."
           )
-          info_log.append(loggers.LogEntry(info_message, [person]))
+          info_log.append(loggers.LogEntry(info_message, [person_id]))
+    else:
+      for office in offices:
+        person_id = office.find("OfficeHolderPersonIds").text
+        if person_id in person_office_dict:
+          person_office_dict[person_id].append(office.get("objectId"))
+        else:
+          person_office_dict[person_id] = [office.get("objectId")]
+        term = office.find(".//Term")
+        if term is not None:
+          date_validator = base.DateRule(None, None)
+          date_validator.gather_dates(term)
+          end_date_person = date_validator.end_date
+          if end_date_person is not None:
+            sixty_days_earlier = datetime.datetime.now() + datetime.timedelta(
+                days=-60
+            )
+            partial_date_sixty_days = base.PartialDate(
+                sixty_days_earlier.year,
+                sixty_days_earlier.month,
+                sixty_days_earlier.day,
+            )
+            if end_date_person < partial_date_sixty_days:
+              outdated_offices.append(office.get("objectId"))
+      for person in persons:
+        pid = person.get("objectId")
+        if person_office_dict.get(pid) is not None:
+          check_person_outdated = all(
+              item in outdated_offices for item in person_office_dict.get(pid)
+          )
+          if check_person_outdated:
+            info_message = (
+                "The officeholder mandates ended more than 60 days ago. "
+                "Therefore, you can remove the person and the related offices "
+                "from the feed."
+            )
+            info_log.append(loggers.LogEntry(info_message, [person]))
     if info_log:
       raise loggers.ElectionInfo(info_log)
 

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.dev13'
+__version__ = '1.49.dev15'

{civics_cdf_validator-1.49.dev13.dist-info → civics_cdf_validator-1.49.dev15.dist-info}/METADATA

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

@@ -3,13 +3,13 @@ civics_cdf_validator/base.py,sha256=5zntjAdAA-bdwYOOStFgUle9LGX_ccelS--thMhUG9A,
 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=Ucw1vURByvUoyMVdBUDnzggO15kExbnpsBZU0Wlg-EE,159895
+civics_cdf_validator/rules.py,sha256=MfNt3RnztLEUuf6-Ksd9O484Ihrn5GzE3rlWIF6KzFc,163372
 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=VFMdAjvjwr34E1vqDkhcL8mmJWGxF_XUDagoSEfJ11Y,189
-civics_cdf_validator-1.49.dev13.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-civics_cdf_validator-1.49.dev13.dist-info/METADATA,sha256=MBpl8nej6fgkR0c0jy0owtovKInrOYSLDPpp1k8viaw,1009
-civics_cdf_validator-1.49.dev13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-civics_cdf_validator-1.49.dev13.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
-civics_cdf_validator-1.49.dev13.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
-civics_cdf_validator-1.49.dev13.dist-info/RECORD,,
+civics_cdf_validator/version.py,sha256=-opmfDTRJeiPpxkg4oi9RUmaqlgTkt2qPKUoiRXDQVc,189
+civics_cdf_validator-1.49.dev15.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+civics_cdf_validator-1.49.dev15.dist-info/METADATA,sha256=2FV0eKQ4cTQXIIGfsB8jI45EdmXqxv1pS0KvEkcZ1uA,1009
+civics_cdf_validator-1.49.dev15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+civics_cdf_validator-1.49.dev15.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
+civics_cdf_validator-1.49.dev15.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
+civics_cdf_validator-1.49.dev15.dist-info/RECORD,,