fixes

Author: SorinSV

models/analytics/google_analytics_events_wid.sql

@@ -32,7 +32,7 @@
 {%- set tmp_res = ta_firebase.get_filtered_columns_for_table("google_analytics_installs_raw", columnNamesInstallDimensions, miniColumnsToIgnoreInGroupBy) -%}
 {%- set columnsForInstallDimensions = tmp_res[0] -%}
 {%- set installDimensionsUnnestedCount = tmp_res[1]  -%}
--- {# do these separaetely, so we don't end up with install_installed_dates #}
+{# do these separaetely, so we don't end up with install_installed_dates #}
 {%- set tmp_res = ta_firebase.get_filtered_columns_for_table("google_analytics_installs_raw", ["installed_dates"], miniColumnsToIgnoreInGroupBy) -%}
 {%- set columnsForInstalledDatesDimension = tmp_res[0] -%}
 {%- set installedDatesDimensionsUnnestedCount = tmp_res[1]  -%}
@@ -49,8 +49,8 @@
 {%- set miniColumnsToAlsoNil = [] -%}
 WITH data as (
     SELECT    DATE(events.event_ts) as event_date
-            , project_id
-            , dataset_id
+            , events.project_id
+            , events.dataset_id
             , {{ ta_firebase.unpack_columns_into_minicolumns(columnsForEventDimensions, miniColumnsToIgnoreInGroupBy, miniColumnsToAlsoNil ,"events.", "event_") }}
             , DATE(installs.install_ts) as install_date
             , events.install_age as install_age

models/analytics/google_analytics_events_wid_forced_nulls.sql

@@ -32,7 +32,7 @@
 {%- set tmp_res = ta_firebase.get_filtered_columns_for_table("google_analytics_installs_raw", columnNamesInstallDimensions, miniColumnsToIgnoreInGroupBy) -%}
 {%- set columnsForInstallDimensions = tmp_res[0] -%}
 {%- set installDimensionsUnnestedCount = tmp_res[1]  -%}
--- {# do these separaetely, so we don't end up with install_installed_dates #}
+{# do these separaetely, so we don't end up with install_installed_dates #}
 {%- set tmp_res = ta_firebase.get_filtered_columns_for_table("google_analytics_installs_raw", ["installed_dates"], miniColumnsToIgnoreInGroupBy) -%}
 {%- set columnsForInstalledDatesDimension = tmp_res[0] -%}
 {%- set installedDatesDimensionsUnnestedCount = tmp_res[1]  -%}
@@ -50,8 +50,8 @@
 {%- set miniColumnsToAlsoNil = ta_firebase.get_mini_columns_to_also_force_null_when_rolling_up() -%}
 WITH data as (
     SELECT    DATE(events.event_ts) as event_date
-            , project_id
-            , dataset_id
+            , events.project_id
+            , events.dataset_id
             , {{ ta_firebase.unpack_columns_into_minicolumns(columnsForEventDimensions, miniColumnsToIgnoreInGroupBy, miniColumnsToAlsoNil ,"events.", "event_") }}
             , DATE(installs.install_ts) as install_date
             , events.install_age as install_age

models/app_health/app_health.sql

@@ -61,7 +61,7 @@
     {%- endfor -%}
 {%- endfor -%}
 
-{%- set commonDimensions = ["event_date","platform","app_id","reverse_app_id",
+{%- set commonDimensions = ["event_date","platform","bundle_id","reverse_bundle_id",
                             "app_version.join_value","platform_version.join_value",
                             "device_hardware.type","device_hardware.manufacturer","device_hardware.os_model"] -%}
 
@@ -134,8 +134,8 @@ WITH analytics AS (
 )
 SELECT  event_date
       , platform 
-      , app_id
-      , reverse_app_id
+      , bundle_id
+      , reverse_bundle_id
       , {{ ta_firebase.get_version_record_from_normalized('app_version_join_value') }} AS app_version
       , {{ ta_firebase.get_version_record_from_normalized('platform_version_join_value') }} AS platform_version
       , STRUCT<type STRING, manufacturer STRING, os_model STRING>(

models/crashlytics/crashlytics_events.sql

@@ -10,7 +10,7 @@
 ) }}
 
 
-{%- set columnNamesEventDimensions = ["bunlde_id", "reverse_bundle_id", "issue", "platform", "error_type", "process_state"
+{%- set columnNamesEventDimensions = ["bundle_id", "reverse_bundle_id", "issue", "platform", "error_type", "process_state"
                                      ,"orientation", "app_version", "platform_version", "jailbroken_state"
                                      ,"device_hardware", "custom_keys"
 ] -%}

models/crashlytics/crashlytics_events_raw.sql

@@ -116,8 +116,8 @@
     , installation_uuid as crashlytics_user_pseudo_id
     , (SELECT value FROM UNNEST(custom_keys) WHERE key = 'fb_user_pseudo_id') as firebase_analytics_user_pseudo_id
     , COALESCE(user.id, (SELECT value FROM UNNEST(custom_keys) WHERE key = 'app_user_id')) as user_id
-    , bundle_identifier as app_id
-    , ARRAY_TO_STRING(ARRAY_REVERSE(SPLIT(bundle_identifier, '.')), '.') as reverse_app_id
+    , bundle_identifier as bundle_id
+    , ARRAY_TO_STRING(ARRAY_REVERSE(SPLIT(bundle_identifier, '.')), '.') as reverse_bundle_id
     , event_id
          -- the platform we get in operating_system.type is not populated for Android, only for iOS. So rely on _TABLE_SUFFIX instead
     , CASE WHEN _TABLE_SUFFIX LIKE '%ANDROID%' THEN'ANDROID'