ga4-export-fixer 0.4.7-dev.1 → 0.4.7-dev.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ga4-export-fixer",
-  "version": "0.4.7-dev.1",
+  "version": "0.4.7-dev.3",
   "description": "",
   "main": "index.js",
   "files": [
@@ -17,11 +17,14 @@
     "createTable.js"
   ],
   "scripts": {
-    "test": "node tests/ga4EventsEnhanced.test.js && node tests/mergeSQLConfigurations.test.js && node tests/preOperations.test.js && node tests/documentation.test.js",
+    "test": "node tests/ga4EventsEnhanced.test.js && node tests/mergeSQLConfigurations.test.js && node tests/preOperations.test.js && node tests/documentation.test.js && node tests/inputValidation.test.js && node tests/createTable.test.js",
+    "test:summary": "node tests/testRunner.js",
     "test:docs": "node tests/documentation.test.js",
     "test:preops": "node tests/preOperations.test.js",
     "test:events": "node tests/ga4EventsEnhanced.test.js",
     "test:merge": "node tests/mergeSQLConfigurations.test.js",
+    "test:validation": "node tests/inputValidation.test.js",
+    "test:createTable": "node tests/createTable.test.js",
     "test:integration": "node tests/integration/integration.test.js",
     "readme": "node scripts/updateReadme.js",
     "prepublishOnly": "node scripts/updateReadme.js"

package/tables/ga4EventsEnhanced/index.js

@@ -157,7 +157,7 @@ const getFinalColumnOrder = (eventDataStep, sessionDataStep) => {
  */
 const _generateEnhancedEventsSQL = (mergedConfig) => {
     // the most accurate available timestamp column
-    const mainTimestampColumn = mergedConfig.customTimestampParam ? 'event_custom_timestamp' : 'event_timestamp';
+    const timestampColumn = mergedConfig.customTimestampParam ? 'event_custom_timestamp' : 'event_timestamp';
 
     // exlude these events from the table
     const excludedEvents = mergedConfig.excludedEvents;
@@ -236,12 +236,12 @@ ${excludedEventsSQL}`,
         name: 'session_data',
         columns: {
             session_id: 'session_id',
-            user_id: helpers.aggregateValue('user_id', 'last', mainTimestampColumn),
-            merged_user_id: `ifnull(${helpers.aggregateValue('user_id', 'last', mainTimestampColumn)}, any_value(user_pseudo_id))`,
-            session_params: helpers.aggregateSessionParams(mergedConfig.sessionParams, 'session_params_prep', mainTimestampColumn),
-            session_traffic_source_last_click: helpers.aggregateValue('session_traffic_source_last_click', 'first', mainTimestampColumn),
-            session_first_traffic_source: `array_agg(collected_traffic_source order by ${mainTimestampColumn} limit 1)[safe_offset(0)]`, // don't ignore nulls
-            landing_page: helpers.aggregateValue(`if(entrances > 0, page, null)`, 'first', mainTimestampColumn),
+            user_id: helpers.aggregateValue('user_id', 'last', timestampColumn),
+            merged_user_id: `ifnull(${helpers.aggregateValue('user_id', 'last', timestampColumn)}, any_value(user_pseudo_id))`,
+            session_params: helpers.aggregateSessionParams(mergedConfig.sessionParams, 'session_params_prep', timestampColumn),
+            session_traffic_source_last_click: helpers.aggregateValue('session_traffic_source_last_click', 'first', timestampColumn),
+            session_first_traffic_source: `array_agg(collected_traffic_source order by ${timestampColumn} limit 1)[safe_offset(0)]`, // don't ignore nulls
+            landing_page: helpers.aggregateValue(`if(entrances > 0, page, null)`, 'first', timestampColumn),
         },
         from: 'event_data',
         where: `session_id is not null`,
@@ -346,8 +346,20 @@ const setPreOperations = (config) => {
     return preOperations.setPreOperations(mergedConfig);
 };
 
+const getColumnDescriptions = (config) => {
+    const mergedConfig = utils.mergeSQLConfigurations(defaultConfig, config);
+    return documentation.getColumnDescriptions(mergedConfig, columnMetadata);
+};
+
+const getTableDescription = (config) => {
+    const mergedConfig = utils.mergeSQLConfigurations(defaultConfig, config);
+    return documentation.buildTableDescription(mergedConfig, getTableDescriptionSections(mergedConfig));
+};
+
 module.exports = {
-    generateSql: generateEnhancedEventsSQL,
     createTable: createEnhancedEventsTable,
-    setPreOperations: setPreOperations
+    generateSql: generateEnhancedEventsSQL,
+    setPreOperations: setPreOperations,
+    getColumnDescriptions: getColumnDescriptions,
+    getTableDescription: getTableDescription
 }