darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-23 07:46:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename billing contact email and name fields to plural

Browse Source 
So:

'billing_contact_email_address' becomes 'billing_contact_email_addresses'
AND
'billing_contact_name' becomes 'billing_contact_names'

This is to signify that each of those fields can contain numerous
items
This commit is contained in:
Pea Tyczynska
2021-01-25 17:53:22 +00:00
parent ffac16a2a0
commit b3abdfb401
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models.py
View File

@@ -489,8 +489,8 @@ class Service(db.Model, Versioned):
notes = db.Column(db.Text, nullable=True) notes = db.Column(db.Text, nullable=True)
purchase_order_number = db.Column(db.String(255), nullable=True) purchase_order_number = db.Column(db.String(255), nullable=True)
billing_contact_name = db.Column(db.Text, nullable=True) billing_contact_names = db.Column(db.Text, nullable=True)
billing_contact_email_address = db.Column(db.Text, nullable=True) billing_contact_email_addresses = db.Column(db.Text, nullable=True)
billing_reference = db.Column(db.String(255), nullable=True) billing_reference = db.Column(db.String(255), nullable=True)
email_branding = db.relationship( email_branding = db.relationship(

16
migrations/versions/0339_service_billing_details.py
View File

@@ -15,12 +15,12 @@ down_revision = '0338_add_notes_to_service'
def upgrade(): def upgrade():
# ### commands auto generated by Alembic - please adjust! ### # ### commands auto generated by Alembic - please adjust! ###
op.add_column('services', sa.Column('billing_contact_email_address', sa.Text(), nullable=True)) op.add_column('services', sa.Column('billing_contact_email_addresses', sa.Text(), nullable=True))
op.add_column('services', sa.Column('billing_contact_name', sa.Text(), nullable=True)) op.add_column('services', sa.Column('billing_contact_names', sa.Text(), nullable=True))
op.add_column('services', sa.Column('billing_reference', sa.String(length=255), nullable=True)) op.add_column('services', sa.Column('billing_reference', sa.String(length=255), nullable=True))
op.add_column('services', sa.Column('purchase_order_number', sa.String(length=255), nullable=True)) op.add_column('services', sa.Column('purchase_order_number', sa.String(length=255), nullable=True))
op.add_column('services_history', sa.Column('billing_contact_email_address', sa.Text(), nullable=True)) op.add_column('services_history', sa.Column('billing_contact_email_addresses', sa.Text(), nullable=True))
op.add_column('services_history', sa.Column('billing_contact_name', sa.Text(), nullable=True)) op.add_column('services_history', sa.Column('billing_contact_names', sa.Text(), nullable=True))
op.add_column('services_history', sa.Column('billing_reference', sa.String(length=255), nullable=True)) op.add_column('services_history', sa.Column('billing_reference', sa.String(length=255), nullable=True))
op.add_column('services_history', sa.Column('purchase_order_number', sa.String(length=255), nullable=True)) op.add_column('services_history', sa.Column('purchase_order_number', sa.String(length=255), nullable=True))
# ### end Alembic commands ### # ### end Alembic commands ###
@@ -30,10 +30,10 @@ def downgrade():
# ### commands auto generated by Alembic - please adjust! ### # ### commands auto generated by Alembic - please adjust! ###
op.drop_column('services_history', 'purchase_order_number') op.drop_column('services_history', 'purchase_order_number')
op.drop_column('services_history', 'billing_reference') op.drop_column('services_history', 'billing_reference')
op.drop_column('services_history', 'billing_contact_name') op.drop_column('services_history', 'billing_contact_names')
op.drop_column('services_history', 'billing_contact_email_address') op.drop_column('services_history', 'billing_contact_email_addresses')
op.drop_column('services', 'purchase_order_number') op.drop_column('services', 'purchase_order_number')
op.drop_column('services', 'billing_reference') op.drop_column('services', 'billing_reference')
op.drop_column('services', 'billing_contact_name') op.drop_column('services', 'billing_contact_names')
op.drop_column('services', 'billing_contact_email_address') op.drop_column('services', 'billing_contact_email_addresses')
# ### end Alembic commands ### # ### end Alembic commands ###

4
tests/app/service/test_rest.py
View File

@@ -248,8 +248,8 @@ def test_get_service_by_id(admin_request, sample_service):
assert set(json_resp['data'].keys()) == { assert set(json_resp['data'].keys()) == {
'active', 'active',
'allowed_broadcast_provider', 'allowed_broadcast_provider',
'billing_contact_email_address', 'billing_contact_email_addresses',
'billing_contact_name', 'billing_contact_names',
'billing_reference', 'billing_reference',
'consent_to_research', 'consent_to_research',
'contact_link', 'contact_link',