feat: add support for CCX courses

macros/get_problem_id.sql

@@ -3,5 +3,5 @@
 -- either the problem id is at the end of the object ID
 -- or is followed by '/answer' or '/hint'
 {% macro get_problem_id(object_id) %}
-   regexpExtract(object_id, 'xblock/([\w\d-\+:]*@problem\+block@[\w\d][^_]*)(_\d_\d)?', 1)
+   regexpExtract(object_id, 'xblock/([\w\d-\+:@]*@problem\+block@[\w\d][^_]*)(_\d_\d)?', 1)
 {% endmacro %}

models/base/xapi_events_all_parsed.sql

@@ -37,7 +37,7 @@ SELECT
         -- Otherwise use the object id
         JSON_VALUE(event::String, '$.object.id')
     ) as course_id,
-    coalesce(get_org_from_course_url(course_id), '') as org,
+    coalesce(get_org_from_course_url(course_id), get_org_from_ccx_course_url(course_id), '') as org,
     emission_time as emission_time,
     event::String as event
 FROM {{ source('xapi', 'xapi_events_all') }}

tests/get_problem_id.sql

@@ -0,0 +1,6 @@
+select
+    'http://local.edly.io:8000/xblock/block-v1:edunext+demo+demo+ccx+type@problem+block@3c1646f7133a4c5fb4557d649e22c251' as object_id
+from
+    system.one
+where
+    {{ get_problem_id('object_id') }} != 'block-v1:edunext+demo+demo+ccx+type@problem+block@3c1646f7133a4c5fb4557d649e22c251'

tests/get_problem_id_with_ccx.sql

@@ -0,0 +1,6 @@
+select
+    'http://local.edly.io:8000/xblock/ccx-block-v1:edunext+demo+demo+ccx@1+type@problem+block@3c1646f7133a4c5fb4557d649e22c251' as object_id
+from
+    system.one
+where
+    {{ get_problem_id('object_id') }} != 'ccx-block-v1:edunext+demo+demo+ccx@1+type@problem+block@3c1646f7133a4c5fb4557d649e22c251'