Merge pull request #2580 from alphagov/set-bad-email-addresses-to-perm-fail

Set bad email addresses to permanent-failure
This commit is contained in:
Katie Smith
2019-08-12 13:24:27 +01:00
committed by Rebecca Law
7 changed files with 37 additions and 168 deletions

View File

@@ -352,7 +352,7 @@ class Organisation(db.Model):
services = db.relationship(
'Service',
secondary='organisation_to_service',
secondary='services',
uselist=True)
agreement_signed = db.Column(db.Boolean, nullable=True)
@@ -479,11 +479,8 @@ class Service(db.Model, Versioned):
go_live_user = db.relationship('User', foreign_keys=[go_live_user_id])
go_live_at = db.Column(db.DateTime, nullable=True)
organisation = db.relationship(
'Organisation',
secondary=organisation_to_service,
uselist=False,
single_parent=True)
organisation_id = db.Column(UUID(as_uuid=True), db.ForeignKey('organisation.id'), index=True, nullable=True)
organisation = db.relationship('Organisation', foreign_keys=[organisation_id])
email_branding = db.relationship(
'EmailBranding',