bugfix/revert-validator-fixes (#164)

* Revert "cleanup/remove-is-required-from-constant-validator (#163)"

This reverts commit c5c3395.

* Make allow none / optional behavior more explicit

* Use allow none in tests and models

* Lint

* Simplify even further

Author: Jackson Maxfield Brown

cdp_backend/database/validators.py

@@ -169,6 +169,13 @@ def create_constant_value_validator(constant_cls: Type) -> Callable[[str], bool]
     -------
     validator_func: Callable[[str], bool]
         The validator func.
+
+    Notes
+    -----
+    Will always allow `None` as a valid option.
+    To remove `None` as a viable input, set the database model field `required=True`.
+
+    See: https://github.com/CouncilDataProject/cdp-backend/pull/164
     """
 
     def is_valid(value: str) -> bool:
@@ -185,6 +192,6 @@ def is_valid(value: str) -> bool:
         status: bool
             The validation status.
         """
-        return value in get_all_class_attr_values(constant_cls)
+        return value is None or value in get_all_class_attr_values(constant_cls)
 
     return is_valid

cdp_backend/pipeline/event_gather_pipeline.py

@@ -1421,7 +1421,7 @@ def store_event_processing_results(
                             db_model=matter_status_db_model,
                             credentials_file=credentials_file,
                         )
-                    except FieldValidationFailed:
+                    except (FieldValidationFailed, RequiredField):
                         allowed_matter_decisions = (
                             constants_utils.get_all_class_attr_values(
                                 db_constants.MatterStatusDecision

cdp_backend/tests/database/test_validators.py

@@ -136,6 +136,7 @@ def test_remote_resource_exists(
 @pytest.mark.parametrize(
     "decision, expected_result",
     [
+        (None, True),  # None always allowed in validator, rejected by model
         ("Approve", True),
         ("INVALID", False),
     ],
@@ -149,6 +150,7 @@ def test_vote_decision_is_valid(decision: str, expected_result: bool) -> None:
 @pytest.mark.parametrize(
     "decision, expected_result",
     [
+        (None, True),  # None always allowed in validator, allowed by model
         ("Passed", True),
         ("INVALID", False),
     ],
@@ -157,7 +159,7 @@ def test_event_minutes_item_decision_is_valid(
     decision: str, expected_result: bool
 ) -> None:
     validator_func = validators.create_constant_value_validator(
-        EventMinutesItemDecision
+        EventMinutesItemDecision,
     )
     actual_result = validator_func(decision)
     assert actual_result == expected_result
@@ -166,19 +168,23 @@ def test_event_minutes_item_decision_is_valid(
 @pytest.mark.parametrize(
     "decision, expected_result",
     [
+        (None, True),  # None always allowed in validator, rejected by model
         ("Adopted", True),
         ("INVALID", False),
     ],
 )
 def test_matter_status_decision_is_valid(decision: str, expected_result: bool) -> None:
-    validator_func = validators.create_constant_value_validator(MatterStatusDecision)
+    validator_func = validators.create_constant_value_validator(
+        MatterStatusDecision,
+    )
     actual_result = validator_func(decision)
     assert actual_result == expected_result
 
 
 @pytest.mark.parametrize(
     "title, expected_result",
     [
+        (None, True),  # None always allowed in validator, rejected by model
         ("Councilmember", True),
         ("INVALID", False),
     ],

setup.py

@@ -130,7 +130,10 @@
             "run_cdp_event_index=cdp_backend.bin.run_cdp_event_index:main",
             "search_cdp_events=cdp_backend.bin.search_cdp_events:main",
             "process_special_event=cdp_backend.bin.process_special_event:main",
-            "add_content_hash_to_sessions=cdp_backend.bin.add_content_hash_to_sessions:main",
+            (
+                "add_content_hash_to_sessions="
+                "cdp_backend.bin.add_content_hash_to_sessions:main"
+            ),
         ],
     },
     install_requires=requirements,