New complaints model to persist complaints from SES.

If a someone gets an email from one of our services and then complain about it (mark as spam or otherwise), we get a callback from SES.
The service needs to know about these complaints so they can remove that email from their mailing list.
This commit is contained in:
Rebecca Law
2018-05-31 14:43:49 +01:00
parent 23e6b57c26
commit 1faba916b2
4 changed files with 52 additions and 0 deletions

View File

@@ -1814,3 +1814,16 @@ class FactNotificationStatus(db.Model):
notification_count = db.Column(db.Integer(), nullable=False)
created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)
class Complaint(db.Model):
__tablename__ = 'complaints'
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
notification_id = db.Column(UUID(as_uuid=True), db.ForeignKey('notification_history.id'),
index=True, nullable=False)
service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), unique=False, index=True, nullable=False)
service = db.relationship(Service, backref=db.backref('complaints'))
ses_feedback_id = db.Column(db.Text, nullable=True)
complaint_type = db.Column(db.Text, nullable=True)
complaint_date = db.Column(db.DateTime, nullable=True)
created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)

View File

@@ -35,6 +35,8 @@ def process_ses_response(ses_request):
if notification_type == 'Bounce':
notification_type = determine_notification_bounce_type(notification_type, ses_message)
elif notification_type == 'Complaint':
# Complaints are going to be stored in a table of it's own,
# this will no longer update the status of a notification as it does now.
remove_emails_from_complaint(ses_message)
current_app.logger.info("Complaint from SES: \n{}".format(ses_message))
return

View File

@@ -235,6 +235,7 @@ class ServiceSchema(BaseSchema):
'monthly_billing',
'reply_to_email_addresses',
'letter_contacts',
'complaints',
)
strict = True

View File

@@ -0,0 +1,36 @@
"""
Revision ID: 0196_complaints_table
Revises: 0195_ft_notification_timestamps
Create Date: 2018-05-31 14:31:36.649544
"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql
revision = '0196_complaints_table'
down_revision = '0195_ft_notification_timestamps'
def upgrade():
op.create_table('complaints',
sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('notification_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('service_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('ses_feedback_id', sa.Text(), nullable=True),
sa.Column('complaint_type', sa.Text(), nullable=True),
sa.Column('complaint_date', sa.DateTime(), nullable=True),
sa.Column('created_at', sa.DateTime(), nullable=False),
sa.ForeignKeyConstraint(['notification_id'], ['notification_history.id'], ),
sa.ForeignKeyConstraint(['service_id'], ['services.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_index(op.f('ix_complaints_notification_id'), 'complaints', ['notification_id'], unique=False)
op.create_index(op.f('ix_complaints_service_id'), 'complaints', ['service_id'], unique=False)
def downgrade():
op.drop_index(op.f('ix_complaints_service_id'), table_name='complaints')
op.drop_index(op.f('ix_complaints_notification_id'), table_name='complaints')
op.drop_table('complaints')