From f93225f7ed67868f8b04e124a841065623e2759f Mon Sep 17 00:00:00 2001 From: Matt Travers Date: Mon, 13 Jun 2022 17:28:17 -0400 Subject: [PATCH 1/9] Added DateField to models --- .../fixtures/test_db_f3x_summaries.json | 1498 ++++++++--------- .../fixtures/test_f3x_summaries.json | 24 +- .../migrations/0010_auto_20220609_1730.py | 33 + .../fecfiler/f3x_summaries/models.py | 8 +- ...alter_schatransaction_contribution_date.py | 18 + .../fecfiler/scha_transactions/models.py | 2 +- requirements.txt | 2 +- 7 files changed, 818 insertions(+), 767 deletions(-) create mode 100644 django-backend/fecfiler/f3x_summaries/migrations/0010_auto_20220609_1730.py create mode 100644 django-backend/fecfiler/scha_transactions/migrations/0009_alter_schatransaction_contribution_date.py diff --git a/django-backend/fecfiler/f3x_summaries/fixtures/test_db_f3x_summaries.json b/django-backend/fecfiler/f3x_summaries/fixtures/test_db_f3x_summaries.json index 722033883..7f5d122cf 100644 --- a/django-backend/fecfiler/f3x_summaries/fixtures/test_db_f3x_summaries.json +++ b/django-backend/fecfiler/f3x_summaries/fixtures/test_db_f3x_summaries.json @@ -1,752 +1,752 @@ [ - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Heather Clantz", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "MY", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220103", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Kristen Roach", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "MY", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210120", - "coverage_through_date": "20220525", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Christine Smith", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M12", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20221115", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XN", - "filer_committee_id_number": "C00277608", - "committee_name": "Freddie Singleton", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M9", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20210907", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Violet Pair", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M6", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Lola Mendez", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M3", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Douglas Whitmore", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M12", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Jacob Atkison", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M3", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XN", - "filer_committee_id_number": "C00277608", - "committee_name": "Katherine Weatherwax", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M2", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Ramon Swanson", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M5", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XN", - "filer_committee_id_number": "C00277608", - "committee_name": "Richard Anderson", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M9", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XN", - "filer_committee_id_number": "C00277608", - "committee_name": "Jesus Grinstead", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "TER", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Kali Martinez", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "12R", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Linda Johnson", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "12P", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Daniel Davis", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "12P", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Russell Fitzgerald", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M9", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XN", - "filer_committee_id_number": "C00277608", - "committee_name": "Nicole Wilson", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M9", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XN", - "filer_committee_id_number": "C00277608", - "committee_name": "Angela Watson", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "12C", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Joseph Lowery", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "TER", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Carl Ward", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "30S", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Edward Vann", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "12C", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Julie Binkley", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "Q1", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XT", - "filer_committee_id_number": "C00277608", - "committee_name": "Joel Smith", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "12S", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Franklin Arce", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M2", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } - }, - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XA", - "filer_committee_id_number": "C00277608", - "committee_name": "Jerry Demery", - "change_of_address": null, - "street_1": null, - "street_2": null, - "city": null, - "state": null, - "zip": null, - "report_code": "M12", - "election_code": null, - "date_of_election": null, - "state_of_election": null, - "coverage_from_date": "20210121", - "coverage_through_date": "20220205", - "qualified_committee": null, - "treasurer_last_name": null, - "treasurer_first_name": null, - "treasurer_middle_name": null, - "treasurer_prefix": null, - "treasurer_suffix": null, - "date_signed": null, - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 2 - } + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Heather Clantz", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "MY", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-01-03", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Kristen Roach", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "MY", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-20", + "coverage_through_date": "2022-05-25", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Christine Smith", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M12", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-11-15", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XN", + "filer_committee_id_number": "C00277608", + "committee_name": "Freddie Singleton", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M9", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2021-09-07", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Violet Pair", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M6", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Lola Mendez", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M3", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Douglas Whitmore", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M12", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Jacob Atkison", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M3", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XN", + "filer_committee_id_number": "C00277608", + "committee_name": "Katherine Weatherwax", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M2", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Ramon Swanson", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M5", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XN", + "filer_committee_id_number": "C00277608", + "committee_name": "Richard Anderson", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M9", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XN", + "filer_committee_id_number": "C00277608", + "committee_name": "Jesus Grinstead", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "TER", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Kali Martinez", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "12R", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Linda Johnson", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "12P", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Daniel Davis", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "12P", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Russell Fitzgerald", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M9", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XN", + "filer_committee_id_number": "C00277608", + "committee_name": "Nicole Wilson", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M9", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XN", + "filer_committee_id_number": "C00277608", + "committee_name": "Angela Watson", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "12C", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Joseph Lowery", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "TER", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Carl Ward", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "30S", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Edward Vann", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "12C", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Julie Binkley", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "Q1", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XT", + "filer_committee_id_number": "C00277608", + "committee_name": "Joel Smith", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "12S", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Franklin Arce", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M2", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + }, + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XA", + "filer_committee_id_number": "C00277608", + "committee_name": "Jerry Demery", + "change_of_address": null, + "street_1": null, + "street_2": null, + "city": null, + "state": null, + "zip": null, + "report_code": "M12", + "election_code": null, + "date_of_election": null, + "state_of_election": null, + "coverage_from_date": "2021-01-21", + "coverage_through_date": "2022-02-05", + "qualified_committee": null, + "treasurer_last_name": null, + "treasurer_first_name": null, + "treasurer_middle_name": null, + "treasurer_prefix": null, + "treasurer_suffix": null, + "date_signed": null, + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 2 + } + } ] diff --git a/django-backend/fecfiler/f3x_summaries/fixtures/test_f3x_summaries.json b/django-backend/fecfiler/f3x_summaries/fixtures/test_f3x_summaries.json index c0e242293..3b7a6e4cc 100644 --- a/django-backend/fecfiler/f3x_summaries/fixtures/test_f3x_summaries.json +++ b/django-backend/fecfiler/f3x_summaries/fixtures/test_f3x_summaries.json @@ -1,15 +1,15 @@ [ - { - "model": "f3x_summaries.f3xsummary", - "fields": { - "form_type": "F3XN", - "filer_committee_id_number": "C00000000", - "treasurer_last_name": "Lastname", - "treasurer_first_name": "Firstname", - "date_signed": "20040729", - "created": "2022-02-09T00:00:00.000Z", - "updated": "2022-02-09T00:00:00.000Z", - "committee_account_id": 1000 - } + { + "model": "f3x_summaries.f3xsummary", + "fields": { + "form_type": "F3XN", + "filer_committee_id_number": "C00000000", + "treasurer_last_name": "Lastname", + "treasurer_first_name": "Firstname", + "date_signed": "2004-07-29", + "created": "2022-02-09T00:00:00.000Z", + "updated": "2022-02-09T00:00:00.000Z", + "committee_account_id": 1000 } + } ] diff --git a/django-backend/fecfiler/f3x_summaries/migrations/0010_auto_20220609_1730.py b/django-backend/fecfiler/f3x_summaries/migrations/0010_auto_20220609_1730.py new file mode 100644 index 000000000..c08720da9 --- /dev/null +++ b/django-backend/fecfiler/f3x_summaries/migrations/0010_auto_20220609_1730.py @@ -0,0 +1,33 @@ +# Generated by Django 3.2.12 on 2022-06-09 21:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('f3x_summaries', '0009_auto_20220515_2116'), + ] + + operations = [ + migrations.AlterField( + model_name='f3xsummary', + name='coverage_from_date', + field=models.DateField(blank=True, null=True), + ), + migrations.AlterField( + model_name='f3xsummary', + name='coverage_through_date', + field=models.DateField(blank=True, null=True), + ), + migrations.AlterField( + model_name='f3xsummary', + name='date_of_election', + field=models.DateField(blank=True, null=True), + ), + migrations.AlterField( + model_name='f3xsummary', + name='date_signed', + field=models.DateField(blank=True, null=True), + ), + ] diff --git a/django-backend/fecfiler/f3x_summaries/models.py b/django-backend/fecfiler/f3x_summaries/models.py index 0b2f8b44c..fc9174b22 100644 --- a/django-backend/fecfiler/f3x_summaries/models.py +++ b/django-backend/fecfiler/f3x_summaries/models.py @@ -18,17 +18,17 @@ class F3XSummary(SoftDeleteModel, CommitteeOwnedModel): zip = models.TextField(null=True, blank=True) report_code = models.TextField(null=True, blank=True) election_code = models.TextField(null=True, blank=True) - date_of_election = models.TextField(null=True, blank=True) + date_of_election = models.DateField(null=True, blank=True) state_of_election = models.TextField(null=True, blank=True) - coverage_from_date = models.TextField(null=True, blank=True) - coverage_through_date = models.TextField(null=True, blank=True) + coverage_from_date = models.DateField(null=True, blank=True) + coverage_through_date = models.DateField(null=True, blank=True) qualified_committee = models.BooleanField(default=False, null=True, blank=True) treasurer_last_name = models.TextField(null=True, blank=True) treasurer_first_name = models.TextField(null=True, blank=True) treasurer_middle_name = models.TextField(null=True, blank=True) treasurer_prefix = models.TextField(null=True, blank=True) treasurer_suffix = models.TextField(null=True, blank=True) - date_signed = models.TextField(null=True, blank=True) + date_signed = models.DateField(null=True, blank=True) L6b_cash_on_hand_beginning_period = models.IntegerField(null=True, blank=True) L6c_total_receipts_period = models.IntegerField(null=True, blank=True) L6d_subtotal_period = models.IntegerField(null=True, blank=True) diff --git a/django-backend/fecfiler/scha_transactions/migrations/0009_alter_schatransaction_contribution_date.py b/django-backend/fecfiler/scha_transactions/migrations/0009_alter_schatransaction_contribution_date.py new file mode 100644 index 000000000..8d9ce966e --- /dev/null +++ b/django-backend/fecfiler/scha_transactions/migrations/0009_alter_schatransaction_contribution_date.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2022-06-09 21:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('scha_transactions', '0008_alter_schatransaction_memo_code'), + ] + + operations = [ + migrations.AlterField( + model_name='schatransaction', + name='contribution_date', + field=models.DateField(blank=True, null=True), + ), + ] diff --git a/django-backend/fecfiler/scha_transactions/models.py b/django-backend/fecfiler/scha_transactions/models.py index 91e72c38f..633199379 100644 --- a/django-backend/fecfiler/scha_transactions/models.py +++ b/django-backend/fecfiler/scha_transactions/models.py @@ -25,7 +25,7 @@ class SchATransaction(SoftDeleteModel, CommitteeOwnedModel): contributor_zip = models.TextField(null=True, blank=True) election_code = models.TextField(null=True, blank=True) election_other_description = models.TextField(null=True, blank=True) - contribution_date = models.TextField(null=True, blank=True) + contribution_date = models.DateField(null=True, blank=True) contribution_amount = models.IntegerField(null=True, blank=True) contribution_aggregate = models.IntegerField(null=True, blank=True) contribution_purpose_descrip = models.TextField(null=True, blank=True) diff --git a/requirements.txt b/requirements.txt index 29a795e05..4d4c648ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ django-cors-headers==3.11.0 djangorestframework==3.13.1 djangorestframework-jwt==1.11.0 drf-spectacular==0.21.2 -git+https://github.com/fecgov/fecfile-validate@6e6ea5905f823b125ea548bebb0d05c92642d849#egg=fecfile_validate&subdirectory=fecfile_validate_python +git+https://github.com/fecgov/fecfile-validate@cb2c5107082aafd367efb2460fc660c58ef5c018#egg=fecfile_validate&subdirectory=fecfile_validate_python GitPython==3.1.27 gunicorn==19.10.0 Jinja2==2.11.3 From 0ec6510c4f07e503ad791b205aa96a154a0a0a45 Mon Sep 17 00:00:00 2001 From: Matt Travers Date: Tue, 14 Jun 2022 15:34:31 -0400 Subject: [PATCH 2/9] Updated validate commit hash --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4d4c648ef..be68aa7ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ django-cors-headers==3.11.0 djangorestframework==3.13.1 djangorestframework-jwt==1.11.0 drf-spectacular==0.21.2 -git+https://github.com/fecgov/fecfile-validate@cb2c5107082aafd367efb2460fc660c58ef5c018#egg=fecfile_validate&subdirectory=fecfile_validate_python +git+https://github.com/fecgov/fecfile-validate@fef97923a88fb325b5934883844c193ab7259efe#egg=fecfile_validate&subdirectory=fecfile_validate_python GitPython==3.1.27 gunicorn==19.10.0 Jinja2==2.11.3 From cb6268b5040ac3a61aed680960e9f6924f83bd74 Mon Sep 17 00:00:00 2001 From: Matt Travers Date: Tue, 14 Jun 2022 15:47:36 -0400 Subject: [PATCH 3/9] Fixed migration file conflicts --- .../{0010_auto_20220609_1730.py => 0011_auto_20220609_1730.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename django-backend/fecfiler/f3x_summaries/migrations/{0010_auto_20220609_1730.py => 0011_auto_20220609_1730.py} (94%) diff --git a/django-backend/fecfiler/f3x_summaries/migrations/0010_auto_20220609_1730.py b/django-backend/fecfiler/f3x_summaries/migrations/0011_auto_20220609_1730.py similarity index 94% rename from django-backend/fecfiler/f3x_summaries/migrations/0010_auto_20220609_1730.py rename to django-backend/fecfiler/f3x_summaries/migrations/0011_auto_20220609_1730.py index c08720da9..d472791b0 100644 --- a/django-backend/fecfiler/f3x_summaries/migrations/0010_auto_20220609_1730.py +++ b/django-backend/fecfiler/f3x_summaries/migrations/0011_auto_20220609_1730.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('f3x_summaries', '0009_auto_20220515_2116'), + ('f3x_summaries', '0010_auto_20220525_1157'), ] operations = [ From b171163a818e93715b0ccf9d51ceb5fbd3bce8e3 Mon Sep 17 00:00:00 2001 From: Matt Travers Date: Tue, 14 Jun 2022 16:52:07 -0400 Subject: [PATCH 4/9] Updated test models to correct date string format --- django-backend/fecfiler/f3x_summaries/test_models.py | 2 +- django-backend/fecfiler/f3x_summaries/test_serializers.py | 4 ++-- django-backend/fecfiler/validation/tests.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django-backend/fecfiler/f3x_summaries/test_models.py b/django-backend/fecfiler/f3x_summaries/test_models.py index 87a99e43e..3a7003365 100644 --- a/django-backend/fecfiler/f3x_summaries/test_models.py +++ b/django-backend/fecfiler/f3x_summaries/test_models.py @@ -11,7 +11,7 @@ def setUp(self): filer_committee_id_number="C00123456", treasurer_last_name="Validlastname", treasurer_first_name="Validfirstname", - date_signed="20220101", + date_signed="2022-01-01", committee_account_id=1000, ) diff --git a/django-backend/fecfiler/f3x_summaries/test_serializers.py b/django-backend/fecfiler/f3x_summaries/test_serializers.py index 440818b86..a8d812f22 100644 --- a/django-backend/fecfiler/f3x_summaries/test_serializers.py +++ b/django-backend/fecfiler/f3x_summaries/test_serializers.py @@ -13,13 +13,13 @@ def setUp(self): "filer_committee_id_number": "C00123456", "treasurer_last_name": "Validlastname", "treasurer_first_name": "Validfirstname", - "date_signed": "20220101", + "date_signed": "2022-01-01", } self.invalid_f3x_summary = { "form_type": "invalidformtype", "treasurer_last_name": "Validlastname", - "date_signed": "20220101", + "date_signed": "2022-01-01", } self.mock_request = Request(HttpRequest()) diff --git a/django-backend/fecfiler/validation/tests.py b/django-backend/fecfiler/validation/tests.py index 3482e0aef..60c2f4a62 100644 --- a/django-backend/fecfiler/validation/tests.py +++ b/django-backend/fecfiler/validation/tests.py @@ -18,7 +18,7 @@ def setUp(self): "filer_committee_id_number": "C00123456", "treasurer_last_name": "Validlastname", "treasurer_first_name": "Validfirstname", - "date_signed": "20220101", + "date_signed": "2022-01-01", } self.invalid_f3x_summary = { From e6e33370553c2a902244500f494c484fe33bc3d1 Mon Sep 17 00:00:00 2001 From: toddlees Date: Tue, 14 Jun 2022 18:10:28 -0400 Subject: [PATCH 5/9] convert dates to strings for validation candidate --- django-backend/fecfiler/validation/serializers.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/django-backend/fecfiler/validation/serializers.py b/django-backend/fecfiler/validation/serializers.py index 6f99df485..a39643c20 100644 --- a/django-backend/fecfiler/validation/serializers.py +++ b/django-backend/fecfiler/validation/serializers.py @@ -1,3 +1,4 @@ +from datetime import datetime, date from rest_framework import serializers from fecfile_validate import validate from rest_framework import exceptions @@ -50,7 +51,8 @@ def get_schema_name(self, data): def get_validation_candidate(self, data): """Returns a copy of data where foreign key fields are replaced with the - underlying foreign key field. + underlying foreign key field. Also dates and datetimes will be replaced + with iso8601 strings Example: the f3x table is related to the report code label table by the report code field. DRF gives us the whole @@ -66,6 +68,10 @@ def get_validation_candidate(self, data): validation_candidate.get(foreign_key_field, {}), actual_key ) + for key, value in validation_candidate.items(): + if isinstance(value, date): + validation_candidate[key] = value.isoformat() + return validation_candidate def get_foreign_key_fields(self): From c814ea622031607702e04dc03dff2454b00d9750 Mon Sep 17 00:00:00 2001 From: Matt Travers Date: Tue, 14 Jun 2022 18:31:11 -0400 Subject: [PATCH 6/9] Fixed linting error --- django-backend/fecfiler/validation/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django-backend/fecfiler/validation/serializers.py b/django-backend/fecfiler/validation/serializers.py index a39643c20..88827d386 100644 --- a/django-backend/fecfiler/validation/serializers.py +++ b/django-backend/fecfiler/validation/serializers.py @@ -1,4 +1,4 @@ -from datetime import datetime, date +from datetime import date from rest_framework import serializers from fecfile_validate import validate from rest_framework import exceptions From f91d14f9cd8e03e7de63d895bde617832a0c954c Mon Sep 17 00:00:00 2001 From: Matt Travers Date: Wed, 22 Jun 2022 16:47:52 -0400 Subject: [PATCH 7/9] Resolved merge conflict --- requirements.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/requirements.txt b/requirements.txt index be68aa7ce..f57adabf1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,15 @@ django-cors-headers==3.11.0 djangorestframework==3.13.1 djangorestframework-jwt==1.11.0 drf-spectacular==0.21.2 +<<<<<<< Updated upstream +<<<<<<< Updated upstream git+https://github.com/fecgov/fecfile-validate@fef97923a88fb325b5934883844c193ab7259efe#egg=fecfile_validate&subdirectory=fecfile_validate_python +======= +git+https://github.com/fecgov/fecfile-validate@9f2da0395ec3532b7d7d22568e799bd0bc1e461b#egg=fecfile_validate&subdirectory=fecfile_validate_python +>>>>>>> Stashed changes +======= +git+https://github.com/fecgov/fecfile-validate@9f2da0395ec3532b7d7d22568e799bd0bc1e461b#egg=fecfile_validate&subdirectory=fecfile_validate_python +>>>>>>> Stashed changes GitPython==3.1.27 gunicorn==19.10.0 Jinja2==2.11.3 From 7189dd33841a02f837ef29bf26ef95d1a9f20269 Mon Sep 17 00:00:00 2001 From: Matt Travers Date: Wed, 22 Jun 2022 16:48:42 -0400 Subject: [PATCH 8/9] Resolved merge conflict --- requirements.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index f57adabf1..916743175 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,15 +9,7 @@ django-cors-headers==3.11.0 djangorestframework==3.13.1 djangorestframework-jwt==1.11.0 drf-spectacular==0.21.2 -<<<<<<< Updated upstream -<<<<<<< Updated upstream -git+https://github.com/fecgov/fecfile-validate@fef97923a88fb325b5934883844c193ab7259efe#egg=fecfile_validate&subdirectory=fecfile_validate_python -======= git+https://github.com/fecgov/fecfile-validate@9f2da0395ec3532b7d7d22568e799bd0bc1e461b#egg=fecfile_validate&subdirectory=fecfile_validate_python ->>>>>>> Stashed changes -======= -git+https://github.com/fecgov/fecfile-validate@9f2da0395ec3532b7d7d22568e799bd0bc1e461b#egg=fecfile_validate&subdirectory=fecfile_validate_python ->>>>>>> Stashed changes GitPython==3.1.27 gunicorn==19.10.0 Jinja2==2.11.3 From c664056da72687d43e899ff1a44bddf1fecd4f45 Mon Sep 17 00:00:00 2001 From: Matt Travers Date: Thu, 23 Jun 2022 14:33:13 -0400 Subject: [PATCH 9/9] Updated requirements.txt to point to validate commit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 916743175..ec7bb9478 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ django-cors-headers==3.11.0 djangorestframework==3.13.1 djangorestframework-jwt==1.11.0 drf-spectacular==0.21.2 -git+https://github.com/fecgov/fecfile-validate@9f2da0395ec3532b7d7d22568e799bd0bc1e461b#egg=fecfile_validate&subdirectory=fecfile_validate_python +git+https://github.com/fecgov/fecfile-validate@1fa8c59b83e17b7fb51e8763549885315f9475f2#egg=fecfile_validate&subdirectory=fecfile_validate_python GitPython==3.1.27 gunicorn==19.10.0 Jinja2==2.11.3