Merge pull request #1008 from edx/efischer/fix_columns

Expand course_id column

openassessment/assessment/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
+# pylint: skip-file
 from __future__ import unicode_literals
 
 from django.db import models, migrations

openassessment/assessment/migrations/0002_staffworkflow.py

 # -*- coding: utf-8 -*-
+# pylint: skip-file
 from __future__ import unicode_literals
 
 from django.db import migrations, models

openassessment/assessment/migrations/0003_expand_course_id.py

+# -*- coding: utf-8 -*-
+# pylint: skip-file
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assessment', '0002_staffworkflow'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='aiclassifierset',
+            name='course_id',
+            field=models.CharField(max_length=255, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='aigradingworkflow',
+            name='course_id',
+            field=models.CharField(max_length=255, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='aitrainingworkflow',
+            name='course_id',
+            field=models.CharField(max_length=255, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='peerworkflow',
+            name='course_id',
+            field=models.CharField(max_length=255, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='staffworkflow',
+            name='course_id',
+            field=models.CharField(max_length=255, db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='studenttrainingworkflow',
+            name='course_id',
+            field=models.CharField(max_length=255, db_index=True),
+        ),
+    ]

openassessment/assessment/models/ai.py

@@ -152,7 +152,7 @@ class AIClassifierSet(models.Model):
     # Though these items are duplicated in the database tables for the AITrainingWorkflow,
     # this is okay because it will drastically speed up the operation of assigning classifiers
     # to AIGradingWorkflows
-    course_id = models.CharField(max_length=40, db_index=True)
+    course_id = models.CharField(max_length=255, db_index=True)
     item_id = models.CharField(max_length=128, db_index=True)
 
     @classmethod
@@ -201,7 +201,7 @@ class AIClassifierSet(models.Model):
         # we can't assign them a score.
         all_criteria = set(classifiers_dict.keys())
         all_criteria |= set(
-            criterion.name for criterion in 
+            criterion.name for criterion in
             rubric_index.find_criteria_without_options()
         )
         missing_criteria = rubric_index.find_missing_criteria(all_criteria)
@@ -414,6 +414,7 @@ class AIClassifierSet(models.Model):
 # an AWS S3 bucket.
 AI_CLASSIFIER_STORAGE = "ora2_ai_classifiers"
 
+
 def upload_to_path(instance, filename):    # pylint:disable=W0613
     """
     Calculate the file path where classifiers should be uploaded.
@@ -505,7 +506,7 @@ class AIWorkflow(models.Model):
     # Though these items are duplicated in the database tables for the submissions app,
     # and every workflow has a reference to a submission entry, this is okay because
     # submissions are immutable.
-    course_id = models.CharField(max_length=40, db_index=True)
+    course_id = models.CharField(max_length=255, db_index=True)
     item_id = models.CharField(max_length=128, db_index=True)
 
     # Timestamps

openassessment/assessment/models/base.py

@@ -790,7 +790,6 @@ class AssessmentPart(models.Model):
             msg = u"Missing selections for criteria: {missing}".format(missing=missing_criteria)
             raise InvalidRubricSelection(msg)
 
-
     @classmethod
     def _check_all_criteria_assessed(cls, rubric_index, selected_criteria, criteria_feedback):
         """

openassessment/assessment/models/peer.py

@@ -109,7 +109,7 @@ class PeerWorkflow(models.Model):
 
     student_id = models.CharField(max_length=40, db_index=True)
     item_id = models.CharField(max_length=128, db_index=True)
-    course_id = models.CharField(max_length=40, db_index=True)
+    course_id = models.CharField(max_length=255, db_index=True)
     submission_uuid = models.CharField(max_length=128, db_index=True, unique=True)
     created_at = models.DateTimeField(default=now, db_index=True)
     completed_at = models.DateTimeField(null=True, db_index=True)
@@ -341,9 +341,10 @@ class PeerWorkflow(models.Model):
                 "and student_id<>%s "
                 "and pw.cancelled_at is NULL "
                 "and pw.id not in ( "
-                    "select pwi.author_id "
-                    "from assessment_peerworkflowitem pwi "
-                    "where pwi.scorer_id=%s); ",
+                "select pwi.author_id "
+                "from assessment_peerworkflowitem pwi "
+                "where pwi.scorer_id=%s"
+                "); ",
                 [self.course_id, self.item_id, self.student_id, self.id]
             ))
             workflow_count = len(query)
@@ -379,7 +380,9 @@ class PeerWorkflow(models.Model):
 
         """
         try:
-            item_query = self.graded.filter(submission_uuid=submission_uuid).order_by("-started_at", "-id") # pylint:disable=E1101
+            item_query = self.graded.filter(
+                submission_uuid=submission_uuid
+            ).order_by("-started_at", "-id")  # pylint:disable=E1101
             items = list(item_query[:1])
             if not items:
                 msg = (
@@ -391,8 +394,10 @@ class PeerWorkflow(models.Model):
             item.assessment = assessment
             item.save()
 
-            if (not item.author.grading_completed_at
-                    and item.author.graded_by.filter(assessment__isnull=False).count() >= num_required_grades):
+            if (
+                    not item.author.grading_completed_at and
+                    item.author.graded_by.filter(assessment__isnull=False).count() >= num_required_grades
+            ):
                 item.author.grading_completed_at = now()
                 item.author.save()
         except (DatabaseError, PeerWorkflowItem.DoesNotExist):

openassessment/assessment/models/staff.py

@@ -27,7 +27,7 @@ class StaffWorkflow(models.Model):
     TIME_LIMIT = timedelta(hours=8)
 
     scorer_id = models.CharField(max_length=40, db_index=True)
-    course_id = models.CharField(max_length=40, db_index=True)
+    course_id = models.CharField(max_length=255, db_index=True)
     item_id = models.CharField(max_length=128, db_index=True)
     submission_uuid = models.CharField(max_length=128, db_index=True, unique=True)
     created_at = models.DateTimeField(default=now, db_index=True)

openassessment/assessment/models/student_training.py

@@ -21,7 +21,7 @@ class StudentTrainingWorkflow(models.Model):
     # jeopardizing data integrity.
     student_id = models.CharField(max_length=40, db_index=True)
     item_id = models.CharField(max_length=128, db_index=True)
-    course_id = models.CharField(max_length=40, db_index=True)
+    course_id = models.CharField(max_length=255, db_index=True)
 
     class Meta:
         app_label = "assessment"

openassessment/workflow/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
+# pylint: skip-file
 from __future__ import unicode_literals
 
 from django.db import migrations, models