Merge pull request #53 from fecgov/feature/61-contact-pages

Converted contact type and candidate type to code values
fecgov · Mar 18, 2022 · 7552a61 · 7552a61
2 parents a2088fe + 596467e
commit 7552a61
Show file tree

Hide file tree

Showing 11 changed files with 1,146 additions and 1,283 deletions.
diff --git a/docs/Contact_Candidate.html b/docs/Contact_Candidate.html
diff --git a/docs/Contact_Committee.html b/docs/Contact_Committee.html
diff --git a/docs/Contact_Individual.html b/docs/Contact_Individual.html
diff --git a/docs/Contact_Organization.html b/docs/Contact_Organization.html
diff --git a/fecfile_validate_python/src/fecfile_validate/validate.py b/fecfile_validate_python/src/fecfile_validate/validate.py
@@ -30,7 +30,8 @@ def get_schema(schema_name):
  Returns:
  dict: JSON schema that matches the schema_name"""
  schema_file = f"{schema_name}.json"
- schema_path = os.path.join(os.path.dirname(__file__), "schema/", schema_file)
+ schema_path = os.path.join(os.path.dirname(__file__), "schema/",
+ schema_file)
  #: Handle case where we are not running from a pip package
  if not os.path.isfile(schema_path):
  logger.warning(f"Schema file ({schema_path}) not found in package.")

diff --git a/fecfile_validate_python/tests/sample_IND_contact.json b/fecfile_validate_python/tests/sample_IND_contact.json
@@ -0,0 +1,23 @@
+{
+ "type": "IND",
+ "candidate_id": null,
+ "committee_id": "C00601211",
+ "name": "Gilbert Smith",
+ "last_name": "Smith",
+ "first_name": "Gilbert",
+ "middle_name": null,
+ "prefix": null,
+ "suffix": null,
+ "street_1": "602 Tlumacki St",
+ "street_2": null,
+ "city": "Mclean City",
+ "state": "VA",
+ "zip": "22204",
+ "employer": "Byron Inc",
+ "occupation": "Business Owner",
+ "candidate_office": "P",
+ "candidate_state": null,
+ "candidate_district": null,
+ "telephone": "3043892120",
+ "country": "US"
+}
diff --git a/fecfile_validate_python/tests/test_validate.py b/fecfile_validate_python/tests/test_validate.py
@@ -12,9 +12,18 @@ def sample_f3x():
  return form_data
 
 
+@pytest.fixture
+def sample_ind_contact():
+ with open(os.path.join(os.path.dirname(__file__),
+ "sample_IND_contact.json")) as f:
+ form_data = json.load(f)
+ return form_data
+
+
 @pytest.fixture
 def test_schema():
- with open(os.path.join(os.path.dirname(__file__), "test_schema.json")) as f:
+ with open(os.path.join(os.path.dirname(__file__),
+ "test_schema.json")) as f:
  schema = json.load(f)
  return schema
 
@@ -86,3 +95,17 @@ def test_parse_required_error(test_schema):
  "'nested_field' is a required property",
  "top_level_field.nested_field",
  )
+
+
+def test_invalid_const_value(sample_ind_contact):
+ # Make sure our Individual Contact schema is valid
+ validation_result = validate.validate("Contact_Individual",
+ sample_ind_contact)
+ assert validation_result.errors == []
+
+ # Check the const type property works by setting an invalid "type" property
+ sample_ind_contact["type"] = "Individual"
+ validation_result = validate.validate("Contact_Individual",
+ sample_ind_contact)
+ assert validation_result.errors[0].path == "type"
+ assert validation_result.errors[0].message == "'IND' was expected"