civics-cdf-validator 1.56.dev1__py3-none-any.whl → 1.56.dev3__py3-none-any.whl

civics_cdf_validator/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/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'

{civics_cdf_validator-1.56.dev1.dist-info → civics_cdf_validator-1.56.dev3.dist-info}/METADATA

@@ -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.dist-info → civics_cdf_validator-1.56.dev3.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=ZfWFd9yskcd2-qb83EPz7eqa1iGO8BRFMtDZeE1hofA,6921
 civics_cdf_validator/office_utils.py,sha256=aFxcFQZF2oBn0gPXt_kv1LxHGvwzABScT8X5yaYtVLw,2705
-civics_cdf_validator/rules.py,sha256=HeV9gjKBXkvwG_zDlI6XlYvuHegZBqRDkvrBJjpcxBA,164276
+civics_cdf_validator/rules.py,sha256=ioYMDJ8TymWyLVLtLXjOadfFXa78_Kk1wThUmbI452M,165458
 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=K0XaAKcTljLmR6-BPZvcbojWL3yCgsRN76Zo7AAoogs,188
-civics_cdf_validator-1.56.dev1.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-civics_cdf_validator-1.56.dev1.dist-info/METADATA,sha256=v9osN_mvpPXGm-932ULK5v0Zxu2L_zaVZ3YNzeURW_0,1218
-civics_cdf_validator-1.56.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-civics_cdf_validator-1.56.dev1.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
-civics_cdf_validator-1.56.dev1.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
-civics_cdf_validator-1.56.dev1.dist-info/RECORD,,
+civics_cdf_validator/version.py,sha256=uG573yGW1ViQ6oaGoYlzWfXyjZIA3_2envRTa6rcHkY,188
+civics_cdf_validator-1.56.dev3.dist-info/licenses/LICENSE-2.0.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+civics_cdf_validator-1.56.dev3.dist-info/METADATA,sha256=NxouFx5Fm7HHHrFpmxy5bmjDHWX5Yc6ASVr9OeYmpzo,1218
+civics_cdf_validator-1.56.dev3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+civics_cdf_validator-1.56.dev3.dist-info/entry_points.txt,sha256=QibgvtMOocwDi7fQ1emgMJ2lIlI41sW0__KIQdnVn90,77
+civics_cdf_validator-1.56.dev3.dist-info/top_level.txt,sha256=PYT5Eclxbop5o6DJIcgs4IeU6Ds5jqyftjoFbgkkJYo,21
+civics_cdf_validator-1.56.dev3.dist-info/RECORD,,

{civics_cdf_validator-1.56.dev1.dist-info → civics_cdf_validator-1.56.dev3.dist-info}/WHEEL

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