Merge pull request #15 from dragonfi/reintroduce-user-id

Use scope_ids.user_id instead of runtime.user_id

drag_and_drop_v2/drag_and_drop_v2.py

@@ -194,7 +194,8 @@ class DragAndDropBlock(XBlock):
                     pass
 
         self.runtime.publish(self, 'xblock.drag-and-drop-v2.item.dropped', {
-            'user_id': self.runtime.user_id,
+            'user_id': self.scope_ids.user_id,
+            'component_id': self._get_unique_id(),
             'item_id': item['id'],
             'location': attempt['zone'],
             'is_correct': is_correct,
@@ -224,11 +225,20 @@ class DragAndDropBlock(XBlock):
         except KeyError as e:
             return {'result': 'error', 'message': 'Missing event_type in JSON data'}
 
-        data['user_id'] = self.runtime.user_id
+        data['user_id'] = self.scope_ids.user_id
+        data['component_id'] = self._get_unique_id()
 
         self.runtime.publish(self, event_type, data)
         return {'result':'success'}
 
+    def _get_unique_id(self):
+        try:
+            unique_id = self.location.name
+        except AttributeError:
+            # workaround for xblock workbench
+            unique_id = self.parent.replace('.',  '-')
+        return unique_id
+
     @staticmethod
     def workbench_scenarios():
         """A canned scenario for display in the workbench."""