Merge branch 'Release-snowplow-media-player/0.9.1' into fix_duplicate…

…s_media_ads
snowplow · Oct 22, 2024 · e9d013b · e9d013b
2 parents 28228e0 + da0665c
commit e9d013b
Show file tree

Hide file tree

Showing 10 changed files with 293 additions and 277 deletions.
diff --git a/integration_tests/data/expected/snowplow_media_player_base_expected.csv b/integration_tests/data/expected/snowplow_media_player_base_expected.csv
diff --git a/integration_tests/data/expected/snowplow_media_player_media_ad_views_expected.csv b/integration_tests/data/expected/snowplow_media_player_media_ad_views_expected.csv
diff --git a/models/base/scratch/base_scratch.yml b/models/base/scratch/base_scratch.yml
@@ -42,6 +42,8 @@ models:
         description: '{{ doc("col_original_session_identifier") }}'
       - name: session_identifier
         description: '{{ doc("col_session_identifier") }}'
+      - name: app_id
+        description: '{{doc("col_app_id")}}'
       - name: user_identifier
         description: '{{ doc("col_user_identifier") }}'
       - name: media_identifier

diff --git a/models/media_ad_views/media_ad_views.yml b/models/media_ad_views/media_ad_views.yml
@@ -28,6 +28,8 @@ models:
         description: '{{ doc("col_user_id")}}'
       - name: session_identifier
         description: '{{ doc("col_session_identifier")}}'
+      - name: app_id
+        description: '{{doc("col_app_id")}}'
       - name: play_id
         description: '{{ doc("col_play_id")}}'
       - name: ad_break_id

diff --git a/models/media_ad_views/scratch/base_scratch.yml b/models/media_ad_views/scratch/base_scratch.yml
@@ -27,6 +27,8 @@ models:
         description: '{{ doc("col_user_id")}}'
       - name: session_identifier
         description: '{{ doc("col_session_identifier")}}'
+      - name: app_id
+        description: '{{doc("col_app_id")}}'
       - name: domain_sessionid_array
         description: '{{ doc("col_domain_sessionid_array") }}'
       - name: play_id

diff --git a/models/media_ad_views/scratch/snowplow_media_player_media_ad_views_this_run.sql b/models/media_ad_views/scratch/snowplow_media_player_media_ad_views_this_run.sql
@@ -39,6 +39,7 @@ events_this_run as (
     ,ev.media_identifier
     ,ev.user_identifier
     ,ev.session_identifier
+    ,ev.app_id 
     ,ev.play_id
     ,ev.media_ad_break__break_id as ad_break_id
     ,ev.media_ad__ad_id as ad_id
@@ -80,8 +81,8 @@ events_this_run as (
     ,{{ snowplow_utils.get_string_agg('original_session_identifier', 'ev', is_distinct=True) }} as domain_sessionid_array
 
   from events_this_run as ev
+  {{ dbt_utils.group_by(n=9+(var('snowplow__ad_views_passthroughs', [])|length)) }}
 
-  {{ dbt_utils.group_by(n=8+(var('snowplow__ad_views_passthroughs', [])|length)) }}
 
 )
 
@@ -93,6 +94,7 @@ select
   ,p.media_label
   ,p.user_identifier
   ,p.session_identifier
+  ,p.app_id
   ,p.domain_sessionid_array
   ,p.user_id
   ,p.play_id

diff --git a/models/media_base/media_base.yml b/models/media_base/media_base.yml
@@ -24,6 +24,8 @@ models:
         description: '{{ doc("col_media_label") }}'
       - name: session_identifier
         description: '{{ doc("col_session_identifier") }}'
+      - name: app_id
+        description: '{{doc("col_app_id")}}'
       - name: domain_sessionid_array
         description: '{{ doc("col_domain_sessionid_array") }}'
       - name: user_identifier

diff --git a/models/media_base/scratch/base_scratch.yml b/models/media_base/scratch/base_scratch.yml
@@ -23,6 +23,8 @@ models:
         description: '{{ doc("col_media_label") }}'
       - name: session_identifier
         description: '{{ doc("col_session_identifier") }}'
+      - name: app_id
+        description: '{{doc("col_app_id")}}'
       - name: domain_sessionid_array
         description: '{{ doc("col_domain_sessionid_array") }}'
       - name: user_identifier

diff --git a/models/media_base/scratch/snowplow_media_player_base_this_run.sql b/models/media_base/scratch/snowplow_media_player_base_this_run.sql
@@ -40,6 +40,7 @@ events_this_run as (
     ,i.player_id
     ,i.media_label
     ,i.session_identifier
+    ,i.app_id
     ,i.user_identifier
     ,i.user_id
     ,i.platform
@@ -86,7 +87,7 @@ events_this_run as (
 
   from events_this_run as i
 
-  {{ dbt_utils.group_by(n=17+(var('snowplow__base_passthroughs', [])|length)) }}
+  {{ dbt_utils.group_by(n=18+(var('snowplow__base_passthroughs', [])|length)) }}
 
 )
 
@@ -206,6 +207,7 @@ select
   d.player_id,
   d.media_label,
   d.session_identifier,
+  d.app_id,
   d.domain_sessionid_array,
   d.user_identifier,
   d.user_id,

diff --git a/models/media_plays/media_plays.yml b/models/media_plays/media_plays.yml
@@ -24,6 +24,8 @@ models:
         description: '{{ doc("col_media_label") }}'
       - name: session_identifier
         description: '{{ doc("col_session_identifier") }}'
+      - name: app_id
+        description: '{{doc("col_app_id")}}'
       - name: domain_sessionid_array
         description: '{{ doc("col_domain_sessionid_array") }}'
       - name: user_identifier