Fix auto generated ID fields in old mongo

mentoring/components/answer.py

@@ -223,7 +223,7 @@ class AnswerBlock(AnswerMixin, StepMixin, StudioEditableXBlockMixin, XBlock):
         """
         # Generate a random 'name' value
         if template_id == 'studio_default':
-            return {'metadata': {'name': uuid.uuid4().hex[:7]}, 'data': {}}
+            return {'data': {'name': uuid.uuid4().hex[:7]}}
         return {'metadata': {}, 'data': {}}
 
 

mentoring/components/choice.py

@@ -107,7 +107,7 @@ class ChoiceBlock(StudioEditableXBlockMixin, XBlock):
         # Generate a random 'value' value. We can't just use default=UNIQUE_ID on the field,
         # because that doesn't work properly with import/export, re-run, or duplicating the block
         if template_id == 'studio_default':
-            return {'metadata': {'value': uuid.uuid4().hex[:7]}, 'data': {}}
+            return {'data': {'value': uuid.uuid4().hex[:7]}}
         return {'metadata': {}, 'data': {}}
 
     @classmethod

mentoring/components/message.py

@@ -85,7 +85,7 @@ class MentoringMessageBlock(XBlock, StudioEditableXBlockMixin):
         """
         Used to interact with Studio's create_xblock method to instantiate pre-defined templates.
         """
-        return {'metadata': {'type': template_id, 'content': "Message goes here."}, 'data': {}}
+        return {'data': {'type': template_id, 'content': "Message goes here."}}
 
     @classmethod
     def parse_xml(cls, node, runtime, keys, id_generator):