Commit 2de84b51 by Zia Fazal Committed by Jonathan Piacenti

added document_filename field to submissions model

Removed course module migration
parent 17dd85f6
...@@ -7,17 +7,7 @@ from django.db import models ...@@ -7,17 +7,7 @@ from django.db import models
class Migration(SchemaMigration): class Migration(SchemaMigration):
def forwards(self, orm): def forwards(self, orm):
# Adding model 'CourseModuleCompletion'
db.create_table('api_manager_coursemodulecompletion', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('created', self.gf('model_utils.fields.AutoCreatedField')(default=datetime.datetime.now)),
('modified', self.gf('model_utils.fields.AutoLastModifiedField')(default=datetime.datetime.now)),
('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='course_completions', to=orm['auth.User'])),
('course_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
('content_id', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
))
db.send_create_signal('api_manager', ['CourseModuleCompletion'])
# Adding M2M table for field groups on 'Organization' # Adding M2M table for field groups on 'Organization'
db.create_table('api_manager_organization_groups', ( db.create_table('api_manager_organization_groups', (
...@@ -29,9 +19,7 @@ class Migration(SchemaMigration): ...@@ -29,9 +19,7 @@ class Migration(SchemaMigration):
def backwards(self, orm): def backwards(self, orm):
# Deleting model 'CourseModuleCompletion'
db.delete_table('api_manager_coursemodulecompletion')
# Removing M2M table for field groups on 'Organization' # Removing M2M table for field groups on 'Organization'
db.delete_table('api_manager_organization_groups') db.delete_table('api_manager_organization_groups')
......
...@@ -58,6 +58,7 @@ class WorkgroupSubmission(TimeStampedModel): ...@@ -58,6 +58,7 @@ class WorkgroupSubmission(TimeStampedModel):
document_id = models.CharField(max_length=255) document_id = models.CharField(max_length=255)
document_url = models.CharField(max_length=255) document_url = models.CharField(max_length=255)
document_mime_type = models.CharField(max_length=255) document_mime_type = models.CharField(max_length=255)
document_filename = models.CharField(max_length=255, blank=True, null=True)
class WorkgroupSubmissionReview(TimeStampedModel): class WorkgroupSubmissionReview(TimeStampedModel):
......
...@@ -68,7 +68,8 @@ class WorkgroupSubmissionSerializer(serializers.HyperlinkedModelSerializer): ...@@ -68,7 +68,8 @@ class WorkgroupSubmissionSerializer(serializers.HyperlinkedModelSerializer):
""" Meta class for defining additional serializer characteristics """ """ Meta class for defining additional serializer characteristics """
model = WorkgroupSubmission model = WorkgroupSubmission
fields = ( fields = (
'id', 'url', 'created', 'modified', 'document_id', 'document_url', 'document_mime_type', 'id', 'url', 'created', 'modified', 'document_id', 'document_url',
'document_mime_type', 'document_filename',
'user', 'workgroup', 'reviews' 'user', 'workgroup', 'reviews'
) )
......
...@@ -47,6 +47,7 @@ class SubmissionsApiTests(TestCase): ...@@ -47,6 +47,7 @@ class SubmissionsApiTests(TestCase):
self.test_document_id = "Document12345.pdf" self.test_document_id = "Document12345.pdf"
self.test_document_url = "http://test-s3.amazonaws.com/bucketname" self.test_document_url = "http://test-s3.amazonaws.com/bucketname"
self.test_document_mime_type = "application/pdf" self.test_document_mime_type = "application/pdf"
self.test_document_filename = "Test PDF Document"
self.test_user = User.objects.create( self.test_user = User.objects.create(
email="test@edx.org", email="test@edx.org",
...@@ -133,6 +134,7 @@ class SubmissionsApiTests(TestCase): ...@@ -133,6 +134,7 @@ class SubmissionsApiTests(TestCase):
'document_id': self.test_document_id, 'document_id': self.test_document_id,
'document_url': self.test_document_url, 'document_url': self.test_document_url,
'document_mime_type': self.test_document_mime_type, 'document_mime_type': self.test_document_mime_type,
'document_filename': self.test_document_filename,
} }
response = self.do_post(self.test_submissions_uri, submission_data) response = self.do_post(self.test_submissions_uri, submission_data)
self.assertEqual(response.status_code, 400) self.assertEqual(response.status_code, 400)
...@@ -143,6 +145,7 @@ class SubmissionsApiTests(TestCase): ...@@ -143,6 +145,7 @@ class SubmissionsApiTests(TestCase):
'document_id': self.test_document_id, 'document_id': self.test_document_id,
'document_url': self.test_document_url, 'document_url': self.test_document_url,
'document_mime_type': self.test_document_mime_type, 'document_mime_type': self.test_document_mime_type,
'document_filename': self.test_document_filename,
} }
response = self.do_post(self.test_submissions_uri, submission_data) response = self.do_post(self.test_submissions_uri, submission_data)
self.assertEqual(response.status_code, 400) self.assertEqual(response.status_code, 400)
...@@ -154,6 +157,7 @@ class SubmissionsApiTests(TestCase): ...@@ -154,6 +157,7 @@ class SubmissionsApiTests(TestCase):
'document_id': self.test_document_id, 'document_id': self.test_document_id,
'document_url': self.test_document_url, 'document_url': self.test_document_url,
'document_mime_type': self.test_document_mime_type, 'document_mime_type': self.test_document_mime_type,
'document_filename': self.test_document_filename,
} }
response = self.do_post(self.test_submissions_uri, submission_data) response = self.do_post(self.test_submissions_uri, submission_data)
self.assertEqual(response.status_code, 201) self.assertEqual(response.status_code, 201)
...@@ -172,6 +176,7 @@ class SubmissionsApiTests(TestCase): ...@@ -172,6 +176,7 @@ class SubmissionsApiTests(TestCase):
self.assertEqual(response.data['document_id'], self.test_document_id) self.assertEqual(response.data['document_id'], self.test_document_id)
self.assertEqual(response.data['document_url'], self.test_document_url) self.assertEqual(response.data['document_url'], self.test_document_url)
self.assertEqual(response.data['document_mime_type'], self.test_document_mime_type) self.assertEqual(response.data['document_mime_type'], self.test_document_mime_type)
self.assertEqual(response.data['document_filename'], self.test_document_filename)
self.assertIsNotNone(response.data['reviews']) self.assertIsNotNone(response.data['reviews'])
self.assertIsNotNone(response.data['created']) self.assertIsNotNone(response.data['created'])
self.assertIsNotNone(response.data['modified']) self.assertIsNotNone(response.data['modified'])
...@@ -188,6 +193,7 @@ class SubmissionsApiTests(TestCase): ...@@ -188,6 +193,7 @@ class SubmissionsApiTests(TestCase):
'document_id': self.test_document_id, 'document_id': self.test_document_id,
'document_url': self.test_document_url, 'document_url': self.test_document_url,
'document_mime_type': self.test_document_mime_type, 'document_mime_type': self.test_document_mime_type,
'document_filename': self.test_document_filename,
} }
response = self.do_post(self.test_submissions_uri, submission_data) response = self.do_post(self.test_submissions_uri, submission_data)
self.assertEqual(response.status_code, 201) self.assertEqual(response.status_code, 201)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment