civics-cdf-validator 1.56.dev1__tar.gz → 1.56.dev3__tar.gz

{civics_cdf_validator-1.56.dev1/civics_cdf_validator.egg-info → civics_cdf_validator-1.56.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.56.dev1
+Version: 1.56.dev3
 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.56.dev1 → civics_cdf_validator-1.56.dev3/civics_cdf_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.56.dev1
+Version: 1.56.dev3
 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.56.dev1 → civics_cdf_validator-1.56.dev3}/rules.py

@@ -633,18 +633,6 @@ class GpUnitOcdId(base.BaseRule):
         )
 
 
-# TODO(b/337001513): Remove this once the new rule is rolled out everywhere and
-# no feeds have this in their disabled rules anymore.
-class ElectoralDistrictOcdId(base.BaseRule):
-  """All GpUnits MUST have a valid OCD ID."""
-
-  def elements(self):
-    return ["ReportingUnit"]
-
-  def check(self, element):
-    pass
-
-
 class DuplicatedGpUnitOcdId(base.BaseRule):
   """2 GpUnits should not have same OCD ID."""
 
@@ -4341,7 +4329,7 @@ class SourceDirPathMustBeSetAfterInitialDeliveryDate(base.BaseRule):
         )
 
 
-class OfficeHolderSubFeedDatesAreSequential(base.DateRule):
+class OfficeholderSubFeedDatesAreSequential(base.DateRule):
   """Dates in an OfficeHolderSubFeed element should be sequential."""
 
   def elements(self):
@@ -4732,6 +4720,47 @@ class NoExtraElectionReportCollections(base.BaseRule):
       )
 
 
+class FeedElementsShouldHaveSubElementsBasedOnType(base.BaseRule):
+  """Feeds should have certain elements based on feed type.
+
+  For example, Feeds of type officeHolder should have an OfficeHolderSubFeed,
+  similarly pre-election and election-results feeds should have an
+  ElectionEventCollection. In the case of an ElectionEventCollection, at least
+  one ElectionEvent element should be present.
+  """
+
+  def elements(self):
+    return ["Feed"]
+
+  def check(self, element):
+    feed_type = element.find("FeedType")
+    feed_id = element.find("FeedId").text
+
+    if not element_has_text(feed_type):
+      return
+
+    feed_type = feed_type.text
+    if feed_type == "officeholder":
+      if element.find("OfficeholderSubFeed") is None:
+        raise loggers.ElectionError.from_message(
+            "OfficeholderSubFeed should exist for %s feed %s."
+            % (feed_type, feed_id)
+        )
+    elif feed_type == "pre-election" or feed_type == "election-results":
+      if element.find("ElectionEventCollection") is None:
+        raise loggers.ElectionError.from_message(
+            "ElectionEventCollection should exist for %s feed %s."
+            % (feed_type, feed_id)
+        )
+      if not element.find("ElectionEventCollection").findall(
+          "ElectionEvent"
+      ):
+        raise loggers.ElectionError.from_message(
+            "ElectionEventCollection should have at least one ElectionEvent"
+            " for %s feed %s." % (feed_type, feed_id)
+        )
+
+
 class RuleSet(enum.Enum):
   """Names for sets of rules used to validate a particular feed type."""
 
@@ -4826,7 +4855,6 @@ ELECTION_RULES = COMMON_RULES + (
     ElectionStartDates,
     ElectionTypesAndCandidateContestTypesAreCompatible,
     ElectionTypesAreCompatible,
-    ElectoralDistrictOcdId,
     FullTextMaxLength,
     FullTextOrBallotText,
     GpUnitsHaveSingleRoot,
@@ -4888,12 +4916,13 @@ METADATA_RULES = (
     # go/keep-sorted start
     ElectionEventDatesAreSequential,
     Encoding,
+    FeedElementsShouldHaveSubElementsBasedOnType,
     FeedHasValidCountryCode,
     FeedIdsAreUnique,
     FeedInactiveDateIsLatestDate,
     FeedInactiveDateSetForNonEvergreenFeed,
     FeedTypeHasValidFeedLongevity,
-    OfficeHolderSubFeedDatesAreSequential,
+    OfficeholderSubFeedDatesAreSequential,
     OptionalAndEmpty,
     Schema,
     SourceDirPathMustBeSetAfterInitialDeliveryDate,

{civics_cdf_validator-1.56.dev1 → civics_cdf_validator-1.56.dev3}/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.56.dev1'
+__version__ = '1.56.dev3'