From 2f762f56937fae9f0d59caa334f11bfca238c07a Mon Sep 17 00:00:00 2001 From: pkfec Date: Tue, 14 May 2024 16:57:02 -0400 Subject: [PATCH] Update receipt type and disbursement type desc --- webservices/args.py | 4 ++-- webservices/common/models/national_party.py | 2 +- webservices/docs.py | 4 ++-- webservices/resources/national_party.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/webservices/args.py b/webservices/args.py index 779bdd05b2..5e473a85c6 100644 --- a/webservices/args.py +++ b/webservices/args.py @@ -1419,11 +1419,11 @@ def make_seek_args(field=fields.Int, description=None): 'recipient_name': fields.List(Keyword, description=docs.RECIPIENT_NAME), 'recipient_state': fields.List(IStr, description=docs.RECIPIENT_STATE), 'recipient_zip': fields.List(IStr, description=docs.RECIPIENT_ZIP), - 'spender_committee_designation': fields.List( + 'recipient_committee_designation': fields.List( IStr(validate=validate.OneOf(['', 'A', 'J', 'P', 'U', 'B', 'D'])), description=docs.DESIGNATION, ), - 'spender_committee_type': fields.List( + 'recipient_committee_type': fields.List( IStr(validate=validate.OneOf([ '', 'C', 'D', 'E', 'H', 'I', 'N', 'O', 'P', 'Q', 'S', 'U', 'V', 'W', 'X', 'Y', 'Z'])), diff --git a/webservices/common/models/national_party.py b/webservices/common/models/national_party.py index 2749b5543e..fe5969ec0a 100644 --- a/webservices/common/models/national_party.py +++ b/webservices/common/models/national_party.py @@ -38,7 +38,7 @@ class NationalParty_ScheduleA(db.Model): committee_id = db.Column('cmte_id', db.String(9), doc=docs.COMMITTEE_ID) committee_name = db.Column('cmte_nm', db.String, doc=docs.COMMITTEE_NAME) recipient_committee_type = db.Column('cmte_tp', db.String, doc=docs.COMMITTEE_TYPE) - committee_type_full = db.Column(db.String) + recipient_committee_type_full = db.Column('committee_type_full', db.String) contributor_aggregate_ytd = db.Column('contb_aggregate_ytd', db.Numeric(14, 2)) contribution_receipt_amount = db.Column('contb_receipt_amt', db.Numeric(14, 2)) contribution_receipt_date = db.Column('contb_receipt_dt', db.Date) diff --git a/webservices/docs.py b/webservices/docs.py index 6e4d986cad..dd0bc7b330 100644 --- a/webservices/docs.py +++ b/webservices/docs.py @@ -2458,7 +2458,7 @@ def add_ytd(var): national party headquarters buildings, and election recounts and contests and other legal proceedings accounts ''' -RECEIPT_TYPE_CODES = 'National party account transaction codes for receipts:\n\ +RECEIPT_TYPE_CODES = 'National party account receipt types:\n\ -30 CONVENTION ACCOUNT RECEIPT - INDIVIDUAL\n\ -30E EARMARKED – CONVENTION\n\ -30F MEMO RECEIPT FROM REGISTERED FILER - JF CONVENTION ACCOUNT\n\ @@ -2501,7 +2501,7 @@ def add_ytd(var): Filter by contributions of any amount received by committees ''' -DISBURSEMENT_TYPE_CODES = 'National party account transaction codes for disbursements:\n\ +DISBURSEMENT_TYPE_CODES = 'National party account disbursement types:\n\ -40 CONVENTION ACCOUNT DISBURSEMENT\n\ -40T CONVENTION ACCOUNT REFUND - TRIBAL\n\ -40Y CONVENTION ACCOUNT REFUND - INDIVIDUAL\n\ diff --git a/webservices/resources/national_party.py b/webservices/resources/national_party.py index cf01597844..625ba72f52 100644 --- a/webservices/resources/national_party.py +++ b/webservices/resources/national_party.py @@ -131,8 +131,8 @@ class NationalParty_ScheduleBView(ApiResource): ('recipient_committee_id', models.NationalParty_ScheduleB.recipient_committee_id), ('disbursement_purpose_category', models.NationalParty_ScheduleB.disbursement_purpose_category), - ('spender_committee_type', models.NationalParty_ScheduleB.spender_committee_type), - ('spender_committee_designation', models.NationalParty_ScheduleB.spender_committee_designation), + ('recipient_committee_type', models.NationalParty_ScheduleB.recipient_committee_type), + ('recipient_committee_designation', models.NationalParty_ScheduleB.recipient_committee_designation), ('two_year_transaction_period', models.NationalParty_ScheduleB.two_year_transaction_period), ('party_account_type', models.NationalParty_ScheduleB.party_account),