mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-21 16:01:15 -05:00
Add created_by_id to jobs table.
The user logged in will be the user marked as creating the job. The admin code already sends the created_by user when creating a job.
This commit is contained in:
@@ -247,6 +247,8 @@ class Job(db.Model):
|
||||
index=False,
|
||||
unique=False,
|
||||
nullable=True)
|
||||
created_by = db.relationship('User')
|
||||
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)
|
||||
|
||||
|
||||
VERIFY_CODE_TYPES = ['email', 'sms']
|
||||
|
||||
34
migrations/versions/0009_created_by_for_jobs.py
Normal file
34
migrations/versions/0009_created_by_for_jobs.py
Normal file
@@ -0,0 +1,34 @@
|
||||
"""empty message
|
||||
|
||||
Revision ID: 0009_created_by_for_jobs
|
||||
Revises: 0008_archive_template
|
||||
Create Date: 2016-04-26 14:54:56.852642
|
||||
|
||||
"""
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '0009_created_by_for_jobs'
|
||||
down_revision = '0008_archive_template'
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy.dialects import postgresql
|
||||
|
||||
def upgrade():
|
||||
### commands auto generated by Alembic - please adjust! ###
|
||||
op.add_column('jobs', sa.Column('created_by_id', postgresql.UUID(as_uuid=True), nullable=True))
|
||||
op.create_index(op.f('ix_jobs_created_by_id'), 'jobs', ['created_by_id'], unique=False)
|
||||
op.create_foreign_key(None, 'jobs', 'users', ['created_by_id'], ['id'])
|
||||
op.get_bind()
|
||||
op.execute('UPDATE jobs SET created_by_id = \
|
||||
(SELECT user_id FROM user_to_service WHERE jobs.service_id = user_to_service.service_id LIMIT 1)')
|
||||
op.alter_column('jobs', 'created_by_id', nullable=False)
|
||||
### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade():
|
||||
### commands auto generated by Alembic - please adjust! ###
|
||||
op.drop_constraint(None, 'jobs', type_='foreignkey')
|
||||
op.drop_index(op.f('ix_jobs_created_by_id'), table_name='jobs')
|
||||
op.drop_column('jobs', 'created_by_id')
|
||||
### end Alembic commands ###
|
||||
@@ -235,7 +235,8 @@ def sample_job(notify_db,
|
||||
'template_id': template.id,
|
||||
'original_file_name': 'some.csv',
|
||||
'notification_count': notification_count,
|
||||
'created_at': created_at
|
||||
'created_at': created_at,
|
||||
'created_by': service.created_by
|
||||
}
|
||||
job = Job(**data)
|
||||
dao_create_job(job)
|
||||
@@ -275,7 +276,8 @@ def sample_email_job(notify_db,
|
||||
'service': service,
|
||||
'template_id': template.id,
|
||||
'original_file_name': 'some.csv',
|
||||
'notification_count': 1
|
||||
'notification_count': 1,
|
||||
'created_by': service.created_by
|
||||
}
|
||||
job = Job(**data)
|
||||
dao_create_job(job)
|
||||
|
||||
@@ -20,7 +20,8 @@ def test_create_job(sample_template):
|
||||
'service_id': sample_template.service.id,
|
||||
'template_id': sample_template.id,
|
||||
'original_file_name': 'some.csv',
|
||||
'notification_count': 1
|
||||
'notification_count': 1,
|
||||
'created_by': sample_template.created_by
|
||||
}
|
||||
|
||||
job = Job(**data)
|
||||
|
||||
@@ -97,7 +97,8 @@ def test_create_job(notify_api, sample_template, mocker, fake_uuid):
|
||||
'service': str(sample_template.service.id),
|
||||
'template': str(sample_template.id),
|
||||
'original_file_name': 'thisisatest.csv',
|
||||
'notification_count': 1
|
||||
'notification_count': 1,
|
||||
'created_by': str(sample_template.created_by.id)
|
||||
}
|
||||
path = '/service/{}/job'.format(sample_template.service.id)
|
||||
auth_header = create_authorization_header(
|
||||
|
||||
Reference in New Issue
Block a user