darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-02 17:48:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Not null job_id and rebuilt the migration script to include this

Browse Source
This commit is contained in:
Martyn Inglis
2017-05-12 13:18:12 +01:00
parent 889c650724
commit 835dcc6273
3 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models.py
View File

@@ -1035,7 +1035,7 @@ class JobStatistics(db.Model):
__tablename__ = 'job_statistics' __tablename__ = 'job_statistics'
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
job_id = db.Column(UUID(as_uuid=True), db.ForeignKey('jobs.id'), index=True, unique=True) job_id = db.Column(UUID(as_uuid=True), db.ForeignKey('jobs.id'), index=True, unique=True, nullable=False)
job = db.relationship('Job', backref=db.backref('job_statistics', lazy='dynamic')) job = db.relationship('Job', backref=db.backref('job_statistics', lazy='dynamic'))
emails_sent = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0) emails_sent = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
emails_delivered = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0) emails_delivered = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)

7
migrations/versions/0083_add_job_stats.py
View File

@@ -1,8 +1,8 @@
"""empty message """empty message
Revision ID: 0083_add_job_stats Revision ID: 0083_add_job_stats
Revises: 0080_fix_rate_start_date Revises: 0082_add_go_live_template
Create Date: 2017-05-09 12:44:43.173269 Create Date: 2017-05-12 13:16:14.147368
""" """
@@ -17,7 +17,7 @@ from sqlalchemy.dialects import postgresql
def upgrade(): def upgrade():
op.create_table('job_statistics', op.create_table('job_statistics',
sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('job_id', postgresql.UUID(as_uuid=True), nullable=True), sa.Column('job_id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('emails_sent', sa.BigInteger(), nullable=False), sa.Column('emails_sent', sa.BigInteger(), nullable=False),
sa.Column('emails_delivered', sa.BigInteger(), nullable=False), sa.Column('emails_delivered', sa.BigInteger(), nullable=False),
sa.Column('emails_failed', sa.BigInteger(), nullable=False), sa.Column('emails_failed', sa.BigInteger(), nullable=False),
@@ -26,6 +26,7 @@ def upgrade():
sa.Column('sms_failed', sa.BigInteger(), nullable=False), sa.Column('sms_failed', sa.BigInteger(), nullable=False),
sa.Column('letters_sent', sa.BigInteger(), nullable=False), sa.Column('letters_sent', sa.BigInteger(), nullable=False),
sa.Column('letters_failed', sa.BigInteger(), nullable=False), sa.Column('letters_failed', sa.BigInteger(), nullable=False),
sa.Column('created_at', sa.DateTime(), nullable=True),
sa.Column('updated_at', sa.DateTime(), nullable=True), sa.Column('updated_at', sa.DateTime(), nullable=True),
sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ), sa.ForeignKeyConstraint(['job_id'], ['jobs.id'], ),
sa.PrimaryKeyConstraint('id') sa.PrimaryKeyConstraint('id')

22
migrations/versions/0084_add_created_to_job_stats.py
View File

@@ -1,22 +0,0 @@
"""empty message
Revision ID: 0084_add_created_to_job_stats
Revises: 0081_add_job_stats
Create Date: 2017-05-11 15:05:53.420946
"""
# revision identifiers, used by Alembic.
revision = '0084_add_created_to_job_stats'
down_revision = '0083_add_job_stats'
from alembic import op
import sqlalchemy as sa
def upgrade():
op.add_column('job_statistics', sa.Column('created_at', sa.DateTime(), nullable=True))
def downgrade():
op.drop_column('job_statistics', 'created_at')