ga4-export-fixer 0.1.6-dev.2 → 0.1.6-dev.3

package/helpers.js

@@ -1,4 +1,5 @@
 const constants = require('./constants');
+const { baseConfig } = require('./defaultConfig');
 
 /*
 Unnesting parameters
@@ -248,19 +249,29 @@ const ga4ExportDateFilters = (config) => {
  *   @param {Object} [config.preOperations] - Contains full refresh date range values.
  * @returns {string} - SQL condition string to filter the query by date range.
  */
-const finalDataFilter = (config) => {
+const incrementalDateFilter = (config) => {
   const setDateRange = (start, end) => {
     return `(event_date >= ${start} and event_date <= ${end})`;
   };
 
+  // test mode
   if (config.test) {
-    return setDateRange(config.testConfig.dateRangeStart, config.testConfig.dateRangeEnd);
+    const testStart = config.testConfig.dateRangeStart || baseConfig.testConfig.dateRangeStart;
+    const testEnd = config.testConfig.dateRangeEnd || baseConfig.testConfig.dateRangeEnd;
+
+    return setDateRange(testStart, testEnd);
   }
+
+  // incremental mode
   if (config.incremental) {
     return setDateRange(constants.DATE_RANGE_START_VARIABLE, constants.DATE_RANGE_END_VARIABLE);
   }
-    
-  return setDateRange(config.preOperations.dateRangeStartFullRefresh, config.preOperations.dateRangeEnd);
+
+  // full refresh mode
+  const fullRefreshStart = config.preOperations.dateRangeStartFullRefresh || baseConfig.preOperations.dateRangeStartFullRefresh;
+  const fullRefreshEnd = config.preOperations.dateRangeEnd || baseConfig.preOperations.dateRangeEnd;
+
+  return setDateRange(fullRefreshStart, fullRefreshEnd);
 };
 
 /*
@@ -744,7 +755,7 @@ module.exports = {
   filterEventParams,
   aggregateSessionParams,
   excludeNullSessionParams,
-  finalDataFilter,
+  incrementalDateFilter,
   extractPageDetails,
   extractUrlHostname,
   extractUrlPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ga4-export-fixer",
-  "version": "0.1.6-dev.2",
+  "version": "0.1.6-dev.3",
   "description": "",
   "main": "index.js",
   "files": [
@@ -10,7 +10,8 @@
     "preOperations.js",
     "constants.js",
     "tables",
-    "inputValidation.js"
+    "inputValidation.js",
+    "config.js"
   ],
   "scripts": {
     "test": "node tests/ga4EventsEnhanced.test.js",

package/tables/ga4EventsEnhanced.js

@@ -3,71 +3,11 @@ const utils = require('../utils.js');
 const inputValidation = require('../inputValidation.js');
 const constants = require('../constants.js');
 const preOperations = require('../preOperations.js');
+const { ga4EventsEnhancedConfig } = require('../defaultConfig.js'); // config defaults
 
 // default configuration for the GA4 Events Enhanced table
 const defaultConfig = {
-    // required
-    sourceTable: undefined,
-    sourceTableType: 'GA4_EXPORT', // used with pre operations to detect if ga4 export specific pre operations are needed
-    self: undefined,
-    incremental: undefined,
-    // optional but recommended
-    schemaLock: undefined,
-    // only used with js tables
-    // dataformTableConfig: {},
-    // optional
-    includedExportTypes: {
-        daily: true,
-        intraday: true,
-        fresh: false,
-    },
-    timezone: 'Etc/UTC',
-    customTimestampParam: undefined,
-    dataIsFinal: {
-        detectionMethod: 'EXPORT_TYPE', // or 'DAY_THRESHOLD'
-        dayThreshold: 4 // only used if detectionMethod is 'DAY_THRESHOLD'
-    },
-    test: false,
-    testConfig: {
-        dateRangeStart: 'current_date()-1',
-        dateRangeEnd: 'current_date()',
-    },
-    // number of additional days to take in for taking into account sessions that overlap days
-    bufferDays: 1,
-    preOperations: {
-        dateRangeStartFullRefresh: 'date(2000, 1, 1)',
-        dateRangeEnd: 'current_date()',
-        // incrementalStartOverride and incrementalEndOverride are used to override the date range start and end for incremental refresh
-        // this is useful if you want to re-process only a specific date range
-        incrementalStartOverride: undefined,
-        incrementalEndOverride: undefined,
-        numberOfPreviousDaysToScan: 10,
-    },
-    // these parameters are excluded by default because they've been made available in other columns
-    defaultExcludedEventParams: [
-        'page_location',
-        'ga_session_id',
-        //'custom_event_timestamp', // removed if customTimestampParam is used
-    ],
-    excludedEventParams: [],
-    eventParamsToColumns: [
-        //{name: 'page_location', type: 'string', columnName: 'page_location2'},
-    ],
-    sessionParams: [],
-    defaultExcludedEvents: [],
-    // session_start and first_visit are excluded via the excludedEvents array
-    // this allows the user to include them if needed
-    excludedEvents: [
-        'session_start',
-        'first_visit'
-    ],
-    defaultExcludedColumns: [
-        'event_dimensions', // legacy column, not needed
-        'traffic_source', // renamed to user_traffic_source
-        'session_id'
-    ],
-    // exclude these columns when extracting raw data from the export tables
-    excludedColumns: [],
+    ...ga4EventsEnhancedConfig,
 };
 
 // List the columns in the order they should be in the final table
@@ -342,7 +282,7 @@ ${excludedEventsSQL}`,
                 condition: 'using(session_id)'
             }
         ],
-        where: helpers.finalDataFilter(mergedConfig)
+        where: helpers.incrementalDateFilter(mergedConfig)
     };
 
     const steps = [