ga4-export-fixer 0.1.6-dev.9 → 0.2.0

package/README.md

@@ -32,7 +32,7 @@ Include the package in the package.json file in your Dataform repository.
 {
   "dependencies": {
     "@dataform/core": "3.0.42",
-    "ga4-export-fixer": "0.1.5"
+    "ga4-export-fixer": "0.2.0"
   }
 }
 ```
@@ -220,35 +220,72 @@ All fields are optional except `sourceTable`. Default values are applied automat
 
 Date fields (`dateRangeStart`, `dateRangeEnd`, etc.) accept string dates in `YYYYMMDD` or `YYYY-MM-DD` format, or BigQuery SQL expressions (e.g. `'current_date()'`, `'date(2026, 1, 1)'`).
 
-### Build on top of the ga4_events_enhanced table
+### Building on top of the ga4_events_enhanced table
+
+Setting up incremental updates is easy using the **setPreOperations()** function. Just ensure that your result table includes the **data_is_final** flag from the **ga4_enhanced_events** table.
+
+The **incrementalDateFilter()** function applies the same date filtering used by **ga4_events_enhanced**, based on the **config** options and the variables declared by **setPreOperations()**.
+
+Key fields such as session_id, user_id, and session_traffic_source_last_click are available as clean, sessionized versions that handle edge cases like sessions spanning midnight.
 
 **`definitions/ga4/ga4_sessions.sqlx`**
 ```javascript
 config {
   type: "incremental",
-  description: "GA4 Events Enhanced table",
-  schema: "ga4",
+  description: "GA4 sessions table",
+  schema: "ga4_export_fixer",
   bigquery: {
     partitionBy: "event_date",
-    clusterBy: ['event_name', 'session_id', 'page_location', 'data_is_final'],
+    clusterBy: ['session_id', 'data_is_final'],
   },
   tags: ['ga4_export_fixer']
 }
 
 js {
-  const { ga4EventsEnhanced } = require('ga4-export-fixer');
+  const { setPreOperations, helpers } = require('ga4-export-fixer');
 
   const config = {
-    sourceTable: ref(constants.GA4_TABLES.MY_GA4_EXPORT),
     self: self(),
-    incremental: incremental()
+    incremental: incremental(),
+    /*
+    Default options that can be overriden:
+    test: false,
+    testConfig: {
+        dateRangeStart: 'current_date()-1',
+        dateRangeEnd: 'current_date()',
+    },
+    preOperations: {
+        dateRangeStartFullRefresh: 'date(2000, 1, 1)',
+        dateRangeEnd: 'current_date()',
+        // incremental date range overrides allow re-processing only a subset of the data:
+        //incrementalStartOverride: undefined,
+        //incrementalEndOverride: undefined,
+    },
+    */
   };
 }
 
-${ga4EventsEnhanced.generateSql(config)}
+select
+  event_date,
+  session_id,
+  user_pseudo_id,
+  user_id,
+  any_value(session_traffic_source_last_click.cross_channel_campaign) as session_traffic_source,
+  any_value(landing_page) as landing_page,
+  current_datetime() as row_inserted_timestamp,
+  min(data_is_final) as data_is_final
+from
+  ${ref('ga4_events_enhanced_298233330')}
+where
+  ${helpers.incrementalDateFilter(config)}
+group by 
+  event_date,
+  session_id,
+  user_pseudo_id,
+  user_id
 
 pre_operations {
-  ${ga4EventsEnhanced.setPreOperations(config)}
+  ${setPreOperations(config)}
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ga4-export-fixer",
-  "version": "0.1.6-dev.9",
+  "version": "0.2.0",
   "description": "",
   "main": "index.js",
   "files": [

package/preOperations.js

@@ -85,7 +85,7 @@ const getDateRangeStartIntraday = (config) => {
       date
   )
   select
-    max(
+    min(
       if(
         intraday = true and daily = false,
         date,