Merge pull request #12 from alphagov/add-job-fields

Add convenience fields to job to make processing

app/models.py

@@ -105,6 +105,8 @@ class Job(db.Model):
 
     id = db.Column(UUID(as_uuid=True), primary_key=True)
     original_file_name = db.Column(db.String, nullable=False)
+    bucket_name = db.Column(db.String, nullable=False)
+    file_name = db.Column(db.String, nullable=False)
     service_id = db.Column(db.BigInteger, db.ForeignKey('services.id'), index=True, unique=False)
     service = db.relationship('Service', backref=db.backref('jobs', lazy='dynamic'))
     template_id = db.Column(db.BigInteger, db.ForeignKey('templates.id'), index=True, unique=False)

migrations/versions/0005_add_job_details.py

@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 0005_add_job_details
+Revises: 0004_create_jobs
+Create Date: 2016-01-15 15:57:38.022562
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0005_add_job_details'
+down_revision = '0004_create_jobs'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('jobs', sa.Column('bucket_name', sa.String(), nullable=False))
+    op.add_column('jobs', sa.Column('file_name', sa.String(), nullable=False))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('jobs', 'file_name')
+    op.drop_column('jobs', 'bucket_name')
+    ### end Alembic commands ###

tests/app/conftest.py

@@ -78,10 +78,15 @@ def sample_job(notify_db,
     if template is None:
         template = sample_template(notify_db, notify_db_session,
                                    service=service)
+    job_id = uuid.uuid4()
+    bucket_name = 'service-{}-notify'.format(service.id)
+    file_name = '{}.csv'.format(job_id)
     data = {
         'id': uuid.uuid4(),
         'service_id': service.id,
         'template_id': template.id,
+        'bucket_name': bucket_name,
+        'file_name': file_name,
         'original_file_name': 'some.csv'
     }
     job = Job(**data)

tests/app/dao/test_jobs_dao.py

@@ -13,11 +13,16 @@ from app.models import Job
 def test_save_job(notify_db, notify_db_session, sample_template):
 
     assert Job.query.count() == 0
+
     job_id = uuid.uuid4()
+    bucket_name = 'service-{}-notify'.format(sample_template.service.id)
+    file_name = '{}.csv'.format(job_id)
     data = {
         'id': job_id,
-        'service_id': sample_template.service_id,
+        'service_id': sample_template.service.id,
         'template_id': sample_template.id,
+        'bucket_name': bucket_name,
+        'file_name': file_name,
         'original_file_name': 'some.csv'
     }
 
@@ -29,21 +34,9 @@ def test_save_job(notify_db, notify_db_session, sample_template):
     assert job == job_from_db
 
 
-def test_get_job_by_id(notify_db, notify_db_session, sample_template):
-    assert Job.query.count() == 0
-    job_id = uuid.uuid4()
-    data = {
-        'id': job_id,
-        'service_id': sample_template.service_id,
-        'template_id': sample_template.id,
-        'original_file_name': 'some.csv'
-    }
-    job = Job(**data)
-    save_job(job)
-
-    job_from_db = get_job_by_id(job_id)
-
-    assert job == job_from_db
+def test_get_job_by_id(notify_db, notify_db_session, sample_job):
+    job_from_db = get_job_by_id(sample_job.id)
+    assert sample_job == job_from_db
 
 
 def test_get_jobs_for_service(notify_db, notify_db_session, sample_job):

tests/app/job/test_job_rest.py

@@ -69,11 +69,15 @@ def test_post_job(notify_api, notify_db, notify_db_session, sample_template):
     template_id = sample_template.id
     service_id = sample_template.service.id
     original_file_name = 'thisisatest.csv'
+    bucket_name = 'service-{}-notify'.format(service_id)
+    file_name = '{}.csv'.format(job_id)
     data = {
         'id': str(job_id),
         'service': service_id,
         'template': template_id,
-        'original_file_name': original_file_name
+        'original_file_name': original_file_name,
+        'bucket_name': bucket_name,
+        'file_name': file_name,
     }
     with notify_api.test_request_context():
         with notify_api.test_client() as client: