Make it so that create_assessment returns the same (cached) data structures that…

Make it so that create_assessment returns the same (cached) data structures that get_assessment(s) returns.

apps/openassessment/assessment/peer_api.py

@@ -19,7 +19,7 @@ from openassessment.assessment.models import (
 )
 from openassessment.assessment.serializers import (
     AssessmentSerializer, AssessmentFeedbackSerializer, RubricSerializer,
-    rubric_from_dict, serialize_assessments
+    full_assessment_dict, rubric_from_dict, serialize_assessments,
 )
 from submissions import api as sub_api
 from submissions.api import get_submission_and_student
@@ -233,7 +233,7 @@ def create_assessment(
         # Close the active assessment
         _close_active_assessment(scorer_workflow, submission_uuid, assessment)
 
-        return peer_serializer.data
+        return full_assessment_dict(assessment)
     except DatabaseError:
         error_message = _(
             u"An error occurred while creating assessment {} for submission: "

apps/openassessment/assessment/self_api.py

@@ -9,7 +9,7 @@ from submissions.api import (
 )
 from openassessment.assessment.serializers import (
     AssessmentSerializer, InvalidRubric, RubricSerializer,
-    rubric_from_dict, serialize_assessments
+    full_assessment_dict, rubric_from_dict, serialize_assessments
 )
 from openassessment.assessment.models import (
     Assessment, AssessmentPart, InvalidOptionSelection
@@ -100,7 +100,7 @@ def create_assessment(submission_uuid, user_id, options_selected, rubric_dict, s
     ])
 
     # Return the serialized assessment
-    return serializer.data
+    return full_assessment_dict(assessment)
 
 
 def get_assessment(submission_uuid):

apps/openassessment/assessment/serializers.py

@@ -140,11 +140,7 @@ class AssessmentPartSerializer(serializers.ModelSerializer):
 
 
 class AssessmentSerializer(serializers.ModelSerializer):
-    """Serializer for :class:`Assessment`."""
-
-    # parts = AssessmentPartSerializer(many=True, read_only=True)
-    # points_earned = serializers.Field(source='points_earned')
-    # points_possible = serializers.Field(source='points_possible')
+    """Simplified serializer for :class:`Assessment` that's lighter on the DB."""
 
     class Meta:
         model = Assessment
@@ -155,13 +151,6 @@ class AssessmentSerializer(serializers.ModelSerializer):
             'scorer_id',
             'score_type',
             'feedback',
-
-            # Foreign Key
-            # 'parts',
-
-            # Computed, not part of the model
-            #'points_earned',
-            #'points_possible',
         )