darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-11 09:27:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2045 from alphagov/email-branding-colors-and-domain

Browse Source 
New columns for EmailBranding.
This commit is contained in:
Rebecca Law
2018-08-17 12:56:32 +01:00
committed by GitHub
parent 60ecb7ddce 640a400165
commit 1658f4de71
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models.py
View File

@@ -203,9 +203,12 @@ class EmailBranding(db.Model):
__tablename__ = 'email_branding'
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
colour = db.Column(db.String(7), nullable=True)
banner_colour = db.Column(db.String(7), nullable=True)
single_id_colour = db.Column(db.String(7), nullable=True)
logo = db.Column(db.String(255), nullable=True)
name = db.Column(db.String(255), nullable=True)
text = db.Column(db.String(255), nullable=True)
domain = db.Column(db.Text, nullable=True)
def serialize(self):
serialized = {
@@ -214,6 +217,9 @@ class EmailBranding(db.Model):
"logo": self.logo,
"name": self.name,
"text": self.text,
"banner_colour": self.banner_colour,
"single_id_colour": self.single_id_colour,
"domain": self.domain
}
return serialized

24
migrations/versions/0213_brand_colour_domain_.py Normal file
View File

@@ -0,0 +1,24 @@
"""
Revision ID: 0213_brand_colour_domain
Revises: 0212_remove_caseworking
Create Date: 2018-08-16 16:29:41.374944
"""
from alembic import op
import sqlalchemy as sa
revision = '0213_brand_colour_domain'
down_revision = '0212_remove_caseworking'
def upgrade():
op.add_column('email_branding', sa.Column('banner_colour', sa.String(length=7), nullable=True))
op.add_column('email_branding', sa.Column('domain', sa.Text(), nullable=True))
op.add_column('email_branding', sa.Column('single_id_colour', sa.String(length=7), nullable=True))
def downgrade():
op.drop_column('email_branding', 'single_id_colour')
op.drop_column('email_branding', 'domain')
op.drop_column('email_branding', 'banner_colour')

3
tests/app/email_branding/test_rest.py
View File

@@ -32,7 +32,8 @@ def test_get_email_branding_by_id(admin_request, notify_db, notify_db_session):
email_branding_id=email_branding.id
)
assert set(response['email_branding'].keys()) == {'colour', 'logo', 'name', 'id', 'text'}
assert set(response['email_branding'].keys()) == {'colour', 'logo', 'name', 'id', 'text',
'banner_colour', 'single_id_colour', 'domain'}
assert response['email_branding']['colour'] == '#FFFFFF'
assert response['email_branding']['logo'] == '/path/image.png'
assert response['email_branding']['name'] == 'Some Org'