Merge pull request #27 from SoryRawyer/rds/add-graded-to-xblock-json

feat: add graded boolean to xblock json (FC-0033)

event_sink_clickhouse/__init__.py

@@ -2,4 +2,4 @@
 A sink for Open edX events to send them to ClickHouse.
 """
 
-__version__ = '0.1.1'
+__version__ = '0.1.2'

event_sink_clickhouse/sinks/course_published.py

@@ -106,6 +106,7 @@ def serialize_xblock(item, index, detached_xblock_types, dump_id, dump_timestamp
             'run': course_key.run,
             'block_type': block_type,
             'detached': 1 if block_type in detached_xblock_types else 0,
+            'graded': 1 if getattr(item, 'graded', False) else 0,
         }
 
         # Core table data, if things change here it's a big deal.

test_utils/helpers.py

@@ -52,7 +52,7 @@ class FakeXBlock:
     """
     Fakes the parameters of an XBlock that we care about.
     """
-    def __init__(self, identifier, detached_block=False):
+    def __init__(self, identifier, detached_block=False, graded=False):
         self.block_type = "course_info" if detached_block else "vertical"
         self.scope_ids = Mock()
         self.scope_ids.usage_id.course_key = course_key_factory()
@@ -61,6 +61,7 @@ def __init__(self, identifier, detached_block=False):
         self.display_name_with_default = f"Display name {identifier}"
         self.edited_on = datetime.now()
         self.children = []
+        self.graded = graded
 
     def get_children(self):
         """
@@ -188,6 +189,10 @@ def course_factory():
     for i in range(3):
         course.append(FakeXBlock(f"Detached {i}", detached_block=True))
 
+    # Create some graded blocks at the top level
+    for i in range(3):
+        course.append(FakeXBlock(f"Graded {i}", graded=True))
+
     return course
 
 

tests/test_course_published.py

@@ -1,7 +1,9 @@
 """
 Tests for the course_published sinks.
 """
+import json
 import logging
+import uuid
 from datetime import datetime
 from unittest.mock import patch
 
@@ -206,3 +208,18 @@ def test_get_last_dump_time():
     last_published_date = sink.get_course_last_dump_time(course_key)
     dt = datetime.strptime(last_published_date, "%Y-%m-%d %H:%M:%S.%f+00:00")
     assert dt
+
+
+def test_xblock_json_seralization():
+    course = course_factory()
+
+    for index, item in enumerate(course):
+        block = CoursePublishedSink.serialize_xblock(
+            item,
+            index,
+            mock_detached_xblock_types(),
+            str(uuid.uuid4()),
+            str(datetime.now()),
+        )
+        block_json = json.loads(block['xblock_data_json'])
+        assert bool(int(block_json['graded'])) == item.graded