Merge pull request #157 from edx/ormsbee/integrity_err

Fix integrity error on submission under repeatable-read mode.

apps/openassessment/workflow/api.py

@@ -7,7 +7,7 @@ import logging
 
 from django.db import DatabaseError
 
-
+from openassessment.assessment import peer_api
 from submissions import api as sub_api
 from .models import AssessmentWorkflow
 from .serializers import AssessmentWorkflowSerializer
@@ -118,11 +118,12 @@ def create_workflow(submission_uuid):
     # we're getting from the outside is the submission_uuid, which is already
     # validated by this point.
     try:
+        peer_api.create_peer_workflow(submission_uuid)
         workflow = AssessmentWorkflow.objects.create(
             submission_uuid=submission_uuid,
             status=AssessmentWorkflow.STATUS.peer
         )
-    except DatabaseError as err:
+    except (DatabaseError, peer_api.PeerAssessmentError) as err:
         err_msg = u"Could not create assessment workflow: {}".format(err)
         logger.exception(err_msg)
         raise AssessmentWorkflowInternalError(err_msg)

apps/openassessment/workflow/models.py

@@ -122,7 +122,6 @@ class AssessmentWorkflow(TimeStampedModel, StatusModel):
         else:
             # Default starting status is peer
             new_status = self.STATUS.peer
-            peer_api.create_peer_workflow(self.submission_uuid)
 
         # If we're at least waiting, let's check if we have a peer score and
         # can move all the way to done