feat: unify *_link columns with display name

openedx · Sep 9, 2024 · 7b85a6a · 7b85a6a
1 parent ce6ff25
commit 7b85a6a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 22 deletions.
diff --git a/models/problems/fact_problem_responses.sql b/models/problems/fact_problem_responses.sql
@@ -23,8 +23,8 @@ select
     blocks.course_run as course_run,
     responses.problem_id as problem_id,
     blocks.block_name as problem_name,
-    blocks.display_name_with_location as problem_name_with_location,
-    {{ a_tag("responses.object_id", "blocks.block_name") }} as problem_link,
+    {{ a_tag("responses.object_id", "blocks.display_name_with_location") }}
+    as problem_name_with_location,
     blocks.graded as graded,
     course_order as course_order,
     responses.actor_id as actor_id,
@@ -55,7 +55,6 @@ group by
     problem_id,
     problem_name,
     problem_name_with_location,
-    problem_link,
     actor_id,
     responses,
     success,

diff --git a/models/problems/int_problem_results.sql b/models/problems/int_problem_results.sql
@@ -31,9 +31,9 @@ select
     blocks.course_run as course_run,
     full_responses.problem_id as problem_id,
     blocks.block_name as problem_name,
-    blocks.display_name_with_location as problem_name_with_location,
+    {{ a_tag("full_responses.object_id", "blocks.display_name_with_location") }}
+    as problem_name_with_location,
     blocks.course_order as course_order,
-    {{ a_tag("full_responses.object_id", "blocks.block_name") }} as problem_link,
     full_responses.actor_id as actor_id,
     full_responses.responses as responses,
     full_responses.success as success,

diff --git a/models/problems/schema.yml b/models/problems/schema.yml
@@ -28,9 +28,6 @@ models:
       - name: problem_name_with_location
         data_type: String
         description: "The problem's display name with section, subsection, and unit prepended to the name. This provides additional context when looking at problem names and can help data consumers understand which problem they are analyzing"
-      - name: problem_link
-        data_type: String
-        description: "An anchor tag with a link to the problem"
       - name: graded
         data_type: Bool
         description: "Whether the block is graded"
@@ -129,9 +126,6 @@ models:
       - name: problem_name_with_location
         data_type: String
         description: "The problem's display name with section, subsection, and unit prepended to the name. This provides additional context when looking at problem names and can help data consumers understand which problem they are analyzing"
-      - name: problem_link
-        data_type: String
-        description: "An anchor tag with a link to the problem"
       - name: actor_id
         data_type: String
         description: "The xAPI actor identifier"

diff --git a/models/problems/section_problem_engagement.sql b/models/problems/section_problem_engagement.sql
@@ -32,8 +32,8 @@ with
             blocks.course_name as course_name,
             responses.problem_id as problem_id,
             blocks.block_name as problem_name,
-            blocks.display_name_with_location as problem_name_with_location,
-            {{ a_tag("responses.object_id", "blocks.block_name") }} as problem_link,
+            {{ a_tag("responses.object_id", "blocks.display_name_with_location") }}
+            as problem_name_with_location,
             blocks.graded as graded,
             course_order as course_order,
             responses.actor_id as actor_id,
@@ -60,7 +60,6 @@ with
             problem_id,
             problem_name,
             problem_name_with_location,
-            problem_link,
             actor_id,
             responses,
             success,

diff --git a/models/problems/subsection_problem_engagement.sql b/models/problems/subsection_problem_engagement.sql
@@ -32,8 +32,8 @@ with
             blocks.course_name as course_name,
             responses.problem_id as problem_id,
             blocks.block_name as problem_name,
-            blocks.display_name_with_location as problem_name_with_location,
-            {{ a_tag("responses.object_id", "blocks.block_name") }} as problem_link,
+            {{ a_tag("responses.object_id", "blocks.display_name_with_location") }}
+            as problem_name_with_location,
             blocks.graded as graded,
             course_order as course_order,
             responses.actor_id as actor_id,
@@ -60,7 +60,6 @@ with
             problem_id,
             problem_name,
             problem_name_with_location,
-            problem_link,
             actor_id,
             responses,
             success,

diff --git a/models/video/fact_video_plays.sql b/models/video/fact_video_plays.sql
@@ -24,8 +24,8 @@ select
     blocks.course_run as course_run,
     plays.video_id as video_id,
     blocks.block_name as video_name,
-    blocks.display_name_with_location as video_name_with_location,
-    {{ a_tag("plays.object_id", "blocks.block_name") }} as video_link,
+    {{ a_tag("plays.object_id", "blocks.display_name_with_location") }}
+    as video_name_with_location,
     blocks.graded as graded,
     plays.video_position as video_position,
     plays.video_duration as video_duration,

diff --git a/models/video/schema.yml b/models/video/schema.yml
@@ -28,9 +28,6 @@ models:
       - name: video_name_with_location
         data_type: String
         description: "The name of the video with the section and subsection"
-      - name: video_link
-        data_type: String
-        description: "An anchor tag with a link to the video"
       - name: graded
         data_type: Boolean
         description: "Whether the block is graded"