Merge pull request #74 from stratofax/dev-make-flat

Consolidate code to use ElectionData class

src/electos/ballotmaker/election_data.py

@@ -48,7 +48,6 @@ def __post_init__(self):
             self.election_report.election[0].name.text[0].content
         )
         log.info(f"Election: {self.election_name}")
-
         self.start_date = self.election_report.election[0].start_date
         log.info(f"Start date: {self.start_date}")
         self.end_date = self.election_report.election[0].end_date

src/electos/ballotmaker/make_ballots.py

@@ -1,7 +1,7 @@
 import logging
 from pathlib import Path
 
-from electos.ballotmaker.constants import NO_ERRORS, NO_FILE
+from electos.ballotmaker.election_data import ElectionData
 
 log = logging.getLogger(__name__)
 
@@ -16,13 +16,7 @@ def make_ballots(
         Output directory for generated PDF files
         Styles file for ballot formatting
     """
-    # is the EDF a file?
-    if _edf is None:
-        log.debug("No EDF file provided to make ballots.")
-        return NO_FILE
-    if not _edf.is_file():
-        log.debug(f"Can't make ballots, EDF {_edf} is not a file")
-        return NO_FILE
     # was a valid output directory provided?
-    # was a styles file provided?
-    return NO_ERRORS
+    # was a styles file provided
+    election_data = ElectionData(_edf)
+    return election_data.edf_error

src/electos/ballotmaker/validate_edf.py

@@ -1,8 +1,7 @@
 import logging
 from pathlib import Path
 
-from electos.ballotmaker.constants import NO_DATA, NO_ERRORS, NO_FILE
-from electos.ballotmaker.read_edf import read_edf
+from electos.ballotmaker.election_data import ElectionData
 
 log = logging.getLogger(__name__)
 
@@ -14,14 +13,6 @@ def validate_edf(
     Requires:
         EDF file (JSON format) edf_file: Path,
     """
-    # is the EDF a file?
-    if _edf is None:
-        log.debug("No EDF file provided for validation.")
-        return NO_FILE
-    if not _edf.is_file():
-        log.debug(f"Can't validate, EDF {_edf} is not a file")
-        return NO_FILE
+    election_data = ElectionData(_edf)
 
-    ballot_style_count = read_edf(_edf)
-    log.info(f"Found {ballot_style_count} ballots in {_edf}")
-    return NO_ERRORS
+    return election_data.edf_error